From b245e3475f66c94afb94f8b2287bf0185a343732 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 28 May 2009 06:07:27 +0800 Subject: Restructure things so that the application is now just another module. Kohana makes this type of transition fairly straightforward in that all controllers/helpers/etc are still located in the cascading filesystem without any extra effort, except that I've temporarily added a hack to force modules/gallery into the module path. Rename what's left of "core" to be "application" so that it conforms more closely to the Kohana standard (basically, just application/config/config.php which is the minimal thing that you need in the application directory) There's still considerable work left to be done here. Signed-off-by: Gallery Role Account --- .../gallery/views/admin_advanced_settings.html.php | 34 +++ .../gallery/views/admin_block_log_entries.html.php | 11 + modules/gallery/views/admin_block_news.html.php | 11 + .../views/admin_block_photo_stream.html.php | 14 ++ .../gallery/views/admin_block_platform.html.php | 18 ++ modules/gallery/views/admin_block_stats.html.php | 12 + modules/gallery/views/admin_block_welcome.html.php | 20 ++ modules/gallery/views/admin_dashboard.html.php | 38 ++++ modules/gallery/views/admin_graphics.html.php | 28 +++ modules/gallery/views/admin_graphics_gd.html.php | 29 +++ .../views/admin_graphics_graphicsmagick.html.php | 21 ++ .../views/admin_graphics_imagemagick.html.php | 21 ++ modules/gallery/views/admin_graphics_none.html.php | 7 + modules/gallery/views/admin_languages.html.php | 15 ++ modules/gallery/views/admin_maintenance.html.php | 181 +++++++++++++++ .../gallery/views/admin_maintenance_task.html.php | 32 +++ modules/gallery/views/admin_modules.html.php | 32 +++ modules/gallery/views/admin_theme_details.html.php | 6 + modules/gallery/views/admin_themes.html.php | 89 ++++++++ .../gallery/views/admin_themes_preview.html.php | 7 + modules/gallery/views/after_install.html.php | 29 +++ .../gallery/views/after_install_loader.html.php | 7 + modules/gallery/views/form.html.php | 75 +++++++ modules/gallery/views/kohana_error_page.php | 118 ++++++++++ modules/gallery/views/kohana_profiler.php | 35 +++ modules/gallery/views/l10n_client.html.php | 31 +++ modules/gallery/views/maintenance.html.php | 50 +++++ modules/gallery/views/move_browse.html.php | 47 ++++ modules/gallery/views/move_tree.html.php | 19 ++ modules/gallery/views/permissions_browse.html.php | 56 +++++ modules/gallery/views/permissions_form.html.php | 94 ++++++++ modules/gallery/views/quick_pane.html.php | 108 +++++++++ modules/gallery/views/scaffold.html.php | 169 ++++++++++++++ modules/gallery/views/simple_uploader.html.php | 249 +++++++++++++++++++++ 34 files changed, 1713 insertions(+) create mode 100644 modules/gallery/views/admin_advanced_settings.html.php create mode 100644 modules/gallery/views/admin_block_log_entries.html.php create mode 100644 modules/gallery/views/admin_block_news.html.php create mode 100644 modules/gallery/views/admin_block_photo_stream.html.php create mode 100644 modules/gallery/views/admin_block_platform.html.php create mode 100644 modules/gallery/views/admin_block_stats.html.php create mode 100644 modules/gallery/views/admin_block_welcome.html.php create mode 100644 modules/gallery/views/admin_dashboard.html.php create mode 100644 modules/gallery/views/admin_graphics.html.php create mode 100644 modules/gallery/views/admin_graphics_gd.html.php create mode 100644 modules/gallery/views/admin_graphics_graphicsmagick.html.php create mode 100644 modules/gallery/views/admin_graphics_imagemagick.html.php create mode 100644 modules/gallery/views/admin_graphics_none.html.php create mode 100644 modules/gallery/views/admin_languages.html.php create mode 100644 modules/gallery/views/admin_maintenance.html.php create mode 100644 modules/gallery/views/admin_maintenance_task.html.php create mode 100644 modules/gallery/views/admin_modules.html.php create mode 100644 modules/gallery/views/admin_theme_details.html.php create mode 100644 modules/gallery/views/admin_themes.html.php create mode 100644 modules/gallery/views/admin_themes_preview.html.php create mode 100644 modules/gallery/views/after_install.html.php create mode 100644 modules/gallery/views/after_install_loader.html.php create mode 100644 modules/gallery/views/form.html.php create mode 100644 modules/gallery/views/kohana_error_page.php create mode 100644 modules/gallery/views/kohana_profiler.php create mode 100644 modules/gallery/views/l10n_client.html.php create mode 100644 modules/gallery/views/maintenance.html.php create mode 100644 modules/gallery/views/move_browse.html.php create mode 100644 modules/gallery/views/move_tree.html.php create mode 100644 modules/gallery/views/permissions_browse.html.php create mode 100644 modules/gallery/views/permissions_form.html.php create mode 100644 modules/gallery/views/quick_pane.html.php create mode 100644 modules/gallery/views/scaffold.html.php create mode 100644 modules/gallery/views/simple_uploader.html.php (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 new file mode 100644 index 00000000..1f3825bd --- /dev/null +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -0,0 +1,34 @@ + +
+

+

+ +

+
    +
  • + ") ?> +
  • +
+ + + + + + + + + module_name == "core" && $var->name == "_cache") continue ?> + + + + + + +
module_name ?> name ?> + module_name/$var->name") ?>" + class="gDialogLink" + title=" $var->name, "module_name" => $var->module_name)) ?>"> + value ?> + +
+
diff --git a/modules/gallery/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php new file mode 100644 index 00000000..db6313e1 --- /dev/null +++ b/modules/gallery/views/admin_block_log_entries.html.php @@ -0,0 +1,11 @@ + + diff --git a/modules/gallery/views/admin_block_news.html.php b/modules/gallery/views/admin_block_news.html.php new file mode 100644 index 00000000..cb276ae5 --- /dev/null +++ b/modules/gallery/views/admin_block_news.html.php @@ -0,0 +1,11 @@ + +
    + +
  • + "> +

    + +

    +
  • + +
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php new file mode 100644 index 00000000..e8a4d933 --- /dev/null +++ b/modules/gallery/views/admin_block_photo_stream.html.php @@ -0,0 +1,14 @@ + + +

+ +

diff --git a/modules/gallery/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php new file mode 100644 index 00000000..6b79f047 --- /dev/null +++ b/modules/gallery/views/admin_block_platform.html.php @@ -0,0 +1,18 @@ + +
    +
  • + PHP_OS)) ?> +
  • +
  • + function_exists("apache_get_version") ? apache_get_version() : t("Unknown"))) ?> +
  • +
  • + phpversion())) ?> +
  • +
  • + Database::instance()->query("SELECT version() as v")->current()->v)) ?> +
  • +
  • + $load_average)) ?> +
  • +
diff --git a/modules/gallery/views/admin_block_stats.html.php b/modules/gallery/views/admin_block_stats.html.php new file mode 100644 index 00000000..2d975073 --- /dev/null +++ b/modules/gallery/views/admin_block_stats.html.php @@ -0,0 +1,12 @@ + +
    +
  • + module::get_var("core", "version"))) ?> +
  • +
  • + $album_count)) ?> +
  • +
  • + $photo_count)) ?> +
  • +
diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php new file mode 100644 index 00000000..488fa908 --- /dev/null +++ b/modules/gallery/views/admin_block_welcome.html.php @@ -0,0 +1,20 @@ + +

+ +

+
    +
  • + graphics and language settings.", + array("graphics_url" => url::site("admin/graphics"), + "language_url" => url::site("admin/languages"))) ?> +
  • +
  • + choose a theme, or customize the way it looks.", + array("theme_url" => url::site("admin/theme"), + "theme_details_url" => url::site("admin/theme_details"))) ?> +
  • +
  • + install modules to add cool features!", + array("modules_url" => url::site("admin/modules"))) ?> +
  • +
diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php new file mode 100644 index 00000000..c266d7e1 --- /dev/null +++ b/modules/gallery/views/admin_dashboard.html.php @@ -0,0 +1,38 @@ + + +
+ +
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php new file mode 100644 index 00000000..08374471 --- /dev/null +++ b/modules/gallery/views/admin_graphics.html.php @@ -0,0 +1,28 @@ + + +
+

+

+ +

+ +

+ + +
+

+ +
+
+ diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php new file mode 100644 index 00000000..cae68b74 --- /dev/null +++ b/modules/gallery/views/admin_graphics_gd.html.php @@ -0,0 +1,29 @@ + +
gd["GD Version"] ? " gInstalledToolkit" : " gUnavailable" ?>"> + " alt="" /> +

+

+ GD website for more information.", + array("url" => "http://www.boutell.com/gd")) ?> +

+ gd["GD Version"] && function_exists('imagerotate')): ?> +

+ $tk->gd["GD Version"])) ?> +

+

+ +

+ gd["GD Version"]): ?> +

+ $tk->gd["GD Version"])) ?> +

+

+ +

+ +

+ +

+ +
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php new file mode 100644 index 00000000..720a9459 --- /dev/null +++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php @@ -0,0 +1,21 @@ + +
graphicsmagick ? " gInstalledToolkit" : " gUnavailable" ?>"> +

+ " alt="" /> +

+ GraphicsMagick website for more information.", + array("url" => "http://www.graphicsmagick.org")) ?> +

+ graphicsmagick): ?> +

+ $tk->graphicsmagick)) ?> +

+

+ +

+ +

+ +

+ +
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php new file mode 100644 index 00000000..c7468eed --- /dev/null +++ b/modules/gallery/views/admin_graphics_imagemagick.html.php @@ -0,0 +1,21 @@ + +
imagemagick ? " gInstalledToolkit" : " gUnavailable" ?>"> +

+ " alt="" /> +

+ ImageMagick website for more information.", + array("url" => "http://www.imagemagick.org")) ?> +

+ imagemagick): ?> +

+ $tk->imagemagick)) ?> +

+

+ +

+ +

+ +

+ +
diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php new file mode 100644 index 00000000..5306a70d --- /dev/null +++ b/modules/gallery/views/admin_graphics_none.html.php @@ -0,0 +1,7 @@ + +
+

+

+ +

+
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php new file mode 100644 index 00000000..2b43f1b4 --- /dev/null +++ b/modules/gallery/views/admin_languages.html.php @@ -0,0 +1,15 @@ + +
+

+ + + +

+ " + class="gDialogLink"> + + + +

+ +
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php new file mode 100644 index 00000000..bc060a7b --- /dev/null +++ b/modules/gallery/views/admin_maintenance.html.php @@ -0,0 +1,181 @@ + +
+

+

+ +

+ +
+

+ + + + + + + + + + + + + +
+ + + + + +
+ name ?> + + description ?> + + callback?csrf=$csrf") ?>" + class="gDialogLink"> + + +
+
+ + count()): ?> +
+

+ " + class="gButtonLink ui-icon-left ui-state-default ui-corner-all right"> + + + + + + + + + + + + + "> + + + + + + + + +
+ + + + + + + + + + + +
+ updated) ?> + + name ?> + + done): ?> + state == "cancelled"): ?> + + + + state == "stalled"): ?> + + + $task->percent_complete)) ?> + + + status ?> + + owner()->name ?> + + state == "stalled"): ?> + id?csrf=$csrf") ?>"> + + + + id?csrf=$csrf") ?>"> + + +
+
+ + + count()): ?> +
+ " + class="gButtonLink ui-icon-left ui-state-default ui-corner-all right"> + + +

+ + + + + + + + + + + "> + + + + + + + + +
+ + + + + + + + + + + +
+ updated) ?> + + name ?> + + state == "success"): ?> + + state == "error"): ?> + + state == "cancelled"): ?> + + + + status ?> + + owner()->name ?> + + done): ?> + id?csrf=$csrf") ?>"> + + + + id?csrf=$csrf") ?>"> + + + id?csrf=$csrf") ?>"> + + + +
+
+ +
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php new file mode 100644 index 00000000..1ee02311 --- /dev/null +++ b/modules/gallery/views/admin_maintenance_task.html.php @@ -0,0 +1,32 @@ + + +
+
+
+
+ + +
+
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php new file mode 100644 index 00000000..3fddd6cd --- /dev/null +++ b/modules/gallery/views/admin_modules.html.php @@ -0,0 +1,32 @@ + +
+

+

+ +

+ +
"> + + + + + + + + + + $module_info): ?> + "> + $module_name); ?> + locked) $data["disabled"] = 1; ?> + + + + + + + +
name) ?> version ?> description) ?>
+ "/> +
+
diff --git a/modules/gallery/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_details.html.php new file mode 100644 index 00000000..eb450b16 --- /dev/null +++ b/modules/gallery/views/admin_theme_details.html.php @@ -0,0 +1,6 @@ + +
+

+ + +
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php new file mode 100644 index 00000000..f85bce70 --- /dev/null +++ b/modules/gallery/views/admin_themes.html.php @@ -0,0 +1,89 @@ + + + +

+

+ +

+ +
+

+
+ " + alt="name ?>" /> +

name ?>

+

+ description ?> +

+
+ +

+ +
+ +
+

+
+ " + alt="name ?>" /> +

name ?>

+

+ description ?> +

+
+ +

+ +
\ No newline at end of file diff --git a/modules/gallery/views/admin_themes_preview.html.php b/modules/gallery/views/admin_themes_preview.html.php new file mode 100644 index 00000000..a7aea172 --- /dev/null +++ b/modules/gallery/views/admin_themes_preview.html.php @@ -0,0 +1,7 @@ + +

+ "> + %theme_name", array("theme_name" => $info->name)) ?> + +

+ diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php new file mode 100644 index 00000000..aa26858a --- /dev/null +++ b/modules/gallery/views/after_install.html.php @@ -0,0 +1,29 @@ + +

+ +

+ +

+ +

+ +

+ %user_name account. The very first thing you should do is to change your password to something that you'll remember.", array("user_name" => $user->name)) ?> +

+ +

+ id}") ?>" + title="" + id="gAfterInstallChangePasswordLink" class="gButtonLink ui-state-default ui-corners-all"> + +

+ +

+ Gallery website has news and information about Gallery Project and community.", array("url" => "http://gallery.menalto.com")) ?> +

+ +

+ documentation site or you can ask for help in the forums!", array("codex_url" => "http://codex.gallery2.org/Main_Page", "forum_url" => "http://gallery.menalto.com/forum")) ?> + diff --git a/modules/gallery/views/after_install_loader.html.php b/modules/gallery/views/after_install_loader.html.php new file mode 100644 index 00000000..baf91eed --- /dev/null +++ b/modules/gallery/views/after_install_loader.html.php @@ -0,0 +1,7 @@ + +" + href=""/> + diff --git a/modules/gallery/views/form.html.php b/modules/gallery/views/form.html.php new file mode 100644 index 00000000..ec2a56a9 --- /dev/null +++ b/modules/gallery/views/form.html.php @@ -0,0 +1,75 @@ + +"; +} +if ($title) { + print $title; +} + +if (!function_exists("DrawForm")) { + function DrawForm($inputs, $level=1) { + $error_messages = array(); + $prefix = str_repeat(" ", $level); + $haveGroup = false; + // On the first level, make sure we have a group if not add the