diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-05 21:52:48 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-05 21:52:48 +0200 |
| commit | 92993b26a88f5433fee746c1a6097566b8a3f367 (patch) | |
| tree | 6e3e4991ee84238cfa51fa672d36fb5475704374 /app/layout | |
| parent | 9b3673f945ba61059c4444a623ec16229d942fdc (diff) | |
| parent | 9d4269ddcbac7b2c4efed6e8a572cfb1c0ba8f65 (diff) | |
Merge branch 'dev' into 320-template
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/nav_menu.phtml | 55 |
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> |