diff options
| author | 2013-12-15 03:30:24 +0100 | |
|---|---|---|
| committer | 2013-12-15 03:30:24 +0100 | |
| commit | 878e96202e8a22e4857b98e29b0a1fce68eccbc9 (patch) | |
| tree | f9233c3b48a0cd6e0ac2536ddcc1897201595ad4 /app/layout/nav_menu.phtml | |
| parent | 4af233e1f736eb2256e5e1696418635165467855 (diff) | |
Grosse refactorisation pour permettre le chargement automatique des classes
C'est parti de changements pour
https://github.com/marienfressinaud/FreshRSS/issues/255 et finalement
j'ai continué la refactorisation...
Ajout de préfixes FreshRSS_ et Minz_ sur le modèle de SimplePie_.
Toutes les classes sont maintenant en chargement automatique (devrait
améliorer les performances en évitant de charger plein de classes
inutilisées, et faciliter la maintenance).
Suppression de set_include_path().
Si souhaité, certaines classes de Minz pourraient être déplacées dans un
sous-répertoire, par exemple les exceptions.
Tests et relecture nécessaires.
Diffstat (limited to 'app/layout/nav_menu.phtml')
| -rw-r--r-- | app/layout/nav_menu.phtml | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index f3e985dc0..92a987aed 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -1,22 +1,22 @@ <div class="nav_menu"> - <a class="btn toggle_aside" href="#aside_flux"><?php echo RSSThemes::icon('category'); ?></a> + <a class="btn toggle_aside" href="#aside_flux"><?php echo FreshRSS_Themes::icon('category'); ?></a> <?php if (!login_is_conf ($this->conf) || is_logged ()) { ?> - <a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo RSSThemes::icon('refresh'); ?></a> + <a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo FreshRSS_Themes::icon('refresh'); ?></a> <?php $get = false; - $string_mark = Translate::t ('mark_all_read'); + $string_mark = Minz_Translate::t ('mark_all_read'); if ($this->get_f) { $get = 'f_' . $this->get_f; - $string_mark = Translate::t ('mark_feed_read'); + $string_mark = Minz_Translate::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 = Translate::t ('mark_cat_read'); + $string_mark = Minz_Translate::t ('mark_cat_read'); } $nextGet = $get; if (($this->conf->onread_jump_next () === 'yes') && (strlen ($get) > 2)) { @@ -57,15 +57,15 @@ $p = isset($this->entries[0]) ? $this->entries[0] : null; $idMax = $p === null ? '0' : $p->id(); $markReadUrl = _url ('entry', 'read', 'is_read', 1, 'get', $get, 'nextGet', $nextGet, 'idMax', $idMax); - Session::_param ('markReadUrl', $markReadUrl); + Minz_Session::_param ('markReadUrl', $markReadUrl); ?> <div class="stick" id="nav_menu_read_all"> - <a class="read_all btn" href="<?php echo $markReadUrl; ?>"><?php echo Translate::t ('mark_read'); ?></a> + <a class="read_all btn" href="<?php echo $markReadUrl; ?>"><?php echo Minz_Translate::t ('mark_read'); ?></a> <div class="dropdown"> <div id="dropdown-read" class="dropdown-target"></div> - <a class="dropdown-toggle btn" href="#dropdown-read"><?php echo RSSThemes::icon('down'); ?></a> + <a class="dropdown-toggle btn" href="#dropdown-read"><?php echo FreshRSS_Themes::icon('down'); ?></a> <ul class="dropdown-menu"> <li class="dropdown-close"><a href="#close">❌</a></li> @@ -75,15 +75,15 @@ $today = @strtotime('today'); $one_week = $today - 604800; ?> - <li class="item"><a href="<?php echo _url ('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $today . '000000'); ?>"><?php echo Translate::t ('before_one_day'); ?></a></li> - <li class="item"><a href="<?php echo _url ('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $one_week . '000000'); ?>"><?php echo Translate::t ('before_one_week'); ?></a></li> + <li class="item"><a href="<?php echo _url ('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $today . '000000'); ?>"><?php echo Minz_Translate::t ('before_one_day'); ?></a></li> + <li class="item"><a href="<?php echo _url ('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $one_week . '000000'); ?>"><?php echo Minz_Translate::t ('before_one_week'); ?></a></li> </ul> </div> </div> <?php } ?> <?php - $params = Request::params (); + $params = Minz_Request::params (); if (isset ($params['search'])) { $params['search'] = urlencode ($params['search']); } @@ -95,33 +95,33 @@ ?> <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 Translate::t ('display'); ?> <?php echo RSSThemes::icon('down'); ?></a> + <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 = $url; - $actual_view = Request::param('output', 'normal'); + $actual_view = Minz_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 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 Url::display ($url_output); ?>"> - <?php echo Translate::t ('reader_view'); ?> + <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 Url::display ($url_output); ?>"> - <?php echo Translate::t ('global_view'); ?> + <a class="view_normal" href="<?php echo Minz_Url::display ($url_output); ?>"> + <?php echo Minz_Translate::t ('global_view'); ?> </a> </li> <?php } ?> @@ -134,15 +134,15 @@ if ($this->state == 'not_read') { $url_state['params']['state'] = 'all'; ?> - <a class="print_all" href="<?php echo Url::display ($url_state); ?>"> - <?php echo Translate::t ('show_all_articles'); ?> + <a class="print_all" href="<?php echo Minz_Url::display ($url_state); ?>"> + <?php echo Minz_Translate::t ('show_all_articles'); ?> </a> <?php } else { $url_state['params']['state'] = 'not_read'; ?> - <a class="print_non_read" href="<?php echo Url::display ($url_state); ?>"> - <?php echo Translate::t ('show_not_reads'); ?> + <a class="print_non_read" href="<?php echo Minz_Url::display ($url_state); ?>"> + <?php echo Minz_Translate::t ('show_not_reads'); ?> </a> <?php } ?> </li> @@ -153,15 +153,15 @@ if ($this->order === 'DESC') { $url_order['params']['order'] = 'ASC'; ?> - <a href="<?php echo Url::display ($url_order); ?>"> - <?php echo Translate::t ('older_first'); ?> + <a href="<?php echo Minz_Url::display ($url_order); ?>"> + <?php echo Minz_Translate::t ('older_first'); ?> </a> <?php } else { $url_order['params']['order'] = 'DESC'; ?> - <a href="<?php echo Url::display ($url_order); ?>"> - <?php echo Translate::t ('newer_first'); ?> + <a href="<?php echo Minz_Url::display ($url_order); ?>"> + <?php echo Minz_Translate::t ('newer_first'); ?> </a> <?php } ?> </li> @@ -169,8 +169,8 @@ <li class="separator"></li> <li class="item"> - <a class="view_rss" target="_blank" href="<?php echo Url::display ($this->rss_url); ?>"> - <?php echo Translate::t ('rss_view'); ?> + <a class="view_rss" target="_blank" href="<?php echo Minz_Url::display ($this->rss_url); ?>"> + <?php echo Minz_Translate::t ('rss_view'); ?> </a> </li> </ul> @@ -178,20 +178,20 @@ <div class="item search"> <form action="<?php echo _url ('index', 'index'); ?>" method="get"> - <?php $search = Request::param ('search', ''); ?> - <input type="search" name="search" value="<?php echo $search; ?>" placeholder="<?php echo Translate::t ('search_short'); ?>" /> + <?php $search = Minz_Request::param ('search', ''); ?> + <input type="search" name="search" value="<?php echo $search; ?>" placeholder="<?php echo Minz_Translate::t ('search_short'); ?>" /> - <?php $get = Request::param ('get', ''); ?> + <?php $get = Minz_Request::param ('get', ''); ?> <?php if($get != '') { ?> <input type="hidden" name="get" value="<?php echo $get; ?>" /> <?php } ?> - <?php $order = Request::param ('order', ''); ?> + <?php $order = Minz_Request::param ('order', ''); ?> <?php if($order != '') { ?> <input type="hidden" name="order" value="<?php echo $order; ?>" /> <?php } ?> - <?php $state = Request::param ('state', ''); ?> + <?php $state = Minz_Request::param ('state', ''); ?> <?php if($state != '') { ?> <input type="hidden" name="state" value="<?php echo $state; ?>" /> <?php } ?> |
