summaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/aside_feed.phtml2
-rw-r--r--app/layout/aside_flux.phtml2
-rw-r--r--app/layout/header.phtml34
-rw-r--r--app/layout/nav_entries.phtml5
-rw-r--r--app/layout/nav_menu.phtml67
5 files changed, 75 insertions, 35 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 158f012d0..4c56d12fc 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -43,7 +43,7 @@
<?php if (!empty ($this->feeds)) { ?>
<?php foreach ($this->feeds as $feed) { ?>
- <li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?>">
+ <li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?>">
<a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>">
<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" />
<?php echo $feed->name (); ?>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index d1fe6b759..449ffaff4 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -62,7 +62,7 @@
<ul class="feeds<?php echo $c_active ? ' active' : ''; ?>">
<?php foreach ($feeds as $feed) { ?>
<?php $f_active = false; if ($this->get_f == $feed->id ()) { $f_active = true; } ?>
- <li class="item<?php echo $f_active ? ' active' : ''; ?>">
+ <li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?>">
<div class="dropdown">
<div id="dropdown-<?php echo $feed->id(); ?>" class="dropdown-target"></div>
<a class="dropdown-toggle" href="#dropdown-<?php echo $feed->id(); ?>"><i class="icon i_configure"></i></a>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 628019c97..4131f8687 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -15,21 +15,26 @@
</div>
<div class="item search">
- <?php
- $params = Request::params ();
- if (isset ($params['search'])) {
- unset ($params['search']);
- }
- $url = array (
- 'c' => 'index',
- 'a' => 'index',
- 'params' => $params
- );
- ?>
- <form action="<?php echo Url::display ($url); ?>" method="get">
+ <form action="<?php echo _url ('index', 'index'); ?>" method="get">
<div class="stick">
- <?php $s = Request::param ('search', ''); ?>
- <input type="text" name="search" id="search" value="<?php echo $s; ?>" placeholder="<?php echo Translate::t ('search'); ?>" />
+ <?php $search = Request::param ('search', ''); ?>
+ <input type="text" name="search" id="search" value="<?php echo $search; ?>" placeholder="<?php echo Translate::t ('search'); ?>" />
+
+ <?php $get = Request::param ('get', ''); ?>
+ <?php if($get != '') { ?>
+ <input type="hidden" name="get" value="<?php echo $get; ?>" />
+ <?php } ?>
+
+ <?php $order = Request::param ('order', ''); ?>
+ <?php if($order != '') { ?>
+ <input type="hidden" name="order" value="<?php echo $order; ?>" />
+ <?php } ?>
+
+ <?php $state = Request::param ('state', ''); ?>
+ <?php if($state != '') { ?>
+ <input type="hidden" name="state" value="<?php echo $state; ?>" />
+ <?php } ?>
+
<button class="btn" type="submit"><i class="icon i_search"></i></button>
</div>
</form>
@@ -49,6 +54,7 @@
<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Translate::t ('shortcuts'); ?></a></li>
<li class="separator"></li>
<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Translate::t ('about'); ?></a></li>
+ <li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Translate::t ('logs'); ?></a></li>
</ul>
</div>
</div>
diff --git a/app/layout/nav_entries.phtml b/app/layout/nav_entries.phtml
new file mode 100644
index 000000000..101e7443e
--- /dev/null
+++ b/app/layout/nav_entries.phtml
@@ -0,0 +1,5 @@
+<ul class="nav_entries">
+ <li class="item"><a class="previous_entry" href="#"><i class="icon i_prev"></i></a></li>
+ <li class="item"><a href="#"><i class="icon i_up"></i></a></li>
+ <li class="item"><a class="next_entry" href="#"><i class="icon i_next"></i></a></li>
+</ul> \ No newline at end of file
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 3411f344b..d36814bee 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -59,43 +59,72 @@
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
+ <?php
+ $url_output = $url;
+ $actual_view = Request::param('output', 'normal');
+ ?>
+ <?php if($actual_view != 'normal') { ?>
+ <li class="item">
+ <?php $url_output['params']['output'] = 'normal'; ?>
+ <a class="view_normal" href="<?php echo Url::display ($url_output); ?>">
+ <?php echo Translate::t ('normal_view'); ?>
+ </a>
+ </li>
+ <?php } if($actual_view != 'reader') { ?>
+ <li class="item">
+ <?php $url_output['params']['output'] = 'reader'; ?>
+ <a class="view_normal" href="<?php echo Url::display ($url_output); ?>">
+ <?php echo Translate::t ('reader_view'); ?>
+ </a>
+ </li>
+ <?php } if($actual_view != 'global') { ?>
+ <li class="item">
+ <?php $url_output['params']['output'] = 'global'; ?>
+ <a class="view_normal" href="<?php echo Url::display ($url_output); ?>">
+ <?php echo Translate::t ('global_view'); ?>
+ </a>
+ </li>
+ <?php } ?>
+
+ <li class="separator"></li>
+
<li class="item">
<?php
+ $url_state = $url;
if ($this->state == 'not_read') {
- $url['params']['state'] = 'all';
+ $url_state['params']['state'] = 'all';
?>
- <a class="print_all" href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('show_all_articles'); ?></a>
+ <a class="print_all" href="<?php echo Url::display ($url_state); ?>">
+ <?php echo Translate::t ('show_all_articles'); ?>
+ </a>
<?php
} else {
- $url['params']['state'] = 'not_read';
+ $url_state['params']['state'] = 'not_read';
?>
- <a class="print_non_read" href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('show_not_reads'); ?></a>
+ <a class="print_non_read" href="<?php echo Url::display ($url_state); ?>">
+ <?php echo Translate::t ('show_not_reads'); ?>
+ </a>
<?php } ?>
</li>
+
<li class="separator"></li>
- <?php
- $params = Request::params ();
- if (isset ($params['search'])) {
- $params['search'] = urlencode ($params['search']);
- }
- $url = array (
- 'c' => 'index',
- 'a' => 'index',
- 'params' => $params
- );
- ?>
<li class="item">
<?php
+ $url_order = $url;
if ($this->order == 'low_to_high') {
- $url['params']['order'] = 'high_to_low';
+ $url_order['params']['order'] = 'high_to_low';
?>
- <a href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('older_first'); ?></a>
+ <a href="<?php echo Url::display ($url_order); ?>">
+ <?php echo Translate::t ('older_first'); ?>
+ </a>
<?php
} else {
- $url['params']['order'] = 'low_to_high';
+ $url_order['params']['order'] = 'low_to_high';
?>
- <a href="<?php echo Url::display ($url); ?>"><?php echo Translate::t ('newer_first'); ?></a>
+ <a href="<?php echo Url::display ($url_order); ?>">
+ <?php echo Translate::t ('newer_first'); ?>
+ </a>
<?php } ?>
</li>
</ul>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 12:22:36 +0000