summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Lange <code@nerdmind.de>2017-09-15 00:50:10 +0200
committerThomas Lange <code@nerdmind.de>2017-09-15 00:56:12 +0200
commitbd5f13aa6c79cb67cf0537db01ab85a7d3141759 (patch)
tree8558c9172e6a9d937327e2925c0b381a490789fd
parentddc0ab932c5629b0f4f6ae5fe8466fb20d7f3e32 (diff)
downloadblog-bd5f13aa6c79cb67cf0537db01ab85a7d3141759.tar.gz
blog-bd5f13aa6c79cb67cf0537db01ab85a7d3141759.tar.xz
blog-bd5f13aa6c79cb67cf0537db01ab85a7d3141759.zip
The unnecessary second list for the "Login" and "Logout" list points in the main navigation of the admin template have been removed.
-rw-r--r--template/admin/html/main.php22
-rw-r--r--template/admin/rsrc/main.css5
2 files changed, 12 insertions, 15 deletions
diff --git a/template/admin/html/main.php b/template/admin/html/main.php
index 572ce4f..0918d3b 100644
--- a/template/admin/html/main.php
+++ b/template/admin/html/main.php
@@ -20,22 +20,18 @@
<div class="header-line">
<div class="header-content">
<nav id="main-navi">
+ <ul>
<?php if(Application::isAuthenticated()): ?>
- <ul>
- <li><a href="<?=Application::getAdminURL()?>" title="<?=$Language->text('overview_dashboard_text')?>"><i class="fa fa-dashboard"></i><span>Dashboard</span></a></li>
- <li><a href="<?=Application::getAdminURL('post/')?>" title="<?=$Language->text('post_overview')?>"><i class="fa fa-newspaper-o"></i><span><?=$Language->text('posts')?></span></a></li>
- <li><a href="<?=Application::getAdminURL('page/')?>" title="<?=$Language->text('page_overview')?>"><i class="fa fa-file-text-o"></i><span><?=$Language->text('pages')?></span></a></li>
- <li><a href="<?=Application::getAdminURL('user/')?>" title="<?=$Language->text('user_overview')?>"><i class="fa fa-user"></i><span><?=$Language->text('users')?></span></a></li>
- <li><a href="<?=Application::getAdminURL('database.php')?>" title="<?=$Language->text('overview_database_text')?>"><i class="fa fa-database"></i><span><?=$Language->text('overview_database_text')?></span></a></li>
- </ul>
- <ul>
- <li><a href="<?=Application::getAdminURL('auth.php?action=logout&amp;token='.Application::getSecurityToken())?>"><i class="fa fa-sign-out"></i><span><?=$Language->text('logout')?></span></a></li>
- </ul>
+ <li><a href="<?=Application::getAdminURL()?>" title="<?=$Language->text('overview_dashboard_text')?>"><i class="fa fa-dashboard"></i><span>Dashboard</span></a></li>
+ <li><a href="<?=Application::getAdminURL('post/')?>" title="<?=$Language->text('post_overview')?>"><i class="fa fa-newspaper-o"></i><span><?=$Language->text('posts')?></span></a></li>
+ <li><a href="<?=Application::getAdminURL('page/')?>" title="<?=$Language->text('page_overview')?>"><i class="fa fa-file-text-o"></i><span><?=$Language->text('pages')?></span></a></li>
+ <li><a href="<?=Application::getAdminURL('user/')?>" title="<?=$Language->text('user_overview')?>"><i class="fa fa-user"></i><span><?=$Language->text('users')?></span></a></li>
+ <li><a href="<?=Application::getAdminURL('database.php')?>" title="<?=$Language->text('overview_database_text')?>"><i class="fa fa-database"></i><span><?=$Language->text('overview_database_text')?></span></a></li>
+ <li><a href="<?=Application::getAdminURL('auth.php?action=logout&amp;token='.Application::getSecurityToken())?>"><i class="fa fa-sign-out"></i><span><?=$Language->text('logout')?></span></a></li>
<?php else: ?>
- <ul>
- <li><a href="<?=Application::getAdminURL('auth.php')?>"><i class="fa fa-sign-in"></i><span><?=$Language->text('login')?></span></a></li>
- </ul>
+ <li><a href="<?=Application::getAdminURL('auth.php')?>"><i class="fa fa-sign-in"></i><span><?=$Language->text('login')?></span></a></li>
<?php endif; ?>
+ </ul>
</nav>
</div>
</div>
diff --git a/template/admin/rsrc/main.css b/template/admin/rsrc/main.css
index 26b618a..95a68a2 100644
--- a/template/admin/rsrc/main.css
+++ b/template/admin/rsrc/main.css
@@ -71,10 +71,11 @@ body{font-family:Ruda,sans-serif;font-size:0.7rem;line-height:1.2rem;}
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
/* Main Navigation
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-#main-navi ul{list-style:none;margin:0;padding:0;float:left;}
+#main-navi ul{list-style:none;margin:0;padding:0;}
#main-navi li{display:inline;}
-#main-navi ul+ul{float:right;}
#main-navi li .fa{margin-right:0.25rem;}
+#main-navi li:last-child{float:right;}
+#main-navi li:first-child{float:none;}
#main-navi a{padding:0.1rem 0.3rem;background:#DDD;border:0.05rem solid #AAA;color:inherit;text-decoration:none;text-align:center;display:inline-block;}
#main-navi a:hover, #main-navi a:focus{text-decoration:none;background:#CCC;}
#main-navi a:focus{background:#CCC;}