1 files changed, 41 insertions, 46 deletions
diff --git a/templates/part.content.expand.php b/templates/part.content.expand.php
index 15209dca7..2d7aaa550 100644
--- a/templates/part.content.expand.php
+++ b/templates/part.content.expand.php
@@ -1,58 +1,53 @@
-<li class="item"
+<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 }}">
 
-    <h2 class="date">
-        <span class="timeago" title="{{ item.pubDate*1000|date:'dd-MM-yyyy' }}">
-            {{ Content.getRelativeDate(item.pubDate) }}
-        </span>
-    </h2>
-
-    <button class="star svg"
-            ng-click="Content.toggleStar(item.id)"
-            ng-class="{
-                'starred': item.starred
-            }"></button>
-
-    <h1 class="title">
-        <a target="_blank" ng-href="{{ item.url }}">
-            {{ item.title }}
-        </a>
-    </h1>
-
-    <h2 class="author">
-        <span>
-            <?php p($l->t('from')) ?>
-            <a ng-href="#/items/feeds/{{ item.feedId }}"
-                class="from_feed">{{ Content.getFeed(item.feedId).title }}</a>
-        </span>
-        <span ng-show="item.author">
-            <?php p($l->t('by')) ?>
-            {{ item.author }}
-        </span>
-    </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 class="bottom-utils">
+    <div class="utils">
         <ul>
+            <li ng-click="Content.toggleStar(item.id)">
+                <button class="star svg" ng-class="{'starred': item.starred}" title="<?php p($l->t('Star')); ?>"></button>
+            </li>
             <li ng-click="Content.toggleKeepUnread(item.id)">
-                <label for="keep-unread">
-                    <input type="checkbox" name="keep-unread" ng-checked="item.keepUnread"/>
-                    <?php p($l->t('Keep unread')); ?>
-                </label>
+                <button class="star svg" ng-class="{'starred': item.keepUnread}" title="<?php p($l->t('Keep unread')); ?>"></button>
             </li>
         </ul>
     </div>
+
+    <div class="article">
+        <time class="date" 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>
+
+        <h1 class="title">
+            <a target="_blank" ng-href="{{ item.url }}">
+                {{ item.title }}
+            </a>
+        </h1>
+
+        <h2 class="author">
+            <span>
+                <?php p($l->t('from')) ?>
+                <a ng-href="#/items/feeds/{{ item.feedId }}"
+                    class="from_feed">{{ Content.getFeed(item.feedId).title }}</a>
+            </span>
+            <span ng-show="item.author">
+                <?php p($l->t('by')) ?>
+                {{ item.author }}
+            </span>
+        </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>