restructured admin views

diff --git a/pages/admin.php b/pages/admin.php
index 2cebc3a287d866bd0a62bf868e82ec4746d55cd4..0668ac32410786557b5029865c35117692e82272 100644 (file)
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -17,7 +17,7 @@
 \r
        $body = elgg_view_title(elgg_echo('tidypics:administration'));\r
        \r
-       $body .= elgg_view("admin/tidypics", array('tab' => $tab));\r
+       $body .= elgg_view("tidypics/admin/tidypics", array('tab' => $tab));\r
        \r
        page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));\r
 \r

diff --git a/views/default/tidypics/settings.php b/views/default/tidypics/admin/settings.php
similarity index 89%
rename from views/default/tidypics/settings.php
rename to views/default/tidypics/admin/settings.php
index 9e082d9aba81ff508653f846fcabed9b3f217a08..1b449cfc7974364dc3b5d216c3866bc62f257709 100644 (file)
--- a/views/default/tidypics/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -21,5 +21,5 @@
 <a href="<?php echo $system_url; ?>">Run Server Analysis</a>\r
 </p>\r
 <?php\r
-       echo elgg_view("tidypics/forms/admin");\r
+       echo elgg_view("tidypics/forms/settings");\r
 ?>
\ No newline at end of file

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

diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
new file mode 100644 (file)
index 0000000..7d6aa22
--- /dev/null
+++ b/views/default/tidypics/admin/tidypics.php
@@ -0,0 +1,36 @@
+<?php
+
+       global $CONFIG;
+       
+       $tab = $vars['tab'];
+       
+       $settingsselect = ''; 
+       $statsselect = '';
+       switch($tab) {
+               case 'settings':
+                       $settingsselect = 'class="selected"';
+                       break;
+               case 'stats':
+                       $statsselect = 'class="selected"';
+                       break;
+       }
+       
+?>
+<div class="contentWrapper">
+       <div id="elgg_horizontal_tabbed_nav">
+               <ul>
+                       <li <?php echo $settingsselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php?tab=settings'; ?>"><?php echo elgg_echo('tidypics:settings'); ?></a></li>
+                       <li <?php echo $statsselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php?tab=stats'; ?>"><?php echo elgg_echo('tidypics:stats'); ?></a></li>
+               </ul>
+       </div>
+<?php
+       switch($tab) {
+               case 'settings':
+                       echo elgg_view("tidypics/admin/settings");
+                       break;
+               case 'stats':
+                       echo elgg_view("tidypics/admin/stats");
+                       break;
+       }
+?>
+</div>

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/settings.php
similarity index 97%
rename from views/default/tidypics/forms/admin.php
rename to views/default/tidypics/forms/settings.php
index c52348ecca5df1dccbeaf2dc69df5ab589fdbb7d..d493a623b292c0d83978abfeec7c08f3b68b352d 100644 (file)
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/settings.php
@@ -16,7 +16,7 @@
        }\r
        \r
        if (extension_loaded('imagick'))\r
-               $img_lib_options['ImageMagickPHP'] = 'IMagick PHP';\r
+               $img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';\r
                \r
        $disablefunc = explode(',', ini_get('disable_functions'));\r
        if (is_callable('exec') && !in_array('exec',$disablefunc))\r