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

// add new tpl for navigation top/side

Browse Source
This commit is contained in:
Kevin Granger
2013-09-05 19:07:57 +02:00
parent a3233cc00c
commit b2fd886722
9 changed files with 175 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme.sass
+41 -34
View File
@@ -133,11 +133,10 @@ html, body
#main
min-height: 100%
//height: auto!important
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
@@ -234,10 +233,11 @@ html, body
float: left
width: 240px
background-color: $main-color
border-bottom: 1px solid lighten($main-color,5%)
//border-bottom: 1px solid lighten($main-color,5%)
border-right: 1px solid black
.menu
border-top: 1px black solid
.maintab > a [class^="icon-"], .menu .maintab > a [class*=" icon-"]
.maintab > a > i
font-size: 20px
@include border-radius(40px)
height: 30px
@@ -258,6 +258,9 @@ html, body
ul
display: block
background-color: white
li.active
.submenu_expand i
display: none
> ul
> li
position: relative
@@ -280,6 +283,7 @@ html, body
background-color: white
> a
display: block
position: relative
padding: 2px 0 2px 8px
border-top: 1px solid lighten($main-color,5%)
border-bottom: 1px solid darken($main-color,10%)
@@ -300,10 +304,23 @@ html, body
@include transition-property(color)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
&:hover
color: white
.submenu_expand
position: absolute
right: 10px
top: 11px
i
font-size: 18px
font-weight: 100
color: black
@include text-shadow(lighten($main-color,10%) 1px 1px 0)
background-color: transparent
ul.submenu
a
display: block
padding: 2px 5px 2px 10px
padding: 4px 5px 4px 10px
font-size: 12px
border: none
border-bottom: solid 1px #eee
@@ -360,6 +377,9 @@ html, body
@media (max-width: $screen-tablet)
margin-left: 0
width: 100%
.submenu_expand
display: none
.menu-collapse
height: 54px
@@ -373,6 +393,7 @@ html, body
i
color: lighten($secondary-color,10%)
// Tool bar
.toolbar_btn
position: relative
@@ -797,28 +818,33 @@ fieldset > .row
background-color: blue
//.list-toolbar-btn
#topbar
#nav-topbar
display: none
position: fixed
left: 80
width: 100%
height: 25px
height: 32px
z-index: 600
background-color: $main-color
border-top: black solid 1px
border-bottom: black solid 1px
a
line-height: 25px
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
color: white!important
background-color: transparent
font-size: 20px
.menu-collapse
display: none
.menu
padding: 0 0 0 60px
padding: 0
display: inline
li
display: inline
@@ -826,6 +852,7 @@ fieldset > .row
display: none
.hook_panel
@extend .well
@include box-shadow(rgba(white,0.9) 0 0 0 1px inset)
@@ -1151,15 +1178,12 @@ fieldset > .row
+scale(1)
$treeBackgroundHover: lighten(blue,30%)
$treeBackgroundSelect: blue
.tree
border: 1px solid #BBBBBB
border-radius: 4px 4px 4px 4px
+border-radius(4px)
overflow-y: auto
overflow-x: hidden
padding: 10px 15px 0 15px
@@ -1172,12 +1196,9 @@ $treeBackgroundSelect: blue
.tree-folder-header
position: relative
height: 20px
-webkit-border-radius: 6px
-moz-border-radius: 6px
border-radius: 6px
+border-radius(6px)
&:hover
background-color: $treeBackgroundHover
i
position: absolute
float: left
@@ -1188,23 +1209,16 @@ $treeBackgroundSelect: blue
white-space: nowrap
overflow: hidden
text-overflow: ellipsis
.tree-folder-content
margin-left: 23px
.tree-item
.tree-item
position: relative
width: 100%
height: 20px
cursor: pointer
margin-top: 1px
-webkit-border-radius: 6px
-moz-border-radius: 6px
border-radius: 6px
&:hover
background-color: $treeBackgroundHover
.tree-item-name
position: absolute
left: 29px
@@ -1216,10 +1230,7 @@ $treeBackgroundSelect: blue
width: 4px
height: 4px
background-color: #ccc
-webkit-border-radius: 6px
-moz-border-radius: 6px
border-radius: 6px
+border-radius(6px)
.icon-ok
position: absolute
top: 1px
@@ -1230,8 +1241,6 @@ $treeBackgroundSelect: blue
background-color: $treeBackgroundSelect
#carrier_wizard.swMain
position: relative
display: block
@@ -1249,7 +1258,6 @@ $treeBackgroundSelect: blue
display: block
position: relative
clear: both
ul.anchor
position: relative
display: block
@@ -1364,7 +1372,6 @@ $treeBackgroundSelect: blue
@extend .alert-danger
.range_inf td, .range_sup td
background-color: #ccc
.range_type
width: 220px
text-align: right
admin-dev/themes/default/js/admin-theme.js
+28 -20
View File
@@ -22,27 +22,35 @@
* International Registered Trademark & Property of PrestaShop SA
*/
function adminNav(navId)
{
$(".submenu-collapse").remove();
if($(".expanded").length ){
$(".expanded > ul").slideUp(
"fast",
function(){
var $target = $(".expanded").not(".active");
$target.removeClass("expanded");
$(navId).not($target).addClass("expanded");
$(navId).not($target).children("ul:first").hide().slideDown();
}
);
}
else{
$(navId).not(".active").addClass("expanded");
$(navId).not(".active").children("ul:first").hide().slideDown();
}
}
$( document ).ready(function() {
$('.submenu_expand').click(function(){
//var $tab = $(this).parent().data('submenu');
var $navId = $(this).parent();
$(".submenu-collapse").remove();
if($(".expanded").length ){
$(".expanded > ul").slideUp(
"fast",
function(){
var $target = $(".expanded");
$target.removeClass("expanded");
$($navId).not($target).not(".active").addClass("expanded");
$($navId).not($target).not(".active").children("ul:first").hide().slideDown();
}
);
}
else{
$($navId).not(".active").addClass("expanded");
$($navId).not(".active").children("ul:first").hide().slideDown();
}
});
});
$( document ).ready(function() {
$('.label-tooltip').tooltip();
});
$( document ).ready(function() {
$('.menu-collapse').click(function(){
$('body').toggleClass('page-sidebar-closed');
});
});
admin-dev/themes/default/js/vendor/nv.d3.js
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ var nv = window.nv || {};
nv.version = '1.1.10b';
nv.dev = true //set false when in production
nv.dev = false //set false when in production
window.nv = nv;
admin-dev/themes/default/template/header.tpl
+5 -47
View File
@@ -210,8 +210,8 @@
</li>
{/if}
</ul>
</div>
<div class="collapse navbar-collapse navbar-collapse-primary">
</div>
<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'}"/>
@@ -271,55 +271,13 @@
{if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
</nav>{* end header_infos*}
</header>
{* end header*}
{/if}
<div id="main">
<nav id="nav-sidebar" data-spy="affix" data-offset-top="0" role="navigation">
{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'}
<ul class="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|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}');">
<i class="icon-{$t.class_name}"></i>
<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
</a>
<ul class="submenu">
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
<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}
{/foreach}
</ul>
</li>
{/if}
{/foreach}
</ul>
{/if}
</nav>
{include file='nav-top.tpl'}
{include file='nav-side.tpl'}
<div id="content" class="page-content">
{if $display_header && $install_dir_exists}
admin-dev/themes/default/template/helpers/form/form.tpl
+2
View File
@@ -232,6 +232,7 @@
{foreach $input.values as $value}
<div class="radio {if isset($input.class)}"{$input.class}"{/if}">
<div class="label">
<input type="radio" name="{$input.name}"id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
@@ -244,6 +245,7 @@
{else}
{$value.label}
{/if}
</div>
</div>
{*if isset($input.br) && $input.br}<br />{/if*}
{*if isset($value.p) && $value.p}<p>{$value.p}</p>{/if*}
admin-dev/themes/default/template/layout.tpl
+11 -12
View File
@@ -31,18 +31,17 @@
{if count($errors) && (!isset($disableDefaultErrorOutPut) || $disableDefaultErrorOutPut == false)}
<div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($errors) == 1}
{reset($errors)}
{else}
{l s='%d errors' sprintf=$errors|count}
<br/>
<ol>
{foreach $errors as $error}
<li>{$error}</li>
{/foreach}
</ol>
{/if}
{if count($errors) == 1}
{reset($errors)}
{else}
{l s='%d errors' sprintf=$errors|count}
<br/>
<ol>
{foreach $errors as $error}
<li>{$error}</li>
{/foreach}
</ol>
{/if}
</div>
{/if}
{if isset($informations) && count($informations) && $informations}
admin-dev/themes/default/template/nav-side.tpl
+41
View File
@@ -0,0 +1,41 @@
<nav id="nav-sidebar" data-spy="affix" data-offset-top="0" role="navigation">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
<span class="menu-collapse">
<i class="icon-align-justify"></i>
</span>
{if $controller_name != 'AdminLogin'}
<ul class="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|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}" 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>
<span class="submenu_expand" ><i class="icon-collapse"></i></span>
<ul class="submenu">
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
<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}
{/foreach}
</ul>
</li>
{/if}
{/foreach}
</ul>
{/if}
</nav>
admin-dev/themes/default/template/nav-top.tpl
+45
View File
@@ -0,0 +1,45 @@
<nav id="nav-topbar" role="navigation">
{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'}
<ul class="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|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}');">
<i class="icon-{$t.class_name}"></i>
<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
</a>
<ul class="submenu">
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
<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}
{/foreach}
</ul>
</li>
{/if}
{/foreach}
</ul>
{/if}
</nav>