From 24bd873c4fd32577dc30e3eb591abc1e20f5cde3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 12 Jun 2009 03:50:50 +0800
Subject: Rename theme_details to theme_options.  These changes got left out of
 68fd196d66e2d21f571ff3b5a673f18cd129abf9 leaving us in a temporarily broken
 state.

Signed-off-by:  <unostar@danalan.info>
---
 modules/g2_import/views/admin_g2_import.html.php   | 4 ++--
 modules/gallery/helpers/gallery_menu.php           | 4 ++--
 modules/gallery/helpers/theme.php                  | 2 +-
 modules/gallery/views/admin_block_welcome.html.php | 4 ++--
 modules/gallery/views/admin_theme_details.html.php | 6 ------
 modules/gallery/views/admin_theme_options.html.php | 6 ++++++
 6 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 modules/gallery/views/admin_theme_details.html.php
 create mode 100644 modules/gallery/views/admin_theme_options.html.php

(limited to 'modules')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 85525a81..c0ee2b17 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -52,7 +52,7 @@
     <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
         array("g2_pixels" => $g2_sizes["thumb"]["size"],
               "g3_pixels" => $thumb_size,
-              "url" => url::site("admin/theme_details"))) ?>
+              "url" => url::site("admin/theme_options"))) ?>
   </div>
   <? endif ?>
 
@@ -61,7 +61,7 @@
     <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
         array("g2_pixels" => $g2_sizes["resize"]["size"],
               "g3_pixels" => $resize_size,
-              "url" => url::site("admin/theme_details"))) ?>
+              "url" => url::site("admin/theme_options"))) ?>
   </div>
   <? endif ?>
 
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
index 9729a868..fd4ec241 100644
--- a/modules/gallery/helpers/gallery_menu.php
+++ b/modules/gallery/helpers/gallery_menu.php
@@ -144,9 +144,9 @@ class gallery_menu_Core {
                         ->label(t("Theme Choice"))
                         ->url(url::site("admin/themes")))
                ->append(Menu::factory("link")
-                        ->id("theme_details")
+                        ->id("theme_options")
                         ->label(t("Theme Options"))
-                        ->url(url::site("admin/theme_details"))))
+                        ->url(url::site("admin/theme_options"))))
       ->append(Menu::factory("link")
                ->id("maintenance")
                ->label(t("Maintenance"))
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index af340db6..0a43f25c 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -40,7 +40,7 @@ class theme_Core {
   }
 
   static function get_edit_form_admin() {
-    $form = new Forge("admin/theme_details/save/", "", null, array("id" =>"gThemeDetailsForm"));
+    $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"gThemeOptionsForm"));
     $group = $form->group("edit_theme");
     $group->input("page_size")->label(t("Items per page"))->id("gPageSize")
       ->rules("required|valid_digit")
diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index a453b006..38d2bd56 100644
--- a/modules/gallery/views/admin_block_welcome.html.php
+++ b/modules/gallery/views/admin_block_welcome.html.php
@@ -9,9 +9,9 @@
               "language_url" => url::site("admin/languages"))) ?>
   </li>
   <li>
-    <?= t("Appearance - <a href=\"%theme_url\">choose a theme</a>, or <a href=\"%theme_details_url\">customize the way it looks</a>.",
+    <?= t("Appearance - <a href=\"%theme_url\">choose a theme</a>, or <a href=\"%theme_options_url\">customize the way it looks</a>.",
         array("theme_url" => url::site("admin/themes"),
-              "theme_details_url" => url::site("admin/theme_details"))) ?>
+              "theme_options_url" => url::site("admin/theme_options"))) ?>
   </li>
   <li>
     <?= t("Customize - <a href=\"%modules_url\">install modules</a> to add cool features!",
diff --git a/modules/gallery/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_details.html.php
deleted file mode 100644
index f093b70b..00000000
--- a/modules/gallery/views/admin_theme_details.html.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminThemeDetails">
-  <h1> <?= t("Theme Options") ?> </h1>
-
-  <?= $form ?>
-</div>
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
new file mode 100644
index 00000000..724e6438
--- /dev/null
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -0,0 +1,6 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="gAdminThemeOptions">
+  <h1> <?= t("Theme Options") ?> </h1>
+
+  <?= $form ?>
+</div>
-- 
cgit v1.2.3