mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-07 22:54:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reorganise menus (aside and header)

Browse Source
This commit is contained in:
Marien Fressinaud
2014-10-17 09:33:35 +02:00
parent 5797344aff
commit 74be86d7e8
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/layout/aside_configure.phtml
View File

@@ -18,12 +18,12 @@
<li class="item<?php echo Minz_Request::actionName() === 'queries' ? ' active' : ''; ?>">
<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
</li>
<li class="separator"></li>
<li class="item<?php echo Minz_Request::controllerName() === 'user' &&
Minz_Request::actionName() === 'profil'? ' active' : ''; ?>">
<a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a>
</li>
<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
<li class="nav-header"><?php echo _t('administration'); ?></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('users.manage'); ?></a>

3
app/layout/header.phtml
View File

@@ -62,9 +62,10 @@ if (Minz_Configuration::canLogIn()) {
<li class="item"><a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a></li>
<li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a></li>
<li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a></li>
<li class="separator"></li>
<li class="item"><a href="<?php echo _url('user', 'profil'); ?>"><?php echo _t('users.profil'); ?></a></li>
<li class="separator"></li>
<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
<li class="dropdown-header"><?php echo _t('administration'); ?></li>
<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('users.manage'); ?></a></li>
<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('authentication'); ?></a></li>
<li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a></li>

2
lib/lib_opml.php
View File

@@ -101,6 +101,7 @@ function libopml_parse_string($xml) {
// First, we get all "head" elements. Head is required but its sub-elements
// are optional.
// TODO: test head exists!
foreach ($opml->head->children() as $key => $value) {
if (in_array($key, unserialize(HEAD_ELEMENTS), true)) {
$array['head'][$key] = (string)$value;
@@ -114,6 +115,7 @@ function libopml_parse_string($xml) {
// Then, we get body oulines. Body must contain at least one outline
// element.
$at_least_one_outline = false;
// TODO: test body exists!
foreach ($opml->body->children() as $key => $value) {
if ($key === 'outline') {
$at_least_one_outline = true;