restructured admin views

5 files changed, 39 insertions, 3 deletions

diff --git a/pages/admin.php b/pages/admin.php
index 2cebc3a28..0668ac324 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -17,7 +17,7 @@
 

 	$body = elgg_view_title(elgg_echo('tidypics:administration'));

 	

-	$body .= elgg_view("admin/tidypics", array('tab' => $tab));

+	$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/views/default/tidypics/settings.php b/views/default/tidypics/admin/settings.php
index 9e082d9ab..1b449cfc7 100644
--- 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>

 </p>

 <?php

-	echo elgg_view("tidypics/forms/admin");

+	echo elgg_view("tidypics/forms/settings");

 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/stats.php b/views/default/tidypics/admin/stats.php
index 8de3415a1..8de3415a1 100644
--- a/views/default/tidypics/stats.php
+++ b/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
index 000000000..7d6aa220c
--- /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
index c52348ecc..d493a623b 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/settings.php
@@ -16,7 +16,7 @@
 	}

 	

 	if (extension_loaded('imagick'))

-		$img_lib_options['ImageMagickPHP'] = 'IMagick PHP';

+		$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';

 		

 	$disablefunc = explode(',', ini_get('disable_functions'));

 	if (is_callable('exec') && !in_array('exec',$disablefunc))