4 files changed, 7 insertions, 27 deletions
diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php
index d3c61fa8..779bb475 100644
--- a/core/helpers/core_block.php
+++ b/core/helpers/core_block.php
@@ -21,9 +21,7 @@
 class core_block_Core {
   public static function head($theme) {
     $url = url::base(true);
-    $head[] = "<script>var base_url = \"$url\";</script>";
-    $head[] = '<script src="' . url::file("core/js/menu.js") . '" type="text/javascript"></script>';
-    return implode("\n", $head);
+    return "<script>var base_url = \"$url\";</script>\n";
   }
 
   public static function page_bottom($theme) {
diff --git a/core/js/menu.js b/core/js/menu.js
deleted file mode 100644
index 7ca166e7..00000000
--- a/core/js/menu.js
+++ /dev/null
@@ -1,21 +0,0 @@
-$("document").ready(function() {
-  $("#gSiteMenu ul:not(:first)").css("display", "none");
-  $("#gSiteMenu li").mouseover(function (ev) {
-    $(this).children("ul").css("display", "block");
-    $(this).children("ul").find("li").css("clear", "both");
-
-    this.dropdown_open = true;
-  });
-  $("#gSiteMenu li").mouseout(function (ev) {
-    $(this).children("ul").css("display", "none");
-    this.dropdown_open = false;
-  });
-
-  $("#gSiteMenu li a").click(function () {
-    var href = $(this).attr("href");
-    if (href == "#") {
-      return false;
-    }
-    return true;
-  });
-});
diff --git a/core/libraries/Menu.php b/core/libraries/Menu.php
index 9fd51415..39996d01 100644
--- a/core/libraries/Menu.php
+++ b/core/libraries/Menu.php
@@ -55,7 +55,7 @@ class Menu_Element {
  */
 class Menu_Element_Link extends Menu_Element {
   public function __toString() {
-    return "<li><a href=\"$this->url\">$this->label</a><li>";
+    return "<li><a class=\"gMenuElement\" href=\"$this->url\">$this->label</a><li>";
   }
 }
 
@@ -64,7 +64,7 @@ class Menu_Element_Link extends Menu_Element {
  */
 class Menu_Element_Dialog extends Menu_Element {
   public function __toString() {
-    return "<li><a class=\"gDialogLink\" href=\"$this->url\" " .
+    return "<li><a class=\"gMenuLink\" href=\"$this->url\" " .
            "title=\"$this->label\">$this->label</a></li>";
   }
 }
@@ -117,7 +117,7 @@ class Menu_Core extends Menu_Element {
   }
 
   public function __toString() {
-    $html = $this->is_root ? "<ul>" : "<li><a href=#>$this->label</a><ul>";
+    $html = $this->is_root ? "<ul class=\"gMenu\">" : "<li><a href=#>$this->label</a><ul class=\"gMenu\">";
     $html .= implode("\n", $this->elements);
     $html .= $this->is_root ? "</ul>" : "</ul></li>";
     return $html;
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 93994664..a131421b 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -3,6 +3,9 @@
  */
 $("document").ready(function() {
 
+  $(".gMenuLink").addClass("gDialogLink");
+  $("ul.gMenu").addClass("sf-menu");
+  
   /**
    * Superfish menu options
    */