diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-11 15:30:31 +0100 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-11 15:30:55 +0100 |
| commit | 5492e60510379add1523454f322def81167be8be (patch) | |
| tree | 8fff208ff6492758cff1b17aae7ec02c797cd322 /templates/main.php | |
| parent | e10d99e13da782e4c4bed03974bb10959ed333b4 (diff) | |
new style and style cleanup for the news app
Diffstat (limited to 'templates/main.php')
| -rw-r--r-- | templates/main.php | 78 |
1 files changed, 23 insertions, 55 deletions
diff --git a/templates/main.php b/templates/main.php index cd2cd8821..91fcaf048 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,64 +1,32 @@ -<div class="content_wrapper" ng-app="News"> - <div id="leftcontent_news" class="main_column"> - <div id="feed_wrapper"> - <div id="feeds" ng-controller="FeedController"> - <ul data-id="0" droppable> - <li ng-class="{ - active: isFeedActive(feedType.Subscriptions, 0), - all_read: getUnreadCount(feedType.Subscriptions, 0)==0 - }" - class="subscriptions" - ng-show="isShown(feedType.Subscriptions, 0)"> - <a class="title" - href="#" - ng-click="loadFeed(feedType.Subscriptions, 0)"> - <?php p($l->t('New articles'))?> - </a> - <span class="unread_items_counter"> - {{ getUnreadCount(feedType.Subscriptions, 0) }} - </span> - <span class="buttons"> - <button class="svg action feeds_markread" - ng-click="markAllRead(feedType.Subscriptions, 0)" - title="<?php p($l->t('Mark all read')) ?>"></button> - </span> - </li> - <li ng-class="{ - active: isFeedActive(feedType.Starred, 0), - all_read: getUnreadCount(feedType.Starred, 0)==0 - }" - class="starred" - ng-show="isShown(feedType.Starred, 0)"> - <a class="title" - href="#" - ng-click="loadFeed(feedType.Starred, 0)"> - <?php p($l->t('Starred')) ?> - </a> - <span class="unread_items_counter"> - {{ getUnreadCount(feedType.Starred, 0) }} - </span> - </li> +<div id="app" ng-app="News"> + <div id="left-content" ng-controller="FeedController"> - <?php print_unescaped($this->inc('part.listfolder')) ?> - <?php print_unescaped($this->inc('part.listfeed', array('folderId' => '0'))) ?> + <ul class="with-icon" data-id="0" droppable> + <?php print_unescaped($this->inc('part.addnew')) ?> + <?php print_unescaped($this->inc('part.feed.unread')) ?> + <?php print_unescaped($this->inc('part.feed.starred')) ?> + <?php print_unescaped($this->inc('part.listfolder')) ?> + <?php print_unescaped($this->inc('part.listfeed', array('folderId' => '0'))) ?> + <?php print_unescaped($this->inc('part.showall')); ?> + </ul> - </ul> + <div id="app-settings" ng-class="{open: showSettings==true}" + ng-controller="SettingsController" hide-settings-when-focus-lost> + <div id="app-settings-header"> + <button name="app settings" + class="settings-button" + ng-click="showSettings=!showSettings"></button> + </div> + <div id="app-settings-content"> + <?php print_unescaped($this->inc('part.settings')) ?> </div> </div> - <?php print_unescaped($this->inc('part.settings')) ?> - </div> - <div id="rightcontent_news" class="main_column"> - <div id="feed_items" - ng-class="{loading: loading.loading>0}" - ng-controller="ItemController" - when-scrolled="scroll()" - feed-navigation> - <?php - print_unescaped($this->inc("part.items")); - ?> - </div> + <div id="right-content" ng-class="{loading: loading.loading>0}" + ng-controller="ItemController" when-scrolled="scroll()" feed-navigation> + <?php print_unescaped($this->inc("part.items")); ?> </div> + </div> |