Hide the menu until we can superfish it so that we don't see the

unstyled list appear which causes the page layout to flicker.

4 files changed, 14 insertions, 12 deletions

diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 120b04ba..677b985a 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -13,6 +13,7 @@ $(document).ready(function(){
     pathClass: 'current',
     speed: 'fast'
   });
+  $("#gSiteAdminMenu").css("display", "block");
 
   // Apply modal dialogs
   var dialogLinks = $(".gDialogLink");
@@ -48,7 +49,7 @@ $(document).ready(function(){
 
   // Add drop shadows
   $(".gSelected").dropShadow();
-	
+
   // In-place editing for tag admin
   $(".gEditable").bind("click", editInplace);
 
@@ -77,7 +78,7 @@ function closeEditInPlaceForms() {
 
 function editInplace(element){
 	closeEditInPlaceForms();
-	
+
   // creat edit form
 	var tag_id = $(this).attr('id').substr(5);
   var tag_name = $(this).text();
@@ -88,7 +89,7 @@ function editInplace(element){
 	form += '<input type="submit" class="submit" value="Save" />';
 	form += '<span>or</span> <a href="#">cancel</a>';
 	form += '</form>';
-  
+
   // add edit form
 	$(this).parent().html(form);
   $("#gRenameTagForm #name")
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index f585b503..85a9cacf 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -46,7 +46,7 @@
             <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1") ?>">Logout</a></li>
           </ul>
           <a href="<?= url::site("albums/1") ?>"><img src="<?= url::file("themes/default/images/logo.png") ?>" id="gLogo" alt="<?= t("Gallery 3: Your Photos on Your Web Site") ?>" /></a>
-          <div id="gSiteAdminMenu">
+          <div id="gSiteAdminMenu" style="display: none">
             <?= $theme->admin_menu() ?>
           </div>
           <?= $theme->admin_header_bottom() ?>
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 15815c70..3c6ca777 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -23,6 +23,7 @@ $(document).ready(function() {
     },
     speed: 'fast'
   });
+  $("#gSiteMenu").css("display", "block");
 
   // Round view menu buttons
   if ($("#gViewMenu").length) {
@@ -36,7 +37,7 @@ $(document).ready(function() {
   handleShortFormEvent(shortForms);
   $(".gShortForm input[type=text]").addClass("ui-corner-left");
   $(".gShortForm input[type=submit]").addClass("ui-state-default ui-corner-right");
-  
+
   // Apply jQuery UI button css to submit inputs
   $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all");
 
@@ -81,12 +82,12 @@ $(document).ready(function() {
 
   // Add hover state for buttons
   $(".ui-state-default").hover(
-	  function(){
-		  $(this).addClass("ui-state-hover");
-	  },
-	  function(){
-		  $(this).removeClass("ui-state-hover");
-	  }
+    function(){
+      $(this).addClass("ui-state-hover");
+    },
+    function(){
+      $(this).removeClass("ui-state-hover");
+    }
   );
 
 });
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 016fb3fb..2f40d8a9 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,7 +4,7 @@
   <img id="gLogo" alt="<?= t("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
 </a>
 
-<div id="gSiteMenu">
+<div id="gSiteMenu" style="display: none">
 <?= $theme->site_menu() ?>
 </div>