From 59f42f80ad4f292ebbb95ec58d95e0503d29711f Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Thu, 11 Apr 2013 17:55:59 +0200
Subject: add a button for people to get out of add folder mode

---
 templates/part.addnew.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index 05117ea5a..9e64a4a03 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -15,11 +15,18 @@
 	<div class="add-new-popup">
 		<fieldset class="personalblock">
 			<p class="error">
-				<span ng-show="feedEmptyError"><?php p($l->t('Address must not be empty!')); ?></span>
-				<span ng-show="feedError">
-					<?php p($l->t('Could not add feed! Check if feed contains valid RSS or exists already!')); ?>
+				<span ng-show="feedEmptyError">
+					<?php p($l->t('Error: address must not be empty!')); ?>
+				</span>
+				<span ng-show="feedExistsError">
+					<?php p($l->t('Error: address exists already!')); ?>
+				</span>
+				<span ng-show="folderEmptyError">
+					<?php p($l->t('Error: folder name must not be empty!')); ?>
+				</span>
+				<span ng-show="folderExistsError">
+					<?php p($l->t('Error: folder exists already')); ?>
 				</span>
-				<span ng-show="folderExistsError"><?php p($l->t('Folder exists already')); ?></span>
 			</p>
 			<form>
 
@@ -55,13 +62,18 @@
 						placeholder="<?php p($l->t('Folder name')); ?>" 
 						autofocus
 						ui-keyup="{13: 'addFolder(folderName)'}"/>
-					<button title="<?php p($l->t('Add')); ?>" 
+				<button title="<?php p($l->t('Back')); ?>" 
+						ng-show="addNewFolder"
+						ng-click="addNewFolder=false"
+						ng-disabled="isAddingFolder()"
+						class="back-button"></button>
+				<button title="<?php p($l->t('Add')); ?>" 
 						ng-show="addNewFolder"
 						ng-click="addFolder(folderName)"
 						ng-disabled="isAddingFolder()"
 						ng-class="{loading: isAddingFolder()}">
 						<?php p($l->t('Create')); ?>
-					</button>
+				</button>
 			</form>	
 		</fieldset>
 	</div>
-- 
cgit v1.2.3