diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 03:03:44 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 03:03:44 +0200 |
| commit | 761412ebaaf0930499ca26e7acdd0965be5a50ae (patch) | |
| tree | 24c62f2b64e12d92e339c16f96fb1f01dae7972c /templates | |
| parent | 1a04a1c73540be7c7294ef86b92df65bd91c5fc8 (diff) | |
create folders!
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/part.navigation.addfeed.php | 6 | ||||
| -rw-r--r-- | templates/part.navigation.folder.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/templates/part.navigation.addfeed.php b/templates/part.navigation.addfeed.php index 4dbe94d20..6e014311b 100644 --- a/templates/part.navigation.addfeed.php +++ b/templates/part.navigation.addfeed.php @@ -10,11 +10,14 @@ <form ng-submit="Navigation.createFeed(feed)" name="feedform"> <input type="text" ng-model="feed.url" + ng-class="{'ng-invalid': Navigation.feedUrlExists(feed.url)}" placeholder="<?php p($l->t('Web address')); ?>" name="address" pattern="[^\s]+" required> + <p class="error" ng-show="Navigation.feedUrlExists(feed.url)"><?php p($l->t('Feed exists already!')); ?></p> + <!-- select a folder --> <select name="folder" title="<?php p($l->t('Folder')); ?>" @@ -50,7 +53,8 @@ <input type="submit" value="<?php p($l->t('Subscribe')); ?>" class="primary" - ng-disabled="Navigation.newFolder && Navigation.folderNameExists(folder.name)"> + ng-disabled="Navigation.feedUrlExists(feed.url) || + (Navigation.newFolder && Navigation.folderNameExists(folder.name))"> </form> </div> </li> diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index 7b4194b5b..d524a65d0 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -40,7 +40,7 @@ class="title icon-folder" ng-hide="folder.editing || folder.error" ng-class="{ - 'icon-loading': !folder.id + 'folder-loading': !folder.id }"> {{ folder.name }} </a> |