From f41cce501b34c4eb1ad4a9bbc2dbef76b3ec24b1 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 30 Apr 2012 00:10:38 +0000
Subject: feature 2626: testing a Cancel button

git-svn-id: http://piwigo.org/svn/trunk@14547 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/configuration.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'admin/themes')

diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 08bd97593..e7b052f22 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -497,9 +497,10 @@ jQuery(document).ready(function() {
       {'... or '|@translate}<a href="#" class="addWatermarkOpen">{'add a new watermark'|@translate}</a>
       <br><img id="wImg"></img></span>{* #selectWatermark *}
       <span id="addWatermark"{if isset($ferrors.watermarkImage)} style="display:inline"{/if}>
-      <a href="#" class="addWatermarkOpen">{'add a new watermark'|@translate}</a> (png)
-      <br><input type="file" size="60" id="watermarkImage" name="watermarkImage"{if isset($ferrors.watermarkImage)} class="dError"{/if}>
+      {'add a new watermark'|@translate}
+      <br><input type="file" size="60" id="watermarkImage" name="watermarkImage"{if isset($ferrors.watermarkImage)} class="dError"{/if}> (png)
       {if isset($ferrors.watermarkImage)}<span class="dErrorDesc" title="{$ferrors.watermarkImage}">!</span>{/if}
+      <br>{'... or '|@translate}<a href="#" class="addWatermarkOpen">{'Cancel'|@translate}</a>
       </span>{* #addWatermark *}
     </li>
 
-- 
cgit v1.2.3