Merge with mainline

static/css/default.css

@@ -229,7 +229,7 @@ div.right {
 .logo {
     float: right;
     /*margin: 5px 0 0 5px;*/
-    height: 90px;
+    height: 80px;
 }
 
 .dropdown {

static/js/common.js

@@ -180,8 +180,10 @@ checkTableSelection = function(text) {
     return confirm(text);
 };
 
-searchbox_init = function() {
+function searchbox_init() {
     var myFx = new Fx.Slide($("searchparams"));
+    var $searchfield = $("searchfield");
+
     myFx.hide();
     $("searchopts").addEvent("click", function(event) {
         myFx.cancel();
@@ -191,28 +193,31 @@ searchbox_init = function() {
         myFx.cancel();
         myFx.toggle();
     });
-    $("searchfield").addEvent("change", function(event) {
+    $searchfield.addEvent("change", function(event) {
         var criteria = "";
+        var pattern = this.get("value");
+
         $$("input[name=scriteria]:checked").each(function(obj) {
             criteria = obj.value;
         });
-        var pattern = $("searchfield").get("value");
         if (pattern != "") {
-            var params = "pattern=" + pattern + "&criteria=" + criteria;
-            current_anchor.updateparams(params);
+            current_anchor.setparams({
+                pattern: pattern,
+                criteria: criteria
+            });
         } else {
             current_anchor.deleteParam("pattern");
             current_anchor.deleteParam("criteria");
         }
         current_anchor.update();
     });
-    $("searchfield").addEvent("click", function(event) {
-        $("searchfield").select();
+    $searchfield.addEvent("click", function(event) {
+        $searchfield.select();
     });
 
-    $("searchfield").addEvent("blur", function(event) {
-        if ($("searchfield").value == "") {
-            $("searchfield").set("value", gettext("Search..."));
+    $searchfield.addEvent("blur", function(event) {
+        if ($searchfield.value == "") {
+            $searchfield.set("value", gettext("Search..."));
         }
     });
     $("searchbox").setStyle("float", "left");
@@ -220,7 +225,7 @@ searchbox_init = function() {
     if (frag.indexOf('?') != -1) {
         var params = frag.substring(frag.indexOf('?') + 1).parseQueryString();
         if ($defined(params.pattern)) {
-            $("searchfield").set("value", params.pattern);
+            $searchfield.set("value", params.pattern);
         }
         if ($defined(params.criteria)) {
             $("crit_" + params.criteria).checked = true;

static/js/email_listing.js

@@ -4,9 +4,11 @@
  */
 
 function navbarcallback(event) {
-  event.stop();
-  current_anchor.setparams(navparams);
-  current_anchor.parse_string($(event.target).getParent().get("href")).update();
+    event.stop();
+    current_anchor.reset()
+        .setparams(navparams)
+        .updateparams(this.get("href"))
+        .update();
 }
 
 function updatelisting(resp) {
@@ -23,7 +25,7 @@ function updatelisting(resp) {
     }
     if ($defined(resp.navbar)) {
         $("navbar").set("html", resp.navbar);
-        $("navbar").getChildren("a").addEvent("click", navbarcallback);
+        $$("#navbar a").addEvent("click", navbarcallback);
     }
 }