From f84782d6200efb424731c93bd029c7cbeb9f3dad Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 29 Sep 2010 20:47:43 -0700
Subject: Stop caching all module variables in the vars table using the
 name=_cache row.  If that overflows, it will cause us to be unable to load
 variables, and we can't recover from that.

Instead, use the Cache table.  Bump the gallery module to v40.  Fixes
ticket #1405.
---
 modules/gallery/views/admin_advanced_settings.html.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 1f7d2f64..edaeecaf 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -17,7 +17,6 @@
         <th> <?= t("Value") ?></th>
       </tr>
       <? foreach ($vars as $var): ?>
-      <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
       <tr class="<?= text::alternate("g-odd", "g-even") ?>">
         <td> <?= $var->module_name ?> </td>
         <td> <?= html::clean($var->name) ?> </td>
-- 
cgit v1.2.3


From 86981c5afb980f744103af8b2e9a229e745d98fb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Oct 2010 21:09:14 -0700
Subject: Use the "loading" image from themes/wind since it's no longer in
 gallery3/lib.

---
 modules/gallery/views/upgrader.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 1ec49c77..ad2e3421 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -17,7 +17,7 @@
           <a id="dialog_close_link" style="display: none" onclick="$('#dialog').fadeOut(); return false;" href="#" class="close">[x]</a>
           <div id="busy" style="display: none">
             <h1>
-              <img width="16" height="16" src="<?= url::file("lib/images/loading-small.gif") ?>"/>
+              <img width="16" height="16" src="<?= url::file("themes/wind/images/loading-small.gif") ?>"/>
               <?= t("Upgrade in progress!") ?>
             </h1>
             <p>
-- 
cgit v1.2.3


From 945e79b17182f7c96eb4b566bd41d26b5f8c4288 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 8 Nov 2010 13:51:51 -0800
Subject: Add a pure javascript mechanism for filtering advanced properties. 
 Partial fix for #1478.

---
 .../gallery/views/admin_advanced_settings.html.php  | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index edaeecaf..d4f646f8 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -9,6 +9,7 @@
     <li class="g-warning"><?= t("Change these values at your own risk!") ?></li>
   </ul>
 
+  <?= t("Filter:") ?> <input id="g-admin-advanced-settings-filter" type="text"></input>
   <div class="g-block-content">
     <table>
       <tr>
@@ -17,7 +18,7 @@
         <th> <?= t("Value") ?></th>
       </tr>
       <? foreach ($vars as $var): ?>
-      <tr class="<?= text::alternate("g-odd", "g-even") ?>">
+      <tr class="setting-row <?= text::alternate("g-odd", "g-even") ?>">
         <td> <?= $var->module_name ?> </td>
         <td> <?= html::clean($var->name) ?> </td>
         <td>
@@ -35,4 +36,22 @@
       <? endforeach ?>
     </table>
   </div>
+
+  <script>
+    $(document).ready(function() {
+      $("#g-admin-advanced-settings-filter").keyup(function() {
+        var filter = $(this).attr("value");
+        if (filter) {
+          $("tr.setting-row").fadeOut("fast");
+          $("tr.setting-row td:contains(" + filter + "), tr.setting-row td a:contains(" + filter + ")").each(function() {
+            if ($(this).children().length < 1) {
+              $(this).closest("tr").stop().show();
+            }
+          });
+        } else {
+          $("tr.setting-row").show();
+        }
+      });
+    });
+  </script>
 </div>
-- 
cgit v1.2.3


From 12b77c7ef4bb715df45aa7299872691cc0c4dcef Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 20 Nov 2010 20:54:16 -0800
Subject: Move the sys_getloadavg() call into the template since that's what
 we're doing for other similar calls

---
 modules/gallery/helpers/gallery_block.php           | 1 -
 modules/gallery/views/admin_block_platform.html.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 3e2a7313..86886237 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -70,7 +70,6 @@ class gallery_block_Core {
       $block->css_id = "g-platform";
       $block->title = t("Platform information");
       $block->content = new View("admin_block_platform.html");
-      $block->content->load_average = join(" ", sys_getloadavg());
       break;
 
     case "project_news":
diff --git a/modules/gallery/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php
index 379ab0aa..9a594fa5 100644
--- a/modules/gallery/views/admin_block_platform.html.php
+++ b/modules/gallery/views/admin_block_platform.html.php
@@ -16,7 +16,7 @@
     <?= t("MySQL: %mysql_version", array("mysql_version" => Database::instance()->query("SELECT version() as v")->current()->v)) ?>
   </li>
   <li>
-    <?= t("Server load: %load_average", array("load_average" => $load_average)) ?>
+    <?= t("Server load: %load_average", array("load_average" => join(" ", sys_getloadavg()))) ?>
   </li>
   <li>
     <?= t("Graphics toolkit: %toolkit", array("toolkit" => module::get_var("gallery", "graphics_toolkit"))) ?>
-- 
cgit v1.2.3