|
|
@@ -37,19 +37,28 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
|
|
|
<?php $display_others = false; } ?>
|
|
|
|
|
|
<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
|
|
|
- <ul class="horizontal-list flux_header">
|
|
|
- <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
|
|
|
- <?php if ($this->conf->toplineRead ()) { ?><li class="item manage"><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"> </a></li><?php } ?>
|
|
|
- <?php if ($this->conf->toplineFavorite ()) { ?><li class="item manage"><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"> </a></li><?php } ?>
|
|
|
- <?php
|
|
|
+ <ul class="horizontal-list flux_header"><?php
|
|
|
+ if (!login_is_conf ($this->conf) || is_logged ()) {
|
|
|
+ if ($this->conf->toplineRead ()) {
|
|
|
+ ?><li class="item manage"><?php
|
|
|
+ ?><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"><?php
|
|
|
+ echo $item->isRead () ? '☑' : '✉'; ?></a><?php
|
|
|
+ ?></li><?php
|
|
|
}
|
|
|
- $feed = HelperCategory::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache
|
|
|
- if (empty($feed)) $feed = $item->feed (true);
|
|
|
+ if ($this->conf->toplineFavorite ()) {
|
|
|
+ ?><li class="item manage"><?php
|
|
|
+ ?><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"><?php
|
|
|
+ echo $item->isFavorite () ? '★' : '☆'; ?></a><?php
|
|
|
+ ?></li><?php
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $feed = HelperCategory::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache
|
|
|
+ if (empty($feed)) $feed = $item->feed (true);
|
|
|
?>
|
|
|
<li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
|
|
|
<li class="item title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li>
|
|
|
<?php if ($this->conf->toplineDate ()) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
|
|
|
- <?php if ($this->conf->toplineLink ()) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"> </a></li><?php } ?>
|
|
|
+ <?php if ($this->conf->toplineLink ()) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>">↗</a></li><?php } ?>
|
|
|
</ul>
|
|
|
|
|
|
<div class="flux_content">
|
|
|
@@ -65,11 +74,21 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
|
|
|
}
|
|
|
?>
|
|
|
</div>
|
|
|
- <ul class="horizontal-list bottom">
|
|
|
- <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
|
|
|
- <?php if ($this->conf->bottomlineRead ()) { ?><li class="item manage"><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"> </a></li><?php } ?>
|
|
|
- <?php if ($this->conf->bottomlineFavorite ()) { ?><li class="item manage"><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"> </a></li><?php } ?>
|
|
|
- <?php } ?>
|
|
|
+ <ul class="horizontal-list bottom"><?php
|
|
|
+ if (!login_is_conf ($this->conf) || is_logged ()) {
|
|
|
+ if ($this->conf->bottomlineRead ()) {
|
|
|
+ ?><li class="item manage"><?php
|
|
|
+ ?><a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', $item->isRead () ? 0 : 1); ?>"><?php
|
|
|
+ echo $item->isRead () ? '☑' : '☐'; ?></a><?php
|
|
|
+ ?></li><?php
|
|
|
+ }
|
|
|
+ if ($this->conf->bottomlineFavorite ()) {
|
|
|
+ ?><li class="item manage"><?php
|
|
|
+ ?><a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', $item->isFavorite () ? 0 : 1); ?>"><?php
|
|
|
+ echo $item->isFavorite () ? '★' : '☆'; ?></a><?php
|
|
|
+ ?></li><?php
|
|
|
+ }
|
|
|
+ } ?>
|
|
|
<li class="item">
|
|
|
<?php
|
|
|
if ($this->conf->bottomlineSharing ()) {
|