aboutsummaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-06-05 21:25:21 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-06-05 21:25:21 +0200
commite70933dfeb0ae0941d1599ef1f4bea9160654e0d (patch)
treebb1d6b0852f432a90b6ad98953033c105bdb5c51 /app/layout
parent192c0a001d5c9f57955402e4298da80dff68c6bd (diff)
Update links to change view
- Dropdown menu is transformed into stick buttons - 3 new icons (view-normal, view-global, view-reader) - Link to access RSS is now next to these buttons (should we kept it here?)
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/nav_menu.phtml55
1 files changed, 20 insertions, 35 deletions
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 9990448ba..1114d0060 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -169,37 +169,27 @@
</div>
<?php } ?>
- <div class="dropdown" id="nav_menu_views">
- <div id="dropdown-views" class="dropdown-target"></div>
- <a class="dropdown-toggle btn" href="#dropdown-views"><?php echo Minz_Translate::t ('display'); ?> <?php echo FreshRSS_Themes::icon('down'); ?></a>
- <ul class="dropdown-menu">
- <li class="dropdown-close"><a href="#close">❌</a></li>
+ <?php $url_output = $this->url; ?>
+ <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 Minz_Translate::t('normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <?php echo FreshRSS_Themes::icon("view-normal"); ?>
+ </a>
- <?php
- $url_output = $this->url;
- if ($actual_view !== 'normal') { ?>
- <li class="item">
- <?php $url_output['params']['output'] = 'normal'; ?>
- <a class="view_normal" href="<?php echo Minz_Url::display ($url_output); ?>">
- <?php echo Minz_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 Minz_Url::display ($url_output); ?>">
- <?php echo Minz_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 Minz_Url::display ($url_output); ?>">
- <?php echo Minz_Translate::t ('global_view'); ?>
- </a>
- </li>
- <?php } ?>
- </ul>
+ <?php $url_output['params']['output'] = 'global'; ?>
+ <a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo Minz_Translate::t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <?php echo FreshRSS_Themes::icon("view-global"); ?>
+ </a>
+
+ <?php $url_output['params']['output'] = 'reader'; ?>
+ <a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo Minz_Translate::t('reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <?php echo FreshRSS_Themes::icon("view-reader"); ?>
+ </a>
+
+ <?php $url_output['params']['output'] = 'rss'; ?>
+ <a class="view_rss btn" target="_blank" title="<?php echo Minz_Translate::t ('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+ <?php echo FreshRSS_Themes::icon('rss'); ?>
+ </a>
</div>
<div class="item search">
@@ -240,11 +230,6 @@
<a class="btn" href="<?php echo Minz_Url::display ($url_order); ?>" title="<?php echo Minz_Translate::t ($title); ?>">
<?php echo FreshRSS_Themes::icon($icon); ?>
</a>
-
- <?php $url_output['params']['output'] = 'rss'; ?>
- <a class="btn view_rss" target="_blank" href="<?php echo Minz_Url::display ($url_output); ?>" title="<?php echo Minz_Translate::t ('rss_view'); ?>">
- <?php echo FreshRSS_Themes::icon('rss'); ?>
- </a>
<?php if ($this->loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?>
<a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo FreshRSS_Themes::icon('refresh'); ?></a>