2 files changed, 13 insertions, 13 deletions
diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php
index 7e9c17ac2..403203f69 100644
--- a/views/default/forms/photos/admin/settings.php
+++ b/views/default/forms/photos/admin/settings.php
@@ -2,7 +2,7 @@
 /**
  * Tidypics admin settings form body
  *
- * @todo watermark, quota, remove original image, group only upload not delete
+ * @todo remove original image, group only upload not delete
  */
 
 $plugin = elgg_get_plugin_from_id('tidypics');
@@ -24,15 +24,3 @@ $content = elgg_view('forms/photos/admin/settings/thumbnails', array('plugin' =>
 echo elgg_view_module('inline', $title, $content);
 
 echo elgg_view('input/submit', array('value' => elgg_echo("save")));
-
-return true;
-
-
-// Quota Size
-$quota = $plugin->quota;
-if (!$quota) {
-	$quota = 0;
-}
-$form_body .= "<p>" . elgg_echo('tidypics:settings:quota') . "<br />";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "</p>";
-
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index 352a9c5a1..c99b9d688 100644
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -34,3 +34,15 @@ echo elgg_view("input/text", array(
 	'value' => $plugin->watermark_text,
 ));
 echo '</div>';
+
+// Quota Size
+$quota = $plugin->quota;
+if (!$quota) {
+	$quota = 0;
+}
+echo '<div>' . elgg_echo('tidypics:settings:quota');
+echo elgg_view('input/text', array(
+	'name' => 'params[quota]',
+	'value' => $quota,
+));
+echo '</div>';