debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove the search field from the speed dial

Browse source
This commit is contained in:
Jean-François Guchens 2009-05-15 23:47:32 +02:00 committed by Christian Dywan
parent 3388c17f74
commit b6ea294189
1 changed files with 14 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
data/speeddial-head.html
View file

@ -11,7 +11,6 @@
<script type="text/javascript" src="{res}/mootools.js"></script> <script type="text/javascript" src="{res}/mootools.js"></script>
<style> <style>
html, body, #content { html, body, #content {
margin: 0px; margin: 0px;
padding: 0px padding: 0px
@ -25,11 +24,15 @@
#wrap { #wrap {
width: 660px; width: 660px;
height: 550px; height: 500px;
margin: 0px auto; margin: 0px auto;
text-align: center; text-align: center;
} }
#content {
margin-top: 40px;
}
div.shortcut { div.shortcut {
float: left; float: left;
border: 1px solid #ccc; border: 1px solid #ccc;
@ -102,30 +105,10 @@
color: #222; color: #222;
} }
#search_bar {
margin: 20px 0px 20px;
}
div.clear { div.clear {
clear: both; clear: both;
} }
input[type=text] {
color: #ddd;
vertical-align: middle;
font-size: 13px;
}
input[type=text]:active, input[type=text]:focus {
color: #222;
}
button {
font-size: 12px;
padding: 5px 7px;
vertical-align: middle;
}
div.activated { div.activated {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
@ -163,6 +146,12 @@
sc = JSON.decode ({json_data}); sc = JSON.decode ({json_data});
var encodeSafe = function (obj) {
var str = JSON.encode (obj);
str = str.replace (/\'/g, '\\\'');
return str;
}
var getAction = function (id) var getAction = function (id)
{ {
var a = $(id).getFirst (); var a = $(id).getFirst ();
@ -219,7 +208,7 @@
sc.shortcuts[num].href = href; sc.shortcuts[num].href = href;
sc.shortcuts[num].img = data; sc.shortcuts[num].img = data;
console.log ("speed_dial-save '" + JSON.encode (sc) + "'"); console.log ("speed_dial-save '" + encodeSafe (sc) + "'");
} }
var renameShortcut = function (id) var renameShortcut = function (id)
@ -232,7 +221,7 @@
$(id).getLast ().set ('html', name); $(id).getLast ().set ('html', name);
sc.shortcuts[num].title = name; sc.shortcuts[num].title = name;
console.log ("speed_dial-save '" + JSON.encode (sc) + "'"); console.log ("speed_dial-save '" + encodeSafe (sc) + "'");
} }
var clearShortcut = function (id) var clearShortcut = function (id)
@ -261,16 +250,7 @@
sc.shortcuts[num].title = ""; sc.shortcuts[num].title = "";
sc.shortcuts[num].img = ""; sc.shortcuts[num].img = "";
console.log ("speed_dial-save '" + JSON.encode (sc) + "'"); console.log ("speed_dial-save '" + encodeSafe (sc) + "'");
}
var speeddialSearch = function ()
{
var reg = new RegExp ("%s", "g");
var search_url = $('search_bar').getProperty ('action');
var search_content = $('search_bar').getFirst ().get ('value');
window.location.href = search_url.replace (reg, encodeURIComponent (search_content));
return false;
} }
var buildSpeeddial = function () var buildSpeeddial = function ()
@ -329,12 +309,6 @@
</head> </head>
<body> <body>
<div id="wrap"> <div id="wrap">
<form id="search_bar" name="search_bar" action="{search_uri}"
method="get" onsubmit="javascript:return speeddialSearch();">
<input type="text" name="q" value="{search_title}" onfocus="javascript:this.value='';"
onblur="javascript:if(this.value=='') this.value='{search_title}';" />
<button>{search}</button>
</form>
<div id="content"> <div id="content">
</div> </div>
</div> </div>