diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-13 03:01:11 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-13 03:01:11 +0200 |
commit | 6c327bd5f8cdbebf45c6aa87f2d54f3dd26663a2 (patch) | |
tree | ad191891100d39c528bed77eb08a2e4b5573c5b1 /templates | |
parent | 7efe48d3d7d746b62ea8daf19edf8b3542520bb7 (diff) |
new layout and design for feed items, mark all as read is now faster because it uses an own ajax request, css and javascript refactor, the titlebar is now only loaded once
Diffstat (limited to 'templates')
-rw-r--r-- | templates/main.php | 4 | ||||
-rw-r--r-- | templates/part.items.php | 20 |
2 files changed, 15 insertions, 9 deletions
diff --git a/templates/main.php b/templates/main.php index e02a29277..5c066e599 100644 --- a/templates/main.php +++ b/templates/main.php @@ -35,7 +35,9 @@ if ($_['feedid']){ <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>"> <?php echo $this->inc("part.items.header"); - echo $this->inc("part.items"); + echo '<div id="feed_items">'; + echo $this->inc("part.items"); + echo '</div>'; ?> <div id="appsettings" class="popup bottomleft hidden"></div> diff --git a/templates/part.items.php b/templates/part.items.php index 4099bac34..e481bd2d2 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -5,7 +5,6 @@ $feedid = isset($_['feedid']) ? $_['feedid'] : ''; $itemmapper = new OCA\News\ItemMapper(); $items = $itemmapper->findAll($feedid); -echo '<div id="feed_items">'; echo '<ul>'; foreach($items as $item) { @@ -23,20 +22,25 @@ foreach($items as $item) { $startTitle = $l->t('Mark as important'); } - echo '<li class="news_item ' . $newsItemClass .'" data-id="' . $item->getId() . '" data-feedid="' . $feedid . '">'; - echo '<div class="item_utils">'; - echo '<ul>'; + echo '<li class="feed_item ' . $newsItemClass .'" data-id="' . $item->getId() . '" data-feedid="' . $feedid . '">'; + + echo '<div class="utils">'; + echo '<ul class="primary_item_utils">'; echo '<li class="star ' . $starClass . '" title="' . $startTitle . '"></li>'; - echo '<li>' . parse_url($item->getUrl())['host'] . '</li>'; echo '</ul>'; - echo '<ul class="hidden_item_utils">'; + + echo '<ul class="secondary_item_utils">'; echo '<li class="keep_unread">' . $l->t('Keep unread') . '<input type="checkbox" /></li>'; echo '</ul>'; echo '</div>'; - echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>'; + + echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>'; + + echo '<h2 class="item_author">' . $l->t('from') . ' ' . parse_url($item->getUrl())['host'] . '</h2>'; + echo '<div class="body">' . $item->getBody() . '</div>'; + echo '</li>'; } echo '</ul>'; -echo '</div>'; |