cleaning up the admin area

diff --git a/languages/en.php b/languages/en.php
index 36ac388775b1eee7e1f34d6ad4bc747523c959ba..0177678c6efc17f67b0e2265851d574582caf67b 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -13,9 +13,7 @@ $english = array(
                        'albums' => "Photo Albums",
                        'tidypics:disabled' => 'Disabled',
                        'tidypics:enabled' => 'Enabled',
-                       'admin:settings:tidypics' => 'Tidypics',
-                       'admin:statistics:tidypics' => 'Tidypics',
-                       'admin:administer_utilities:tidypics_tools' => 'Tidypics Tools',
+                       'admin:settings:photos' => 'Tidypics',
 
                        'photos:add' => "Create album",
                        'images:upload' => "Upload photos",

diff --git a/pages/admin.php b/pages/admin.php
deleted file mode 100644 (file)
index c6be121..0000000
--- a/pages/admin.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Tidypics Admin Page
- * @todo deprecated
- */
-
-admin_gatekeeper();
-set_context('admin');
-
-$tab = get_input('tab', 'settings');
-
-$body = elgg_view_title(elgg_echo('tidypics:administration'));
-
-$body .= elgg_view("tidypics/admin/tidypics", array('tab' => $tab));
-
-page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));

diff --git a/start.php b/start.php
index 1228fe3f1dcb68430e87511f30f3a4a2dcbe07ce..9295dc7eb7f3cd32ad217023cd659617d73a9832 100644 (file)
--- a/start.php
+++ b/start.php
@@ -52,7 +52,7 @@ function tidypics_init() {
        elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu');
 
        // Add admin menu item
-       elgg_register_admin_menu_item('configure', 'tidypics', 'settings');
+       elgg_register_admin_menu_item('configure', 'photos', 'settings');
 
        // Register for search
        elgg_register_entity_type('object', 'image');

diff --git a/views/default/admin/settings/tidypics.php b/views/default/admin/settings/photos.php
similarity index 61%
rename from views/default/admin/settings/tidypics.php
rename to views/default/admin/settings/photos.php
index fcb96b6c823e2b697f41149ade7dd170bceb856e..cc3592f37f4aa0d1b9f31bf776cca5158fa4820a 100644 (file)
--- a/views/default/admin/settings/tidypics.php
+++ b/views/default/admin/settings/photos.php
@@ -12,32 +12,32 @@ echo elgg_view('navigation/tabs', array(
        'tabs' => array(
                array(
                        'text' => elgg_echo('settings'),
-                       'href' => '/admin/settings/tidypics',
+                       'href' => '/admin/settings/photos',
                        'selected' => ($tab == 'settings'),
                ),
                array(
                        'text' => elgg_echo('tidypics:server_info'),
-                       'href' => '/admin/settings/tidypics?tab=server_info',
+                       'href' => '/admin/settings/photos?tab=server_info',
                        'selected' => ($tab == 'server_info'),
                ),
                array(
                        'text' => elgg_echo('tidypics:server_config'),
-                       'href' => '/admin/settings/tidypics?tab=server_config',
+                       'href' => '/admin/settings/photos?tab=server_config',
                        'selected' => ($tab == 'server_config'),
                ),
                array(
                        'text' => 'ImageMagick',
-                       'href' => '/admin/settings/tidypics?tab=image_lib',
+                       'href' => '/admin/settings/photos?tab=image_lib',
                        'selected' => ($tab == 'image_lib'),
                ),
                array(
                        'text' => elgg_echo('tidypics:settings:thumbnail'),
-                       'href' => '/admin/settings/tidypics?tab=thumbnail',
+                       'href' => '/admin/settings/photos?tab=thumbnail',
                        'selected' => ($tab == 'thumbnail'),
                ),
                array(
                        'text' => elgg_echo('tidypics:settings:help'),
-                       'href' => '/admin/settings/tidypics?tab=help',
+                       'href' => '/admin/settings/photos?tab=help',
                        'selected' => ($tab == 'help'),
                ),
        )
@@ -45,27 +45,27 @@ echo elgg_view('navigation/tabs', array(
 
 switch ($tab) {
        case 'server_info':
-               echo elgg_view('admin/settings/tidypics/server_info');
+               echo elgg_view('admin/settings/photos/server_info');
                break;
 
        case 'server_config':
-               echo elgg_view('admin/settings/tidypics/server_config');
+               echo elgg_view('admin/settings/photos/server_config');
                break;
 
        case 'image_lib':
-               echo elgg_view('admin/settings/tidypics/image_lib');
+               echo elgg_view('admin/settings/photos/image_lib');
                break;
 
        case 'thumbnail':
-               echo elgg_view('admin/settings/tidypics/thumbnail');
+               echo elgg_view('admin/settings/photos/thumbnail');
                break;
 
        case 'help':
-               echo elgg_view('admin/settings/tidypics/help');
+               echo elgg_view('admin/settings/photos/help');
                break;
 
        default:
        case 'settings':
-               echo elgg_view('admin/settings/tidypics/settings');
+               echo elgg_view('admin/settings/photos/settings');
                break;
-}
\ No newline at end of file
+}

diff --git a/views/default/admin/settings/tidypics/help.php b/views/default/admin/settings/photos/help.php
similarity index 100%
rename from views/default/admin/settings/tidypics/help.php
rename to views/default/admin/settings/photos/help.php

diff --git a/views/default/admin/settings/tidypics/image_lib.php b/views/default/admin/settings/photos/image_lib.php
similarity index 100%
rename from views/default/admin/settings/tidypics/image_lib.php
rename to views/default/admin/settings/photos/image_lib.php

diff --git a/views/default/admin/settings/tidypics/server_config.php b/views/default/admin/settings/photos/server_config.php
similarity index 100%
rename from views/default/admin/settings/tidypics/server_config.php
rename to views/default/admin/settings/photos/server_config.php

diff --git a/views/default/admin/settings/tidypics/server_info.php b/views/default/admin/settings/photos/server_info.php
similarity index 97%
rename from views/default/admin/settings/tidypics/server_info.php
rename to views/default/admin/settings/photos/server_info.php
index 1f32ab008b937d7f1cc85bb10124f2d32fdc1ccd..c100b0de293299e99d46b445eb79e6468fee0441 100644 (file)
--- a/views/default/admin/settings/tidypics/server_info.php
+++ b/views/default/admin/settings/photos/server_info.php
@@ -3,8 +3,6 @@
  * Tidypics server analysis
  */
 
-$title = elgg_echo('admin:administer_utilities:tidypics_tools');
-
 function tp_readable_size($bytes) {
        if (strpos($bytes, 'M')) {
                return $bytes . 'B';
@@ -49,7 +47,7 @@ ob_start();
                <td><?php echo elgg_echo('tidypics:server_info:gd_desc'); ?></td>
        </tr>
        <tr>
-               <td>IMagick</td>
+               <td>imagick</td>
                <td><?php echo (extension_loaded('imagick')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
                <td></td>
        </tr>

diff --git a/views/default/admin/settings/tidypics/settings.php b/views/default/admin/settings/photos/settings.php
similarity index 100%
rename from views/default/admin/settings/tidypics/settings.php
rename to views/default/admin/settings/photos/settings.php

diff --git a/views/default/admin/settings/tidypics/thumbnail.php b/views/default/admin/settings/photos/thumbnail.php
similarity index 100%
rename from views/default/admin/settings/tidypics/thumbnail.php
rename to views/default/admin/settings/photos/thumbnail.php