restyle and fix add website popup

4 files changed, 75 insertions, 86 deletions

diff --git a/css/navigation.css b/css/navigation.css
index a97697141..b967f51db 100644
--- a/css/navigation.css
+++ b/css/navigation.css
@@ -7,16 +7,9 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @copyright Bernhard Posselt 2014
  */
-.add-new:hover a.opened {
-    background-color: transparent !important;
-}
-
 .add-new .heading {
     height: 44px;
-    line-height: 44px;
     width: 100%;
-    display: block;
-    padding-top: 10px;
 }
 
 .add-new .heading:hover {
@@ -35,28 +28,32 @@
 }
 
 .add-new-popup {
-    display: none;
+    /*display: none;*/
+    height: 120px;
     padding: 15px 10px;
+    box-shadow: inset 0px -1px 10px #dedede;
+    border-top: 1px solid #dedede;
+    border-bottom: 1px solid #dedede;
 }
 
-.add-new input[type=text] {
+.add-new-popup input[type=text] {
     width: 170px;
 }
 
-.add-new select {
+.add-new-popup select {
     width: 170px;
     margin-top: 1px !important;
     height: 30px;
     background-color: #eee;
 }
 
-.add-new input {
+.add-new-popup input {
     margin-top: 15px;
     box-sizing: border-box;
 }
 
-.add-new input,
-.add-new select {
+.add-new-popup input,
+.add-new-popup select {
     margin: 0 0 5px 0;
     display: inline-block;
     float: left;
@@ -65,7 +62,7 @@
     border-right: 0;
 }
 
-.add-new button {
+.add-new-popup button {
     margin: 0 0 5px 0;
     display: inline-block;
     float: left;
@@ -75,32 +72,32 @@
     margin-top: 1px;
 }
 
-.add-new .action-button {
+.add-new-popup .action-button {
     width: 30px;
     background-position: center;
     background-repeat: no-repeat;
 }
 
-.add-new .back-button {
+.add-new-popup .back-button {
     border-radius: 0;
     background-image: url('../img/delete.svg');
 }
 
-.add-new .new-button {
+.add-new-popup .new-button {
     border-radius: 0;
     background-image: url('../img/add.svg');
     border-top-right-radius: 5px;
     border-bottom-right-radius: 5px;
 }
 
-.add-new .create-button {
+.add-new-popup .create-button {
     border-radius: 0;
     background-image: url('../img/mark_read.svg');
     border-top-right-radius: 5px;
     border-bottom-right-radius: 5px;
 }
 
-.add-new .error {
+.add-new-popup .error {
     padding: 0 0 10px 0;
 }
 
diff --git a/js/build/app.js b/js/build/app.js
index 1feea1d90..85ecaf878 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -401,14 +401,14 @@ var $__build_47_app__ = function () {
           this.renameFolder = function () {
             console.log('TBD');
           };
-          this.deleteFeed = function () {
-            console.log('TBD');
+          this.deleteFeed = function (feedUrl) {
+            console.log(feedUrl);
           };
-          this.deleteFolder = function () {
-            console.log('TBD');
+          this.deleteFolder = function (folderName) {
+            console.log(folderName);
           };
-          this.moveFeed = function () {
-            console.log('TBD');
+          this.moveFeed = function (feedId, folderId) {
+            console.log(feedId + folderId);
           };
         }
       ]);
diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js
index 8307b0e75..25fa6ddd1 100644
--- a/js/controller/NavigationController.js
+++ b/js/controller/NavigationController.js
@@ -138,16 +138,16 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource,
         console.log('TBD');
     };
 
-    this.deleteFeed = () => {
-        console.log('TBD');
+    this.deleteFeed = (feedUrl) => {
+        console.log(feedUrl);
     };
 
-    this.deleteFolder = () => {
-        console.log('TBD');
+    this.deleteFolder = (folderName) => {
+        console.log(folderName);
     };
 
-    this.moveFeed = () => {
-        console.log('TBD');
+    this.moveFeed = (feedId, folderId) => {
+        console.log(feedId + folderId);
     };
 
 });
\ No newline at end of file
diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index d48e7b516..bf986e5c0 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -1,14 +1,6 @@
 <li class="add-new">
-    <div class="list-title list-title-with-icon heading"
-        ng-mouseover="longadd=true"
-        ng-mouseleave="longadd=false">
-
-        <button data-apps-slide-toggle=".add-new-popup"
-            ng-hide="longadd"
-        >+ </button>
-        <button data-apps-slide-toggle=".add-new-popup"
-            ng-show="longadd"
-        >+ <?php p($l->t('Add Website'))?></button>
+    <div class="list-title list-title-with-icon heading">
+        <button data-apps-slide-toggle=".add-new-popup">+ <?php p($l->t('Add Website'))?></button>
     </div>
 
     <div class="add-new-popup">
@@ -21,51 +13,51 @@
                 <?php p($l->t('Error: folder exists already')); ?>
             </span>
         </p>
-            <form>
+        <form>
+
+            <input type="text"
+                ng-model="feedUrl"
+                placeholder="<?php p($l->t('Address')); ?>"
+                name="adress"
+                autofocus>
+            <button title="<?php p($l->t('Add')); ?>"
+                    class="primary"
+                    ng-disabled="!feedUrl.trim()"
+                    ng-click="createFeed(feedUrl, folderId.id)"><?php p($l->t('Add')); ?></button>
+        </form>
+        <form>
+            <select name="folder"
+                    data-create="<?php p($l->t('New 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">
+            </button>
+        </form>
 
-                <input type="text"
-                    ng-model="feedUrl"
-                    placeholder="<?php p($l->t('Address')); ?>"
-                    name="adress"
-                    autofocus>
-                <button title="<?php p($l->t('Add')); ?>"
-                        class="primary"
-                        ng-disabled="!feedUrl.trim()"
-                        ng-click="createFeed(feedUrl, folderId.id)"><?php p($l->t('Add')); ?></button>
-            </form>
-            <form>
-                <select name="folder"
-                        data-create="<?php p($l->t('New 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"
-                        ui-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">
-                </button>
-            </form>
-        </fieldset>
     </div>
 </li>