diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-02 10:37:51 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-02 10:38:00 +0200 |
commit | 711c260bfea993e0a1124951a55eee6c989ee888 (patch) | |
tree | 8982f13a41e9054bb7c2377b66769fe83ae9371a /templates | |
parent | 635a9d779549832b4dacb2c5b9f4033d846bf154 (diff) |
small pixel fixes
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.addnew.php | 2 | ||||
-rw-r--r-- | templates/part.feed.starred.php | 5 | ||||
-rw-r--r-- | templates/part.feed.unread.php | 4 | ||||
-rw-r--r-- | templates/part.listfeed.php | 10 | ||||
-rw-r--r-- | templates/part.listfolder.php | 8 | ||||
-rw-r--r-- | templates/part.settings.php | 3 |
6 files changed, 19 insertions, 13 deletions
diff --git a/templates/part.addnew.php b/templates/part.addnew.php index d49a0b61c..05117ea5a 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -12,7 +12,7 @@ <?php p($l->t('Add Website'))?> </a> - <div class="add-new-popup" > + <div class="add-new-popup"> <fieldset class="personalblock"> <p class="error"> <span ng-show="feedEmptyError"><?php p($l->t('Address must not be empty!')); ?></span> diff --git a/templates/part.feed.starred.php b/templates/part.feed.starred.php index 1d96d9fe8..4bd0a5fef 100644 --- a/templates/part.feed.starred.php +++ b/templates/part.feed.starred.php @@ -5,4 +5,9 @@ ng-click="loadFeed(feedType.Starred, 0)"> <?php p($l->t('Starred')) ?> </a> + <span class="utils"> + <span class="unread-counter"> + {{ getStarredCount() }} + </span> + </span> </li>
\ No newline at end of file diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index 32aa867e7..85f4c8766 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -17,10 +17,10 @@ </a> <span class="utils"> <span class="unread-counter"> - {{ getUnreadCount(feedType.Subscriptions, 0) }} + {{ getUnreadCount() }} </span> <button class="svg action mark-read-icon" - ng-click="markAllRead(feedType.Subscriptions, 0)" + ng-click="feedBl.markAllRead()" title="<?php p($l->t('Mark all read')) ?>"></button> </span> </li>
\ No newline at end of file diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 2f136801c..4db9cd385 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -2,7 +2,7 @@ active: isFeedActive(feedType.Feed, feed.id), unread: feed.unreadCount!=0 }" - ng-repeat="feed in getFeedsOfFolder(<?php p($_['folderId']); ?>)" + ng-repeat="feed in feedBl.getFeedsOfFolder(<?php p($_['folderId']); ?>)" ng-show="isShown(feedType.Feed, feed.id)" data-id="{{feed.id}}" class="feed" @@ -15,17 +15,17 @@ </a> <span class="utils"> - <button ng-click="delete(feedType.Feed, feed.id)" + <button ng-click="feedBl.delete(feed.id)" class="svg action delete-icon" title="<?php p($l->t('Delete feed')); ?>"></button> <span class="unread-counter"> - {{ getUnreadCount(feedType.Feed, feed.id) }} + {{ getFeedUnreadCount(feed.id) }} </span> <button class="svg action mark-read-icon" - ng-show="getUnreadCount(feedType.Feed, feed.id)>0" - ng-click="markAllRead(feedType.Feed, feed.id)" + ng-show="feed.unreadCount > 0" + ng-click="feedBl.markFeedRead(feed.id)" title="<?php p($l->t('Mark all read')); ?>"></button> </span> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index f237daa54..6d02aea7a 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -1,8 +1,8 @@ <li ng-class="{ active: isFeedActive(feedType.Folder, folder.id), open: folder.open, - collapsible: hasFeeds(folder.id), - unread: getUnreadCount(feedType.Folder, folder.id)!=0}" + collapsible: folderBl.hasFeeds(folder.id), + unread: getFolderUnreadCount(folder.id) != 0}" ng-repeat="folder in folders" ng-show="isShown(feedType.Folder, folder.id)" class="folder" @@ -10,7 +10,7 @@ droppable> <button class="collapse" title="<?php p($l->t('Collapse'));?>" - ng-click="toggleFolder(folder.id)"></button> + ng-click="folderBl.toggleFolder(folder.id)"></button> <a href="#" class="title folder-icon" ng-click="loadFeed(feedType.Folder, folder.id)"> @@ -19,7 +19,7 @@ <span class="utils"> - <button ng-click="delete(feedType.Folder, folder.id)" + <button ng-click="folderBl.delete(folder.id)" class="svg action delete-icon" title="<?php p($l->t('Delete folder')); ?>"></button> diff --git a/templates/part.settings.php b/templates/part.settings.php index 4fd963e8a..38c51933f 100644 --- a/templates/part.settings.php +++ b/templates/part.settings.php @@ -1,6 +1,7 @@ <fieldset class="personalblock"> <legend><strong><?php p($l->t('Import / Export OPML')); ?></strong></legend> - <input type="file" id="opml-upload" name="files[]" read-file/> + <input type="file" id="opml-upload" name="import" + oc-read-file="import($fileContent)"/> <button title="<?php p($l->t('Import')); ?>" oc-forward-click="{selector:'#opml-upload'}"> <?php p($l->t('Import')); ?> |