cleaning up the admin pages

3 files changed, 13 insertions, 19 deletions

diff --git a/languages/en.php b/languages/en.php
index 2ee3a6e5e..9587f3053 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -62,6 +62,7 @@ $english = array(
 			
 		//settings
 			'tidypics:settings' => 'Settings',
+			'tidypics:settings:server:analysis' => 'Run Server Analysis',
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
 			'tidypics:settings:image_lib' => "Image Library",
 			'tidypics:settings:thumbnail' => "Thumbnail Creation",
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index bc0befa16..60c34b64e 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -2,25 +2,18 @@
 
 echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
 
-global $CONFIG;  
-$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
-$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
-$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
-
-$upgrade = false;
-if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
-	$upgrade = true;
-}
 ?>
 <p>
-	<?php
-	if ($upgrade) {
-		?>
-	<a href="<?php echo $upgrade_url; ?>">Upgrade</a><br />
-		<?php
-	}
-	?>
-	<a href="<?php echo $system_url; ?>">Run Server Analysis</a>
+<?php
+echo elgg_view('tidypics/admin/upgrade');
+
+global $CONFIG;
+$url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
+$text = elgg_echo('tidypics:settings:server:analysis');
+
+echo "<a href=\"$url\">$text</a>";
+?>
 </p>
 <?php
+
 echo elgg_view("tidypics/forms/settings");
diff --git a/views/default/tidypics/admin/thumbnails.php b/views/default/tidypics/admin/thumbnails.php
index ccd884005..960028fb9 100644
--- a/views/default/tidypics/admin/thumbnails.php
+++ b/views/default/tidypics/admin/thumbnails.php
@@ -2,9 +2,9 @@
 <h3>Overview</h3>
 <p>
 This page allows you to create thumbnails for images when the thumbnail creation failed during upload. 
-You may experience problems with thumbnail creation if your image library in not configured properly or
+You may experience problems with thumbnail creation if your image library is not configured properly or
 if there is not enough memory for the GD library to load and resize an image. If your users have 
-experienced problems with thumbnail creation and you have modified your setup, you can try to redo the
+experienced problems with thumbnail creation and you have corrected your configuration, you can try to redo the
 thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing
 a photo) and enter it below. 
 </p>