From 2d8b04169dda48a5dba8503d9943bdeee2c64685 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 14 Jul 2012 15:15:30 -0400
Subject: watermarking returns

---
 views/default/forms/photos/admin/settings.php      | 4 ----
 views/default/forms/photos/admin/settings/main.php | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'views/default/forms/photos')

diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php
index 2b6399a67..7e9c17ac2 100644
--- a/views/default/forms/photos/admin/settings.php
+++ b/views/default/forms/photos/admin/settings.php
@@ -28,10 +28,6 @@ echo elgg_view('input/submit', array('value' => elgg_echo("save")));
 return true;
 
 
-// Watermark Text
-$form_body .= "<p>" . elgg_echo('tidypics:settings:watermark') . "<br />";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "</p>";
-
 // Quota Size
 $quota = $plugin->quota;
 if (!$quota) {
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index 349c951f9..352a9c5a1 100644
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -26,3 +26,11 @@ echo elgg_view('input/text', array(
 	'value' => $plugin->maxfilesize,
 ));
 echo '</div>';
+
+// Watermark Text
+echo '<div>' . elgg_echo('tidypics:settings:watermark');
+echo elgg_view("input/text", array(
+	'name' => 'params[watermark_text]',
+	'value' => $plugin->watermark_text,
+));
+echo '</div>';
-- 
cgit v1.2.3