1 files changed, 17 insertions, 12 deletions
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index 6dace1830..e1d20f953 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -1,18 +1,23 @@
 <?php
+/**
+ * Tidypics admin settings tab
+ */
 
-echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
+$form_body = elgg_view('forms/tidypics/admin/settings', $vars);
 
-?>
-<p>
-<?php
-echo elgg_view('tidypics/admin/upgrade');
+$server_analysis_link = elgg_view('output/url', array(
+	'href' => "{$vars['url']}mod/tidypics/pages/server_analysis.php",
+	'text' => elgg_echo('tidypics:settings:server:analysis'),
+));
 
-$url = "{$vars['url']}mod/tidypics/pages/server_analysis.php";
-$text = elgg_echo('tidypics:settings:server:analysis');
+echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions')));
 
-echo "<a href=\"$url\">$text</a>";
-?>
-</p>
-<?php
+echo '<p>';
+echo elgg_view('tidypics/admin/upgrade');
+echo $server_analysis_link;
+echo '</p>';
 
-echo elgg_view("tidypics/forms/settings");
+echo elgg_view('input/form', array(
+	'body' => $form_body,
+	'action' => $vars['url'] . 'action/tidypics/admin/settings',
+));