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

// Module List + some design WIP

Browse Source
This commit is contained in:
Kevin Granger
2013-08-05 20:42:14 +02:00
parent 6533ee4bec
commit bdc9d77c09
9 changed files with 649 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/_toggle-switch.scss
+2 -2
View File
@@ -247,13 +247,13 @@ https://github.com/ghinda/css-toggle-switch
.prestashop-switch { .prestashop-switch {
min-width: 150px; min-width: 150px;
color: #999; color: #666;
text-align: center; text-align: center;
border-radius: 3px; border-radius: 3px;
@include box-shadow(rgba(#48525F,0.3) 0 0 6px 1px inset) @include box-shadow(rgba(#48525F,0.3) 0 0 6px 1px inset)
} }
.prestashop-switch input:checked + label { .prestashop-switch input:checked + label {
color: lighten($brand-primary,10%); color: #333;
@include text-shadow(rgba(white,0.7) 1px 1px 0); @include text-shadow(rgba(white,0.7) 1px 1px 0);
} }
.prestashop-switch .slide-button { .prestashop-switch .slide-button {
admin-dev/themes/default/css/admin-theme.css
+289 -276
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/css/admin-theme.sass
+157 -83
View File
@@ -1,11 +1,23 @@
//variables //variables
$icon-color: #87C795 $icon-color: #87C795
$bg-content-color: #F6F5F3 $bg-content-color: #F8F9FB
$bg-head-color: #97C885
$brand-primary: #444B55 //$bg-head-color: #F5792B // orange
//$bg-head-color: #81A98C //vert d'eau
//$bg-head-color: #ED3A6C // fushia
//$bg-head-color: #0091B0 // bleu
//$bg-head-color: #00C3C1 //turquoise
$bg-head-color: #9DC44B // vert pomme
//$bg-head-color: #97C885 // vert menthe
//$bg-head-color: #4691D2 // bleu ciel
//$brand-primary: #E6E6E6
//$brand-primary: #373E35 // vert camo
$brand-primary: #262C3F // bleu nuit
$panel-color: $brand-primary $panel-color: $brand-primary
$badge-panel-color: #DC315E $badge-panel-color: #DC315E
$bg-body-color: $bg-content-color
@import "compass" @import "compass"
@import "bootstrap/variables" @import "bootstrap/variables"
@@ -21,12 +33,12 @@ body.fixed-top
position: relative position: relative
top: 53px top: 53px
margin-bottom: 50px margin-bottom: 50px
background-color: #C5C3BF background-color: $bg-body-color
#header_infos #header_infos
height: 53px height: 53px
border-bottom: solid 2px black //border-bottom: solid 2px black
background-color: darken($brand-primary,10%) background-color: darken($brand-primary,20%)
z-index: 9999 z-index: 9999
@include box-shadow(rgba(black,0.15) 0 2px 0) @include box-shadow(rgba(black,0.15) 0 2px 0)
#header_shopname #header_shopname
@@ -45,21 +57,21 @@ body.fixed-top
position: relative position: relative
#content #content
float: left //float: left
min-height: 100% min-height: 100%
width: 1282px //width: 1278px
padding: 90px 20px 90px padding: 90px 20px 90px
margin: 0 0 0 240px margin: 0 0 0 240px
border-left: 2px solid black //border-left: 2px solid black
border-right: 2px solid black //border-right: 2px solid black
background-color: $bg-content-color background-color: $bg-content-color
//background-image: url('../img/patterns/bedge_grunge.png') //background-image: url('../img/patterns/bedge_grunge.png')
@include box-shadow(darken($bg-content-color,30%) 0 0 0 4px) //@include box-shadow(darken($bg-content-color,30%) 0 0 0 4px)
fieldset, .panel fieldset, .panel
padding: 20px padding: 20px
margin-bottom: 10px margin-bottom: 20px
border: solid 1px darken($bg-content-color,10%) border: solid 1px darken($bg-content-color,10%)
background-color: $bg-content-color background-color: lighten($bg-content-color,20%)
@include border-radius(5px) @include border-radius(5px)
@include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset) @include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset)
.panel-heading .panel-heading
@@ -74,7 +86,9 @@ body.fixed-top
font-size: 1.2em font-size: 1.2em
font-weight: 300 font-weight: 300
text-transform: uppercase text-transform: uppercase
background-color: lighten($panel-color,10%) background-color: $panel-color
i, a
color: $bg-head-color!important
.badge .badge
background-color: lighten($panel-color,20%) background-color: lighten($panel-color,20%)
border-radius: 0 border-radius: 0
@@ -105,20 +119,20 @@ body.fixed-top
@include box-shadow(white 0 0 0 1px inset) @include box-shadow(white 0 0 0 1px inset)
.page-head .page-head
width: 1278px width: 100%
height: 69px height: 69px
padding: 4px 3px 0 20px padding: 5px 10px 0 0
margin: 0 margin: 0
border-bottom: 4px solid darken($bg-head-color,30%) border-bottom: 4px solid darken($bg-head-color,20%)
position: fixed position: fixed
top: 53px top: 53px
left: 242px left: 0px
z-index: 9000 z-index: 9000
background-color: $bg-head-color background-color: $bg-head-color
@include box-shadow(rgba(black,0.15) 0 7px 0, rgba(white,0.15) 0 -1px 0 inset) @include box-shadow(rgba(black,0.15) 0 7px 0, rgba(white,0.15) 0 -1px 0 inset)
h2.page-title h2.page-title
@extend .pull-left @extend .pull-left
padding: 0 padding: 0 0 0 260px
font-size: 20px font-size: 20px
line-height: 25px line-height: 25px
color: white color: white
@@ -134,10 +148,12 @@ body.fixed-top
background: #f5f5f5 background: #f5f5f5
.page-sidebar .page-sidebar
z-index: 9001
top: 53px top: 53px
position: fixed position: fixed
width: 240px width: 240px
border-bottom: solid 1px black border-bottom: solid 1px black
background-color: $brand-primary
@include box-shadow(darken($bg-content-color,30%) 0 4px 0) @include box-shadow(darken($bg-content-color,30%) 0 4px 0)
min-height: 700px min-height: 700px
height: 100% height: 100%
@@ -153,7 +169,7 @@ body.fixed-top
padding: 0 padding: 0
padding-bottom: 100px padding-bottom: 100px
li li
background-color: #48525F background-color: lighten($brand-primary,0)
list-style: none list-style: none
li:not(.active) ul li:not(.active) ul
display: none display: none
@@ -164,22 +180,26 @@ body.fixed-top
> li > li
&:hover > a, &.active > a &:hover > a, &.active > a
color: white color: white
background-color: darken(#48525F,15%) background-color: darken($brand-primary,5%)
border-top: 1px solid darken($brand-primary,15%) @include box-shadow($bg-head-color -4px 0 0 inset)
border-bottom: 1px solid darken($brand-primary,10%) i
@include box-shadow(darken($brand-primary,15%) -4px 0 0 inset) color: $bg-head-color!important
@include transition-property(background-color, border)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
> a > a
display: block display: block
padding: 5px 0 5px 5px padding: 5px 0 5px 5px
border-top: 1px solid lighten(#48525F,5%) border-top: 1px solid lighten($brand-primary,5%)
border-bottom: 1px solid darken(#48525F,10%) border-bottom: 1px solid darken($brand-primary,15%)
color: lighten(#48525F,35%) color: lighten($brand-primary,45%)
text-transform: uppercase text-transform: uppercase
text-decoration: none text-decoration: none
@include box-shadow(darken(#48525F,5%) -4px 0 0 inset) @include transition-property(background-color, border, box-shadow)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
@include box-shadow(darken($brand-primary,15%) -4px 0 0 inset)
i
@include transition-property(color)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
img img
margin-right: 10px margin-right: 10px
ul ul
@@ -190,16 +210,16 @@ body.fixed-top
li li
a a
display: block display: block
padding: 3px 15px 3px 20px padding: 3px 10px 3px 10px
font-size: 12px font-size: 12px
border: none border: none
border-bottom: 1px solid #F5F5F5 border-bottom: 1px solid lighten($bg-head-color,25%)
background-color: white background-color: white
i i
margin-top: 3px margin-top: 3px
color: #CECECE color: $bg-head-color
&:hover &:hover
background-color: lighten(#48525F,15%) background-color: lighten($bg-head-color,35%)
text-decoration: none text-decoration: none
i i
color: $brand-primary color: $brand-primary
@@ -210,28 +230,6 @@ body.fixed-top
i i
color: $brand-primary color: $brand-primary
#footer
z-index: 9999
position: fixed
width: 100%
bottom: 0
padding: 0
background-color: darken($brand-primary,10%)
.go-top
display: block
padding: 0px 6px 0px 6px
margin: -2px 0px 0px
text-decoration: none
color: #fff
cursor: pointer
font-size: 16px
background-color: #111
.go-top i
color: #666
font-size: 22px
margin-bottom: 5px
#menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] #menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"]
font-size: 22px font-size: 22px
border-radius: 40px border-radius: 40px
@@ -244,27 +242,30 @@ body.fixed-top
// Tool bar // Tool bar
.toolbar_btn .toolbar_btn
@extend .btn //@extend .btn
//@extend .btn-primary //@extend .btn-primary
background-color: $brand-primary //background-color: $brand-primary
border: solid 1px lighten($bg-head-color,5%)
position: relative position: relative
padding: 2px 5px !important padding: 2px 5px !important
margin-right: 3px margin-right: 3px
border-bottom: 4px solid darken($brand-primary,7%) //border-bottom: 4px solid darken($brand-primary,7%)
font-size: 11px font-size: 12px
font-weight: 600
color: white color: white
text-shadow: -1px -1px 0 rgba(black,0.6) text-align: center
text-shadow: none
//@include background(linear-gradient(top, lighten($brand-primary,15%), $brand-primary)) //@include background(linear-gradient(top, lighten($brand-primary,15%), $brand-primary))
@include box-shadow(rgba(black,0.15) 0 3px 0, rgba(white,0.1) 0 0 0 1px inset) //@include box-shadow(rgba(black,0.15) 0 3px 0, rgba(white,0.1) 0 0 0 1px inset)
&:hover &:hover
top: 2px //top: 2px
border-color: $brand-primary //border-color: $brand-primary
border-bottom: 2px solid lighten($brand-primary,10%) //border-bottom: 2px solid lighten($brand-primary,10%)
color: $brand-primary //color: $brand-primary
text-shadow: 1px 1px 0 rgba(white,0.6) //@include text-shadow(lighten($bg-head-color,15%) 1px 1px 0)
background-color: lighten($brand-primary,40%)!important background-color: lighten($bg-head-color,5%)!important
@include background(linear-gradient(top left, lighten($brand-primary,75%), lighten($brand-primary,55%))) //@include background(linear-gradient(top left, lighten($brand-primary,75%), lighten($brand-primary,55%)))
@include box-shadow(rgba(black,0.3) 0 1px 3px, rgba(white,0.4) 0 0 0 1px inset) //@include box-shadow(rgba(black,0.3) 0 1px 3px, rgba(white,0.4) 0 0 0 1px inset)
.icon-AdminDashboard .icon-AdminDashboard
@extend .icon-dashboard @extend .icon-dashboard
@@ -302,11 +303,14 @@ body.fixed-top
.icon-AdminParentStats .icon-AdminParentStats
@extend .icon-bar-chart @extend .icon-bar-chart
background-color: adjust-hue($icon-color, 330) background-color: adjust-hue($icon-color, 330)
.icon-AdminStock
@extend .icon-archive
background-color: adjust-hue($icon-color, 360)
[class^="icon-Admin"] [class^="icon-Admin"]
//background-color: #9ED072 background-color: darken($brand-primary,10%)
margin-right: 6px margin-right: 6px
color: $brand-primary!important color: lighten($brand-primary,10%)!important
[class^="process-icon-"], [class*=" process-icon-"] [class^="process-icon-"], [class*=" process-icon-"]
height: 32px height: 32px
@@ -389,9 +393,9 @@ label.control-label
label.control-label span.label-tooltip label.control-label span.label-tooltip
text-decoration: none text-decoration: none
font-size: 13px font-size: 13px
background-color: #D7E1ED background-color: darken($bg-content-color,5%)
border: none border: none
border-bottom: solid 1px darken($bg-content-color,20%) border-bottom: solid 1px darken($bg-content-color,10%)
padding: 0 5px padding: 0 5px
@include border-radius(3px) @include border-radius(3px)
@@ -438,14 +442,14 @@ input[type="password"].input-tiny
@include background(linear-gradient(top, darken($bg-content-color,10%), darken($bg-content-color,20%))) @include background(linear-gradient(top, darken($bg-content-color,10%), darken($bg-content-color,20%)))
.btn-primary .btn-primary
border-color: $brand-primary border-color: $bg-head-color
color: lighten($brand-primary,70%) color: lighten($bg-head-color,70%)
@include background(linear-gradient(top,lighten($brand-primary,30%),lighten($brand-primary,20%))) @include background(linear-gradient(top,lighten($bg-head-color,10%),lighten($bg-head-color,0%)))
@include box-shadow(lighten($brand-primary,40%) 0 0 0 1px inset) @include box-shadow(lighten($bg-head-color,10%) 0 0 0 1px inset)
&:hover, &:focus &:hover, &:focus
border-color: $brand-primary border-color: $bg-head-color
color: lighten($brand-primary,70%) color: lighten($bg-head-color,70%)
@include background(linear-gradient(top,lighten($brand-primary,20%),lighten($brand-primary,10%))) @include background(linear-gradient(top,darken($bg-head-color,0%),darken($bg-head-color,10%)))
.btn-group-action .btn-group-action
display: inline-block display: inline-block
@@ -527,6 +531,9 @@ tr.filter
.breadcrumb .breadcrumb
background-color: lighten($bg-content-color,7%) background-color: lighten($bg-content-color,7%)
.badge
background-color: $bg-head-color
.badge-success .badge-success
@extend .badge @extend .badge
background-color: $brand-success background-color: $brand-success
@@ -538,3 +545,70 @@ tr.filter
.icon-big .icon-big
font-size: 4em font-size: 4em
color: darken($bg-content-color,20%) color: darken($bg-content-color,20%)
#module-list
h3
position: relative
top: 0
left: 0
margin: 0
padding: 0
background-color: transparent
color: $brand-primary
font-weight: 500
#footer
z-index: 9002
display: block
//position: absolute
//width: 100%
bottom: 0
padding: 5px 0
background-color: darken($bg-content-color,5%)
@include box-shadow(darken($bg-content-color,40%) 0 2px 10px inset)
#go-top
position: fixed
bottom: 10px
height: 30px
width: 30px
text-align: center
line-height: 30px
right: 10px
z-index: 9003
display: block
padding: 0px 6px 0px 6px
margin: -2px 0px 0px
text-decoration: none
color: #fff
cursor: pointer
font-size: 16px
background-color: rgba(0,0,0,0.8)
.go-top i
color: #666
font-size: 22px
margin-bottom: 5px
.link-social
&:hover
text-decoration: none
i
font-size: 2em
width: 30px
height: 30px
display: inline-block
line-height: 30px
text-align: center
@include border-radius(30px)
.link-twitter i
background-color: #7CCEEF
.link-facebook i
color: white
background-color: #557DBB
.link-github i
background-color: white
.link-google i
color: white
background-color: #E6644E
admin-dev/themes/default/template/controllers/modules/filters.tpl
+35 -92
View File
@@ -23,93 +23,26 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if $add_permission eq '1'}
{if isset($logged_on_addons)}
<!--start addons login-->
<div id="addons_login_div" class="row" >
<div class="col-lg-12">
<h3>
<i class="icon-user"></i>
{l s='You are logged into PrestaShop Addons.'}
</h3>
<div class="row">
<label class="control-label col-lg-9">
<i class="icon-user"></i> {l s='Welcome'} {$username_addons}
</label>
<label class="control-label col-lg-3">
<a href="#" id="addons_logout_button">
<i class="icon-signout"></i> {l s='Log out from PrestaShop Addons.'}
</a>
</label>
</div>
</div>
</div>
<!--end addons login-->
{else}
{if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'}
<div class="alert alert-block">
<b>{l s='If you want to be able to fully use the AdminModules panel and have free modules available, you should enable the following configuration on your server:'}</b><br />
{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if}
{if $check_openssl eq 'ko'}- {l s='Enable php openSSL extension'}<br />{/if}
</div>
{else}
<!--start addons login-->
<div id="addons_login_div" class="row">
<div class="col-lg-12">
<form id="addons_login_form" method="post" class="form-horizontal">
<h3>
<i class="icon-user"></i>
{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}
</h3>
<div class="row">
<label class="control-label col-lg-3">{l s='Addons Login'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-user"></i></span>
<input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s= 'Password Addons'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
</div>
</div>
<div class="row">
<div class="col-lg-10 col-offset-3">
<button class="btn btn-default" id="addons_login_button" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
<div id="addons_loading" class="help-block"></div>
</div>
</div>
</form>
</div>
</div>
<!--end addons login-->
{/if}
{/if}
{/if}
<!--start filter module--> <!--start filter module-->
<div class="well"> <div class="well">
<form id="filternameForm" method="post" class="form-horizontal"> <div class="row">
<div class="row"> <div class="col-lg-6">
<div class="input-group col-lg-4"> <form id="filternameForm" method="post" class="form-horizontal">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input"> <div class="input-group col-lg-12">
<span class="input-group-btn"> <input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<button class="btn btn-default" type="submit"> <span class="input-group-btn">
<i class="icon-search"></i> {l s='Search'} <button class="btn btn-default" type="submit">
</button> <i class="icon-search"></i> {l s='Search'}
</span> </button>
</div> </span>
</div>
</form>
</div> </div>
</form> <div class="col-lg-6">
<form method="post" class="form-inline"> <form method="post" class="form-inline pull-right">
<label>{l s='Sort by'}:</label> <label>{l s='Sort by'}</label>
<span> <!-- <span>
<select class="filter fixed-width-XL" name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}> <select class="filter fixed-width-L" name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option> <option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option> <option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option>
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option> <option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option>
@@ -122,29 +55,29 @@
</optgroup> </optgroup>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option> <option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
</select> </select>
</span> </span> -->
<span> <span>
<select class="filter fixed-width-XL" name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}> <select class="filter fixed-width-L" name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option> <option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option> <option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option> <option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option>
</select> </select>
</span> </span>
<span> <span>
<select class="filter fixed-width-XL" name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}> <select class="filter fixed-width-L" name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option> <option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option>
<option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option> <option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option>
<option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option> <option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option>
</select> </select>
</span> </span>
<span> <!-- <span>
<select class="filter fixed-width-XL" name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}> <select class="filter fixed-width-XL" name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}>
<option value="0" >{l s='All countries'}</option> <option value="0" >{l s='All countries'}</option>
<option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option> <option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option>
</select> </select>
</span> </span> -->
<span class="pull-right"> <!-- <span class="pull-right">
<button class="btn btn-small" type="submit" name="resetFilterModules"> <button class="btn btn-default btn-small" type="submit" name="resetFilterModules">
<i class="icon-eraser"></i> <i class="icon-eraser"></i>
{l s='Reset'} {l s='Reset'}
</button> </button>
@@ -152,7 +85,17 @@
<i class="icon-filter"></i> <i class="icon-filter"></i>
{l s='Filter'} {l s='Filter'}
</button> </button>
</span> </span> -->
</form> </form>
</div>
</div>
</div> </div>
<!--end filter module--> <!--end filter module-->
admin-dev/themes/default/template/controllers/modules/list.tpl
+91 -109
View File
@@ -24,28 +24,25 @@
*} *}
{if count($modules)} {if count($modules)}
<div class="row-fluid"> <table id="module-list" class="table">
<span class="pull-right">
<button type="button" class="btn btn-default" onclick="modules_management('install')">
<i class="icon-plus-sign-alt"></i>
{l s='Install the selection'}
</button>
<button type="button" class="btn btn-default" onclick="modules_management('uninstall')">
<i class="icon-minus-sign-alt"></i>
{l s='Uninstall the selection'}
</button>
</span>
</div>
<table cellspacing="0" cellpadding="0" class="table table-striped table-hover">
<thead> <thead>
<tr class="nodrag nodrop"> <tr>
<th width="1%"> <th width="1%">
<input type="checkbox" rel="false" class="noborder" id="checkme"> <input type="checkbox" rel="false" class="noborder" id="checkme">
</th> </th>
<th width="20%">{l s='Logo'}</th> <th colspan="3">
<th width="45%">{l s='Module name'}</th> <div class="btn-group pull-right">
<th width="35%">&nbsp;</th> <a class="btn btn-default btn-small" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
</tr> <i class="icon-list"></i>
{l s='Normal view'}
</a>
<a class="btn btn-default btn-small" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
</div>
</th>
</tr>
<tbody> <tbody>
{foreach from=$modules item=module} {foreach from=$modules item=module}
<tr> <tr>
@@ -61,109 +58,94 @@
</td> </td>
<td> <td>
<div id="anchor{$module->name|ucfirst}"> <div id="anchor{$module->name|ucfirst}">
<h4>{$module->displayName} <h3 class="module-title">
{$module->displayName}
{if isset($module->type) && $module->type == 'addonsMustHave'} {if isset($module->type) && $module->type == 'addonsMustHave'}
<span class="label label-danger">{l s='Must Have'}</span> <span class="label label-info">{l s='Must Have'}</span>
{else}
{if isset($module->id) && $module->id gt 0}
<span class="label label-success{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>
{else}
<span class="label label-warning">{l s='Not installed'}</span>
{/if}
{/if} {/if}
</h4> <!-- {if isset($module->id) && $module->id gt 0}
<span class="label label-success{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>
{else}
<span class="label label-warning">{l s='Not installed'}</span>
{/if} -->
</h3>
<div class="row-fluid"> <div class="row-fluid">
<dl class="dl-horizontal"> <p class="module-infos">
<span>{$module->categoryName}</span> -
{if isset($module->author) && !empty($module->author)} {if isset($module->author) && !empty($module->author)}
<dt>{l s='Developed by'} :</dt> {l s='Developed by'} {$module->author|truncate:20:'...'}
<dd>{$module->author|truncate:20:'...'}</dd>
{/if} {/if}
<dt>{l s='Version'} :</dt> &nbsp;- {l s='Version'} : {$module->version}
<dd>{$module->version} {if isset($module->version_addons)}
{if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} ({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'})
</dd> {/if}
<dt>{l s='Category'} :</dt> </p>
<dd>{$module->categoryName}</dd> <p class="module-description">
{if isset($module->description) && $module->description ne ''} {if isset($module->description) && $module->description ne ''}
<dt>{l s='Description'} :</dt> {l s='Description'} : {$module->description}
<dd>{$module->description}</dd>
{else}
&nbsp;
{/if} {/if}
</dl> </p>
</div> </div>
{if isset($module->message) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="alert">{$module->message}</div>{/if} {if isset($module->message) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="alert alert-success">{$module->message}</div>{/if}
</div> </div>
</td> </td>
<td> <td width="180px">
<div id="list-action-button" class="row-light"> <div id="list-action-button" class="btn-group">
<div class="btn-group">
{if isset($module->type) && $module->type == 'addonsMustHave'} {if isset($module->type) && $module->type == 'addonsMustHave'}
<a href="{$module->addons_buy_url}" target="_blank"> <a class="btn btn-default" href="{$module->addons_buy_url}" target="_blank">
<span class="btn btn-default"> <i class="icon-shopping-cart"></i> &nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}
<i class="icon-shopping-cart"></i> &nbsp;&nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if} </a>
</span> {else}
{if $module->id && isset($module->version_addons) && $module->version_addons}
<a class="btn btn-warning" href="{$module->options.update_url}">
<i class="icon-refresh"></i> {l s='Update it!'}
</a> </a>
{else} {/if}
{if $module->id && isset($module->version_addons) && $module->version_addons} <a class="btn {if isset($module->id) && $module->id gt 0}btn-danger{else}btn-success{/if}" {if isset($module->id) && $module->id gt 0 && !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{if isset($module->id) && $module->id gt 0}{$module->options.uninstall_url}{else}{$module->options.install_url}{/if}">
<a href="{$module->options.update_url}"> {if isset($module->id) && $module->id gt 0}
<span class="btn btn-warning"> <i class="icon-minus-sign-alt"></i>
<i class="icon-refresh"></i> {l s='Update it!'} {l s='Uninstall'}
</span> {else}
</a> <i class="icon-plus-sign-alt"></i>
{l s='Install'}
{/if} {/if}
<a {if isset($module->id) && $module->id gt 0 && !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{if isset($module->id) && $module->id gt 0}{$module->options.uninstall_url}{else}{$module->options.install_url}{/if}" class="button installed"> </a>
{if isset($module->id) && $module->id gt 0} {if !isset($module->not_on_disk)}
<span class="btn btn-danger"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
<i class="icon-minus-sign-alt"></i> <span class="caret">&nbsp;</span>
{l s='Uninstall'} </button>
</span>
{else} <ul class="dropdown-menu">
<span class="btn btn-success"> {$module->optionsHtml}
<i class="icon-plus-sign-alt"></i> {if isset($module->preferences) && isset($module->preferences['favorite']) && $module->preferences['favorite'] == 1}
{l s='Install'} <li>
</span> <a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">
{/if} <i class="icon-star"></i> {l s='Remove from Favorites'}
</a> </a>
<div class="row-fluid btn-group btn-group-action"> </li>
{if !isset($module->not_on_disk)} <li>
<span class="btn btn-default btn-small"> <a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;">
<i class="icon-cog"></i> {l s='Choose an action'} <i class="icon-star"></i> {l s='Mark as Favorite'}
</span> </a>
<button data-toggle="dropdown" class="btn btn-default btn-small dropdown-toggle"> </li>
<span class="caret"></span>&nbsp; {else}
</button> <li>
<ul class="dropdown-menu"> <a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">
{$module->optionsHtml} <i class="icon-star"></i> {l s='Remove from Favorites'}
{if isset($module->preferences) && isset($module->preferences['favorite']) && $module->preferences['favorite'] == 1} </a>
<li> </li>
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#"> <li>
<i class="icon-star"></i> {l s='Remove from Favorites'} <a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">
</a> <i class="icon-star"></i> {l s='Mark as Favorite'}
</li> </a>
<li> </li>
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;"> {/if}
<i class="icon-star"></i> {l s='Mark as Favorite'} </ul>
</a> {else}
</li> &nbsp;
{else} {/if}
<li> {/if}
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">
<i class="icon-star"></i> {l s='Remove from Favorites'}
</a>
</li>
<li>
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">
<i class="icon-star"></i> {l s='Mark as Favorite'}
</a>
</li>
{/if}
{else}
&nbsp;
{/if}
</div>
{/if}
</div>
</div> </div>
</td> </td>
</tr> </tr>
admin-dev/themes/default/template/controllers/modules/page.tpl
+29 -37
View File
@@ -25,45 +25,40 @@
<div id="productBox"> <div id="productBox">
{include file='controllers/modules/header.tpl'} {include file='controllers/modules/header.tpl'}
{include file='controllers/modules/filters.tpl'}
{include file='controllers/modules/login_addons.tpl'}
{if $upgrade_available|@count} {if $upgrade_available|@count}
<div class="alert alert-info" style="display:block;"> <div class="alert alert-info">
{l s='An upgrade is available for some of your modules!'} {l s='An upgrade is available for some of your modules!'}
<ul> <ul>
{foreach from=$upgrade_available item='module'} {foreach from=$upgrade_available item='module'}
<li> &raquo; <a href="{$currentIndex|escape:htmlall}&token={$token|escape:htmlall}&anchor=anchor{$module.anchor|escape:htmlall}"><b>{$module.name|escape:htmlall}</b></a></li> <li> &raquo; <a href="{$currentIndex|escape:htmlall}&token={$token|escape:htmlall}&anchor=anchor{$module.anchor|escape:htmlall}"><b>{$module.name|escape:htmlall}</b></a></li>
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
{/if} {/if}
<div class="row">
<div class="col-lg-12">
<div class="btn-group pull-right"> <div class="panel">
<a class="btn btn-default" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}"> <div class="panel-heading">
<i class="icon-list"></i> <i class="icon-list-ul"></i>
{l s='Normal view'} {l s='Modules list'}
</a>
<a class="btn btn-default" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
</div> </div>
</div> {include file='controllers/modules/filters.tpl'}
<div id="container">
<!--start sidebar module--> <!--start sidebar module-->
<div class="row-fluid"> <div class="row">
<div class="categorieTitle col-lg-3">
<div class="categorieTitle col col-lg-3">
<div class="list-group"> <div class="list-group">
<h3>
<i class="icon-reorder"></i>
{l s='Categories'}
</h3>
<a class="list-group-item {if isset($categoryFiltered.favorites)}active{/if}" href="{$currentIndex}&token={$token}&filterCategory=favorites"> <a class="list-group-item {if isset($categoryFiltered.favorites)}active{/if}" href="{$currentIndex}&token={$token}&filterCategory=favorites">
{l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span> <i class="icon-star"></i> {l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
</a> </a>
<a class="list-group-item {if count($categoryFiltered) lte 0}active{/if}" href="{$currentIndex}&token={$token}&unfilterCategory=yes"> <a class="list-group-item {if count($categoryFiltered) lte 0}active{/if}" href="{$currentIndex}&token={$token}&unfilterCategory=yes">
{l s='Total'} <span class="badge pull-right">{$nb_modules}</span> {l s='All'} <span class="badge pull-right">{$nb_modules}</span>
</a> </a>
{foreach from=$list_modules_categories item=module_category key=module_category_key} {foreach from=$list_modules_categories item=module_category key=module_category_key}
<a class="list-group-item {if isset($categoryFiltered[$module_category_key])}active{/if}" href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}"> <a class="list-group-item {if isset($categoryFiltered[$module_category_key])}active{/if}" href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}">
@@ -72,13 +67,10 @@
{/foreach} {/foreach}
</div> </div>
</div> </div>
</div>
<div id="moduleContainer" class="col-lg-9"> <div id="moduleContainer" class="col col-lg-9">
<h3> {include file='controllers/modules/list.tpl'}
<i class="icon-list-ul"></i> </div>
{l s='Modules list'}
</h3>
{include file='controllers/modules/list.tpl'}
</div> </div>
</div> </div>
</div> </div>
admin-dev/themes/default/template/footer.tpl
+22 -2
View File
@@ -29,14 +29,34 @@
{if $display_footer} {if $display_footer}
{hook h="displayBackOfficeFooter"} {hook h="displayBackOfficeFooter"}
<div id="footer"> <div id="footer">
<div class="footerLeft col-lg-4"> <div id="go-top"><i class="icon-arrow-up"></i></div>
<div class="col-lg-4">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br /> <a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
<span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span> <span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div> </div>
<div class="footerRight col-lg-8"> <div class="col-lg-8">
<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a> <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a> |&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a> |&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
<a class="link-social link-twitter" href="#" title="Twitter">
<i class="icon-twitter"></i>
</a>
<a class="link-social link-facebook" href="#" title="Facebook">
<i class="icon-facebook"></i>
</a>
<a class="link-social link-github" href="#" title="Github">
<i class="icon-github"></i>
</a>
<a class="link-social link-google" href="#" title="Google">
<i class="icon-google-plus"></i>
</a>
{if $iso_is_fr} {if $iso_is_fr}
<p>Questions / Renseignements / Formations : <p>Questions / Renseignements / Formations :
<strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -122,7 +122,7 @@
{* begin HEADER *} {* begin HEADER *}
<div class="container-fluid"> <div class="container-fluid">
<div id="header"> <div id="header">
<div id="header_infos" class="navbar navbar-fixed-top navbar-inverse"> <div id="header_infos" class="navbar navbar-fixed-top">
<a id="header_shopname" class="navbar-brand" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}">{$shop_name}</a> <a id="header_shopname" class="navbar-brand" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}">{$shop_name}</a>
<ul id="notifs_icon_wrapper" class="nav navbar-nav nav-pills"> <ul id="notifs_icon_wrapper" class="nav navbar-nav nav-pills">
admin-dev/themes/default/template/helpers/list/list_header.tpl
+23 -4
View File
@@ -104,11 +104,30 @@
</th> </th>
{foreach $fields_display AS $key => $params} {foreach $fields_display AS $key => $params}
<th {if isset($params.align)} class="{$params.align}"{/if}> <th {if isset($params.align)} class="{$params.align}"{/if}>
{if isset($params.hint)}
<span class="alert alert-info" name="help_box">{$params.hint}<span class="hint-pointer">&nbsp;</span></span>
{/if}
<span class="title_box {if isset($order_by) && ($key == $order_by)} active{/if}"> <span class="title_box {if isset($order_by) && ($key == $order_by)} active{/if}">
{$params.title}
{if isset($params.hint)}
<span class="label-tooltip" data-toggle="tooltip"
title="
{if is_array($params.hint)}
{foreach $params.hint as $hint}
{if is_array($hint)}
{$hint.text}
{else}
{$hint}
{/if}
{/foreach}
{else}
{$params.hint}
{/if}
">
{$params.title}
</span>
{else}
{$params.title}
{/if}
{if (!isset($params.orderby) || $params.orderby) && !$simple_header} {if (!isset($params.orderby) || $params.orderby) && !$simple_header}
<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if} href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}"> <a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if} href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
<i class="icon-caret-down"></i> <i class="icon-caret-down"></i>