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

// Colored switch, removed "required field" legend, removed duplicate links quick access

Browse Source
This commit is contained in:
Kevin Granger
2013-09-04 18:14:11 +02:00
parent b4ecaf3ddb
commit 22d636f93a
8 changed files with 75 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/_toggle-switch.sass
+4 -4
View File
@@ -152,15 +152,15 @@
padding-top: 0!important
font-weight: 500
input:checked + label
color: #333
color: #333!important
@include text-shadow(rgba(white,0.7) 1px 1px 0)
input:not(:checked) + label
i
color: #666!important
.slide-button
position: relative
margin-right: 3px
border-color: darken($bg-content-color,20%)
color: lighten($bg-content-color,50%)
@include background(linear-gradient(top,$bg-content-color, darken($bg-content-color,10%)))
@include box-shadow(rgba(white,1) 0 0 0 1px inset)
p
color: #333
span
admin-dev/themes/default/css/admin-theme.css
+2 -2
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-theme.sass
+46 -164
View File
@@ -62,7 +62,7 @@ $bg-content-color: #F8F8F8 //gris
$bg-header-color: #242424
$bg-footer-color: #242424
$bg-page-head-color : $secondary-color
$bg-panel-heading-color: hsl(hue($secondary-color), 20, 90)
$bg-panel-heading-color: hsl(hue($secondary-color), 10, 90)
//others
$badge-notif-color: #EF1778
@@ -940,7 +940,10 @@ fieldset > .row
font-size: 2em
.size_xxl
font-size: 2.3em
.color_success
color: $brand-success
.color_danger
color: $brand-danger
.dash_trend_down
color: red
@@ -1148,7 +1151,10 @@ fieldset > .row
100%
+opacity(1)
+scale(1)
$treeBackgroundHover: lighten(blue,30%)
$treeBackgroundSelect: blue
@@ -1240,20 +1246,12 @@ $treeBackgroundSelect: blue
position: absolute
display: block
width: 100%
text-align: left
overflow: visible
z-index: 88
clear: both
.StepTitle
display: block
position: relative
margin: 0
padding: 5px
clear: both
text-align: left
z-index: 88
-webkit-border-radius: 5px
-moz-border-radius: 5px
ul.anchor
position: relative
display: block
@@ -1274,36 +1272,30 @@ $treeBackgroundSelect: blue
li
position: relative
display: block
overflow: hidden
a
color: #ccc
height: 32px
display: block
position: relative
margin: 0
margin-right: 16px
padding-right: 25px
margin: 0 16px 0 0
text-decoration: none
outline-style: none
z-index: 99
//overflow: hidden
.stepNumber
position: relative
float: left
width: 24px
height: 32px
margin-right: 3px
text-align: center
padding: 0 5px
padding-top: 0
font-size: 30px
line-height: 32px
color: #fffffe
text-shadow: none
font-weight: normal
font-style: normal
color: white
.stepDesc
position: relative
text-align: left
font-size: 15px
font-size: 13px
height: 32px
display: table-cell
vertical-align: middle
@@ -1313,7 +1305,7 @@ $treeBackgroundSelect: blue
border-left: 14px solid white
border-right: 0
position: absolute
background-color: #ccc
//background-color: #ccc
right: -16px
top: 0
&:after
@@ -1324,35 +1316,22 @@ $treeBackgroundSelect: blue
content: ""
right: 2px
top: -16px
&.selected a.selected
a.disabled
color: #777
background-color: #ccc
.chevron:after
border-left: 14px solid #ccc
a.selected
color: #F8F8F8
cursor: text
background-color: $main-color
.chevron:after
border-left: 14px solid $main-color
&.done a
color: #ccc
background-color: $main-color
.chevron
background-color: $main-color
a.done
color: white
background-color: $brand-success
.chevron:after
border-left: 14px solid $main-color
&.disabled a
cursor: text
background-color: #ccc
color: #878787
.chevron:after
border-left: 14px solid #ccc
&.done a.selected
position: relative
color: #FFF
background-color: $main-color
.chevron
background-color: $main-color
border-left: 14px solid $brand-success
.loader
display: none
.buttonNext
@@ -1377,130 +1356,33 @@ $treeBackgroundSelect: blue
background-color: #FFFFDD
color: #5A5655
+border-radius(5px)
z-index: 999
min-width: 200px
.msgBox .content
padding: 0px
float: left
.msgBox .close
border: 1px solid #CCC
border-radius: 3px
color: #CCC
display: block
float: right
margin: 0 0 0 5px
outline-style: none
padding: 0 2px 0 2px
position: relative
text-align: center
text-decoration: none
#carrier_logo_block
position: absolute
right: 10px
.wizard_error
@extend .alert
@extend .alert-danger
.range_inf td, .range_sup td
background-color: #ccc
.range_type
width: 220px
text-align: right
font-weight: bold
.range_data
width: 110px
.range_sign
width: 18px
font-size: 20px
text-align: center
.range_data_new
width: 110px
table#zones_table
width: auto
.field_error
border-color: $brand-danger
.wizardUX
@extend .clearfix
border: 1px solid blue
background-color: white
ul
list-style: none outside none
padding: 0
margin: 0
li
float: left
margin: 0
padding: 0 20px 0 30px
height: 46px
line-height: 46px
position: relative
background: #ededed
color: blue
font-size: 16px
cursor: default
.chevron
border: 24px solid transparent
border-left: 14px solid blue
border-right: 0
display: block
position: absolute
right: -14px
top: 0
.chevron:before
border: 24px solid transparent
border-left: 14px solid #ededed
border-right: 0
content: ""
display: block
position: absolute
right: 1px
top: -24px
&.complete
background: #f3f4f5
color: blue
&:hover
background: #e7eff8
cursor: pointer
.chevron:before
border-left: 14px solid #e7eff8
.chevron:before
border-left: 14px solid #f3f4f5
&.active
background: #f1f6fc
color: blue
.chevron:before
border-left: 14px solid #f1f6fc
.badge
margin-right: 8px
li:nth-child(1)
border-radius: 4px 0 0 4px
padding-left: 20px
z-index: 10
li:nth-child(2)
z-index: 9
li:nth-child(3)
z-index: 8
li:nth-child(4)
z-index: 7
li:nth-child(5)
z-index: 6
li:nth-child(6)
z-index: 5
li:nth-child(7)
z-index: 4
li:nth-child(8)
z-index: 3
li:nth-child(9)
z-index: 2
li:nth-child(10)
z-index: 1
.actions
line-height: 44px
float: right
padding-right: 15px
vertical-align: middle
a
line-height: 45px
font-size: 12px
margin-right: 8px
.btn-prev
i
margin-right: 5px
.btn-next
i
margin-left: 5px
.step-content
.step-pane
display: none
.active
display: block
.btn-group
.active
display: inline-block
admin-dev/themes/default/template/helpers/form/form.tpl
+4 -4
View File
@@ -274,9 +274,9 @@
{/if}
>
{if $value.value == 1}
<i class="icon-check-sign"></i> {l s='Yes'}
<i class="icon-check-sign color_success"></i> {l s='Yes'}
{else}
<i class="icon-ban-circle"></i> {l s='No'}
<i class="icon-ban-circle color_danger"></i> {l s='No'}
{/if}
</label>
{/foreach}
@@ -511,9 +511,9 @@
{/if}
{block name="other_input"}{/block}
{/foreach}
<!-- {if $required_fields}
<!-- {*if $required_fields}
<div class="small"><sup>*</sup> {l s='Required field'}</div>
{/if} -->
{/if*} -->
</fieldset>
{block name="other_fieldsets"}{/block}
{if isset($fields[$f+1])}<br />{/if}
admin-dev/themes/default/template/helpers/options/options.tpl
+5 -5
View File
@@ -106,11 +106,11 @@
<span class="switch prestashop-switch">
<input type="radio" name="{$key}" id="{$key}_on" value="1" {if $field['value']} checked="checked"{/if}{if isset($field['js']['on'])} {$field['js']['on']}{/if}/>
<label for="{$key}_on" class="radioCheck">
<i class="icon-check-sign"></i> {l s='Yes'}
<i class="icon-check-sign color_success"></i> {l s='Yes'}
</label>
<input type="radio" name="{$key}" id="{$key}_off" value="0" {if !$field['value']} checked="checked"{/if}{if isset($field['js']['off'])} {$field['js']['off']}{/if}/>
<label for="{$key}_off" class="radioCheck">
<i class="icon-ban-circle"></i> {l s='No'}
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
</span>
@@ -290,7 +290,7 @@
type="submit"
id="{$table}_form_submit_btn"
name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
class="btn btn-default {if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
>
<i class="{if isset($categoryData['submit']['icon'])}{$categoryData['submit']['icon']}{else}icon-save{/if}"></i>
{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}
@@ -298,9 +298,9 @@
</div>
</div>
{/if}
{if isset($categoryData['required_fields']) && $categoryData['required_fields']}
<!-- {*if isset($categoryData['required_fields']) && $categoryData['required_fields']}
<div class="small"><sup>*</sup> {l s='Required field'}</div>
{/if}
{/if*} -->
{if isset($categoryData['bottom'])}{$categoryData['bottom']}{/if}
</fieldset>
{/foreach}
controllers/admin/AdminCarrierWizardController.php
+12 -11
View File
@@ -189,7 +189,7 @@ class AdminCarrierWizardControllerCore extends AdminController
array(
'type' => 'logo',
'label' => $this->l('Logo:'),
'name' => 'logo',
'name' => 'logo'
),
array(
'type' => 'text',
@@ -256,21 +256,21 @@ class AdminCarrierWizardControllerCore extends AdminController
'required' => false,
'class' => 't',
'values' => array(
array(
'id' => 'is_free_off',
'value' => 0,
'label' => '<img src="../img/admin/enabled.gif" alt="'.$this->l('Yes').'" title="'.$this->l('Yes').'" />'
),
array(
'id' => 'is_free_on',
'value' => 1,
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
),
array(
'id' => 'is_free_off',
'value' => 0,
'label' => '<img src="../img/admin/enabled.gif" alt="'.$this->l('Yes').'" title="'.$this->l('Yes').'" />'
)
),
'hint' => $this->l('Apply both regular shipping cost and product-specific shipping costs.')
),
array(
'type' => 'switch',
'type' => 'radio',
'label' => $this->l('Billing:'),
'name' => 'shipping_method',
'required' => false,
@@ -303,10 +303,6 @@ class AdminCarrierWizardControllerCore extends AdminController
)
)
),
array(
'type' => 'zone',
'name' => 'zones'
),
array(
'type' => 'select',
'label' => $this->l('Out-of-range behavior:'),
@@ -326,7 +322,12 @@ class AdminCarrierWizardControllerCore extends AdminController
'name' => 'name'
),
'hint' => $this->l('Out-of-range behavior occurs when no defined range matches the customer\'s cart (e.g. when the weight of the cart is greater than the highest weight limit defined by the weight ranges)')
),
array(
'type' => 'zone',
'name' => 'zones'
)
),
));
controllers/admin/AdminLocalizationController.php
+2 -2
View File
@@ -99,7 +99,7 @@ class AdminLocalizationControllerCore extends AdminController
'type' => 'text'
)
),
'submit' => array('title' => $this->l('Save'), 'class' => 'btn btn-primary')
'submit' => array('title' => $this->l('Save'))
),
'options' => array(
'title' => $this->l('Advanced'),
@@ -120,7 +120,7 @@ class AdminLocalizationControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
)
),
'submit' => array('title' => $this->l('Save'), 'class' => 'btn btn-primary')
'submit' => array('title' => $this->l('Save'))
)
);
install-dev/data/xml/quick_access.xml
-6
View File
@@ -5,12 +5,6 @@
<field name="link"/>
</fields>
<entities>
<quick_access id="Home" new_window="0">
<link>index.php</link>
</quick_access>
<quick_access id="My_Shop" new_window="1">
<link>../</link>
</quick_access>
<quick_access id="New_category" new_window="0">
<link>index.php?controller=AdminCategories&amp;addcategory</link>
</quick_access>