dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// perts fix + menu top WIP

Browse Source
This commit is contained in:
Kevin Granger
2013-09-10 20:23:06 +02:00
parent e0d33eae9e
commit f29b1b3a31
6 changed files with 162 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+2 -2
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme.sass
+113 -61
View File
@@ -94,6 +94,8 @@ html, body
@extend .hidden-xs
@extend .nav
@extend .navbar-nav
li a
padding: 9px 5px
> li > a > i
font-size: 1.2em
color: white
@@ -129,6 +131,12 @@ html, body
#header_search
@extend .navbar-form
@extend .navbar-left
width: 130px
padding: 0 0 0 10px
@media (max-width: $screen-tablet)
width: 100%
input, .form-group
margin: 0
#header_quick
@extend .nav
@extend .navbar-nav
@@ -139,7 +147,7 @@ html, body
padding: 36px 0 60px
margin: 0 0 -60px 0
background-color: $bg-content-color
//background-image: url('../img/patterns/bedge_grunge.png') // texture
background-image: url('../img/patterns/bedge_grunge.png') // texture
#content
padding: 90px 20px 0
@@ -331,6 +339,8 @@ html, body
&:hover
color: white
@include text-shadow(darken($main-color,20%) -1px -1px 0)
@media (max-width: $screen-tablet)
display: none
ul.submenu
li
a
@@ -348,12 +358,100 @@ html, body
border-bottom: none
&.active
a
color: contrast-color($secondary-color, white, #333, 10%)
background-color: $secondary-color
border-bottom: solid 1px darken($secondary-color,10%)
@media (max-width: $screen-tablet)
display: none
color: contrast-color($brand-primary, white, #333, 10%)
background-color: $brand-primary
border-bottom: solid 1px darken($brand-primary,10%)
#nav-topbar
height: 28px
position: fixed
top: 36px
left: 80
width: 100%
z-index: 600
background-color: white
border-top: black solid 1px
border-bottom: black solid 1px
ul.menu
height: 28px
margin: 0
padding: 0
display: block
list-style: none
> li
border-right: solid 1px black
height: 26px
padding: 0
margin: 0
list-style: none
position: relative
float: left
> a
display: block
line-height: 26px
color: $main-color
padding: 0 6px
margin: 0
i
margin: 0
width: 15px
background-color: transparent
font-size: 18px
&:hover
text-decoration: none
background-color: $main-color
color: white
i
color: white!important
.menu-collapse
display: none
ul.submenu
display: none!important
@include box-shadow(rgba(black,0.2) 0 0 0 1px,rgba(black,0.3) 2px 2px 4px)
> ul > li:hover
ul.submenu
display: block!important
position: absolute
margin: 0
padding: 0
left: 0
top: 27px
width: 200px!important
li
width: 200px
padding: 0
list-style: none
a
display: block
padding: 4px 5px 4px 10px
font-size: 12px
border: none
border-bottom: solid 1px #eee
background-color: white
&:hover
color: $main-color
background-color: mix(white, $main-color, 90%)
text-decoration: none
&:last-child a
border-bottom: none
&.active
a
color: contrast-color($secondary-color, white, #333, 10%)
background-color: $secondary-color
border-bottom: solid 1px darken($secondary-color,10%)
.page-topbar
#main
padding-top: 64px
#nav-sidebar
display: none
.page-head
top: 64px
#content
margin-left: 0
width: 100%
.page-head h2.page-title
padding: 0 0 0 20px
.page-sidebar-closed
#nav-sidebar
@@ -391,7 +489,6 @@ html, body
.submenu_expand
display: none
.menu-collapse
height: 54px
width: 100%
@@ -403,7 +500,6 @@ html, body
border-bottom: 3px solid darken($main-color,10%)
color: darken($main-color,30%)
// Tool bar
.toolbar_btn
position: relative
@@ -628,20 +724,18 @@ hr
border-top: none
background-color: white
tbody > tr > td
padding: 3px 7px 3px 7px
padding: 3px 7px
vertical-align: middle
word-wrap: nowrap
font-size: 12px
@include box-shadow(rgba(black,0.15) 0 1px 0)
//@include box-shadow(rgba(black,0.15) 0 1px 0)
td.center, th.center
text-align: center
tr td:first-child,
tr th:first-child
tr td:first-child, tr th:first-child
border-top-left-radius: 3px
border-bottom-left-radius: 3px
tr td:last-child,
tr th:last-child
tr td:last-child,tr th:last-child
border-top-right-radius: 3px
border-bottom-right-radius: 3px
@@ -824,40 +918,6 @@ fieldset > .row
.highlight
background-color: #FFFFC0
//.list-toolbar-btn
#nav-topbar
display: none
position: fixed
left: 80
width: 100%
height: 32px
z-index: 600
background-color: $main-color
border-top: black solid 1px
border-bottom: black solid 1px
a
line-height: 32px
color: white
border-right: solid 1px white
padding-right: 3px
margin-right: 3px
i
height: 25px
width: 25px
line-height: 25px
color: white!important
background-color: transparent
font-size: 20px
.menu-collapse
display: none
.menu
padding: 0
display: inline
li
display: inline
.submenu
display: none
.hook_panel
@@ -938,9 +998,6 @@ fieldset > .row
.btn-group
text-align: left
//DASHBOARD
.size_s, .size_md, .size_l, .size_xl, .size_xxl
@@ -1197,7 +1254,7 @@ fieldset > .row
background-color: #ccc
+border-radius(6px)
#carrier_wizard.swMain
#carrier_wizard
position: relative
display: block
.stepContainer
@@ -1267,7 +1324,6 @@ fieldset > .row
border-left: 14px solid white
border-right: 0
position: absolute
//background-color: #ccc
right: -16px
top: 0
&:after
@@ -1297,17 +1353,13 @@ fieldset > .row
.loader
display: none
.buttonNext
@extend .btn
@extend .btn-default
.buttonDisabled
@extend .btn
@extend .btn-disabled
.buttonPrevious
@extend .btn
@extend .btn-default
.buttonFinish
@extend .btn
@extend .btn-primary
.msgBox
position: relative
display: none
admin-dev/themes/default/js/admin-theme.js
+21 -6
View File
@@ -23,9 +23,10 @@
*/
$( document ).ready(function() {
//nav side bar
$('#nav-sidebar li.maintab.has_submenu').append('<span class="submenu_expand"></span>');
$('#nav-sidebar .submenu_expand').click(function(){
//var $tab = $(this).parent().data('submenu');
var $navId = $(this).parent();
$(".submenu-collapse").remove();
if($(".expanded").length ){
@@ -39,19 +40,33 @@ $( document ).ready(function() {
}
);
}
else{
else {
$($navId).not(".active").addClass("expanded");
$($navId).not(".active").children("ul:first").hide().slideDown();
}
});
});
$( document ).ready(function() {
//nav top bar
$(window).on("resize", function() {
var h = $("#nav-topbar").height();
$("#nav-topbar ul.menu").find("li.maintab").each(function(){
if ($(this).position().top > 0) {
$(this).addClass("tab-elipsed").addClass("hide");
}
});
});
//tooltip
$('.label-tooltip').tooltip();
});
$( document ).ready(function() {
//sidebar menu collapse
$('.menu-collapse').click(function(){
$('body').toggleClass('page-sidebar-closed');
});
});
admin-dev/themes/default/template/header.tpl
+18 -6
View File
@@ -102,8 +102,12 @@
{/if}
</head>
<body class="page-topbar">
<!--
<body>
<body class="page-sidebar-closed">
<body class="page-topbar">
-->
{if $display_header}
{* begin HEADER *}
<header id="header">
@@ -214,11 +218,15 @@
<div class="collapse navbar-collapse navbar-collapse-primary">
<form id="header_search" method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}" role="search">
<div class="form-group">
<input type="text" class="form-control" name="bo_query" id="bo_query" value="{$bo_query}" placeholder="{l s='Search'}"/>
<div class="input-group">
<span class="input-group-btn">
<button type="submit" id="bo_search_submit" class="btn btn-default">
<i class="icon-search"></i>
</button>
</span>
<input type="text" class="form-control" name="bo_query" id="bo_query" value="{$bo_query}" placeholder="{l s='Search'}"/>
</div>
</div>
<button type="submit" id="bo_search_submit" class="btn btn-default">
<i class="icon-search"></i>
</button>
<!-- //todo Search in section
<select name="bo_search_type" id="bo_search_type" class="chosen no-search">
<option value="0">{l s='everywhere'}</option>
@@ -249,7 +257,11 @@
<ul id="header_employee_box">
{if {$base_url}}
<li><a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}"><i class="icon-eye-open"></i> {l s='View my shop'}</a></li>
<li>
<a href="http://{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">
<i class="icon-eye-open"></i> {l s='View my shop'}
</a>
</li>
{/if}
<li id="employee_infos" class="dropdown">
<a href='#' class="employee_name dropdown-toggle" data-toggle="dropdown">
admin-dev/themes/default/template/helpers/list/list_content.tpl
+1 -1
View File
@@ -27,7 +27,7 @@
{foreach $list AS $index => $tr}
<tr
{if $position_identifier}id="tr_{$id_category}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
class="{if $index is odd}alt_row{/if}{if $row_hover} row_hover{/if}{if isset($tr.class)} {$tr.class}{/if}"
class="{if isset($tr.class)} {$tr.class}{/if}"
{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
>
<td class="center">
admin-dev/themes/default/template/nav-top.tpl
+7 -15
View File
@@ -2,26 +2,19 @@
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
<span class="menu-collapse">
<i class="icon-align-justify"></i>
</span>
<script type="text/javascript">
$('.menu-collapse').click(function(){
$('body').toggleClass('page-sidebar-closed');
});
</script>
{if $controller_name != 'AdminLogin'}
{if $controller_name != 'AdminLogin'}
<ul class="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
<li class="maintab {if $smarty.get.controller == 'AdminDashboard'}active{/if}">
<a href="{$link->getAdminLink('AdminDashboard')|escape:'htmlall':'UTF-8'}" class="title">
<i class="icon-AdminDashboard"></i>
<span class="title">{l s='Dashboard'}</span>
</a>
</li>
{foreach $tabs as $t}
{if $t.active}
<li class="maintab {if $t.current}active{/if}" id="maintab{$t.id_tab}">
<a href="{if count($t.sub_tabs) > 0}{$t.sub_tabs[0].href}{else}#{/if}" class="title" onclick="javascript:adminNav('#maintab{$t.id_tab}');">
<li class="maintab {if $t.sub_tabs}has_submenu{/if} {if $t.current}active{/if}" id="maintab{$t.id_tab}" data-submenu="{$t.id_tab}">
<a href="{if count($t.sub_tabs) > 0}{$t.sub_tabs[0].href}{else}#{/if}" class="title" >
<i class="icon-{$t.class_name}"></i>
<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
</a>
@@ -31,7 +24,6 @@
<li {if $t2.current} class="active"{/if}>
<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
<i class="icon-chevron-sign-right pull-right"></i>
</a>
</li>
{/if}
@@ -41,5 +33,5 @@
{/if}
{/foreach}
</ul>
{/if}
{/if}
</nav>