Commit 74d96dd7 authored by Tino Goratsch's avatar Tino Goratsch

reworked the default ACP3 layout a little bit

parent d33ab9ad
......@@ -4,7 +4,6 @@ body {
ul {
padding-left: 20px;
}
/* Logo */
#logo {
margin: 10px 20px;
}
......@@ -18,3 +17,10 @@ ul {
.footer {
margin-bottom: 10px;
}
.in-admin #content {
width: auto;
float: none;
}
.in-admin #sidebar {
display: none;
}
......@@ -6,7 +6,6 @@ ul {
padding-left: 20px;
}
/* Logo */
#logo {
margin: 10px 20px;
}
......@@ -25,3 +24,14 @@ ul {
.footer {
margin-bottom: 10px;
}
.in-admin {
#content {
width: auto;
float: none;
}
#sidebar {
display: none;
}
}
#nav-user-login {
margin-bottom: 0;
}
#nav-user-menu + #wrapper {
padding-top: 50px;
}
#nav-user-login {
margin-bottom: 0;
}
#nav-user-menu {
+ #wrapper {
padding-top: 50px;
}
}
<nav class="navbar navbar-default navbar-static-top" id="nav-user-login" role="navigation">
<div class="container">
<form class="navbar-form navbar-right" action="{uri args="users/index/login/redirect_`$redirect_uri`"}" method="post" accept-charset="UTF-8">
<input class="form-control" type="text" name="nickname" id="nav-nickname" maxlength="30" placeholder="{lang t="users|nickname"}" required>
<input class="form-control" type="password" name="pwd" id="nav-pwd" placeholder="{lang t="users|pwd"}" required>
<button type="submit" name="submit" class="btn btn-primary" title="{lang t="users|log_in"}">
<i class="glyphicon glyphicon-log-in"></i>
</button>
</form>
</div>
</nav>
<nav class="navbar navbar-default navbar-fixed-top" id="nav-user-menu" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#nav-user-menu-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<span class="navbar-brand hidden-md hidden-lg">
{lang t="users|user_menu"}
</span>
</div>
<div id="nav-user-menu-collapse" class="collapse navbar-collapse">
{if isset($user_sidebar.modules) || isset($user_sidebar.system)}
<ul class="nav navbar-nav">
{if isset($user_sidebar.modules)}
<li class="dropdown">
<a href="{uri args="acp/acp"}" id="menu-admin-label" class="dropdown-toggle" data-toggle="dropdown" data-target="#menu-administration">
<i class="glyphicon glyphicon-file"></i>
{lang t="users|administration"}
<b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="menu-admin-label">
{foreach $user_sidebar.modules as $row}
<li{if $row.is_active} class="active"{/if}><a href="{uri args="acp/`$row.path`"}">{$row.name}</a></li>
{/foreach}
</ul>
</li>
{/if}
{if isset($user_sidebar.system)}
<li class="dropdown">
<a href="{uri args="acp/system"}" id="menu-system-label" class="dropdown-toggle" data-toggle="dropdown" data-target="#menu-system">
<i class="glyphicon glyphicon-cog"></i>
{lang t="system|system"}
<b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="menu-system-label">
{foreach $user_sidebar.system as $row}
<li{if $row.is_active} class="active"{/if}><a href="{uri args="acp/`$row.path`"}">{$row.name}</a></li>
{/foreach}
</ul>
</li>
{/if}
</ul>
{/if}
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{uri args="users/account"}">
<i class="glyphicon glyphicon-home"></i>
{lang t="users|home"}
</a>
</li>
<li>
<a href="{uri args="users/index/logout/last_`$user_sidebar.current_page`"}">
<i class="glyphicon glyphicon-off"></i>
{lang t="users|logout"}
</a>
</li>
</ul>
</div>
</div>
</nav>
......@@ -5,7 +5,9 @@
</head>
<body>
<div class="container-fluid">
{load_module module="widget/users/index/login"}
{load_module module="widget/users/index/user_menu"}
<div id="wrapper" class="container">
<h1 id="logo" class="hidden-xs">
{if $IS_HOMEPAGE}
<img src="{$DESIGN_PATH}Assets/img/logo.png"
......@@ -41,11 +43,7 @@
</div>
</nav>
<div class="row">
<div class="col-sm-3 col-md-2">
{load_module module="widget/users/index/user_menu"}
{load_module module="widget/users/index/login"}
</div>
<main role="main" id="content" class="col-sm-9 col-md-8">
<main role="main" id="content" class="col-sm-12 col-md-9">
<div id="breadcrumb">
{block BREADCRUMB}
{include file="asset:System/Partials/breadcrumb.tpl" breadcrumb=$BREADCRUMB}
......@@ -55,15 +53,14 @@
{event name="layout.content_before"}
{block CONTENT}{/block}
</main>
<div class="col-md-2 hidden-xs hidden-sm">
<aside id="sidebar" class="col-md-3 hidden-xs hidden-sm">
{load_module module="widget/news"}
{load_module module="widget/newsletter"}
{load_module module="widget/files"}
{load_module module="widget/articles"}
{load_module module="widget/articles/index/single" args=['id' => 1]}
{load_module module="widget/gallery"}
{load_module module="widget/polls"}
</div>
</aside>
</div>
<footer class="row footer">
<div class="col-xs-5 copyright">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment