|
|
@@ -1,7 +1,7 @@
|
|
|
<?php
|
|
|
|
|
|
-$this->partial ('aside_flux');
|
|
|
-$this->partial ('nav_menu');
|
|
|
+$this->partial('aside_flux');
|
|
|
+$this->partial('nav_menu');
|
|
|
|
|
|
if (!empty($this->entries)) {
|
|
|
$display_today = true;
|
|
|
@@ -30,72 +30,72 @@ if (!empty($this->entries)) {
|
|
|
|
|
|
<div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
|
|
|
?><div id="new-article">
|
|
|
- <a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo _t('new_article'); ?></a>
|
|
|
+ <a href="<?php echo Minz_Url::display($this->url); ?>"><?php echo _t('new_article'); ?></a>
|
|
|
</div><?php
|
|
|
foreach ($this->entries as $item) {
|
|
|
- if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) {
|
|
|
+ if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $this->today)) {
|
|
|
?><div class="day" id="day_today"><?php
|
|
|
echo _t('today');
|
|
|
- ?><span class="date"> — <?php echo timestamptodate (time (), false); ?></span><?php
|
|
|
+ ?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
|
|
|
?><span class="name"><?php echo $this->currentName; ?></span><?php
|
|
|
?></div><?php
|
|
|
$display_today = false;
|
|
|
}
|
|
|
- if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $this->today)) {
|
|
|
+ if ($display_yesterday && $item->isDay(FreshRSS_Days::YESTERDAY, $this->today)) {
|
|
|
?><div class="day" id="day_yesterday"><?php
|
|
|
echo _t('yesterday');
|
|
|
- ?><span class="date"> — <?php echo timestamptodate (time () - 86400, false); ?></span><?php
|
|
|
+ ?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
|
|
|
?><span class="name"><?php echo $this->currentName; ?></span><?php
|
|
|
?></div><?php
|
|
|
$display_yesterday = false;
|
|
|
}
|
|
|
- if ($display_others && $item->isDay (FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
|
|
|
+ if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
|
|
|
?><div class="day" id="day_before_yesterday"><?php
|
|
|
echo _t('before_yesterday');
|
|
|
?><span class="name"><?php echo $this->currentName; ?></span><?php
|
|
|
?></div><?php
|
|
|
$display_others = false;
|
|
|
}
|
|
|
- ?><div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
|
|
|
+ ?><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 ($this->loginOk) {
|
|
|
if ($topline_read) {
|
|
|
?><li class="item manage"><?php
|
|
|
- $arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id ()));
|
|
|
+ $arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
|
|
|
if ($item->isRead()) {
|
|
|
$arUrl['params']['is_read'] = 0;
|
|
|
}
|
|
|
?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
|
|
|
- echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
|
|
|
+ echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
|
|
|
?></li><?php
|
|
|
}
|
|
|
if ($topline_favorite) {
|
|
|
?><li class="item manage"><?php
|
|
|
- $arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id ()));
|
|
|
+ $arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
|
|
|
if ($item->isFavorite()) {
|
|
|
$arUrl['params']['is_favorite'] = 0;
|
|
|
}
|
|
|
?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
|
|
|
- echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
|
|
|
+ echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
|
|
|
?></li><?php
|
|
|
}
|
|
|
}
|
|
|
- $feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache
|
|
|
+ $feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed()); //We most likely already have the feed object in cache
|
|
|
if ($feed == null) {
|
|
|
$feed = $item->feed(true);
|
|
|
if ($feed == null) {
|
|
|
$feed = FreshRSS_Feed::example();
|
|
|
}
|
|
|
}
|
|
|
- ?><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 ($topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
|
|
|
- <?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
|
|
|
+ ?><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 ($topline_date) { ?><li class="item date"><?php echo $item->date(); ?> </li><?php } ?>
|
|
|
+ <?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
|
|
|
</ul>
|
|
|
|
|
|
<div class="flux_content">
|
|
|
<div class="content <?php echo $content_width; ?>">
|
|
|
- <h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></h1>
|
|
|
+ <h1 class="title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></h1>
|
|
|
<?php
|
|
|
$author = $item->author();
|
|
|
echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
|
|
|
@@ -106,32 +106,32 @@ if (!empty($this->entries)) {
|
|
|
if ($this->loginOk) {
|
|
|
if ($bottomline_read) {
|
|
|
?><li class="item manage"><?php
|
|
|
- $arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id ()));
|
|
|
+ $arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
|
|
|
if ($item->isRead()) {
|
|
|
$arUrl['params']['is_read'] = 0;
|
|
|
}
|
|
|
?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
|
|
|
- echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
|
|
|
+ echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
|
|
|
?></li><?php
|
|
|
}
|
|
|
if ($bottomline_favorite) {
|
|
|
?><li class="item manage"><?php
|
|
|
- $arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id ()));
|
|
|
+ $arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
|
|
|
if ($item->isFavorite()) {
|
|
|
$arUrl['params']['is_favorite'] = 0;
|
|
|
}
|
|
|
?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
|
|
|
- echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
|
|
|
+ echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
|
|
|
?></li><?php
|
|
|
}
|
|
|
} ?>
|
|
|
<li class="item"><?php
|
|
|
if ($bottomline_sharing) {
|
|
|
- $link = urlencode ($item->link ());
|
|
|
- $title = urlencode ($item->title () . ' · ' . $feed->name ());
|
|
|
+ $link = urlencode($item->link());
|
|
|
+ $title = urlencode($item->title() . ' · ' . $feed->name());
|
|
|
?><div class="dropdown">
|
|
|
- <div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
|
|
|
- <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
|
|
|
+ <div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
|
|
|
+ <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
|
|
|
<?php echo _i('share'); ?>
|
|
|
<?php echo _t('share'); ?>
|
|
|
</a>
|
|
|
@@ -168,10 +168,10 @@ if (!empty($this->entries)) {
|
|
|
</li><?php
|
|
|
}
|
|
|
if ($bottomline_date) {
|
|
|
- ?><li class="item date"><?php echo $item->date (); ?></li><?php
|
|
|
+ ?><li class="item date"><?php echo $item->date(); ?></li><?php
|
|
|
}
|
|
|
if ($bottomline_link) {
|
|
|
- ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php
|
|
|
+ ?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php
|
|
|
} ?>
|
|
|
</ul>
|
|
|
</div>
|
|
|
@@ -181,7 +181,7 @@ if (!empty($this->entries)) {
|
|
|
<?php $this->renderHelper('pagination'); ?>
|
|
|
</div>
|
|
|
|
|
|
-<?php $this->partial ('nav_entries'); ?>
|
|
|
+<?php $this->partial('nav_entries'); ?>
|
|
|
|
|
|
<?php } else { ?>
|
|
|
<div id="stream" class="prompt alert alert-warn normal">
|
Marien Fressinaud