adding feeds and folders, lady and gentlemen :P

1 files changed, 14 insertions, 13 deletions

diff --git a/templates/part.navigation.addfolder.php b/templates/part.navigation.addfolder.php
index f1c494fb8..2f65e9d2b 100644
--- a/templates/part.navigation.addfolder.php
+++ b/templates/part.navigation.addfolder.php
@@ -8,22 +8,23 @@
     <div class="add-new-popup" id="new-folder">
 
         <form ng-submit="Navigation.createFolder(folder)" name="folderform">
-
+            <fieldset ng-disabled="Navigation.addingFolder">
             <!-- add a folder -->
-            <input type="text"
-                   ng-class="{'ng-invalid': Navigation.folderNameExists(folder.name)}"
-                   ng-model="folder.name"
-                   placeholder="<?php p($l->t('Folder name')); ?>"
-                   title="<?php p($l->t('Folder name')); ?>"
-                   name="folderName"
-                   required>
+                <input type="text"
+                       ng-class="{'ng-invalid': !Navigation.addingFolder && Navigation.folderNameExists(folder.name)}"
+                       ng-model="folder.name"
+                       placeholder="<?php p($l->t('Folder name')); ?>"
+                       title="<?php p($l->t('Folder name')); ?>"
+                       name="folderName"
+                       required>
 
-            <p class="error" ng-show="Navigation.folderNameExists(folder.name)"><?php p($l->t('Folder exists already!')); ?></p>
+                <p class="error" ng-show="!Navigation.addingFolder && Navigation.folderNameExists(folder.name)"><?php p($l->t('Folder exists already!')); ?></p>
 
-            <input type="submit"
-                value="<?php p($l->t('Create')); ?>"
-                class="primary"
-                ng-disabled="Navigation.folderNameExists(folder.name)">
+                <input type="submit"
+                    value="<?php p($l->t('Create')); ?>"
+                    class="primary"
+                    ng-disabled="Navigation.folderNameExists(folder.name)">
+            </fieldset>
         </form>
     </div>
 </li>