summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-06-14 07:44:17 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-06-14 07:44:17 -0700
commit1c5264d7f5a2914f3ae0cb1208b2bc2810b090ec (patch)
tree4b6751a0daf69ac9a55fb2c1bb05a60fbc8d6b3e /themes
parent821d3f7854d76922b53df7e523eeaa8d4dca8c7b (diff)
parent793780daa7665f7f86994235c4263fcb63554eb8 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_wind/views/admin.html.php4
-rw-r--r--themes/wind/views/page.html.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index ff7b930f..f9ef18c7 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -53,9 +53,11 @@
&larr; <?= t("back to the ...") ?>
</a>
<?= $theme->user_menu() ?>
- <div id="g-site-admin-menu" class="ui-helper-clearfix">
+ <!-- hide the menu until after the page has loaded, to minimize menu flicker -->
+ <div id="g-site-admin-menu" class="ui-helper-clearfix" style="visibility: hidden">
<?= $theme->admin_menu() ?>
</div>
+ <script type="text/javascript"> $(document).ready(function() { $("#g-site-admin-menu").css("visibility", "visible"); }) </script>
<?= $theme->admin_header_bottom() ?>
</div>
<div id="bd">
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 4cc949ce..6ce2a559 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -87,7 +87,7 @@
<?= $theme->user_menu() ?>
<?= $theme->header_top() ?>
- <!-- hide the menu and make it visible after the page has loaded, to minimize menu flicker -->
+ <!-- hide the menu until after the page has loaded, to minimize menu flicker -->
<div id="g-site-menu" style="visibility: hidden">
<?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
</div>