Reorganise menus (aside and header)

3 files changed, 5 insertions, 2 deletions

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 7a9d0d839..2e2b87203 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -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>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 7e7c1b477..c680cbcdc 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -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>
diff --git a/lib/lib_opml.php b/lib/lib_opml.php
index 16a9921ea..f320335bb 100644
--- a/lib/lib_opml.php
+++ b/lib/lib_opml.php
@@ -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;