From 28b41056e3ea962dce1ad017a3c0a60252195e7a Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 27 May 2009 15:07:27 -0700 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. --- core/views/admin_advanced_settings.html.php | 34 --- core/views/admin_block_log_entries.html.php | 11 - core/views/admin_block_news.html.php | 11 - core/views/admin_block_photo_stream.html.php | 14 -- core/views/admin_block_platform.html.php | 18 -- core/views/admin_block_stats.html.php | 12 -- core/views/admin_block_welcome.html.php | 20 -- core/views/admin_dashboard.html.php | 38 ---- core/views/admin_graphics.html.php | 28 --- core/views/admin_graphics_gd.html.php | 29 --- core/views/admin_graphics_graphicsmagick.html.php | 21 -- core/views/admin_graphics_imagemagick.html.php | 21 -- core/views/admin_graphics_none.html.php | 7 - core/views/admin_languages.html.php | 15 -- core/views/admin_maintenance.html.php | 181 ---------------- core/views/admin_maintenance_task.html.php | 32 --- core/views/admin_modules.html.php | 32 --- core/views/admin_theme_details.html.php | 6 - core/views/admin_themes.html.php | 89 -------- core/views/admin_themes_preview.html.php | 7 - core/views/after_install.html.php | 29 --- core/views/after_install_loader.html.php | 7 - core/views/form.html.php | 75 ------- core/views/kohana_error_page.php | 118 ---------- core/views/kohana_profiler.php | 35 --- core/views/l10n_client.html.php | 31 --- core/views/maintenance.html.php | 50 ----- core/views/move_browse.html.php | 47 ---- core/views/move_tree.html.php | 19 -- core/views/permissions_browse.html.php | 56 ----- core/views/permissions_form.html.php | 94 -------- core/views/quick_pane.html.php | 108 ---------- core/views/scaffold.html.php | 169 --------------- core/views/simple_uploader.html.php | 249 ---------------------- 34 files changed, 1713 deletions(-) delete mode 100644 core/views/admin_advanced_settings.html.php delete mode 100644 core/views/admin_block_log_entries.html.php delete mode 100644 core/views/admin_block_news.html.php delete mode 100644 core/views/admin_block_photo_stream.html.php delete mode 100644 core/views/admin_block_platform.html.php delete mode 100644 core/views/admin_block_stats.html.php delete mode 100644 core/views/admin_block_welcome.html.php delete mode 100644 core/views/admin_dashboard.html.php delete mode 100644 core/views/admin_graphics.html.php delete mode 100644 core/views/admin_graphics_gd.html.php delete mode 100644 core/views/admin_graphics_graphicsmagick.html.php delete mode 100644 core/views/admin_graphics_imagemagick.html.php delete mode 100644 core/views/admin_graphics_none.html.php delete mode 100644 core/views/admin_languages.html.php delete mode 100644 core/views/admin_maintenance.html.php delete mode 100644 core/views/admin_maintenance_task.html.php delete mode 100644 core/views/admin_modules.html.php delete mode 100644 core/views/admin_theme_details.html.php delete mode 100644 core/views/admin_themes.html.php delete mode 100644 core/views/admin_themes_preview.html.php delete mode 100644 core/views/after_install.html.php delete mode 100644 core/views/after_install_loader.html.php delete mode 100644 core/views/form.html.php delete mode 100644 core/views/kohana_error_page.php delete mode 100644 core/views/kohana_profiler.php delete mode 100644 core/views/l10n_client.html.php delete mode 100644 core/views/maintenance.html.php delete mode 100644 core/views/move_browse.html.php delete mode 100644 core/views/move_tree.html.php delete mode 100644 core/views/permissions_browse.html.php delete mode 100644 core/views/permissions_form.html.php delete mode 100644 core/views/quick_pane.html.php delete mode 100644 core/views/scaffold.html.php delete mode 100644 core/views/simple_uploader.html.php (limited to 'core/views') diff --git a/core/views/admin_advanced_settings.html.php b/core/views/admin_advanced_settings.html.php deleted file mode 100644 index 1f3825bd..00000000 --- a/core/views/admin_advanced_settings.html.php +++ /dev/null @@ -1,34 +0,0 @@ - -
-

-

- -

- - - - - - - - - - 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/core/views/admin_block_log_entries.html.php b/core/views/admin_block_log_entries.html.php deleted file mode 100644 index db6313e1..00000000 --- a/core/views/admin_block_log_entries.html.php +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/core/views/admin_block_news.html.php b/core/views/admin_block_news.html.php deleted file mode 100644 index cb276ae5..00000000 --- a/core/views/admin_block_news.html.php +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/core/views/admin_block_photo_stream.html.php b/core/views/admin_block_photo_stream.html.php deleted file mode 100644 index e8a4d933..00000000 --- a/core/views/admin_block_photo_stream.html.php +++ /dev/null @@ -1,14 +0,0 @@ - - -

- -

diff --git a/core/views/admin_block_platform.html.php b/core/views/admin_block_platform.html.php deleted file mode 100644 index 6b79f047..00000000 --- a/core/views/admin_block_platform.html.php +++ /dev/null @@ -1,18 +0,0 @@ - - diff --git a/core/views/admin_block_stats.html.php b/core/views/admin_block_stats.html.php deleted file mode 100644 index 2d975073..00000000 --- a/core/views/admin_block_stats.html.php +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/core/views/admin_block_welcome.html.php b/core/views/admin_block_welcome.html.php deleted file mode 100644 index 488fa908..00000000 --- a/core/views/admin_block_welcome.html.php +++ /dev/null @@ -1,20 +0,0 @@ - -

- -

- diff --git a/core/views/admin_dashboard.html.php b/core/views/admin_dashboard.html.php deleted file mode 100644 index c266d7e1..00000000 --- a/core/views/admin_dashboard.html.php +++ /dev/null @@ -1,38 +0,0 @@ - - -
- -
diff --git a/core/views/admin_graphics.html.php b/core/views/admin_graphics.html.php deleted file mode 100644 index 08374471..00000000 --- a/core/views/admin_graphics.html.php +++ /dev/null @@ -1,28 +0,0 @@ - - -
-

-

- -

- -

- - -
-

- -
-
- diff --git a/core/views/admin_graphics_gd.html.php b/core/views/admin_graphics_gd.html.php deleted file mode 100644 index cae68b74..00000000 --- a/core/views/admin_graphics_gd.html.php +++ /dev/null @@ -1,29 +0,0 @@ - -
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/core/views/admin_graphics_graphicsmagick.html.php b/core/views/admin_graphics_graphicsmagick.html.php deleted file mode 100644 index 720a9459..00000000 --- a/core/views/admin_graphics_graphicsmagick.html.php +++ /dev/null @@ -1,21 +0,0 @@ - -
graphicsmagick ? " gInstalledToolkit" : " gUnavailable" ?>"> -

- " alt="" /> -

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

- graphicsmagick): ?> -

- $tk->graphicsmagick)) ?> -

-

- -

- -

- -

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

- " alt="" /> -

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

- imagemagick): ?> -

- $tk->imagemagick)) ?> -

-

- -

- -

- -

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

-

- -

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

- - - -

- " - class="gDialogLink"> - - - -

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

-

- -

- -
-

- - - - - - - - - - - - - -
- - - - - -
- 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/core/views/admin_maintenance_task.html.php b/core/views/admin_maintenance_task.html.php deleted file mode 100644 index 1ee02311..00000000 --- a/core/views/admin_maintenance_task.html.php +++ /dev/null @@ -1,32 +0,0 @@ - - -
-
-
-
- - -
-
diff --git a/core/views/admin_modules.html.php b/core/views/admin_modules.html.php deleted file mode 100644 index 3fddd6cd..00000000 --- a/core/views/admin_modules.html.php +++ /dev/null @@ -1,32 +0,0 @@ - -
-

-

- -

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

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

-

- -

- -
-

-
- " - alt="name ?>" /> -

name ?>

-

- description ?> -

-
- -

- -
- -
-

-
- " - alt="name ?>" /> -

name ?>

-

- description ?> -

-
- -

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

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

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

- -

- -

- -

- -

- %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/core/views/after_install_loader.html.php b/core/views/after_install_loader.html.php deleted file mode 100644 index baf91eed..00000000 --- a/core/views/after_install_loader.html.php +++ /dev/null @@ -1,7 +0,0 @@ - -" - href=""/> - diff --git a/core/views/form.html.php b/core/views/form.html.php deleted file mode 100644 index ec2a56a9..00000000 --- a/core/views/form.html.php +++ /dev/null @@ -1,75 +0,0 @@ - -"; -} -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