diff options
| -rw-r--r-- | coffee/controllers/feedcontroller.coffee | 6 | ||||
| -rw-r--r-- | css/addnew.css | 4 | ||||
| -rw-r--r-- | css/owncloud.css | 10 | ||||
| -rw-r--r-- | db/objectexistsexception.php | 0 | ||||
| -rw-r--r-- | js/app.js | 6 | ||||
| -rw-r--r-- | templates/part.addnew.php | 5 |
6 files changed, 18 insertions, 13 deletions
diff --git a/coffee/controllers/feedcontroller.coffee b/coffee/controllers/feedcontroller.coffee index 9f3e733ee..d2bb85a84 100644 --- a/coffee/controllers/feedcontroller.coffee +++ b/coffee/controllers/feedcontroller.coffee @@ -52,13 +52,13 @@ angular.module('News').factory '_FeedController', ['Controller', (Controller) -> folderId = 0 else folderId = folder.id - @addingFeed = true + @$scope.adding = true onSuccess = => @$scope.feedUrl = '' - @addingFeed = false + @$scope.adding = false onError = => @$scope.feedError = true - @addingFeed = false + @$scope.adding = false @persistence.createFeed(url, folderId, onSuccess, onError) diff --git a/css/addnew.css b/css/addnew.css index 9904b8693..3374aa04e 100644 --- a/css/addnew.css +++ b/css/addnew.css @@ -22,4 +22,8 @@ .add-new-popup .personalblock:first-child legend { padding-top: 15px; +} + +.add-new input[type=text] { + width: 100px; }
\ No newline at end of file diff --git a/css/owncloud.css b/css/owncloud.css index 98fbacb7d..9bbf920f4 100644 --- a/css/owncloud.css +++ b/css/owncloud.css @@ -74,7 +74,7 @@ #left-content > ul > li.active { border-bottom: 1px solid #ccc; - border-top: 1px solid #ddd; + border-top: 1px solid #ccc; } #left-content ul.with-icon a { @@ -98,11 +98,11 @@ } #left-content > ul > li:hover { - border-top: 1px solid #ddd; + border-top: 1px solid #ccc; } #left-content li > a:hover { - background-color: #ddd; + background-color: #ccc; } /* collapsible */ @@ -209,12 +209,12 @@ #app-settings-content { background-color: #eee; - display: none; + height: 0; padding: 10px; } #app-settings.open #app-settings-content { - display: block; + height: auto; } diff --git a/db/objectexistsexception.php b/db/objectexistsexception.php deleted file mode 100644 index e69de29bb..000000000 --- a/db/objectexistsexception.php +++ /dev/null @@ -1740,14 +1740,14 @@ } else { folderId = folder.id; } - _this.addingFeed = true; + _this.$scope.adding = true; onSuccess = function() { _this.$scope.feedUrl = ''; - return _this.addingFeed = false; + return _this.$scope.adding = false; }; onError = function() { _this.$scope.feedError = true; - return _this.addingFeed = false; + return _this.$scope.adding = false; }; return _this.persistence.createFeed(url, folderId, onSuccess, onError); } diff --git a/templates/part.addnew.php b/templates/part.addnew.php index c2da6cd5f..59dc00380 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -18,13 +18,14 @@ placeholder="<?php p($l->t('Address')); ?>" ng-disabled="isAddingFeed()"> <button title="<?php p($l->t('Add')); ?>" - ng-class="{loading: isAddingFeed()}" + ng-class="{loading: adding}" + ng-disabled="adding" ng-click="addFeed(feedUrl, folderId)"><?php p($l->t('Add')); ?></button> <select name="folder" data-create="<?php p($l->t('New folder')); ?>" title="<?php p($l->t('Folder')); ?>" ng-model="folderId" - ng-disabled="isAddingFeed()" + ng-disabled="adding" ng-options="folder.name for folder in getFolders()" add-folder-select> <option value="" selected><?php p($l->t('No folder')); ?></option> |