From db0966a9bce0396b0c98f3532bca8613f77cdb05 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 12 Jun 2010 15:39:38 -0700
Subject: Fix up some indentation and comment style.

---
 modules/gallery/js/l10n_client.js | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index a1170e2d..a1b970e7 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -60,25 +60,21 @@ jQuery.extend(Gallery, {
           $('#l10n-client').height('22em').removeClass('hidden');
 					//$('#l10n-client').slideUp();
 					$('#g-minimize-l10n').text("_");
-        /*
-         * This CSS clashes with Gallery's CSS, probably due to
-         * YUI's grid / floats.
-          if(!$.browser.msie) {
-              $('body').css('border-bottom', '22em solid #fff');
-          }
-        */
+	  // This CSS clashes with Gallery's CSS, probably due to
+	  // YUI's grid / floats.
+	  // if(!$.browser.msie) {
+	  //     $('body').css('border-bottom', '22em solid #fff');
+	  // }
           $.cookie('Gallery_l10n_client', '1', {expires: 7, path: '/'});
         break;
         case 0:
           $('#l10n-client-string-select, #l10n-client-string-editor, #l10n-client .labels .label').hide();
           $('#l10n-client').height('2em').addClass('hidden');
           // TODO: Localize this message
-					$('#g-minimize-l10n').text(MSG_TRANSLATE_TEXT);
-        /*
-          if(!$.browser.msie) {
-            $('body').css('border-bottom', '0px');
-          }
-        */
+          $('#g-minimize-l10n').text(MSG_TRANSLATE_TEXT);
+          // if(!$.browser.msie) {
+          //   $('body').css('border-bottom', '0px');
+          // }
           $.cookie('Gallery_l10n_client', '0', {expires: 7, path: '/'});
         break;
       }
-- 
cgit v1.2.3


From 6b01022a97e5fbd30d8f9a14b785e3e25ec7c2d4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 13 Jun 2010 20:44:13 -0700
Subject: Hide the admin menu and show it after it's loaded to minimize
 flicker. Normalize the comment text about this interaction between admin_wind
 and wind.

---
 themes/admin_wind/views/admin.html.php | 4 +++-
 themes/wind/views/page.html.php        | 2 +-
 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>
-- 
cgit v1.2.3


From 6f443a819b360a89c53004d3bf860fcedd88ae2e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 13 Jun 2010 20:49:50 -0700
Subject: Change single to double quotes.

---
 modules/gallery/helpers/site_status.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index 759eb382..13c42dda 100644
--- a/modules/gallery/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
@@ -100,7 +100,7 @@ class site_status_Core {
     }
     $buf = array();
     foreach (ORM::factory("message")->find_all() as $msg) {
-      $value = str_replace('__CSRF__', access::csrf_token(), $msg->value);
+      $value = str_replace("__CSRF__", access::csrf_token(), $msg->value);
       $buf[] = "<li class=\"" . self::severity_class($msg->severity) . "\">$value</li>";
     }
 
-- 
cgit v1.2.3


From 793780daa7665f7f86994235c4263fcb63554eb8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 13 Jun 2010 20:51:11 -0700
Subject: Replace __CSRF__ with the actual csrf token.

---
 modules/gallery/helpers/message.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/gallery/helpers/message.php b/modules/gallery/helpers/message.php
index 047eb2c7..1f69e2a9 100644
--- a/modules/gallery/helpers/message.php
+++ b/modules/gallery/helpers/message.php
@@ -78,6 +78,7 @@ class message_Core {
 
     $messages = Session::instance()->get_once("messages", array());
     foreach ($messages as $msg) {
+      $msg[0] = str_replace("__CSRF__", access::csrf_token(), $msg[0]);
       $buf[] = "<li class=\"" . self::severity_class($msg[1]) . "\">$msg[0]</li>";
     }
     if ($buf) {
-- 
cgit v1.2.3