diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-09 23:44:25 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-09 23:44:25 +0200 |
commit | 144607005140602e3e33f8682ceed331e76982aa (patch) | |
tree | 14b54dc6b77255779a01376892f729c1d562a417 /templates | |
parent | 952df56f7962edd1113b6ec749b85b85232cf6a7 (diff) |
several fixes
Diffstat (limited to 'templates')
-rw-r--r-- | templates/index.php | 3 | ||||
-rw-r--r-- | templates/part.content.php | 98 | ||||
-rw-r--r-- | templates/part.navigation.feed.php | 3 | ||||
-rw-r--r-- | templates/part.settings.php | 4 |
4 files changed, 54 insertions, 54 deletions
diff --git a/templates/index.php b/templates/index.php index e5f0d6485..14a41f32d 100644 --- a/templates/index.php +++ b/templates/index.php @@ -40,13 +40,12 @@ style('news', [ <div id="app-settings" ng-controller="SettingsController as Settings"> <?php print_unescaped($this->inc('part.settings')) ?> </div> - </div> <!-- content --> <script type="text/ng-template" id="content.html"><?php print_unescaped($this->inc('part.content')) ?></script> - <div id="app-content" ng-class="{'loading-content': App.loading.isLoading('content')}"> + <div id="app-content" ng-class="{'loading-content': App.loading.isLoading('content') && !App.loading.isLoading('global')}"> <div id="app-content-wrapper" ng-class="{'autopaging': App.loading.isLoading('autopaging')}" ng-hide="App.loading.isLoading('global')" diff --git a/templates/part.content.php b/templates/part.content.php index 49d755fc4..b5c63c439 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -5,59 +5,59 @@ <div ng-if="!App.isFirstRun()"> <ul> <li class="item {{ Content.getFeed(item.feedId).cssClass }}" - ng-repeat="item in Content.getItems() | orderBy:[Content.orderBy()] track by item.id" - ng-click="Content.markRead(item.id)" - ng-class="{read: !item.unread}" - data-id="{{ item.id }}"> + ng-repeat="item in Content.getItems() | orderBy:[Content.orderBy()] track by item.id" + ng-click="Content.markRead(item.id)" + ng-class="{read: !item.unread}" + data-id="{{ item.id }}"> - <div class="utils" ng-click="Content.toggleItem(item)"> - <ul> - <li ng-click="Content.toggleStar(item.id)" class="util" news-stop-propagation> - <button class="star svg" ng-class="{'starred': item.starred}" title="<?php p($l->t('Star')); ?>"></button> - </li> - <li class="util"> - <a class="external icon-link" - target="_blank" - ng-href="{{ item.url }}" - title="<?php p($l->t('Open website')) ?>" - news-stop-propagation> - </a> - </li> - <li ng-click="Content.toggleKeepUnread(item.id)" class="util" news-stop-propagation> - <button class="icon-toggle" ng-class="{'keep-unread': item.keepUnread}" title="<?php p($l->t('Keep unread')); ?>"></button> - </li> - <li class="title"> - <h1> - <a target="_blank" > - {{ item.title }} - </a> - </h1> - </li> - <li class="source"> - <a ng-href="#/items/feeds/{{ item.feedId }}/" news-stop-propagation>{{ Content.getFeed(item.feedId).title }}</a> - </li> - <li class="date"> - <time title="{{ item.pubDate*1000|date:'yyyy-MM-dd HH:mm:ss' }}" - datetime="{{ item.pubDate*1000|date:'yyyy-MM-ddTHH:mm:ssZ' }}"> - {{ Content.getRelativeDate(item.pubDate) }} - </time> - </li> - </ul> - </div> + <div class="utils" ng-click="Content.toggleItem(item)"> + <ul> + <li ng-click="Content.toggleStar(item.id)" class="util" news-stop-propagation> + <button class="star svg" ng-class="{'starred': item.starred}" title="<?php p($l->t('Star')); ?>"></button> + </li> + <li ng-click="Content.toggleKeepUnread(item.id)" class="util" news-stop-propagation> + <button class="icon-toggle" ng-class="{'keep-unread': item.keepUnread}" title="<?php p($l->t('Keep unread')); ?>"></button> + </li> + <li class="util"> + <a class="external icon-link" + target="_blank" + ng-href="{{ item.url }}" + title="<?php p($l->t('Open website')) ?>" + news-stop-propagation> + </a> + </li> + <li class="title" title="{{ item.title }}"> + <h1> + <a target="_blank" > + {{ item.title }} + </a> + </h1> + </li> + <li class="source"> + <a ng-href="#/items/feeds/{{ item.feedId }}/" news-stop-propagation>{{ Content.getFeed(item.feedId).title }}</a> + </li> + <li class="date"> + <time title="{{ item.pubDate*1000|date:'yyyy-MM-dd HH:mm:ss' }}" + datetime="{{ item.pubDate*1000|date:'yyyy-MM-ddTHH:mm:ssZ' }}"> + {{ Content.getRelativeDate(item.pubDate) }} + </time> + </li> + </ul> + </div> - <div class="article" ng-show="!Content.isCompactView() || item.show"> + <div class="article" ng-show="!Content.isCompactView() || item.show"> - <div class="enclosure" ng-if="item.enclosureLink"> - <news-audio type="{{ item.enclosureType }}" - ng-src="{{ item.enclosureLink|trustUrl }}"> - <?php p($l->t('Download')) ?> - </news-audio> - </div> + <div class="enclosure" ng-if="item.enclosureLink"> + <news-audio type="{{ item.enclosureType }}" + ng-src="{{ item.enclosureLink|trustUrl }}"> + <?php p($l->t('Download')) ?> + </news-audio> + </div> - <div class="body" news-bind-html-unsafe="item.body"></div> + <div class="body" news-bind-html-unsafe="item.body"></div> - <h2 class="author" ng-show="item.author">© {{ item.author }}</h2> - </div> - </li> + <h2 class="author" ng-show="item.author">© {{ item.author }}</h2> + </div> + </li> </ul> </div> diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php index ae4442fe5..be3b09372 100644 --- a/templates/part.navigation.feed.php +++ b/templates/part.navigation.feed.php @@ -58,7 +58,8 @@ {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }} </li> <li class="app-navigation-entry-utils-menu-button"> - <button ng-click="App.toggleMenu('f' + feed.id)"></button> + <button ng-click="App.toggleMenu('f' + feed.id)" + title="<?php p($l->t('Menu')); ?>"></button> </li> </ul> </div> diff --git a/templates/part.settings.php b/templates/part.settings.php index 4c9b3eca2..f863b601b 100644 --- a/templates/part.settings.php +++ b/templates/part.settings.php @@ -10,7 +10,7 @@ <p ng-click="Settings.toggleSetting('compact')"> <label for="compact"> <input type="checkbox" ng-checked="Settings.getSetting('compact')" name="compact"> - <?php p($l->t('Use compact view')); ?> + <?php p($l->t('Compact view')); ?> </label> </p> @@ -32,7 +32,7 @@ <p ng-click="Settings.toggleSetting('preventReadOnScroll')"> <label for="preventReadOnScroll"> <input type="checkbox" ng-checked="Settings.getSetting('preventReadOnScroll')" name="preventReadOnScroll"> - <?php p($l->t('Do not as mark read when scrolling')); ?> + <?php p($l->t('Disable mark read during scrolling')); ?> </label> </p> |