summaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/aside_configure.phtml49
-rw-r--r--app/layout/aside_feed.phtml152
-rw-r--r--app/layout/aside_flux.phtml103
-rw-r--r--app/layout/aside_stats.phtml14
-rw-r--r--app/layout/aside_subscription.phtml17
-rw-r--r--app/layout/header.phtml93
-rw-r--r--app/layout/layout.phtml25
-rw-r--r--app/layout/nav_entries.phtml6
-rw-r--r--app/layout/nav_menu.phtml250
9 files changed, 263 insertions, 446 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index d5c9bf4c9..7567a8206 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,33 +1,46 @@
<ul class="nav nav-list aside">
- <li class="nav-header"><?php echo _t('configuration'); ?></li>
+ <li class="nav-header"><?php echo _t('gen.menu.configuration'); ?></li>
<li class="item<?php echo Minz_Request::actionName() === 'display' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a>
+ <a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a>
</li>
<li class="item<?php echo Minz_Request::actionName() === 'reading' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a>
+ <a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a>
</li>
<li class="item<?php echo Minz_Request::actionName() === 'archiving' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a>
+ <a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a>
</li>
<li class="item<?php echo Minz_Request::actionName() === 'sharing' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a>
+ <a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.sharing'); ?></a>
</li>
<li class="item<?php echo Minz_Request::actionName() === 'shortcut' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a>
+ <a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a>
</li>
<li class="item<?php echo Minz_Request::actionName() === 'queries' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
- </li>
- <li class="separator"></li>
- <li class="item<?php echo Minz_Request::actionName() === 'users' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a>
- </li>
- <?php
- $current_user = Minz_Session::param('currentUser', '');
- if (Minz_Configuration::isAdmin($current_user)) {
- ?>
- <li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>">
- <a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
+ <a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a>
+ </li>
+ <li class="item<?php echo Minz_Request::controllerName() === 'user' &&
+ Minz_Request::actionName() === 'profile'? ' active' : ''; ?>">
+ <a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a>
+ </li>
+ <li class="item<?php echo Minz_Request::controllerName() === 'extension' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a>
+ </li>
+ <?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+ <li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li>
+ <li class="item<?php echo Minz_Request::controllerName() === 'user' &&
+ Minz_Request::actionName() === 'manage' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a>
+ </li>
+ <li class="item<?php echo Minz_Request::controllerName() === 'auth' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a>
+ </li>
+ <li class="item<?php echo Minz_Request::controllerName() === 'update' &&
+ Minz_Request::actionName() === 'checkInstall' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a>
+ </li>
+ <li class="item<?php echo Minz_Request::controllerName() === 'update' &&
+ Minz_Request::actionName() === 'index' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a>
</li>
<?php } ?>
</ul>
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 5ffb1c791..a6d22f878 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -1,75 +1,95 @@
-<ul class="nav nav-list aside aside_feed">
- <li class="nav-header"><?php echo Minz_Translate::t ('your_rss_feeds'); ?></li>
+<?php
+ $class = '';
+ if (FreshRSS_Context::$user_conf->hide_read_feeds &&
+ FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+ !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+ $class = ' state_unread';
+ }
+?>
- <li class="nav-form"><form id="add_rss" method="post" action="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'add')); ?>" autocomplete="off">
- <div class="stick">
- <input type="url" name="url_rss" placeholder="<?php echo Minz_Translate::t ('add_rss_feed'); ?>" />
- <div class="dropdown">
- <div id="dropdown-cat" class="dropdown-target"></div>
+<div class="aside aside_feed<?php echo $class; ?>" id="aside_feed">
+ <a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
- <a class="dropdown-toggle btn" href="#dropdown-cat"><?php echo FreshRSS_Themes::icon('down'); ?></a>
- <ul class="dropdown-menu">
- <li class="dropdown-close"><a href="#close">❌</a></li>
-
- <li class="dropdown-header"><?php echo Minz_Translate::t ('category'); ?></li>
-
- <li class="input">
- <select name="category" id="category">
- <?php foreach ($this->categories as $cat) { ?>
- <option value="<?php echo $cat->id (); ?>"<?php echo $cat->id () == 1 ? ' selected="selected"' : ''; ?>>
- <?php echo $cat->name (); ?>
- </option>
- <?php } ?>
- <option value="nc"><?php echo Minz_Translate::t ('new_category'); ?></option>
- </select>
- </li>
-
- <li class="input" style="display:none">
- <input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('new_category'); ?>" />
- </li>
+ <?php if (FreshRSS_Auth::hasAccess()) { ?>
+ <div class="stick configure-feeds no-mobile">
+ <a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.menu.subscription'); ?></a>
+ <a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
+ </div>
+ <?php } elseif (FreshRSS_Auth::accessNeedsLogin()) { ?>
+ <a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
+ <?php } ?>
- <li class="separator"></li>
+ <form id="mark-read-aside" method="post" style="display: none"></form>
- <li class="dropdown-header"><?php echo Minz_Translate::t ('http_authentication'); ?></li>
- <li class="input">
- <input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('username'); ?>" />
- </li>
- <li class="input">
- <input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo Minz_Translate::t ('password'); ?>" />
- </li>
- </ul>
+ <ul class="tree">
+ <li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+ <div class="tree-folder-title">
+ <?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('index.menu.main_stream'); ?></a>
</div>
- <button class="btn" type="submit"><?php echo FreshRSS_Themes::icon('add'); ?></button>
- </div>
- </form></li>
-
- <li class="item">
- <a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
- <?php echo Minz_Translate::t('bookmark'); ?>
- </a>
- </li>
+ </li>
- <li class="item<?php echo Minz_Request::controllerName () == 'importExport' ? ' active' : ''; ?>">
- <a href="<?php echo _url ('importExport', 'index'); ?>"><?php echo Minz_Translate::t ('import_export'); ?></a>
- </li>
+ <li class="tree-folder category favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+ <div class="tree-folder-title">
+ <?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('index.menu.favorites', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+ </div>
+ </li>
- <li class="item<?php echo Minz_Request::actionName () == 'categorize' ? ' active' : ''; ?>">
- <a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Minz_Translate::t ('categories_management'); ?></a>
- </li>
+ <?php
+ foreach ($this->categories as $cat) {
+ $feeds = $cat->feeds();
+ if (!empty($feeds)) {
+ $c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
+ $c_show = $c_active && (!FreshRSS_Context::$user_conf->display_categories ||
+ FreshRSS_Context::$current_get['feed']);
+ ?>
+ <li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+ <div class="tree-folder-title">
+ <a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
+ <a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+ </div>
- <li class="separator"></li>
+ <ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
+ <?php
+ foreach ($feeds as $feed) {
+ $f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
+ ?>
+ <li id="f_<?php echo $feed->id(); ?>" class="item feed<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
+ <div class="dropdown no-mobile">
+ <div class="dropdown-target"></div>
+ <a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
+ <?php /* feed_config_template */ ?>
+ </div>
+ <img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+ </li>
+ <?php } ?>
+ </ul>
+ </li>
+ <?php
+ }
+ }
+ ?>
+ </ul>
+</div>
- <?php if (!empty ($this->feeds)) { ?>
- <?php foreach ($this->feeds as $feed) { ?>
- <?php $nbEntries = $feed->nbEntries (); ?>
- <li class="item<?php echo (isset($this->flux) && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>">
- <a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>">
- <img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" />
- <?php echo $feed->name (); ?>
- </a>
- </li>
- <?php } ?>
- <?php } else { ?>
- <li class="item disable"><?php echo Minz_Translate::t ('no_rss_feed'); ?></li>
- <?php } ?>
-</ul>
+<script id="feed_config_template" type="text/html">
+ <ul class="dropdown-menu">
+ <li class="dropdown-close"><a href="#close">❌</a></li>
+ <li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_------'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
+ <?php if (FreshRSS_Auth::hasAccess()) { ?>
+ <li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '------'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
+ <?php } ?>
+ <li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li>
+ <?php if (FreshRSS_Auth::hasAccess()) { ?>
+ <li class="separator"></li>
+ <li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '------'); ?>"><?php echo _t('gen.action.manage'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '------'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li>
+ <li class="item">
+ <?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
+ <button class="read_all as-link <?php echo $confirm; ?>"
+ form="mark-read-aside"
+ formaction="<?php echo _url('entry', 'read', 'get', 'f_------'); ?>"
+ type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
+ </li>
+ <?php } ?>
+ </ul>
+</script>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
deleted file mode 100644
index aac3c0896..000000000
--- a/app/layout/aside_flux.phtml
+++ /dev/null
@@ -1,103 +0,0 @@
-<div class="aside aside_flux<?php if ($this->conf->hide_read_feeds && ($this->state & FreshRSS_Entry::STATE_NOT_READ) && !($this->state & FreshRSS_Entry::STATE_READ)) echo ' state_unread'; ?>" id="aside_flux">
- <a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
-
- <ul class="categories">
- <?php if ($this->loginOk) { ?>
- <form id="mark-read-aside" method="post" style="display: none"></form>
-
- <li>
- <div class="stick configure-feeds">
- <a class="btn btn-important" href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('subscription_management'); ?></a>
- <a class="btn btn-important" href="<?php echo _url('configure', 'categorize'); ?>" title="<?php echo _t('categories_management'); ?>"><?php echo _i('category-white'); ?></a>
- </div>
- </li>
- <?php } elseif (Minz_Configuration::needsLogin()) { ?>
- <li><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a></li>
- <?php } ?>
-
- <?php
- $arUrl = array('c' => 'index', 'a' => 'index', 'params' => array());
- if ($this->conf->view_mode !== Minz_Request::param('output', 'normal')) {
- $arUrl['params']['output'] = 'normal';
- }
- ?>
- <li>
- <div class="category all<?php echo $this->get_c == 'a' ? ' active' : ''; ?>">
- <a data-unread="<?php echo formatNumber($this->nb_not_read); ?>" class="btn<?php echo $this->get_c == 'a' ? ' active' : ''; ?>" href="<?php echo Minz_Url::display($arUrl); ?>">
- <?php echo _i('all'); ?>
- <?php echo _t('main_stream'); ?>
- </a>
- </div>
- </li>
-
- <li>
- <div class="category favorites<?php echo $this->get_c == 's' ? ' active' : ''; ?>">
- <a data-unread="<?php echo formatNumber($this->nb_favorites['unread']); ?>" class="btn<?php echo $this->get_c == 's' ? ' active' : ''; ?>" href="<?php $arUrl['params']['get'] = 's'; echo Minz_Url::display($arUrl); ?>">
- <?php echo _i('bookmark'); ?>
- <?php echo _t('favorite_feeds', formatNumber($this->nb_favorites['all'])); ?>
- </a>
- </div>
- </li>
-
- <?php
- foreach ($this->cat_aside as $cat) {
- $feeds = $cat->feeds();
- if (!empty($feeds)) {
- $c_active = false;
- $c_show = false;
- if ($this->get_c == $cat->id()) {
- $c_active = true;
- if (!$this->conf->display_categories || $this->get_f) {
- $c_show = true;
- }
- }
- ?><li data-unread="<?php echo $cat->nbNotRead(); ?>"<?php if ($c_active) echo ' class="active"'; ?>><?php
- ?><div class="category stick<?php echo $c_active ? ' active' : ''; ?>"><?php
- ?><a data-unread="<?php echo formatNumber($cat->nbNotRead()); ?>" class="btn<?php echo $c_active ? ' active' : ''; ?>" href="<?php $arUrl['params']['get'] = 'c_' . $cat->id(); echo Minz_Url::display($arUrl); ?>"><?php echo $cat->name(); ?></a><?php
- ?><a class="btn dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a><?php
- ?></div><?php
- ?><ul class="feeds<?php echo $c_show ? ' active' : ''; ?>"><?php
- foreach ($feeds as $feed) {
- $feed_id = $feed->id();
- $nbEntries = $feed->nbEntries();
- $f_active = ($this->get_f == $feed_id);
- ?><li id="f_<?php echo $feed_id; ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>"><?php
- ?><div class="dropdown"><?php
- ?><div class="dropdown-target"></div><?php
- ?><a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a><?php
- /* feed_config_template */
- ?></div><?php
- ?> <img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php
- ?><a class="feed" data-unread="<?php echo formatNumber($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php $arUrl['params']['get'] = 'f_' . $feed_id; echo Minz_Url::display($arUrl); ?>"><?php echo $feed->name(); ?></a><?php
- ?></li><?php
- }
- ?></ul><?php
- ?></li><?php
- }
- } ?>
- </ul>
- <span class="aside_flux_ender"><!-- For fixed menu --></span>
-</div>
-
-<script id="feed_config_template" type="text/html">
- <ul class="dropdown-menu">
- <li class="dropdown-close"><a href="#close">❌</a></li>
- <li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
- <?php if ($this->loginOk) { ?>
- <li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
- <?php } ?>
- <li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
- <?php if ($this->loginOk) { ?>
- <li class="separator"></li>
- <li class="item"><a href="<?php echo _url('configure', 'feed', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
- <li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
- <li class="item">
- <?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
- <button class="read_all as-link <?php echo $confirm; ?>"
- form="mark-read-aside"
- formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
- type="submit"><?php echo _t('mark_read'); ?></button>
- </li>
- <?php } ?>
- </ul>
-</script>
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
index fbfb9d84d..4bdaf7165 100644
--- a/app/layout/aside_stats.phtml
+++ b/app/layout/aside_stats.phtml
@@ -1,12 +1,12 @@
<ul class="nav nav-list aside">
- <li class="nav-header"><?php echo Minz_Translate::t ('stats'); ?></li>
- <li class="item<?php echo Minz_Request::actionName () == 'index' ? ' active' : ''; ?>">
- <a href="<?php echo _url ('stats', 'index'); ?>"><?php echo Minz_Translate::t ('stats_main'); ?></a>
+ <li class="nav-header"><?php echo _t('admin.stats'); ?></li>
+ <li class="item<?php echo Minz_Request::actionName() == 'index' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('admin.stats.menu.main'); ?></a>
</li>
- <li class="item<?php echo Minz_Request::actionName () == 'idle' ? ' active' : ''; ?>">
- <a href="<?php echo _url ('stats', 'idle'); ?>"><?php echo Minz_Translate::t ('stats_idle'); ?></a>
+ <li class="item<?php echo Minz_Request::actionName() == 'idle' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('admin.stats.menu.idle'); ?></a>
</li>
- <li class="item<?php echo Minz_Request::actionName () == 'repartition' ? ' active' : ''; ?>">
- <a href="<?php echo _url ('stats', 'repartition'); ?>"><?php echo Minz_Translate::t ('stats_repartition'); ?></a>
+ <li class="item<?php echo Minz_Request::actionName() == 'repartition' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('admin.stats.menu.repartition'); ?></a>
</li>
</ul>
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
new file mode 100644
index 000000000..8a54e2dc2
--- /dev/null
+++ b/app/layout/aside_subscription.phtml
@@ -0,0 +1,17 @@
+<ul class="nav nav-list aside">
+ <li class="nav-header"><?php echo _t('sub.menu.subscription_management'); ?></li>
+
+ <li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('sub.menu.subscription_management'); ?></a>
+ </li>
+
+ <li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
+ <a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('sub.menu.import_export'); ?></a>
+ </li>
+
+ <li class="item">
+ <a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
+ <?php echo _t('sub.menu.bookmark'); ?>
+ </a>
+ </li>
+</ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 028e63d8a..41a63a565 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -1,22 +1,12 @@
<?php
-if (Minz_Configuration::canLogIn()) {
+
+if (FreshRSS_Auth::accessNeedsAction()) {
?><ul class="nav nav-head nav-login"><?php
- switch (Minz_Configuration::authType()) {
- case 'form':
- if ($this->loginOk) {
- ?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('index', 'formLogout'); ?>"><?php echo _t('logout'); ?></a></li><?php
- } else {
- ?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('index', 'formLogin'); ?>"><?php echo _t('login'); ?></a></li><?php
- }
- break;
- case 'persona':
- if ($this->loginOk) {
- ?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="#"><?php echo _t('logout'); ?></a></li><?php
+ if (FreshRSS_Auth::hasAccess()) {
+ ?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _t('gen.auth.logout'); ?></a></li><?php
} else {
- ?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="#"><?php echo _t('login'); ?></a></li><?php
+ ?><li class="item"><?php echo _i('login'); ?> <a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a></li><?php
}
- break;
- }
?></ul><?php
}
?>
@@ -26,17 +16,16 @@ if (Minz_Configuration::canLogIn()) {
<h1>
<a href="<?php echo _url('index', 'index'); ?>">
<img class="logo" src="<?php echo _i('icon', true); ?>" alt="⊚" />
- <?php echo Minz_Configuration::title(); ?>
+ <?php echo FreshRSS_Context::$system_conf->title; ?>
</a>
</h1>
</div>
<div class="item search">
- <?php if ($this->loginOk || Minz_Configuration::allowAnonymous()) { ?>
+ <?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?>
<form action="<?php echo _url('index', 'index'); ?>" method="get">
<div class="stick">
- <?php $search = Minz_Request::param('search', ''); ?>
- <input type="search" name="search" id="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search'); ?>" />
+ <input type="search" name="search" id="search" class="extend" value="<?php echo FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('gen.menu.search'); ?>" />
<?php $get = Minz_Request::param('get', ''); ?>
<?php if ($get != '') { ?>
@@ -59,57 +48,45 @@ if (Minz_Configuration::canLogIn()) {
<?php } ?>
</div>
- <?php if ($this->loginOk) { ?>
+ <?php if (FreshRSS_Auth::hasAccess()) { ?>
<div class="item configure">
<div class="dropdown">
<div id="dropdown-configure" class="dropdown-target"></div>
<a class="btn dropdown-toggle" href="#dropdown-configure"><?php echo _i('configure'); ?></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</a></li>
- <li class="dropdown-header"><?php echo _t('configuration'); ?></li>
- <li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a></li>
- <li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a></li>
- <li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a></li>
- <li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a></li>
- <li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a></li>
- <li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a></li>
+ <li class="dropdown-header"><?php echo _t('gen.menu.configuration'); ?></li>
+ <li class="item"><a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('gen.menu.display'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('gen.menu.reading'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('gen.menu.archiving'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('gen.menu.sharing'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('gen.menu.shortcuts'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('gen.menu.queries'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('user', 'profile'); ?>"><?php echo _t('gen.menu.user_profile'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('extension', 'index'); ?>"><?php echo _t('gen.menu.extensions'); ?></a></li>
+ <?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
<li class="separator"></li>
- <li class="item"><a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a></li>
- <?php
- $current_user = Minz_Session::param('currentUser', '');
- if (Minz_Configuration::isAdmin($current_user)) {
- ?>
- <li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>
+ <li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
+ <li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a></li>
<?php } ?>
<li class="separator"></li>
- <li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('stats'); ?></a></li>
- <li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('logs'); ?></a></li>
- <li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('gen.menu.stats'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('index', 'logs'); ?>"><?php echo _t('gen.menu.logs'); ?></a></li>
+ <li class="item"><a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('gen.menu.about'); ?></a></li>
<?php
- if (Minz_Configuration::canLogIn()) {
- ?><li class="separator"></li><?php
- switch (Minz_Configuration::authType()) {
- case 'form':
- ?><li class="item"><a class="signout" href="<?php echo _url('index', 'formLogout'); ?>"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
- break;
- case 'persona':
- ?><li class="item"><a class="signout" href="#"><?php echo _i('logout'), ' ', _t('logout'); ?></a></li><?php
- break;
- }
+ if (FreshRSS_Auth::accessNeedsAction()) {
+ ?><li class="separator"></li>
+ <li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php echo _i('logout'), ' ', _t('gen.auth.logout'); ?></a></li><?php
} ?>
</ul>
</div>
</div>
- <?php } elseif (Minz_Configuration::canLogIn()) {
- ?><div class="item configure"><?php
- switch (Minz_Configuration::authType()) {
- case 'form':
- echo _i('login'); ?><a class="signin" href="<?php echo _url('index', 'formLogin'); ?>"><?php echo _t('login'); ?></a></li><?php
- break;
- case 'persona':
- echo _i('login'); ?><a class="signin" href="#"><?php echo _t('login'); ?></a></li><?php
- break;
- }
- ?></div><?php
- } ?>
+ <?php } elseif (FreshRSS_Auth::accessNeedsAction()) { ?>
+ <div class="item configure">
+ <?php echo _i('login'); ?><a class="signin" href="<?php echo _url('auth', 'login'); ?>"><?php echo _t('gen.auth.login'); ?></a>
+ </div>
+ <?php } ?>
</div>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index f95f45b5e..083ffd4b3 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="<?php echo $this->conf->language; ?>" xml:lang="<?php echo $this->conf->language; ?>">
+<html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1.0" />
@@ -10,21 +10,22 @@
<?php $this->renderHelper('javascript_vars'); ?>
//]]></script>
<?php
- if (!empty($this->nextId)) {
- $params = Minz_Request::params();
- $params['next'] = $this->nextId;
- $params['ajax'] = 1;
+ $url_base = Minz_Request::currentRequest();
+ if (FreshRSS_Context::$next_id !== '') {
+ $url_next = $url_base;
+ $url_next['params']['next'] = FreshRSS_Context::$next_id;
+ $url_next['params']['ajax'] = 1;
?>
- <link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display(array('c' => Minz_Request::controllerName(), 'a' => Minz_Request::actionName(), 'params' => $params)); ?>" />
+ <link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display($url_next); ?>" />
<?php } ?>
<link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" />
<link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" />
<?php
- if (isset($this->url)) {
- $rss_url = $this->url;
- $rss_url['params']['output'] = 'rss';
+ if (isset($this->rss_title)) {
+ $url_rss = $url_base;
+ $url_rss['a'] = 'rss';
?>
- <link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($rss_url); ?>" />
+ <link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
<?php } ?>
<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>">
<link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>">
@@ -33,7 +34,7 @@
<link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
- <meta name="apple-mobile-web-app-title" content="<?php echo Minz_Configuration::title(); ?>">
+ <meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>">
<meta name="msapplication-TileColor" content="#FFF" />
<meta name="robots" content="noindex,nofollow" />
</head>
@@ -56,7 +57,7 @@
?>
<div id="notification" class="notification <?php echo $status; ?>">
<span class="msg"><?php echo $msg; ?></span>
- <a class="close" href=""><?php echo FreshRSS_Themes::icon('close'); ?></a>
+ <a class="close" href=""><?php echo _i('close'); ?></a>
</div>
</body>
</html>
diff --git a/app/layout/nav_entries.phtml b/app/layout/nav_entries.phtml
index 3141e92a0..ca6849193 100644
--- a/app/layout/nav_entries.phtml
+++ b/app/layout/nav_entries.phtml
@@ -1,5 +1,5 @@
<ul id="nav_entries">
- <li class="item"><a class="previous_entry" href="#"><?php echo FreshRSS_Themes::icon('prev'); ?></a></li>
- <li class="item"><a class="up" href="#"><?php echo FreshRSS_Themes::icon('up'); ?></a></li>
- <li class="item"><a class="next_entry" href="#"><?php echo FreshRSS_Themes::icon('next'); ?></a></li>
+ <li class="item"><a class="previous_entry" href="#"><?php echo _i('prev'); ?></a></li>
+ <li class="item"><a class="up" href="#"><?php echo _i('up'); ?></a></li>
+ <li class="item"><a class="next_entry" href="#"><?php echo _i('next'); ?></a></li>
</ul> \ No newline at end of file
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index a9e6614e7..3a755b560 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -1,90 +1,31 @@
-<?php
- $actual_view = Minz_Request::param('output', 'normal');
-?>
+<?php $actual_view = Minz_Request::actionName(); ?>
+
<div class="nav_menu">
<?php if ($actual_view === 'normal') { ?>
- <a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
+ <a class="btn toggle_aside" href="#aside_feed"><?php echo _i('category'); ?></a>
<?php } ?>
- <?php if ($this->loginOk) { ?>
+ <?php if (FreshRSS_Auth::hasAccess()) { ?>
<div id="nav_menu_actions" class="stick">
<?php
- $url_state = $this->url;
-
- if ($this->state & FreshRSS_Entry::STATE_READ) {
- $url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_READ;
- $checked = 'true';
- $class = 'active';
- } else {
- $url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_READ;
- $checked = 'false';
- $class = '';
- }
- ?>
- <a id="toggle-read"
- class="btn <?php echo $class; ?>"
- aria-checked="<?php echo $checked; ?>"
- href="<?php echo Minz_Url::display($url_state); ?>"
- title="<?php echo _t('show_read'); ?>">
- <?php echo _i('read'); ?>
- </a>
-
- <?php
- if ($this->state & FreshRSS_Entry::STATE_NOT_READ) {
- $url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_READ;
- $checked = 'true';
- $class = 'active';
- } else {
- $url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_READ;
- $checked = 'false';
- $class = '';
- }
- ?>
- <a id="toggle-unread"
- class="btn <?php echo $class; ?>"
- aria-checked="<?php echo $checked; ?>"
- href="<?php echo Minz_Url::display($url_state); ?>"
- title="<?php echo _t('show_not_reads'); ?>">
- <?php echo _i('unread'); ?>
- </a>
-
- <?php
- if ($this->state & FreshRSS_Entry::STATE_FAVORITE || $this->get_c == 's') {
- $url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_FAVORITE;
- $checked = 'true';
- $class = 'active';
- } else {
- $url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_FAVORITE;
- $checked = 'false';
- $class = '';
- }
- ?>
- <a id="toggle-favorite"
- class="btn <?php echo $class; ?>"
- aria-checked="<?php echo $checked; ?>"
- href="<?php echo Minz_Url::display($url_state); ?>"
- title="<?php echo _t('show_favorite'); ?>">
- <?php echo _i('starred'); ?>
- </a>
-
- <?php
- if ($this->state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
- $url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_FAVORITE;
- $checked = 'true';
- $class = 'active';
- } else {
- $url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_FAVORITE;
- $checked = 'false';
- $class = '';
- }
+ $states = array(
+ 'read' => FreshRSS_Entry::STATE_READ,
+ 'unread' => FreshRSS_Entry::STATE_NOT_READ,
+ 'starred' => FreshRSS_Entry::STATE_FAVORITE,
+ 'non-starred' => FreshRSS_Entry::STATE_NOT_FAVORITE,
+ );
+
+ foreach ($states as $state_str => $state) {
+ $state_enabled = FreshRSS_Context::isStateEnabled($state);
+ $url_state = Minz_Request::currentRequest();
+ $url_state['params']['state'] = FreshRSS_Context::getRevertState($state);
?>
- <a id="toggle-not-favorite"
- class="btn <?php echo $class; ?>"
- aria-checked="<?php echo $checked; ?>"
- href="<?php echo Minz_Url::display($url_state); ?>"
- title="<?php echo _t('show_not_favorite'); ?>">
- <?php echo _i('non-starred'); ?>
- </a>
+ <a id="toggle-<?php echo $state_str; ?>"
+ class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
+ aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
+ title="<?php echo _t('index.menu.' . $state_str); ?>"
+ href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
+ <?php } ?>
<div class="dropdown">
<div id="dropdown-query" class="dropdown-target"></div>
@@ -94,107 +35,58 @@
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="dropdown-header">
- <?php echo _t('queries'); ?>
+ <?php echo _t('index.menu.queries'); ?>
<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
</li>
- <?php foreach ($this->conf->queries as $query) { ?>
+ <?php foreach (FreshRSS_Context::$user_conf->queries as $query) { ?>
<li class="item query">
<a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
</li>
<?php } ?>
- <?php if (count($this->conf->queries) > 0) { ?>
+ <?php if (count(FreshRSS_Context::$user_conf->queries) > 0) { ?>
<li class="separator no-mobile"></li>
<?php } ?>
<?php
- $url_query = $this->url;
+ $url_query = Minz_Request::currentRequest();;
$url_query['c'] = 'configure';
$url_query['a'] = 'addQuery';
?>
- <li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('add_query'); ?></a></li>
+ <li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('index.menu.add_query'); ?></a></li>
</ul>
</div>
</div>
- <?php
- $get = false;
- $string_mark = _t('mark_all_read');
- if ($this->get_f) {
- $get = 'f_' . $this->get_f;
- $string_mark = _t('mark_feed_read');
- } elseif ($this->get_c && $this->get_c != 'a') {
- if ($this->get_c === 's') {
- $get = 's';
- } else {
- $get = 'c_' . $this->get_c;
- }
- $string_mark = _t('mark_cat_read');
- }
- $nextGet = $get;
- if ($this->conf->onread_jump_next && strlen($get) > 2) {
- $anotherUnreadId = '';
- $foundCurrent = false;
- switch ($get[0]) {
- case 'c':
- foreach ($this->cat_aside as $cat) {
- if ($cat->id() == $this->get_c) {
- $foundCurrent = true;
- continue;
- }
- if ($cat->nbNotRead() <= 0) continue;
- $anotherUnreadId = $cat->id();
- if ($foundCurrent) break;
- }
- $nextGet = empty($anotherUnreadId) ? 'a' : 'c_' . $anotherUnreadId;
- break;
- case 'f':
- foreach ($this->cat_aside as $cat) {
- if ($cat->id() == $this->get_c) {
- foreach ($cat->feeds() as $feed) {
- if ($feed->id() == $this->get_f) {
- $foundCurrent = true;
- continue;
- }
- if ($feed->nbNotRead() <= 0) continue;
- $anotherUnreadId = $feed->id();
- if ($foundCurrent) break;
- }
- break;
- }
- }
- $nextGet = empty($anotherUnreadId) ? 'c_' . $this->get_c : 'f_' . $anotherUnreadId;
- break;
- }
- }
-
- $p = isset($this->entries[0]) ? $this->entries[0] : null;
- $idMax = $p === null ? (time() - 1) . '000000' : $p->id();
- if ($this->order === 'ASC') { //In this case we do not know but we guess idMax
- $idMax2 = (time() - 1) . '000000';
- if (strcmp($idMax2, $idMax) > 0) {
- $idMax = $idMax2;
- }
+ <?php
+ $get = FreshRSS_Context::currentGet();
+ $string_mark = _t('index.menu.mark_all_read');
+ if ($get[0] == 'f') {
+ $string_mark = _t('index.menu.mark_feed_read');
+ } elseif ($get[0] == 'c') {
+ $string_mark = _t('index.menu.mark_cat_read');
}
- $arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('get' => $get, 'nextGet' => $nextGet, 'idMax' => $idMax));
- $output = Minz_Request::param('output', '');
- if ($output != '' && $this->conf->view_mode !== $output) {
- $arUrl['params']['output'] = $output;
- }
- $markReadUrl = Minz_Url::display($arUrl);
- Minz_Session::_param('markReadUrl', $markReadUrl);
+ $mark_read_url = array(
+ 'c' => 'entry',
+ 'a' => 'read',
+ 'params' => array(
+ 'get' => $get,
+ 'nextGet' => FreshRSS_Context::$next_get,
+ 'idMax' => FreshRSS_Context::$id_max,
+ )
+ );
?>
<form id="mark-read-menu" method="post" style="display: none"></form>
<div class="stick" id="nav_menu_read_all">
- <?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
+ <?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
<button class="read_all btn <?php echo $confirm; ?>"
form="mark-read-menu"
- formaction="<?php echo $markReadUrl; ?>"
- type="submit"><?php echo _t('mark_read'); ?></button>
+ formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
+ type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
<div class="dropdown">
<div id="dropdown-read" class="dropdown-target"></div>
@@ -206,65 +98,65 @@
<li class="item">
<button class="as-link <?php echo $confirm; ?>"
form="mark-read-menu"
- formaction="<?php echo $markReadUrl; ?>"
+ formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
type="submit"><?php echo $string_mark; ?></button>
</li>
<li class="separator"></li>
<?php
- $mark_before_today = $arUrl;
- $mark_before_today['params']['idMax'] = $this->today . '000000';
- $mark_before_one_week = $arUrl;
- $mark_before_one_week['params']['idMax'] = ($this->today - 604800) . '000000';
+ $today = @strtotime('today');
+ $mark_before_today = $mark_read_url;
+ $mark_before_today['params']['idMax'] = $today . '000000';
+ $mark_before_one_week = $mark_read_url;
+ $mark_before_one_week['params']['idMax'] = ($today - 604800) . '000000';
?>
<li class="item">
<button class="as-link <?php echo $confirm; ?>"
form="mark-read-menu"
formaction="<?php echo Minz_Url::display($mark_before_today); ?>"
- type="submit"><?php echo _t('before_one_day'); ?></button>
+ type="submit"><?php echo _t('index.menu.before_one_day'); ?></button>
</li>
<li class="item">
<button class="as-link <?php echo $confirm; ?>"
form="mark-read-menu"
formaction="<?php echo Minz_Url::display($mark_before_one_week); ?>"
- type="submit"><?php echo _t('before_one_week'); ?></button>
+ type="submit"><?php echo _t('index.menu.before_one_week'); ?></button>
</li>
</ul>
</div>
</div>
<?php } ?>
- <?php $url_output = $this->url; ?>
+ <?php $url_output = Minz_Request::currentRequest(); ?>
<div class="stick" id="nav_menu_views">
- <?php $url_output['params']['output'] = 'normal'; ?>
- <a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <?php $url_output['a'] = 'normal'; ?>
+ <a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('index.menu.normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
<?php echo _i("view-normal"); ?>
</a>
- <?php $url_output['params']['output'] = 'global'; ?>
- <a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <?php $url_output['a'] = 'global'; ?>
+ <a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('index.menu.global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
<?php echo _i("view-global"); ?>
</a>
- <?php $url_output['params']['output'] = 'reader'; ?>
- <a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <?php $url_output['a'] = 'reader'; ?>
+ <a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('index.menu.reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
<?php echo _i("view-reader"); ?>
</a>
<?php
- $url_output['params']['output'] = 'rss';
- if ($this->conf->token) {
- $url_output['params']['token'] = $this->conf->token;
+ $url_output['a'] = 'rss';
+ if (FreshRSS_Context::$user_conf->token) {
+ $url_output['params']['token'] = FreshRSS_Context::$user_conf->token;
}
?>
- <a class="view_rss btn" target="_blank" title="<?php echo _t('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <a class="view_rss btn" target="_blank" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
<?php echo _i('rss'); ?>
</a>
</div>
<div class="item search">
<form action="<?php echo _url('index', 'index'); ?>" method="get">
- <?php $search = Minz_Request::param('search', ''); ?>
- <input type="search" name="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search_short'); ?>" />
+ <input type="search" name="search" class="extend" value="<?php echo FreshRSS_Context::$search; ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
<?php $get = Minz_Request::param('get', ''); ?>
<?php if($get != '') { ?>
@@ -284,23 +176,23 @@
</div>
<?php
- if ($this->order === 'DESC') {
+ if (FreshRSS_Context::$order === 'DESC') {
$order = 'ASC';
$icon = 'up';
- $title = 'older_first';
+ $title = 'index.menu.older_first';
} else {
$order = 'DESC';
$icon = 'down';
- $title = 'newer_first';
+ $title = 'index.menu.newer_first';
}
- $url_order = $this->url;
+ $url_order = Minz_Request::currentRequest();
$url_order['params']['order'] = $order;
?>
<a id="toggle-order" class="btn" href="<?php echo Minz_Url::display($url_order); ?>" title="<?php echo _t($title); ?>">
<?php echo _i($icon); ?>
</a>
- <?php if ($this->loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?>
- <a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>"><?php echo _i('refresh'); ?></a>
+ <?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous_refresh) { ?>
+ <a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('gen.action.actualize'); ?>"><?php echo _i('refresh'); ?></a>
<?php } ?>
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 14:14:06 +0000