diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/part.addnew.php | 15 | ||||
| -rw-r--r-- | templates/part.items.php | 8 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 7 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 4 | ||||
| -rw-r--r-- | templates/part.showall.php | 4 |
5 files changed, 17 insertions, 21 deletions
diff --git a/templates/part.addnew.php b/templates/part.addnew.php index d7d549ad0..9a625e2f3 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -1,5 +1,5 @@ <li class="add-new"> - <a class="list-title list-title-with-icon" ng-click="showAdd=!showAdd" + <a class="list-title list-title-with-icon" oc-click-slide-toggle="{ selector: '.add-new-popup', hideOnFocusLost: true @@ -7,29 +7,30 @@ <?php p($l->t('New'))?> </a> - <div class="add-new-popup" ng-class="{open:showAdd==true}"> + <div class="add-new-popup"> <fieldset class="personalblock"> <legend><strong><?php p($l->t('Add Subscription')); ?></strong></legend> <p class="error"> <span ng-show="feedEmptyError"><?php p($l->t('Address must not be empty!')); ?></span> - <span ng-show="feedExistsError"><?php p($l->t('Feed exists already!')); ?></span> - <span ng-show="feedError"><?php p($l->t('Could not add feed! Check if feed contains valid RSS!')); ?></span> + <span ng-show="feedError"> + <?php p($l->t('Could not add feed! Check if feed contains valid RSS or exists already!')); ?> + </span> <span ng-show="folderExistsError"><?php p($l->t('Folder exists already')); ?></span> </p> <form> <input type="text" ng-model="feedUrl" placeholder="<?php p($l->t('Address')); ?>" - ng-disabled="isAddingFeed()"> + ng-disabled="isAddingFeed() || isAddingFolder()"> <button title="<?php p($l->t('Add')); ?>" - ng-class="{loading: adding}" + ng-class="{loading: isAddingFeed()}" 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="adding" + ng-disabled="isAddingFolder()" ng-options="folder.name for folder in getFolders()" add-folder-select> <option value="" selected><?php p($l->t('No folder')); ?></option> diff --git a/templates/part.items.php b/templates/part.items.php index 8bede824f..9bc3206ca 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -43,14 +43,6 @@ <div class="bottom_utils"> <ul class="secondary_item_utils" ng-class="{show_keep_unread: isKeptUnread(item.id)}"> - <!--<li class="share_link"> - <a class="share" data-item-type="news_item" - data-item="{{item.id}}" title="<?php p($l->t('Share')) ?>" - data-possible-permissions="<?php //p((OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE)) ?>" - href="#"> - <?php p($l->t('Share')) ?> - </a> - </li>--> <li ng-click="keepUnread(item.id, item.feedId)" class="keep_unread"><?php p($l->t('Keep unread')); ?> <input type="checkbox" ng-checked="isKeptUnread(item.id)"/> diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 51b249eb5..a6193afe7 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -1,10 +1,13 @@ -<li ng-class="{active: isFeedActive(feedType.Feed, feed.id), unread: feed.unreadCount!=0}" +<li ng-class="{ + active: isFeedActive(feedType.Feed, feed.id), + unread: feed.unreadCount!=0 + }" ng-repeat="feed in getFeedsOfFolder(<?php p($_['folderId']); ?>)" ng-show="isShown(feedType.Feed, feed.id)" data-id="{{feed.id}}" class="feed" draggable> - <a ng-style="{backgroundImage: feed.icon}" + <a ng-style="{backgroundImage: feed.faviconLink}" href="#" class="title" ng-click="loadFeed(feedType.Feed, feed.id)"> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index 4285ed0ae..e30610d19 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -32,10 +32,10 @@ ng-click="markAllRead(feedType.Folder, folder.id)" title="<?php p($l->t('Mark all read')); ?>"></button> - <button class="svg action edit-icon" +<!-- <button class="svg action edit-icon" ng-click="renameFolder(folder.id)" title="<?php p($l->t('Rename folder')); ?>"></button> - +--> </span> <ul> diff --git a/templates/part.showall.php b/templates/part.showall.php index 61f9cc11d..6d7473e43 100644 --- a/templates/part.showall.php +++ b/templates/part.showall.php @@ -1,7 +1,7 @@ -<li ui-if="!isShowAll()" class="show-all"> +<li ui-if="!isShowAll() && isShown(feedType.Subscributions, 0)" class="show-all"> <a ng-click="setShowAll(true)" href="#"><?php p($l->t('Show all')); ?></a> </li> -<li ui-if="isShowAll()" class="show-all"> +<li ui-if="isShowAll() && isShown(feedType.Subscributions, 0)" class="show-all"> <a ng-click="setShowAll(false)" href="#"><?php p($l->t('Show only unread')); ?></a> </li> |