diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 21:38:20 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 21:38:20 +0200 |
commit | eda8fec5874ebd2ba48b458497cb315eb871105c (patch) | |
tree | b801eee009361a7e965d205de9d792498eb8d1fa /templates | |
parent | b06fc20ddbadbc7522cd23a83a20975f43889890 (diff) |
autoselect folder when it was created and open folder if a feed gets added to it
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.addnew.php | 11 | ||||
-rw-r--r-- | templates/part.listfeed.php | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/templates/part.addnew.php b/templates/part.addnew.php index d04aac85a..5e921c306 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -38,13 +38,13 @@ autofocus> <button title="<?php p($l->t('Add')); ?>" class="primary" - ng-class="{loading: isAddingFeed()}" ng-disabled="isAddingFeed() || isAddingFolder()" ng-click="addFeed(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')); ?>" + title="<?php p($l->t('Folder')); ?>" ng-model="folderId" ng-disabled="isAddingFolder()" ng-options="folder.name for folder in folderBl.getAll()" @@ -54,7 +54,8 @@ <button title="<?php p($l->t('New folder')); ?>" ng-click="addNewFolder=true" ng-hide="addNewFolder" - class="action-button new-button action"></button> + class="action-button new-button action" + oc-click-focus="{selector: 'input[name=\'foldername\']'}"></button> <input type="text" ng-model="folderName" ng-disabled="isAddingFolder()" @@ -75,7 +76,7 @@ ng-class="{loading: isAddingFolder()}" class="action-button create-button action"> </button> - </form> + </form> </fieldset> </div> </li> diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 4008ca8af..7dc06ea59 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -28,7 +28,7 @@ <span class="utils"> - <span class="unread-counter"> + <span class="unread-counter" ng-show="feed.id"> {{ feedBl.getUnreadCount(feed.id) }} </span> |