aboutsummaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/aside_configure.phtml51
-rw-r--r--app/layout/aside_feed.phtml69
-rw-r--r--app/layout/aside_stats.phtml14
-rw-r--r--app/layout/aside_subscription.phtml14
-rw-r--r--app/layout/header.phtml72
-rw-r--r--app/layout/layout.phtml28
-rw-r--r--app/layout/nav_entries.phtml6
-rw-r--r--app/layout/nav_menu.phtml80
-rw-r--r--app/layout/simple.phtml69
9 files changed, 241 insertions, 162 deletions
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 94f5b1f6c..1267f747c 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,51 +1,54 @@
<ul class="nav nav-list aside">
- <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('gen.menu.display'); ?></a>
+ <li class="nav-header"><?= _t('gen.menu.configuration') ?></li>
+ <li class="item<?= Minz_Request::actionName() === 'display' ? ' active' : '' ?>">
+ <a href="<?= _url('configure', 'display') ?>"><?= _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('gen.menu.reading'); ?></a>
+ <li class="item<?= Minz_Request::actionName() === 'reading' ? ' active' : '' ?>">
+ <a href="<?= _url('configure', 'reading') ?>"><?= _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('gen.menu.archiving'); ?></a>
+ <li class="item<?= Minz_Request::actionName() === 'archiving' ? ' active' : '' ?>">
+ <a href="<?= _url('configure', 'archiving') ?>"><?= _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('gen.menu.sharing'); ?></a>
+ <li class="item<?= Minz_Request::actionName() === 'sharing' ? ' active' : '' ?>">
+ <a href="<?= _url('configure', 'sharing') ?>"><?= _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('gen.menu.shortcuts'); ?></a>
+ <li class="item<?= Minz_Request::actionName() === 'shortcut' ? ' active' : '' ?>">
+ <a href="<?= _url('configure', 'shortcut') ?>"><?= _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('gen.menu.queries'); ?></a>
+ <li class="item<?= Minz_Request::actionName() === 'queries' ? ' active' : '' ?>">
+ <a href="<?= _url('configure', 'queries') ?>"><?= _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>
+ <a href="<?= _url('user', 'profile') ?>"><?= _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 class="item<?= Minz_Request::controllerName() === 'extension' ? ' active' : '' ?>">
+ <a href="<?= _url('extension', 'index') ?>"><?= _t('gen.menu.extensions') ?></a>
</li>
+ <?= Minz_ExtensionManager::callHook('menu_configuration_entry') ?>
+
<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
- <li class="nav-header"><?php echo _t('gen.menu.admin'); ?></li>
- <li class="item<?php echo Minz_Request::actionName() === 'system' ? ' active' : ''; ?>">
- <a href="<?php echo _url('configure', 'system')?>"><?php echo _t('gen.menu.system'); ?></a>
+ <li class="nav-header"><?= _t('gen.menu.admin') ?></li>
+ <li class="item<?= Minz_Request::actionName() === 'system' ? ' active' : '' ?>">
+ <a href="<?= _url('configure', 'system') ?>"><?= _t('gen.menu.system') ?></a>
</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>
+ <a href="<?= _url('user', 'manage') ?>"><?= _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 class="item<?= Minz_Request::controllerName() === 'auth' ? ' active' : '' ?>">
+ <a href="<?= _url('auth', 'index') ?>"><?= _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>
+ <a href="<?= _url('update', 'checkInstall') ?>"><?= _t('gen.menu.check_install') ?></a>
</li>
<?php if (!Minz_Configuration::get('system')->disable_update) { ?>
<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>
+ <a href="<?= _url('update', 'index') ?>"><?= _t('gen.menu.update') ?></a>
</li>
<?php } ?>
+ <?= Minz_ExtensionManager::callHook('menu_admin_entry') ?>
<?php } ?>
</ul>
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 637acf4a4..e0c90282f 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -8,30 +8,30 @@
}
?>
-<div class="aside aside_feed<?php echo $class; ?>" id="aside_feed">
- <a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
+<div class="aside aside_feed<?= $class ?>" id="aside_feed">
+ <a class="toggle_aside" href="#close"><?= _i('close') ?></a>
<?php if (FreshRSS_Auth::hasAccess()) { ?>
<div class="stick configure-feeds no-mobile">
- <a id="btn-subscription" class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.menu.subscription'); ?></a>
- <a id="btn-importExport" class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
+ <a id="btn-subscription" class="btn btn-important" href="<?= _url('subscription', 'index') ?>"><?= _t('index.menu.subscription') ?></a>
+ <a id="btn-importExport" class="btn btn-important" href="<?= _url('importExport', 'index') ?>"><?= _i('import') ?></a>
</div>
<?php } elseif (FreshRSS_Auth::accessNeedsLogin()) { ?>
- <a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
+ <a href="<?= _url('index', 'about') ?>"><?= _t('index.menu.about') ?></a>
<?php } ?>
<form id="mark-read-aside" method="post">
- <input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
+ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<ul id="sidebar" class="tree">
- <li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+ <li class="tree-folder category all<?= 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', $actual_view); ?>"><?php echo _t('index.menu.main_stream'); ?></a>
+ <?= _i('all') ?> <a class="title" data-unread="<?= format_number(FreshRSS_Context::$total_unread) ?>" href="<?= _url('index', $actual_view) ?>"><?= _t('index.menu.main_stream') ?></a>
</div>
</li>
- <li class="tree-folder category favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+ <li class="tree-folder category favorites<?= 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', $actual_view, 'get', 's'); ?>"><?php echo _t('index.menu.favorites', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+ <?= _i('bookmark') ?> <a class="title" data-unread="<?= format_number(FreshRSS_Context::$total_starred['unread']) ?>" href="<?= _url('index', $actual_view, 'get', 's') ?>"><?= _t('index.menu.favorites', format_number(FreshRSS_Context::$total_starred['all'])) ?></a>
</div>
</li>
@@ -39,22 +39,22 @@
$t_active = FreshRSS_Context::isCurrentGet('T');
$t_show = $t_active || FreshRSS_Context::$user_conf->display_categories;
?>
- <li class="tree-folder category tags<?php echo $t_active ? ' active' : ''; ?>">
+ <li class="tree-folder category tags<?= $t_active ? ' active' : '' ?>">
<div class="tree-folder-title">
- <a class="dropdown-toggle" href="#"><?php echo _i($t_active ? 'up' : 'down'); ?></a>
- <a class="title" data-unread="<?php echo format_number($this->nbUnreadTags); ?>" href="<?php echo _url('index', $actual_view, 'get', 'T'); ?>"><?php echo _t('index.menu.tags'); ?></a>
+ <a class="dropdown-toggle" href="#"><?= _i($t_active ? 'up' : 'down') ?></a>
+ <a class="title" data-unread="<?= format_number($this->nbUnreadTags) ?>" href="<?= _url('index', $actual_view, 'get', 'T') ?>"><?= _t('index.menu.tags') ?></a>
</div>
- <ul class="tree-folder-items<?php echo $t_show ? ' active' : ''; ?>">
+ <ul class="tree-folder-items<?= $t_show ? ' active' : '' ?>">
<?php
foreach ($this->tags as $tag):
?>
- <li id="t_<?php echo $tag->id(); ?>" class="item feed<?php echo FreshRSS_Context::isCurrentGet('t_' . $tag->id()) ? ' active' : ''; ?>" data-unread="<?php echo $tag->nbUnread(); ?>">
+ <li id="t_<?= $tag->id() ?>" class="item feed<?= FreshRSS_Context::isCurrentGet('t_' . $tag->id()) ? ' active' : '' ?>" data-unread="<?= $tag->nbUnread() ?>">
<div class="dropdown no-mobile">
<div class="dropdown-target"></div>
- <a class="dropdown-toggle"><?php echo _i('configure'); ?></a>
+ <a class="dropdown-toggle"><?= _i('configure') ?></a>
<?php /* tag_config_template */ ?>
</div>
- <?php echo FreshRSS_Themes::alt('label'); ?> <a class="item-title" data-unread="<?php echo format_number($tag->nbUnread()); ?>" href="<?php echo _url('index', $actual_view, 'get', 't_' . $tag->id()); ?>"><?php echo $tag->name(); ?></a>
+ <?= FreshRSS_Themes::alt('label') ?> <a class="item-title" data-unread="<?= format_number($tag->nbUnread()) ?>" href="<?= _url('index', $actual_view, 'get', 't_' . $tag->id()) ?>"><?= $tag->name() ?></a>
</li>
<?php endforeach; ?>
</ul>
@@ -63,28 +63,29 @@
<?php
foreach ($this->categories as $cat) {
$feeds = $cat->feeds();
+ $position = $cat->attributes('position');
if (!empty($feeds)) {
$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
$c_show = $c_active || FreshRSS_Context::$user_conf->display_categories;
?>
- <li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+ <li class="tree-folder category<?= $c_active ? ' active' : '' ?>"<?= null === $position ? '' : "data-position='$position'" ?> data-unread="<?= $cat->nbNotRead() ?>">
<div class="tree-folder-title">
- <a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
- <a class="title<?php echo $cat->hasFeedsWithError() ? ' error' : ''; ?>" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', $actual_view, 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+ <a class="dropdown-toggle" href="#"><?= _i($c_show ? 'up' : 'down') ?></a>
+ <a class="title<?= $cat->hasFeedsWithError() ? ' error' : '' ?>" data-unread="<?= format_number($cat->nbNotRead()) ?>" href="<?= _url('index', $actual_view, 'get', 'c_' . $cat->id()) ?>"><?= $cat->name() ?></a>
</div>
- <ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
+ <ul class="tree-folder-items<?= $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' : '', $feed->mute() ? ' mute' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
+ <li id="f_<?= $feed->id() ?>" class="item feed<?= $f_active ? ' active' : '', $feed->mute() ? ' mute' : '' ?><?= $feed->inError() ? ' error' : '' ?><?= $feed->nbEntries() <= 0 ? ' empty' : '' ?>" data-unread="<?= $feed->nbNotRead() ?>" data-priority="<?= $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>
+ <a class="dropdown-toggle" data-fweb="<?= $feed->website() ?>"><?= _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', $actual_view, 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+ <img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" /> <a class="item-title" data-unread="<?= format_number($feed->nbNotRead()) ?>" href="<?= _url('index', $actual_view, 'get', 'f_' . $feed->id()) ?>"><?= $feed->name() ?></a>
</li>
<?php } ?>
</ul>
@@ -103,8 +104,8 @@
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="item">
<button class="as-link confirm" disabled="disabled"
- form="mark-read-aside" formaction="<?php echo _url('tag', 'delete', 'id_tag', '------'); ?>"
- type="submit"><?php echo _t('gen.action.remove'); ?></button>
+ form="mark-read-aside" formaction="<?= _url('tag', 'delete', 'id_tag', '------') ?>"
+ type="submit"><?= _t('gen.action.remove') ?></button>
</li>
</ul>
</script>
@@ -112,21 +113,21 @@
<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', $actual_view, 'get', 'f_------'); ?>"><?php echo _t('gen.action.filter'); ?></a></li>
+ <li class="item"><a href="<?= _url('index', $actual_view, 'get', 'f_------') ?>"><?= _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>
+ <li class="item"><a href="<?= _url('stats', 'repartition', 'id', '------') ?>"><?= _t('index.menu.stats') ?></a></li>
<?php } ?>
- <li class="item"><a target="_blank" rel="noreferrer" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li>
+ <li class="item"><a target="_blank" rel="noreferrer" href="http://example.net/"><?= _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"><a href="<?= _url('subscription', 'index', 'id', '------') ?>"><?= _t('gen.action.manage') ?></a></li>
+ <li class="item"><a href="<?= _url('feed', 'actualize', 'id', '------') ?>"><?= _t('gen.action.actualize') ?></a></li>
<li class="item">
<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
- <button class="read_all as-link <?php echo $confirm; ?>"
+ <button class="read_all as-link <?= $confirm ?>"
form="mark-read-aside"
- formaction="<?php echo _url('entry', 'read', 'get', 'f_------'); ?>"
- type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
+ formaction="<?= _url('entry', 'read', 'get', 'f_------') ?>"
+ type="submit"><?= _t('gen.action.mark_read') ?></button>
</li>
<?php } ?>
</ul>
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
index 4bdaf7165..705e6ce86 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 _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 class="nav-header"><?= _t('admin.stats') ?></li>
+ <li class="item<?= Minz_Request::actionName() == 'index' ? ' active' : '' ?>">
+ <a href="<?= _url('stats', 'index') ?>"><?= _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 _t('admin.stats.menu.idle'); ?></a>
+ <li class="item<?= Minz_Request::actionName() == 'idle' ? ' active' : '' ?>">
+ <a href="<?= _url('stats', 'idle') ?>"><?= _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 _t('admin.stats.menu.repartition'); ?></a>
+ <li class="item<?= Minz_Request::actionName() == 'repartition' ? ' active' : '' ?>">
+ <a href="<?= _url('stats', 'repartition') ?>"><?= _t('admin.stats.menu.repartition') ?></a>
</li>
</ul>
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index e6a378837..fa1c1aa2d 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -1,15 +1,15 @@
<ul class="nav nav-list aside">
- <li class="nav-header"><?php echo _t('sub.menu.subscription_management'); ?></li>
+ <li class="nav-header"><?= _t('sub.menu.subscription_management') ?></li>
- <li class="item<?php echo Minz_Request::controllerName() === 'subscription' && Minz_Request::actionName() !== 'bookmarklet' ? ' active' : ''; ?>">
- <a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('sub.menu.subscription_management'); ?></a>
+ <li class="item<?= Minz_Request::controllerName() === 'subscription' && Minz_Request::actionName() !== 'bookmarklet' ? ' active' : '' ?>">
+ <a href="<?= _url('subscription', 'index') ?>"><?= _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 class="item<?= Minz_Request::controllerName() === 'importExport' ? ' active' : '' ?>">
+ <a href="<?= _url('importExport', 'index') ?>"><?= _t('sub.menu.import_export') ?></a>
</li>
- <li class="item<?php echo Minz_Request::controllerName() === 'subscription' && Minz_Request::actionName() === 'bookmarklet' ? ' active' : ''; ?>">
- <a href="<?php echo _url('subscription', 'bookmarklet'); ?>"><?php echo _t('sub.menu.subscription_tools'); ?></a>
+ <li class="item<?= Minz_Request::controllerName() === 'subscription' && Minz_Request::actionName() === 'bookmarklet' ? ' active' : '' ?>">
+ <a href="<?= _url('subscription', 'bookmarklet') ?>"><?= _t('sub.menu.subscription_tools') ?></a>
</li>
</ul>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 410ac1ff0..3f7bd80e3 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -3,10 +3,10 @@
if (FreshRSS_Auth::accessNeedsAction()) {
?><ul class="nav nav-head nav-login"><?php
if (FreshRSS_Auth::hasAccess()) {
- ?><li class="item"><?php echo _i('logout'); ?> <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php
+ ?><li class="item"><?= _i('logout') ?> <a class="signout" href="<?= _url('auth', 'logout') ?>"><?php
echo _t('gen.auth.logout') . ' (' . htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') . ')'; ?></a></li><?php
} else {
- ?><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
+ ?><li class="item"><?= _i('login') ?> <a class="signin" href="<?= _url('auth', 'login') ?>"><?= _t('gen.auth.login') ?></a></li><?php
}
?></ul><?php
}
@@ -15,36 +15,36 @@ if (FreshRSS_Auth::accessNeedsAction()) {
<div class="header">
<div class="item title">
<h1>
- <a href="<?php echo _url('index', 'index'); ?>">
- <img class="logo" src="<?php echo _i('icon', true); ?>" alt="" />
- <?php echo FreshRSS_Context::$system_conf->title; ?>
+ <a href="<?= _url('index', 'index') ?>">
+ <img class="logo" src="<?= _i('icon', true) ?>" alt="" />
+ <?= FreshRSS_Context::$system_conf->title ?>
</a>
</h1>
</div>
<div class="item search">
<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?>
- <form action="<?php echo _url('index', 'index'); ?>" method="get">
+ <form action="<?= _url('index', 'index') ?>" method="get">
<div class="stick">
<input type="search" name="search" id="search" class="extend" value="<?php
- echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?php echo _t('gen.menu.search'); ?>" />
+ echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?= _t('gen.menu.search') ?>" />
<?php $get = Minz_Request::param('get', ''); ?>
<?php if ($get != '') { ?>
- <input type="hidden" name="get" value="<?php echo $get; ?>" />
+ <input type="hidden" name="get" value="<?= $get ?>" />
<?php } ?>
<?php $order = Minz_Request::param('order', ''); ?>
<?php if ($order != '') { ?>
- <input type="hidden" name="order" value="<?php echo $order; ?>" />
+ <input type="hidden" name="order" value="<?= $order ?>" />
<?php } ?>
<?php $state = Minz_Request::param('state', ''); ?>
<?php if ($state != '') { ?>
- <input type="hidden" name="state" value="<?php echo $state; ?>" />
+ <input type="hidden" name="state" value="<?= $state ?>" />
<?php } ?>
- <button class="btn" type="submit"><?php echo _i('search'); ?></button>
+ <button class="btn" type="submit"><?= _i('search') ?></button>
</div>
</form>
<?php } ?>
@@ -54,46 +54,52 @@ if (FreshRSS_Auth::accessNeedsAction()) {
<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>
+ <a class="btn dropdown-toggle" href="#dropdown-configure"><?= _i('configure') ?></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</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>
+ <li class="dropdown-header"><?= _t('gen.menu.configuration') ?></li>
+ <li class="item"><a href="<?= _url('configure', 'display') ?>"><?= _t('gen.menu.display') ?></a></li>
+ <li class="item"><a href="<?= _url('configure', 'reading') ?>"><?= _t('gen.menu.reading') ?></a></li>
+ <li class="item"><a href="<?= _url('configure', 'archiving') ?>"><?= _t('gen.menu.archiving') ?></a></li>
+ <li class="item"><a href="<?= _url('configure', 'sharing') ?>"><?= _t('gen.menu.sharing') ?></a></li>
+ <li class="item"><a href="<?= _url('configure', 'shortcut') ?>"><?= _t('gen.menu.shortcuts') ?></a></li>
+ <li class="item"><a href="<?= _url('configure', 'queries') ?>"><?= _t('gen.menu.queries') ?></a></li>
+ <li class="item"><a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a></li>
+ <li class="item"><a href="<?= _url('extension', 'index') ?>"><?= _t('gen.menu.extensions') ?></a></li>
+ <?= Minz_ExtensionManager::callHook('menu_configuration_entry') ?>
+
<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
<li class="separator"></li>
- <li class="dropdown-header"><?php echo _t('gen.menu.admin'); ?></li>
- <li class="item"><a href="<?php echo _url('configure', 'system'); ?>"><?php echo _t('gen.menu.system'); ?></a></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="dropdown-header"><?= _t('gen.menu.admin') ?></li>
+ <li class="item"><a href="<?= _url('configure', 'system') ?>"><?= _t('gen.menu.system') ?></a></li>
+ <li class="item"><a href="<?= _url('user', 'manage') ?>"><?= _t('gen.menu.user_management') ?></a></li>
+ <li class="item"><a href="<?= _url('auth', 'index') ?>"><?= _t('gen.menu.authentication') ?></a></li>
+ <li class="item"><a href="<?= _url('update', 'checkInstall') ?>"><?= _t('gen.menu.check_install') ?></a></li>
<?php if (!Minz_Configuration::get('system')->disable_update) { ?>
- <li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a></li>
+ <li class="item"><a href="<?= _url('update', 'index') ?>"><?= _t('gen.menu.update') ?></a></li>
<?php } ?>
+ <?= Minz_ExtensionManager::callHook('menu_admin_entry') ?>
<?php } ?>
+
<li class="separator"></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>
+ <li class="item"><a href="<?= _url('stats', 'index') ?>"><?= _t('gen.menu.stats') ?></a></li>
+ <li class="item"><a href="<?= _url('index', 'logs') ?>"><?= _t('gen.menu.logs') ?></a></li>
+ <li class="item"><a href="<?= _url('index', 'about') ?>"><?= _t('gen.menu.about') ?></a></li>
+ <?= Minz_ExtensionManager::callHook('menu_other_entry') ?>
+
<li class="separator"></li>
<?php if (FreshRSS_Auth::accessNeedsAction()): ?>
- <li class="item"><a class="signout" href="<?php echo _url('auth', 'logout'); ?>"><?php
+ <li class="item"><a class="signout" href="<?= _url('auth', 'logout') ?>"><?php
echo _i('logout') . ' ' . _t('gen.auth.logout') . ' (' . htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') . ')'; ?></a></li>
<?php else: ?>
- <li class="item"><span class="signout">(<?php echo htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8'); ?>)</span></li>
+ <li class="item"><span class="signout">(<?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?>)</span></li>
<?php endif; ?>
</ul>
</div>
</div>
<?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>
+ <?= _i('login') ?><a class="signin" href="<?= _url('auth', 'login') ?>"><?= _t('gen.auth.login') ?></a>
</div>
<?php } ?>
</div>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 2e16672e6..498cc4470 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,25 +1,25 @@
<?php FreshRSS::preLayout(); ?>
<!DOCTYPE html>
-<html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>">
+<html lang="<?= FreshRSS_Context::$user_conf->language ?>" xml:lang="<?= FreshRSS_Context::$user_conf->language ?>">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1.0" />
- <?php echo self::headStyle(); ?>
+ <?= self::headStyle() ?>
<script id="jsonVars" type="application/json">
<?php $this->renderHelper('javascript_vars'); ?>
</script>
- <?php echo self::headScript(); ?>
- <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'); ?>" />
- <link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>" />
+ <?= self::headScript() ?>
+ <link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?= Minz_Url::display('/favicon.ico') ?>" />
+ <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?= Minz_Url::display('/themes/icons/favicon-256.png') ?>" />
+ <link rel="apple-touch-icon" href="<?= 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 FreshRSS_Context::$system_conf->title; ?>">
+ <meta name="apple-mobile-web-app-title" content="<?= FreshRSS_Context::$system_conf->title ?>">
<meta name="msapplication-TileColor" content="#FFF" />
<?php if (!FreshRSS_Context::$system_conf->allow_referrer) { ?>
<meta name="referrer" content="never" />
<?php } ?>
- <?php echo self::headTitle(); ?>
+ <?= self::headTitle() ?>
<?php
$url_base = Minz_Request::currentRequest();
if (isset($this->rss_title)) {
@@ -29,14 +29,14 @@
$url_rss['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
}
?>
- <link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($url_rss); ?>" />
+ <link rel="alternate" type="application/rss+xml" title="<?= $this->rss_title ?>" href="<?= Minz_Url::display($url_rss) ?>" />
<?php } if (FreshRSS_Context::$system_conf->allow_robots) { ?>
- <meta name="description" content="<?php echo htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8'); ?>" />
+ <meta name="description" content="<?= htmlspecialchars(FreshRSS_Context::$name . ' | ' . FreshRSS_Context::$description, ENT_COMPAT, 'UTF-8') ?>" />
<?php } else { ?>
<meta name="robots" content="noindex,nofollow" />
<?php } ?>
</head>
- <body class="<?php echo Minz_Request::actionName(); ?>">
+ <body class="<?= Minz_Request::actionName() ?>">
<?php
flush();
$this->partial('header');
@@ -62,9 +62,9 @@
invalidateHttpCache();
}
?>
-<div id="notification" class="notification <?php echo $status; ?>">
- <span class="msg"><?php echo $msg; ?></span>
- <a class="close" href=""><?php echo _i('close'); ?></a>
+<div id="notification" class="notification <?= $status ?>">
+ <span class="msg"><?= $msg ?></span>
+ <a class="close" href=""><?= _i('close') ?></a>
</div>
</body>
</html>
diff --git a/app/layout/nav_entries.phtml b/app/layout/nav_entries.phtml
index ca6849193..cbc514737 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 _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>
+ <li class="item"><a class="previous_entry" href="#"><?= _i('prev') ?></a></li>
+ <li class="item"><a class="up" href="#"><?= _i('up') ?></a></li>
+ <li class="item"><a class="next_entry" href="#"><?= _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 af7267bac..da33d3e20 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -9,7 +9,7 @@
<div class="nav_menu">
<?php if ($actual_view === 'normal' || $actual_view === 'reader' ) { ?>
- <a class="btn toggle_aside" href="#aside_feed"><?php echo _i('category'); ?></a>
+ <a class="btn toggle_aside" href="#aside_feed"><?= _i('category') ?></a>
<?php } ?>
<?php if (FreshRSS_Auth::hasAccess()) { ?>
@@ -27,28 +27,28 @@
$url_state = Minz_Request::currentRequest();
$url_state['params']['state'] = FreshRSS_Context::getRevertState($state);
?>
- <a id="toggle-<?php echo $state_str; ?>"
- class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
- role="checkbox" 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>
+ <a id="toggle-<?= $state_str ?>"
+ class="btn <?= $state_enabled ? 'active' : '' ?>"
+ role="checkbox" aria-checked="<?= $state_enabled ? 'true' : 'false' ?>"
+ title="<?= _t('index.menu.' . $state_str) ?>"
+ href="<?= Minz_Url::display($url_state) ?>"><?= _i($state_str) ?></a>
<?php } ?>
<div class="dropdown">
<div id="dropdown-query" class="dropdown-target"></div>
- <a class="dropdown-toggle btn" href="#dropdown-query"><?php echo _i('down'); ?></a>
+ <a class="dropdown-toggle btn" href="#dropdown-query"><?= _i('down') ?></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="dropdown-header">
- <?php echo _t('index.menu.queries'); ?>
- <a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
+ <?= _t('index.menu.queries') ?>
+ <a class="no-mobile" href="<?= _url('configure', 'queries') ?>"><?= _i('configure') ?></a>
</li>
<?php foreach (FreshRSS_Context::$user_conf->queries as $query) { ?>
<li class="item query">
- <a href="<?php echo $query['url']; ?>"><?php echo $query['name']; ?></a>
+ <a href="<?= $query['url'] ?>"><?= $query['name'] ?></a>
</li>
<?php } ?>
@@ -61,7 +61,7 @@
$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('index.menu.add_query'); ?></a></li>
+ <li class="item no-mobile"><a href="<?= Minz_Url::display($url_query) ?>"><?= _i('bookmark-add') ?> <?= _t('index.menu.add_query') ?></a></li>
</ul>
</div>
</div>
@@ -96,24 +96,24 @@
<div class="stick" id="nav_menu_read_all">
<form id="mark-read-menu" method="post">
<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
- <button class="read_all btn <?php echo $confirm; ?>"
+ <button class="read_all btn <?= $confirm ?>"
form="mark-read-menu"
- formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
- type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
+ formaction="<?= Minz_Url::display($mark_read_url) ?>"
+ type="submit"><?= _t('gen.action.mark_read') ?></button>
<div class="dropdown">
- <input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
+ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<div id="dropdown-read" class="dropdown-target"></div>
- <a class="dropdown-toggle btn" href="#dropdown-read"><?php echo _i('down'); ?></a>
+ <a class="dropdown-toggle btn" href="#dropdown-read"><?= _i('down') ?></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="item">
- <button class="as-link <?php echo $confirm; ?>"
+ <button class="as-link <?= $confirm ?>"
form="mark-read-menu"
- formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
- type="submit"><?php echo $string_mark; ?></button>
+ formaction="<?= Minz_Url::display($mark_read_url) ?>"
+ type="submit"><?= $string_mark ?></button>
</li>
<li class="separator"></li>
<?php
@@ -125,23 +125,23 @@
$mark_unread_enabled = FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ) or !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ);
?>
<li class="item">
- <button class="as-link <?php echo $confirm; ?>"
+ <button class="as-link <?= $confirm ?>"
form="mark-read-menu"
- formaction="<?php echo Minz_Url::display($mark_before_today); ?>"
- type="submit"><?php echo _t('index.menu.before_one_day'); ?></button>
+ formaction="<?= Minz_Url::display($mark_before_today) ?>"
+ type="submit"><?= _t('index.menu.before_one_day') ?></button>
</li>
<li class="item">
- <button class="as-link <?php echo $confirm; ?>"
+ <button class="as-link <?= $confirm ?>"
form="mark-read-menu"
- formaction="<?php echo Minz_Url::display($mark_before_one_week); ?>"
- type="submit"><?php echo _t('index.menu.before_one_week'); ?></button>
+ formaction="<?= Minz_Url::display($mark_before_one_week) ?>"
+ type="submit"><?= _t('index.menu.before_one_week') ?></button>
</li>
<li class="separator"></li>
<li class="item">
- <button class="as-link <?php echo $mark_unread_enabled ? $confirm : '" disabled="disabled'; ?>"
+ <button class="as-link <?= $mark_unread_enabled ? $confirm : '" disabled="disabled' ?>"
form="mark-read-menu"
- formaction="<?php echo Minz_Url::display($mark_unread_url); ?>"
- type="submit"><?php echo $string_unmark; ?></button>
+ formaction="<?= Minz_Url::display($mark_unread_url) ?>"
+ type="submit"><?= $string_unmark ?></button>
</li>
</ul>
</div>
@@ -158,8 +158,8 @@
/** @var FreshRSS_ReadingMode $mode */
foreach ($readingModes as $mode) {
?>
- <a class="<?php echo $mode->getId(); ?> btn <?php if ($mode->isActive()) { echo 'active'; } ?>" title="<?php echo $mode->getTitle(); ?>" href="<?php echo Minz_Url::display($mode->getUrlParams()); ?>">
- <?php echo $mode->getName(); ?>
+ <a class="<?= $mode->getId() ?> btn <?php if ($mode->isActive()) { echo 'active'; } ?>" title="<?= $mode->getTitle() ?>" href="<?= Minz_Url::display($mode->getUrlParams()) ?>">
+ <?= $mode->getName() ?>
</a>
<?php
}
@@ -175,29 +175,29 @@
$url_output['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
}
?>
- <a class="view-rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
- <?php echo _i('rss'); ?>
+ <a class="view-rss btn" target="_blank" rel="noreferrer" title="<?= _t('index.menu.rss_view') ?>" href="<?= Minz_Url::display($url_output) ?>">
+ <?= _i('rss') ?>
</a>
</div>
<div class="item search">
- <form action="<?php echo _url('index', 'index'); ?>" method="get">
+ <form action="<?= _url('index', 'index') ?>" method="get">
<input type="search" name="search" class="extend" value="<?php
- echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
+ echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?= _t('index.menu.search_short') ?>" />
<?php $get = Minz_Request::param('get', ''); ?>
<?php if($get != '') { ?>
- <input type="hidden" name="get" value="<?php echo $get; ?>" />
+ <input type="hidden" name="get" value="<?= $get ?>" />
<?php } ?>
<?php $order = Minz_Request::param('order', ''); ?>
<?php if($order != '') { ?>
- <input type="hidden" name="order" value="<?php echo $order; ?>" />
+ <input type="hidden" name="order" value="<?= $order ?>" />
<?php } ?>
<?php $state = Minz_Request::param('state', ''); ?>
<?php if($state != '') { ?>
- <input type="hidden" name="state" value="<?php echo $state; ?>" />
+ <input type="hidden" name="state" value="<?= $state ?>" />
<?php } ?>
</form>
</div>
@@ -215,11 +215,11 @@
$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 $title; ?>">
- <?php echo _i($icon); ?>
+ <a id="toggle-order" class="btn" href="<?= Minz_Url::display($url_order) ?>" title="<?= $title ?>">
+ <?= _i($icon) ?>
</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>
+ <a id="actualize" class="btn" href="<?= _url('feed', 'actualize') ?>" title="<?= _t('gen.action.actualize') ?>"><?= _i('refresh') ?></a>
<?php } ?>
</div>
diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml
new file mode 100644
index 000000000..89fe69005
--- /dev/null
+++ b/app/layout/simple.phtml
@@ -0,0 +1,69 @@
+<?php FreshRSS::preLayout(); ?>
+<!DOCTYPE html>
+<html lang="<?= FreshRSS_Context::$user_conf->language ?>" xml:lang="<?= FreshRSS_Context::$user_conf->language ?>">
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="viewport" content="initial-scale=1.0" />
+ <?= self::headStyle() ?>
+ <script id="jsonVars" type="application/json">
+<?php $this->renderHelper('javascript_vars'); ?>
+ </script>
+ <?= self::headScript() ?>
+ <link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?= Minz_Url::display('/favicon.ico') ?>" />
+ <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?= Minz_Url::display('/themes/icons/favicon-256.png') ?>" />
+ <link rel="apple-touch-icon" href="<?= 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="<?= FreshRSS_Context::$system_conf->title ?>">
+ <meta name="msapplication-TileColor" content="#FFF" />
+ <meta name="referrer" content="never" />
+ <meta name="robots" content="noindex,nofollow" />
+ <?= self::headTitle() ?>
+ </head>
+ <body>
+
+<?php flush(); ?>
+<div class="app-layout app-layout-simple">
+ <div class="header">
+ <div class="item title">
+ <h1>
+ <a href="<?= _url('index', 'index') ?>">
+ <img class="logo" src="<?= _i('icon', true) ?>" alt="" />
+ <?= FreshRSS_Context::$system_conf->title ?>
+ </a>
+ </h1>
+ </div>
+
+ <div class="item"></div>
+
+ <div class="item">
+ <?php if (FreshRSS_Auth::accessNeedsAction()) { ?>
+ <a class="signout" href="<?= _url('auth', 'logout') ?>">
+ <?= _i('logout') . _t('gen.auth.logout') ?>
+
+ (<?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?>)
+ </a>
+ <?php } ?>
+ </div>
+ </div>
+
+ <?php $this->render(); ?>
+</div>
+
+<?php
+ $msg = '';
+ $status = 'closed';
+ if (isset($this->notification)) {
+ $msg = $this->notification['content'];
+ $status = $this->notification['type'];
+
+ invalidateHttpCache();
+ }
+?>
+<div id="notification" class="notification <?= $status ?>">
+ <span class="msg"><?= $msg ?></span>
+ <a class="close" href=""><?= _i('close') ?></a>
+</div>
+
+ </body>
+</html>