From be226b9baa8ce21431e35c32277fda2e8c94a216 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 16 Jun 2009 20:25:01 -0700
Subject: Add option to list *all* l10n messages (that have been indexed) in
 l10n UI

TODO: The "Show All" link is almost invisible (link color ~= background)
---
 modules/gallery/controllers/l10n_client.php | 14 +++++++++++++-
 modules/gallery/views/l10n_client.html.php  |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index aa93a758..831c79c1 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -106,7 +106,19 @@ class L10n_Client_Controller extends Controller {
   }
 
   public static function l10n_form() {
-    $calls = I18n::instance()->call_log();
+    if (Input::instance()->get("show_all_l10n_messages")) {
+      $calls = array();
+      foreach (Database::instance()
+               ->select("key", "message")
+               ->from("incoming_translations")
+               ->where(array("locale" => 'root'))
+               ->get()
+               ->as_array() as $row) {
+        $calls[$row->key] = array(unserialize($row->message), array());
+      }
+    } else {
+      $calls = I18n::instance()->call_log();
+    }
     $locale = I18n::instance()->locale();
 
     if ($calls) {
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 2e53f48f..18f39537 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -2,7 +2,7 @@
 <div id="l10n-client" class="hidden">
   <div class="labels">
     <span class="toggle"><?= t("Translate Text") ?></span>
-    <div class="label strings"><h2><?= t("Page Text") ?></h2></div>
+    <div class="label strings"><h2><?= t("Page Text") ?> <a href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show All)") ?></a></h2></div>
     <div class="label source"><h2><?= t("Source") ?></div>
     <div class="label translation"><h2><?= t("Translation to %language",
                                              array("language" => locale::display_name())) ?></h2></div>
-- 
cgit v1.2.3


From 452402293e79598a07c92d3e0667353854aba837 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 16 Jun 2009 20:33:44 -0700
Subject: Beautify "Show All" link, and only show when it's not already showing
 all strings

---
 modules/gallery/views/l10n_client.html.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 18f39537..01537e25 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -2,7 +2,11 @@
 <div id="l10n-client" class="hidden">
   <div class="labels">
     <span class="toggle"><?= t("Translate Text") ?></span>
-    <div class="label strings"><h2><?= t("Page Text") ?> <a href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show All)") ?></a></h2></div>
+    <div class="label strings"><h2><?= t("Page Text") ?>
+    <? if (!Input::instance()->get('show_all_l10n_messages')): ?>
+      <a style="background-color:#fff" href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show All)") ?></a>
+    <? endif; ?>
+    </h2></div>
     <div class="label source"><h2><?= t("Source") ?></div>
     <div class="label translation"><h2><?= t("Translation to %language",
                                              array("language" => locale::display_name())) ?></h2></div>
-- 
cgit v1.2.3


From 1dccc0286f3d983352e21f8148fdf4d9e9bc205d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 16 Jun 2009 22:09:02 -0700
Subject: Change the page.html file so that if the type of page is login, the
 sidebar contents are are not shown

---
 modules/gallery/controllers/albums.php | 2 +-
 themes/default/views/page.html.php     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 856709c2..17fdec6b 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,7 +26,7 @@ class Albums_Controller extends Items_Controller {
     $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        $view = new Theme_View("page.html", "page");
+        $view = new Theme_View("page.html", "login");
         $view->page_title = t("Log in to Gallery");
         $view->content = user::get_login_form("login/auth_html");
         print $view;
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 3feb14cb..f6286f95 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -81,7 +81,9 @@
           </div>
         </div>
         <div id="gSidebar" class="yui-b">
+          <? if ($theme->page_type != "login"): ?>
           <?= $theme->display("sidebar.html") ?>
+          <? endif ?>
         </div>
       </div>
       <div id="gFooter">
-- 
cgit v1.2.3