TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working : Finish renaming class for bootstrap migration

Browse Source
This commit is contained in:
mespeche
2013-09-04 15:05:49 +02:00
parent dafaa02718
commit 7258b24c88
25 changed files with 2445 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
templates/admin/default/admin-layout.tpl
View File

@@ -23,24 +23,12 @@
<link rel="stylesheet" href="{$asset_url}"> <link rel="stylesheet" href="{$asset_url}">
{/stylesheets} {/stylesheets}
<!-- {stylesheets file='assets/bootstrap/css/bootstrap.css' filters='cssembed'}
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{stylesheets file='assets/bootstrap/css/bootstrap-responsive.css' filters='cssembed'}
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets} -->
{block name="after-bootstrap-css"}{/block} {block name="after-bootstrap-css"}{/block}
{* -- Admin CSS section ------------------------------------------------- *} {* -- Admin CSS section ------------------------------------------------- *}
{block name="before-admin-css"}{/block} {block name="before-admin-css"}{/block}
<!-- {stylesheets file='assets/css/*' filters='less,cssembed'}
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets} -->
{block name="after-admin-css"}{/block} {block name="after-admin-css"}{/block}
{* Modules css are included here *} {* Modules css are included here *}
@@ -58,28 +46,32 @@
{module_include location='before_topbar'} {module_include location='before_topbar'}
<div class="topbar"> <div class="topbar">
<div class="container"> <div class="container">
<div class="row">
<div class="col-md-6">
<div class="version-info">{intl l='Version %ver' ver="{$THELIA_VERSION}"}</div>
</div>
<div class="version-info">{intl l='Version %ver' ver="{$THELIA_VERSION}"}</div> {module_include location='inside_topbar'}
<div class="col-md-6 clearfix">
{module_include location='inside_topbar'} <div class="btn-group pull-right">
<a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> {intl l="View shop"}</a>
<button class="btn btn-default btn-primary"><span class="glyphicon glyphicon-user"></span> {admin attr="firstname"} {admin attr="lastname"}</button>
<button class="btn btn-default btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a class="profile" href="{url path='admin/edit_profile'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
<li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
</ul>
</div>
<div class="user-info"> </div>
<a class="profile" href="{url path='admin/edit_profile'}">{admin attr="firstname"} {admin attr="lastname"}</a> </div>
<a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}">{intl l="Logout"}</a></div>
{loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"}
<form class="form-search pull-right" action="{url path='/admin/search'}">
<div class="control-group">
<div class="input-group">
<input type="text" class="input-medium search-query" id="search_term" name="search_term" placeholder="{intl l='Search'}" />
<button class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
</div>
</div>
</form>
{/loop}
<div class="view-shop"><a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank"><span class="glyphicon glyphicon-white glyphicon-eye-open"></span> {intl l="View shop"}</a></div>
</div> </div>
</div> </div>
@@ -89,83 +81,92 @@
{module_include location='before_top_menu'} {module_include location='before_top_menu'}
<div class="navbar"> <nav class="navbar navbar-default" role="navigation">
<div class="navbar-inner">
<div class="container"> <div class="container">
<div class="navbar-collapse">
<ul class="nav"> <div class="navbar-header">
<button type="button" class="btn navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<li class="{if $admin_current_location == 'home'}active{/if}" id="home_menu"> <div class="collapse navbar-collapse navbar-collapse">
<a href="{url path='/admin/home'}">{intl l="Home"}</a> <ul class="nav navbar-nav">
</li>
{loop name="menu-auth-customer" type="auth" roles="ADMIN" permissions="admin.customers.view"} <li class="{if $admin_current_location == 'home'}active{/if}" id="home_menu">
<li class="{if $admin_current_location == 'customer'}active{/if}" id="customers_menu"> <a href="{url path='/admin/home'}">{intl l="Home"}</a>
<a href="{url path='/admin/customers'}">{intl l="Customers"}</a> </li>
</li>
{/loop}
{loop name="menu-auth-order" type="auth" roles="ADMIN" permissions="admin.orders.view"} {loop name="menu-auth-customer" type="auth" roles="ADMIN" permissions="admin.customers.view"}
<li class="dropdown {if $admin_current_location == 'customer'}active{/if}" id="orders_menu" data-toggle="dropdown"> <li class="{if $admin_current_location == 'customer'}active{/if}" id="customers_menu">
<a href="{url path='/admin/customers'}">{intl l="Customers"}</a>
</li>
{/loop}
<a href="#">{intl l="Orders"} <span class="caret"></span></a> {loop name="menu-auth-order" type="auth" roles="ADMIN" permissions="admin.orders.view"}
<li class="dropdown {if $admin_current_location == 'customer'}active{/if}" id="orders_menu" data-toggle="dropdown">
<ul class="dropdown-menu config_menu" role="menu"> <a href="#">{intl l="Orders"} <span class="caret"></span></a>
<li role="menuitem"><a data-target="{url path='admin/orders'}" href="{url path='admin/orders'}"> <ul class="dropdown-menu config_menu" role="menu">
{intl l="All orders"}
<span class="badge badge-important">{count type="order"}</span></a>
</li>
{loop name="order-status-list" type="order-status"} <li role="menuitem"><a data-target="{url path='admin/orders'}" href="{url path='admin/orders'}">
<li role="menuitem"> {intl l="All orders"}
<a data-target="{url path='admin/orders/$LABEL'}" href="{url path='admin/orders/$LABEL'}"> <span class="badge badge-important">{count type="order"}</span></a>
{$LABEL} <span class="badge badge-important">{count type="order" status="{$ID}"}</span> </li>
</a>
</li>
{/loop}
</ul>
</li>
{/loop}
{loop name="menu-auth-catalog" type="auth" roles="ADMIN" permissions="admin.catalog.view"} {loop name="order-status-list" type="order-status"}
<li class="{if $admin_current_location == 'catalog'}active{/if}" id="catalog_menu"> <li role="menuitem">
<a href="{url path='/admin/catalog'}">{intl l="Catalog"}</a> <a data-target="{url path='admin/orders/$LABEL'}" href="{url path='admin/orders/$LABEL'}">
</li> {$LABEL} <span class="badge badge-important">{count type="order" status="{$ID}"}</span>
{/loop} </a>
</li>
{/loop}
</ul>
</li>
{/loop}
{loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.content.view"} {loop name="menu-auth-catalog" type="auth" roles="ADMIN" permissions="admin.catalog.view"}
<li class="{if $admin_current_location == 'content'}active{/if}" id="content_menu"> <li class="{if $admin_current_location == 'catalog'}active{/if}" id="catalog_menu">
<a href="{url path='/admin/content'}">{intl l="Content"}</a> <a href="{url path='/admin/catalog'}">{intl l="Catalog"}</a>
</li> </li>
{/loop} {/loop}
{loop name="menu-auth-discount" type="auth" roles="ADMIN" permissions="admin.discount.view"} {loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.content.view"}
<li class="{if $admin_current_location == 'discount'}active{/if}" id="discount_menu"> <li class="{if $admin_current_location == 'content'}active{/if}" id="content_menu">
<a href="{url path='/admin/discount'}">{intl l="Discount"}</a> <a href="{url path='/admin/content'}">{intl l="Content"}</a>
</li> </li>
{/loop} {/loop}
{loop name="menu-auth-config" type="auth" roles="ADMIN" permissions="admin.config.view"} {loop name="menu-auth-discount" type="auth" roles="ADMIN" permissions="admin.discount.view"}
<li class="{if $admin_current_location == 'configuration'}active{/if}" id="config_menu"> <li class="{if $admin_current_location == 'discount'}active{/if}" id="discount_menu">
<a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <a href="{url path='/admin/discount'}">{intl l="Discount"}</a>
</li> </li>
{/loop} {/loop}
{loop name="menu-auth-modules" type="auth" roles="ADMIN" permissions="admin.modules.view"} {loop name="menu-auth-config" type="auth" roles="ADMIN" permissions="admin.config.view"}
<li class="{if $admin_current_location == 'modules'}active{/if}" id="modules_menu"> <li class="{if $admin_current_location == 'configuration'}active{/if}" id="config_menu">
<a href="{url path='/admin/modules'}">{intl l="Modules"}</a> <a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a>
</li> </li>
{/loop}
{module_include location='in_top_menu_items'} {loop name="menu-auth-modules" type="auth" roles="ADMIN" permissions="admin.modules.view"}
<li class="{if $admin_current_location == 'modules'}active{/if}" id="modules_menu">
<a href="{url path='/admin/modules'}">{intl l="Modules"}</a>
</li>
{/loop} {module_include location='in_top_menu_items'}
</ul>
</div> {/loop}
</div> </ul>
</div>
</div> </div>
</div>
</nav>
{module_include location='after_top_menu'} {module_include location='after_top_menu'}
@@ -213,12 +214,12 @@
<script src="{$asset_url}"></script> <script src="{$asset_url}"></script>
{/javascripts} {/javascripts}
{javascripts file='assets/bootstrap/js/bootstrap.min.js'} {block name="after-javascript-include"}{/block}
{javascripts file='assets/js/bootstrap/bootstrap.js'}
<script src="{$asset_url}"></script> <script src="{$asset_url}"></script>
{/javascripts} {/javascripts}
{block name="after-javascript-include"}{/block}
{block name="javascript-initialization"}{/block} {block name="javascript-initialization"}{/block}
{* Modules scripts are included now *} {* Modules scripts are included now *}

BIN
templates/admin/default/assets/img/bg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
templates/admin/default/assets/img/deconnexion.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
templates/admin/default/assets/img/header.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
templates/admin/default/assets/img/logo-light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
templates/admin/default/assets/img/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
templates/admin/default/assets/img/top-bar-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
templates/admin/default/assets/img/top.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

1999
templates/admin/default/assets/js/bootstrap/bootstrap.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

16
templates/admin/default/assets/less/thelia/datepicker.less
View File

@@ -20,7 +20,7 @@
display: inline-block; display: inline-block;
border-left: 6px solid transparent; border-left: 6px solid transparent;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-bottom: 6px solid @white; border-bottom: 6px solid #FFF;
position: absolute; position: absolute;
top: -6px; top: -6px;
left: 7px; left: 7px;
@@ -41,15 +41,15 @@
} }
td { td {
&.day:hover { &.day:hover {
background: @grayLighter; background: @gray-lighter;
cursor: pointer; cursor: pointer;
} }
&.day.disabled { &.day.disabled {
color: @grayLighter; color: @gray-lighter;
} }
&.old, &.old,
&.new { &.new {
color: @grayLight; color: @gray-light;
} }
&.active, &.active,
&.active:hover { &.active:hover {
@@ -67,7 +67,7 @@
cursor: pointer; cursor: pointer;
.rounded(4px); .rounded(4px);
&:hover { &:hover {
background: @grayLighter; background: @gray-lighter;
} }
&.active { &.active {
#gradient > .vertical(rgb(243,153,34),rgb(227,83,11)); #gradient > .vertical(rgb(243,153,34),rgb(227,83,11));
@@ -75,7 +75,7 @@
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
} }
&.old { &.old {
color: @grayLight; color: @gray-light;
} }
} }
} }
@@ -86,14 +86,14 @@
} }
&.next, &.next,
&.prev { &.prev {
font-size: @baseFontSize * 1.5; font-size: @font-size-base * 1.5;
} }
} }
thead tr:first-child th { thead tr:first-child th {
cursor: pointer; cursor: pointer;
&:hover{ &:hover{
background: @grayLighter; background: @gray-lighter;
} }
} }

37
templates/admin/default/assets/less/thelia/forms.less
View File

@@ -47,19 +47,19 @@ label {
// Warning // Warning
form .warning { form .warning {
.formFieldState(@warningText, @warningText, @warningBackground); //.formFieldState(@warningText, @warningText, @warningBackground);
} }
// Error // Error
form .error { form .error {
.formFieldState(@errorText, @errorText, @errorBackground); //.formFieldState(@errorText, @errorText, @errorBackground);
} }
// Success // Success
form .success { form .success {
.formFieldState(@successText, @successText, @successBackground); //.formFieldState(@successText, @successText, @successBackground);
} }
// Success // Success
form .info { form .info {
.formFieldState(@infoText, @infoText, @infoBackground); //.formFieldState(@infoText, @infoText, @infoBackground);
} }
@@ -165,4 +165,33 @@ form .info {
text-align: right; text-align: right;
} }
} }
}
// -- Sign in --
.form-signin{
// .form-control {
// position: relative;
// font-size: 16px;
// height: auto;
// padding: 10px;
// -webkit-box-sizing: border-box;
// -moz-box-sizing: border-box;
// box-sizing: border-box;
// &:focus {
// z-index: 2;
// }
// }
// input[type="text"] {
// margin-bottom: -1px;
// border-bottom-left-radius: 0;
// border-bottom-right-radius: 0;
// }
// input[type="password"] {
// margin-bottom: 10px;
// border-top-left-radius: 0;
// border-top-right-radius: 0;
// }
} }

8
templates/admin/default/assets/less/thelia/navbar.less
View File

@@ -24,6 +24,10 @@
// Navbar button for toggling navbar items in responsive layouts // Navbar button for toggling navbar items in responsive layouts
// These definitions need to come after '.navbar .btn' // These definitions need to come after '.navbar .btn'
.navbar .btn-navbar { .navbar .btn {
.buttonBackground(darken(@btnPrimaryBackground, 5%), darken(@btnPrimaryBackgroundHighlight, 5%)); .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
}
.navbar-default .navbar-toggle .icon-bar{
background-color: @btn-primary-color;
} }

396
templates/admin/default/assets/less/thelia/thelia.less
View File

@@ -1,248 +1,248 @@
@import "variables.less"; @import "variables.less";
// @import "navbar.less"; @import "navbar.less";
// @import "scaffolding.less"; @import "scaffolding.less";
// @import "type.less"; @import "type.less";
// @import "breadcrumbs.less"; @import "breadcrumbs.less";
// @import "forms.less"; @import "forms.less";
// @import "datepicker.less"; @import "datepicker.less";
// @import "modals.less"; @import "modals.less";
// @import "tables.less"; @import "tables.less";
// @import "tablesorter.less"; @import "tablesorter.less";
// // -- Base styling ------------------------------------------------------------ // -- Base styling ------------------------------------------------------------
// #wrapper { #wrapper {
// padding-top: 20px; padding-top: 20px;
// } }
// // Bootstrap Adjustements ------------------------------------------------------ // Bootstrap Adjustements ------------------------------------------------------
// .footer { .footer {
// background: none repeat scroll 0 0 transparent; background: none repeat scroll 0 0 transparent;
// border: medium none; border: medium none;
// box-shadow: none; box-shadow: none;
// color: #7D756A; color: #7D756A;
// margin-bottom: 0; margin-bottom: 0;
// padding: 35px 15px 15px; padding: 35px 15px 15px;
// text-align: left; text-align: left;
// } }
// // -- Top bar ----------------------------------------------------------------- // -- Top bar -----------------------------------------------------------------
// .topbar { .topbar {
// background: url("@{imgDir}/top.jpg") repeat-x; background: url("@{imgDir}/top.jpg") repeat-x;
// font-weight: bold; font-weight: bold;
// .version-info { .version-info {
// line-height: @topBarHeight; line-height: @topBarHeight;
// height: @topBarHeight; height: @topBarHeight;
// background: url("@{imgDir}/top-bar-logo.png") left -3px no-repeat; background: url("@{imgDir}/top-bar-logo.png") left -3px no-repeat;
// padding-left: 100px; padding-left: 100px;
// text-shadow: 0px 1px 1px black; text-shadow: 0px 1px 1px black;
// color: #6d737b; color: #6d737b;
// } }
// .form-search, .btn-group{ .form-search, .btn-group{
// margin-top: 10px; margin-top: 10px;
// } }
// } }
// // -- Brandbar ---------------------------------------------------------------- // -- Brandbar ----------------------------------------------------------------
// .loginpage { .loginpage {
// .hero-unit { .hero-unit {
// background-color: transparent; background-color: transparent;
// h1 { h1 {
// margin-bottom: 25px; margin-bottom: 25px;
// } }
// } }
// .well { .well {
// background-color: #E4E3DE; background-color: #E4E3DE;
// border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
// box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset; box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset;
// } }
// } }
// // -- Feed list on home page -------------------------------------------------- // -- Feed list on home page --------------------------------------------------
// .feed-list { .feed-list {
// h2 { h2 {
// font-size: 24px; font-size: 24px;
// line-height: 120%; line-height: 120%;
// color: #E9730F; color: #E9730F;
// a { a {
// &:hover { &:hover {
// color: inherit; color: inherit;
// text-decoration: none; text-decoration: none;
// } }
// } }
// } }
// h3 { h3 {
// margin-bottom: 0; margin-bottom: 0;
// padding-bottom: 0; padding-bottom: 0;
// font-size: 90%; font-size: 90%;
// line-height: 100%; line-height: 100%;
// } }
// .feed-list-item{ .feed-list-item{
// padding: 10px 20px; padding: 10px 20px;
// } }
// } }
// .brandbar { .brandbar {
// background: url("@{imgDir}/header.jpg") repeat-x; background: url("@{imgDir}/header.jpg") repeat-x;
// height: 90px; height: 90px;
// a.brand { a.brand {
// text-indent: -133337px; text-indent: -133337px;
// display: block; display: block;
// float: left; float: left;
// margin-right: 20px; margin-right: 20px;
// background: url("@{imgDir}/logo.png") 0px 12px no-repeat; background: url("@{imgDir}/logo.png") 0px 12px no-repeat;
// width: 124px; width: 124px;
// height: 63px; height: 63px;
// } }
// .breadcrumb { .breadcrumb {
// .rounded(0px); .rounded(0px);
// padding: 25px 0px 25px 30px; padding: 25px 0px 25px 30px;
// background: url("@{imgDir}/logo-light.png") left center no-repeat; background: url("@{imgDir}/logo-light.png") left center no-repeat;
// float: left; float: left;
// margin: 12px 0px 0px 0px; margin: 12px 0px 0px 0px;
// a { a {
// color: #949aa1; color: #949aa1;
// text-shadow: 0px 1px 0px rgba(0,0,0,0.8); text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
// } }
// .active { .active {
// color: #FFF; color: #FFF;
// text-shadow: 0px 1px 0px rgba(0,0,0,0.8); text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
// border-bottom: 1px dotted white; border-bottom: 1px dotted white;
// } }
// } }
// .Blocmoncompte { .Blocmoncompte {
// float: right; float: right;
// margin: 0px; margin: 0px;
// padding: 0px; padding: 0px;
// margin-top: 35px; margin-top: 35px;
// color: white; color: white;
// font-size: 13px; font-size: 13px;
// text-shadow: 0px 1px 0px rgba(0,0,0,0.8); text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
// } }
// dt { dt {
// float: left; float: left;
// margin-right: 15px; margin-right: 15px;
// } }
// .deconnexion { .deconnexion {
// float: right; float: right;
// margin: 0px; margin: 0px;
// a { a {
// text-indent: -13337px; text-indent: -13337px;
// display: block; display: block;
// background: url("@{imgDir}/deconnexion.png") no-repeat; background: url("@{imgDir}/deconnexion.png") no-repeat;
// width: 23px; width: 23px;
// height: 24px; height: 24px;
// } }
// } }
// } }
// .brandbar-wide { .brandbar-wide {
// width: 100%; width: 100%;
// } }
// // -- Login form -------------------------------------------------------------- // -- Login form --------------------------------------------------------------
// .form-signin { .form-signin {
// max-width: 400px; max-width: 400px;
// padding: 19px 29px 29px; padding: 19px 29px 29px;
// margin: 0 auto 20px; margin: 0 auto 20px;
// background-color: #fff; background-color: #fff;
// border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
// .rounded(5px); .rounded(5px);
// .box-shadow; .box-shadow;
// } }
// // -- General decoration of back-office boxes --------------------------------- // -- General decoration of back-office boxes ---------------------------------
// .general-block-decorator { .general-block-decorator {
// background: none repeat scroll 0 0 white; background: none repeat scroll 0 0 white;
// border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
// border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
// box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset, 0 2px 3px rgba(0, 0, 0, 0.1); box-shadow: 0 -4px 0 rgba(0, 0, 0, 0.05) inset, 0 2px 3px rgba(0, 0, 0, 0.1);
// padding: 1em; padding: 1em;
// margin-bottom: 20px; margin-bottom: 20px;
// // The block title // The block title
// .title { .title {
// color: #5A6876; color: #5A6876;
// text-transform: uppercase; text-transform: uppercase;
// font-weight: bold; font-weight: bold;
// padding-bottom: 0.5em; padding-bottom: 0.5em;
// line-height: 30px; line-height: 30px;
// } }
// .title-without-tabs { .title-without-tabs {
// border-bottom: 2px solid #A5CED8; border-bottom: 2px solid #A5CED8;
// margin-bottom: 0.5em; margin-bottom: 0.5em;
// } }
// // The action bar on the right // The action bar on the right
// .actions { .actions {
// text-align: right; text-align: right;
// } }
// } }
// // The overall form container // The overall form container
// .form-container { .form-container {
// // The inner toolbar (flags & save buttons) // The inner toolbar (flags & save buttons)
// .inner-toolbar { .inner-toolbar {
// line-height: 30px; line-height: 30px;
// margin-bottom: 1em; margin-bottom: 1em;
// border-bottom: 1px dotted #A5CED8; border-bottom: 1px dotted #A5CED8;
// padding-bottom: 0.5em; padding-bottom: 0.5em;
// .inner-actions { .inner-actions {
// text-align: right; text-align: right;
// } }
// .nav-pills { .nav-pills {
// margin-bottom: 0; margin-bottom: 0;
// li a { li a {
// padding: 4px; padding: 4px;
// opacity: 0.3; opacity: 0.3;
// } }
// li.active a { li.active a {
// opacity: 1; opacity: 1;
// background-color: #E7E7E7; background-color: #E7E7E7;
// } }
// } }
// } }
// } }
// // -- Editable tweaks --------------------------------------------------------- // -- Editable tweaks ---------------------------------------------------------
// .editable-click, a.editable-click, a.editable-click:hover { .editable-click, a.editable-click, a.editable-click:hover {
// border-bottom: 1px dotted #0088CC; border-bottom: 1px dotted #0088CC;
// } }
// .ui-slider{ .ui-slider{
// margin-top: 23px; margin-top: 23px;
// } }

20
templates/admin/default/assets/less/thelia/variables.less
View File

@@ -8,6 +8,11 @@
@imgDir : '../img'; @imgDir : '../img';
@topBarHeight: 50px; @topBarHeight: 50px;
// Brand colors
// -------------------------
@brand-primary: #f39922;
// Links // Links
// ------------------------- // -------------------------
@@ -21,11 +26,22 @@
// Buttons // Buttons
// ------------------------- // -------------------------
@btn-primary-bg: #f39922; @btn-primary-bg: @brand-primary;
// Iconography // Iconography
// ------------------------- // -------------------------
@icon-font-path: "../fonts/bootstrap/"; @icon-font-path: "../fonts/bootstrap/";
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
// COMPONENT VARIABLES
// --------------------------------------------------
// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
@zindex-dropdown: 1005;

4
templates/admin/default/categories.html
View File

@@ -38,7 +38,7 @@
{loop type="auth" name="can_create" roles="ADMIN" permissions="admin.category.create"} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.category.create"}
<a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new category'}" href="#add_category_dialog" data-toggle="modal"> <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new category'}" href="#add_category_dialog" data-toggle="modal">
<i class="glyphicon glyphicon-plus-sign glyphicon-white"></i> <span class="glyphicon glyphicon-plus-sign"></span>
</a> </a>
{/loop} {/loop}
</caption> </caption>
@@ -176,7 +176,7 @@
{module_include location='product_list_caption'} {module_include location='product_list_caption'}
<a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product'}" href="#productAddModal" data-toggle="modal"> <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product'}" href="#productAddModal" data-toggle="modal">
<i class="glyphicon glyphicon-plus-sign glyphicon-white"></i> <span class="glyphicon glyphicon-plus-sign"></span>
</a> </a>
</caption> </caption>

8
templates/admin/default/currencies.html
View File

@@ -16,8 +16,8 @@
<div id="wrapper" class="container"> <div id="wrapper" class="container">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li><a href="{url path='/admin/configuration/currencies'}">{intl l="Currencies"}</a></li> <li><a href="{url path='/admin/configuration/currencies'}">{intl l="Currencies"}</a></li>
</ul> </ul>
@@ -33,9 +33,9 @@
{intl l='Currencies'} {intl l='Currencies'}
{loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.currencies.create"} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.currencies.create"}
<a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new currency'}" href="#add_currency_dialog" data-toggle="modal"> <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new currency'}" href="#add_currency_dialog" data-toggle="modal">
<span class="glyphicon glyphicon-plus-sign glyphicon-white"></span> <span class="glyphicon glyphicon-plus-sign"></span>
</a> </a>
<button class="btn btn-default btn-info action-btn" title="{intl l='Update rates'}">{intl l='Update rates'} <i class="glyphicon glyphicon-white glyphicon-globe"></i></button> <button class="btn btn-default btn-info action-btn" title="{intl l='Update rates'}">{intl l='Update rates'} <span class="glyphicon glyphicon-globe"></span></button>
{/loop} {/loop}
</caption> </caption>

6
templates/admin/default/currency-edit.html
View File

@@ -12,9 +12,9 @@
{loop name="currency_edit" type="currency" id="$currency_id" backend_context="1" lang="$edit_language_id"} {loop name="currency_edit" type="currency" id="$currency_id" backend_context="1" lang="$edit_language_id"}
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li><a href="{url path='/admin/configuration/currencies'}">{intl l="Currencies"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration/currencies'}">{intl l="Currencies"}</a></li>
<li>{intl l='Editing currency "%name"' name="{$NAME}"}</li> <li>{intl l='Editing currency "%name"' name="{$NAME}"}</li>
</ul> </ul>

105
templates/admin/default/includes/add-category-dialog.html
View File

@@ -1,66 +1,71 @@
{* Adding a new Category *} {* Adding a new Category *}
<div class="modal hide fade" id="add_category_dialog" tabindex="-1" role="dialog" aria-hidden="true"> <div class="modal fade" id="add_category_dialog" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>{intl l="Create a new category"}</h3>
</div>
<div class="modal-header"> {form name="thelia.admin.category.creation"}
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <form method="POST" action="{url path='/admin/catalog/category'}" {form_enctype form=$form}>
<h3>{intl l="Create a new category"}</h3>
</div>
{form name="thelia.admin.category.creation"} {* the action processed by the controller *}
<form method="POST" action="{url path='/admin/catalog/category'}" {form_enctype form=$form}> <input type="hidden" name="action" value="create" />
{* the action processed by the controller *} {form_hidden_fields form=$form}
<input type="hidden" name="action" value="create" />
{form_hidden_fields form=$form} {form_field form=$form field='parent'}
<input type="hidden" name="{$name}" value="{$current_category_id}" />
{/form_field}
{form_field form=$form field='parent'} {form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{$current_category_id}" /> {* on success, redirect to category change page. _ID_ is replaced with the ID of the created category (see Thelia\Action\Category.php) *}
{/form_field} <input type="hidden" name="{$name}" value="{url path='admin/catalog/category' id="_ID_" action='edit'}" />
{/form_field}
{form_field form=$form field='success_url'} <div class="modal-body">
{* on success, redirect to category change page. _ID_ is replaced with the ID of the created category (see Thelia\Action\Category.php) *}
<input type="hidden" name="{$name}" value="{url path='admin/catalog/category' id="_ID_" action='edit'}" />
{/form_field}
<div class="modal-body"> {if #form_error}<div class="alert alert-block alert-error" id="add_category_dialog_error">#form_error_message</div>{/if}
{if #form_error}<div class="alert alert-block alert-error" id="add_category_dialog_error">#form_error_message</div>{/if} <div class="form-group">
<label class="control-label">
<div class="control-group"> {intl l='Category Title *'}
<label class="control-label"> </label>
{intl l='Category Title *'}
</label> {loop type="lang" name="default-lang" default_only="1"}
{form_field form=$form field='locale'}
<div class="controls"> <input type="hidden" name="{$name}" value="{$LOCALE}" />
{loop type="lang" name="default-lang" default_only="1"}
{form_field form=$form field='locale'}
<input type="hidden" name="{$name}" value="{$LOCALE}" />
{/form_field}
<div class="input-append input-block-level">
{form_field form=$form field='title'}
<span {if $error}class="error"{/if}>
<input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Category title'}" placeholder="{intl l='Category title'}" class="input-block-level">
</span>
{/form_field} {/form_field}
<span class="add-on"><img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
</div>
<div class="help-block">{intl l="Enter here the category title in the default language ($TITLE)"}</div> <div class="input-group input-block-level">
{/loop} {form_field form=$form field='title'}
</div> <span {if $error}class="error"{/if}>
<input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Category title'}" placeholder="{intl l='Category title'}" class="form-control input-block-level">
</span>
{/form_field}
<span class="input-group-addon"><img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
</div>
</div> <div class="help-block">{intl l="Enter here the category title in the default language ($TITLE)"}</div>
</div> {/loop}
</div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button> <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
<button type="submit" class="btn btn-primary">{intl l="Create this category"}</button> <button type="submit" class="btn btn-default btn-primary">{intl l="Create this category"}</button>
</div> </div>
</form> </form>
{/form} {/form}
</div>
</div>
</div>
</div>

6
templates/admin/default/includes/category_breadcrumb.html
View File

@@ -1,13 +1,13 @@
{* Breadcrumb for categories browsing and editing *} {* Breadcrumb for categories browsing and editing *}
<li><a href="{url path='admin/home'}">Home</a> <span class="divider">/</span></li> <li><a href="{url path='admin/home'}">Home</a></li>
<li><a href="{url path='admin/catalog'}">Catalog</a> {ifloop rel="category_path"} <span class="divider">/</span></li> <li><a href="{url path='admin/catalog'}">Catalog</a> {ifloop rel="category_path"}</li>
{loop name="category_path" type="category-path" visible="*" category="{$current_category_id}"} {if $ID == $current_category_id} {loop name="category_path" type="category-path" visible="*" category="{$current_category_id}"} {if $ID == $current_category_id}
<li class="active">{if $action == 'edit'} {intl l='Editing %cat' cat="{$TITLE}"} {else} {$TITLE} <a href="{url path='admin/catalog/category' id=" $ID" action='edit' }" title="{intl l='Edit this category'}">{intl l="(edit)"}</a> {/if} <li class="active">{if $action == 'edit'} {intl l='Editing %cat' cat="{$TITLE}"} {else} {$TITLE} <a href="{url path='admin/catalog/category' id=" $ID" action='edit' }" title="{intl l='Edit this category'}">{intl l="(edit)"}</a> {/if}
</li> </li>
{else} {else}
<li><a href="{url path='admin/catalog/category' id=" $ID" action='browse'}">{$TITLE}</a> <span class="divider">/</span></li> <li><a href="{url path='admin/catalog/category' id=" $ID" action='browse'}">{$TITLE}</a></li>
{/if} {/loop} {/ifloop} {elseloop rel="category_path"} {/if} {/loop} {/ifloop} {elseloop rel="category_path"}
</li> </li>
{/elseloop} {/elseloop}

10
templates/admin/default/includes/inner-form-toolbar.html
View File

@@ -1,5 +1,5 @@
<div class="row-fluid inner-toolbar"> <div class="row inner-toolbar">
<div class="span6 inner-actions"> <div class="col-md-6 inner-actions">
{* Display the top form toolbar, with edition flags, and save buttons *} {* Display the top form toolbar, with edition flags, and save buttons *}
{* When creating a new object, only default language is displayed *} {* When creating a new object, only default language is displayed *}
@@ -20,8 +20,8 @@
</ul> </ul>
</div> </div>
<div class="span6 inner-actions"> <div class="col-md-6 inner-actions">
<button type="submit" name="save_mode" value="stay" class="btn btn-primary" title="{intl l='Save'}">{intl l='Save'} <i class="icon icon-white icon-ok"></i></button> <button type="submit" name="save_mode" value="stay" class="btn btn-default btn-primary" title="{intl l='Save'}">{intl l='Save'} <span class="glyphicon glyphicon-ok"></span></button>
<button type="submit" name="save_mode" value="close" class="btn btn-info" title="{intl l='Save and close'}">{intl l='Save and close'} <i class="icon icon-remove icon-white"></i></button> <button type="submit" name="save_mode" value="close" class="btn btn-default btn-info" title="{intl l='Save and close'}">{intl l='Save and close'} <span class="glyphicon glyphicon-remove"></span></button>
</div> </div>
</div> </div>

2
templates/admin/default/login.html
View File

@@ -42,7 +42,7 @@
<label class="checkbox"> <input type="checkbox" name="{$name}" value="{$value}" {$attr} {if $options.checked}checked="checked"{/if}/> {intl l='Remember me'}</label> <label class="checkbox"> <input type="checkbox" name="{$name}" value="{$value}" {$attr} {if $options.checked}checked="checked"{/if}/> {intl l='Remember me'}</label>
{/form_field} {/form_field}
<span class="pull-right"><button type="submit" class="btn btn-default btn-primary">{intl l='Login'} <i class="glyphicon glyphicon-play glyphicon-white"></i></button></span> <span class="pull-right"><button type="submit" class="btn btn-default btn-primary">{intl l='Login'} <span class="glyphicon glyphicon-play"></span></button></span>
</form> </form>
{/form} {/form}
</div> </div>

6
templates/admin/default/message-edit.html
View File

@@ -12,9 +12,9 @@
{loop name="message_edit" type="message" secured="*" id="$message_id" backend_context="1" lang="$edit_language_id"} {loop name="message_edit" type="message" secured="*" id="$message_id" backend_context="1" lang="$edit_language_id"}
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li><a href="{url path='/admin/configuration/messages'}">{intl l="Mailing templates"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration/messages'}">{intl l="Mailing templates"}</a></li>
<li>{intl l='Editing mailing template "%name"' name="{$NAME}"}</li> <li>{intl l='Editing mailing template "%name"' name="{$NAME}"}</li>
</ul> </ul>

6
templates/admin/default/messages.html
View File

@@ -10,8 +10,8 @@
<div id="wrapper" class="container"> <div id="wrapper" class="container">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li><a href="{url path='/admin/configuration/messages'}">{intl l="Mailing templates"}</a></li> <li><a href="{url path='/admin/configuration/messages'}">{intl l="Mailing templates"}</a></li>
</ul> </ul>
@@ -27,7 +27,7 @@
{intl l='Thelia mailing templates'} {intl l='Thelia mailing templates'}
{loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.messages.create"} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.messages.create"}
<a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new mailing template'}" href="#add_message_dialog" data-toggle="modal"> <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new mailing template'}" href="#add_message_dialog" data-toggle="modal">
<i class="glyphicon glyphicon-plus-sign glyphicon-white"></i> <span class="glyphicon glyphicon-plus-sign"></span>
</a> </a>
{/loop} {/loop}

6
templates/admin/default/variable-edit.html
View File

@@ -12,9 +12,9 @@
{loop name="config_edit" type="config" hidden="*" id="$variable_id" backend_context="1" lang="$edit_language_id"} {loop name="config_edit" type="config" hidden="*" id="$variable_id" backend_context="1" lang="$edit_language_id"}
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li><a href="{url path='/admin/configuration/variables'}">{intl l="System variables"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration/variables'}">{intl l="System variables"}</a></li>
<li>{intl l='Editing variable "%name"' name="{$NAME}"}</li> <li>{intl l='Editing variable "%name"' name="{$NAME}"}</li>
</ul> </ul>

8
templates/admin/default/variables.html
View File

@@ -10,8 +10,8 @@
<div id="wrapper" class="container"> <div id="wrapper" class="container">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='/admin/home'}">{intl l="Home"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a> <span class="divider">/</span></li> <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
<li><a href="{url path='/admin/configuration/variables'}">{intl l="System variables"}</a></li> <li><a href="{url path='/admin/configuration/variables'}">{intl l="System variables"}</a></li>
</ul> </ul>
@@ -27,9 +27,9 @@
{intl l='Thelia system variables'} {intl l='Thelia system variables'}
{loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.variables.create"} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.variables.create"}
<a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new variable'}" href="#add_variable_dialog" data-toggle="modal"> <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new variable'}" href="#add_variable_dialog" data-toggle="modal">
<i class="glyphicon glyphicon-plus-sign glyphicon-white"></i> <span class="glyphicon glyphicon-plus-sign"></span>
</a> </a>
<button class="btn btn-default btn-primary action-btn" title="{intl l='Save chages'}">{intl l='Save changes'} <i class="glyphicon glyphicon-white glyphicon-ok"></i></button> <button class="btn btn-default btn-primary action-btn" title="{intl l='Save chages'}">{intl l='Save changes'} <span class="glyphicon glyphicon-ok"></span></button>
{/loop} {/loop}
</caption> </caption>