diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.content.compact.php | 0 | ||||
-rw-r--r-- | templates/part.content.expand.php | 57 | ||||
-rw-r--r-- | templates/part.content.php | 59 |
3 files changed, 54 insertions, 62 deletions
diff --git a/templates/part.content.compact.php b/templates/part.content.compact.php deleted file mode 100644 index e69de29bb..000000000 --- a/templates/part.content.compact.php +++ /dev/null diff --git a/templates/part.content.expand.php b/templates/part.content.expand.php deleted file mode 100644 index 0414ead62..000000000 --- a/templates/part.content.expand.php +++ /dev/null @@ -1,57 +0,0 @@ -<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 }}"> - - <div class="utils"> - <ul> - <li ng-click="Content.toggleStar(item.id)" class="util"> - <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')) ?>"> - </a> - </li> - <li ng-click="Content.toggleKeepUnread(item.id)" class="util"> - <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" ng-click="item.hide=!item.hide"> - {{ item.title }} - </a> - </h1> - </li> - <li class="source"> - <a ng-href="#/items/feeds/{{ item.feedId }}">{{ 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-hide="item.hide"> - <h2 class="author" ng-show="item.author"> - <?php p($l->t('by')) ?> {{ item.author }} - </h2> - - <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> -</li> - diff --git a/templates/part.content.php b/templates/part.content.php index b0e39f8d9..bc9cfb97e 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -3,11 +3,60 @@ </div> <div ng-if="!App.isFirstRun()"> - <ul ng-if="Content.isCompactView()"> - <?php print_unescaped($this->inc('part.content.compact')); ?> - </ul> + <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 }}"> + + <div class="utils"> + <ul> + <li ng-click="Content.toggleStar(item.id)" class="util"> + <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')) ?>"> + </a> + </li> + <li ng-click="Content.toggleKeepUnread(item.id)" class="util"> + <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" ng-click="item.show=!item.show"> + {{ item.title }} + </a> + </h1> + </li> + <li class="source"> + <a ng-href="#/items/feeds/{{ item.feedId }}/">{{ 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="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> - <ul ng-if="!Content.isCompactView()"> - <?php print_unescaped($this->inc('part.content.expand')); ?> + <h2 class="author" ng-show="item.author">© {{ item.author }}</h2> + </div> + </li> </ul> </div> |