From 267b3a1623ebb3d9db2209adc1b14f4c882c3611 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 4 Dec 2009 13:48:52 -0800
Subject: Make the rendering of the Theme Options page consistent between the
 first request and any errors

---
 modules/gallery/controllers/admin_theme_options.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 9de54c78..6297e4aa 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -64,7 +64,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       url::redirect("admin/theme_options");
     } else {
       $view = new Admin_View("admin.html");
-      $view->content = $form;
+      $view->content = new View("admin_theme_options.html");
+      $view->content->form = $form;
       print $view;
     }
   }
-- 
cgit v1.2.3


From f4810345b48d321460d32481e5665ea4602c9207 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 5 Dec 2009 09:13:04 -0800
Subject: Correct inconsistent capitalization on "Server Add"

---
 modules/server_add/helpers/server_add.php       | 2 +-
 modules/server_add/helpers/server_add_event.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/server_add/helpers/server_add.php b/modules/server_add/helpers/server_add.php
index 27794855..60c6426e 100644
--- a/modules/server_add/helpers/server_add.php
+++ b/modules/server_add/helpers/server_add.php
@@ -24,7 +24,7 @@ class server_add_Core {
     }
     if (empty($paths)) {
       site_status::warning(
-        t("Server Add needs configuration. <a href=\"%url\">Configure it now!</a>",
+        t("Server add module needs configuration. <a href=\"%url\">Configure it now!</a>",
           array("url" => html::mark_clean(url::site("admin/server_add")))),
         "server_add_configuration");
     } else {
diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php
index e1295bd4..9b28fd70 100644
--- a/modules/server_add/helpers/server_add_event.php
+++ b/modules/server_add/helpers/server_add_event.php
@@ -22,7 +22,7 @@ class server_add_event_Core {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("server_add")
-               ->label(t("Server Add"))
+               ->label(t("Server add"))
                ->url(url::site("admin/server_add")));
   }
 
@@ -35,7 +35,7 @@ class server_add_event_Core {
       $menu->get("add_menu")
         ->append(Menu::factory("dialog")
                  ->id("server_add")
-                 ->label(t("Server Add"))
+                 ->label(t("Server add"))
                  ->url(url::site("server_add/browse/$item->id")));
     }
   }
-- 
cgit v1.2.3