1 files changed, 34 insertions, 41 deletions

diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index afbbec642..6afc0f40f 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -2,61 +2,54 @@
     <div class="heading icon-add">
         <button
             data-apps-slide-toggle=".add-new-popup"
-            news-focus="[ng-model='feedUrl']"><?php p($l->t('Add Website'))?></button>
+            news-focus="[name='address']"><?php p($l->t('Subscribe'))?></button>
     </div>
 
     <div class="add-new-popup">
 
-        <p class="error">
-            <span ng-show="Navigation.feedExistsError">
-                <?php p($l->t('Error: address exists already!')); ?>
-            </span>
-            <span ng-show="Navigation.folderExistsError">
-                <?php p($l->t('Error: folder exists already')); ?>
-            </span>
-        </p>
-
         <form>
             <input type="text"
                 ng-model="feedUrl"
-                placeholder="<?php p($l->t('Address')); ?>"
-                name="address"
-                autofocus>
-            <select name="folder"
-                    data-create="<?php p($l->t('New folder')); ?>"
+                placeholder="<?php p($l->t('Web-Address')); ?>"
+                name="address">
+
+            <!-- standard folder select box -->
+            <div ng-hide="Navigation.newFolder">
+                <select name="folder"
                     title="<?php p($l->t('Folder')); ?>"
                     ng-model="folderId"
                     ng-options="folder.name for folder in Navigation.getAllFolders() track by folder.name"
                     ng-hide="addNewFolder">
-                <option value="" selected="selected"><?php p($l->t('Choose folder')); ?></option>
-            </select>
-            <button title="<?php p($l->t('New folder')); ?>"
-                    ng-click="addNewFolder=true"
-                    ng-hide="addNewFolder"
-                    class="action-button new-button action"></button>
-            <input type="text"
-                    ng-model="folderName"
-                    ng-if="addNewFolder"
-                    name="foldername"
-                    placeholder="<?php p($l->t('Folder name')); ?>"
-                    autofocus
-                    class="folder-input"
-                    ng-keyup="{13: 'Navigation.createFolder(folderName)'}"/>
-            <button title="<?php p($l->t('Back to folder selection')); ?>"
-                    ng-show="addNewFolder"
-                    ng-click="addNewFolder=false"
-                    class="action-button back-button action"></button>
-            <button title="<?php p($l->t('Create folder')); ?>"
-                    ng-show="addNewFolder"
-                    ng-click="Navigation.createFolder(folderName)"
-                    ng-disabled="!folderName.trim()"
-                    ng-class="{loading: Navigation.isAddingFolder()}"
-                    class="action-button create-button action">
+                    <option value="" selected="selected"><?php p($l->t('Top Level')); ?></option>
+                </select>
+                <button class="icon-add add-new-folder-primary"
+                        title="<?php p($l->t('New Folder')); ?>"
+                        ng-click="Navigation.newFolder=true"
+                        news-focus="[name='folderName']">
+            </div>
+
+            <!-- adding a new folder -->
+            <div ng-show="Navigation.newFolder">
+                <input type="text"
+                       ng-model="folderName"
+                       placeholder="<?php p($l->t('Folder-Name')); ?>"
+                       name="folderName"
+                       ng-if="Navigation.newFolder">
+                <button class="icon-checkmark add-new-folder-primary"
+                        title="<?php p($l->t('Create folder')); ?>"
+                        ng-click="Navigation.newFolder=false">
+                <button class="icon-close add-new-folder-secondary"
+                        title="<?php p($l->t('Cancel')); ?>"
+                        ng-click="Navigation.newFolder=false">
+            </div>
+
             </button>
-            <button title="<?php p($l->t('Add')); ?>"
+            <input title="<?php p($l->t('Subscribe')); ?>"
+                    value="<?php p($l->t('Subscribe')); ?>"
                     class="primary"
+                    type="submit"
                     ng-disabled="!feedUrl.trim()"
-                    ng-click="createFeed(feedUrl, folderId.id)"><?php p($l->t('Add')); ?></button>
+                    ng-click="createFeed(feedUrl, folderId.id)">
         </form>
 
     </div>