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

// gamification + multishop wip

Browse Source
This commit is contained in:
Kevin Granger
2013-12-03 15:21:13 +01:00
parent da2d48890f
commit 3f2ce54efd
6 changed files with 192 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+30
View File
@@ -3123,6 +3123,36 @@ a.link-social:hover { text-decoration: none; }
.animated.fadeIn { -webkit-animation-name: fadeIn; -moz-animation-name: fadeIn; -o-animation-name: fadeIn; }
.hide { display: none; }
.text-right { text-align: right; }
.text-left { text-align: left; }
.text-center { text-align: center; }
.gamification-tip { width: 100%; margin: 0 0 20px 0; position: relative; background-color: #f8f8f8; }
.gamification-tip div.gamification-tip-title { position: absolute; top: 0; left: 0; height: 40px; line-height: 40px; width: 90px; padding: 0 0 0 40px; background: url("http://gamification.prestashop.com/images/interface/gamification-lightbulb.png") 10px 5px no-repeat; color: #556e26; font-size: 14px; font-weight: bold; }
.gamification-tip div.gamification-tip-description-container { height: 40px; padding: 0 130px; display: table-cell; vertical-align: middle; font-size: 13px; color: #666666; background: url("http://gamification.prestashop.com/images/interface/gamification-tip-bg.png") 100px top no-repeat; }
.gamification-tip div.gamification-tip-description-container span.gamification-tip-description { display: inline-block; font-size: 0.9em; line-height: 15px; max-height: 30px; overflow: hidden; }
.gamification-tip span.gamification-tip-cta { position: absolute; line-height: 42px; height: 40px; top: 0; right: 0; padding: 0 10px 0 30px; background: url("http://gamification.prestashop.com/images/interface/gamification-cta-bg.png") left top no-repeat #a6c964; }
.gamification-tip span.gamification-tip-cta a { display: inline-block; width: 100%; padding: 0 35px 0 0; font-size: 14px; text-transform: uppercase; font-weight: bold; text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0; color: #556e26; background: url("http://gamification.prestashop.com/images/interface/gamification-popin.png") right 10px no-repeat; }
.gamification-tip-infobox { padding: 0 20px 20px 20px; position: relative; }
.gamification-tip-infobox .gamification-tip-infobox-title { display: inline-block; margin: 0 0 20px -20px; width: 100%; padding: 10px 20px 5px; border-bottom: solid 3px #739334; font: 800 18px/20px arial; text-transform: uppercase; color: #556e26; background-color: #e7f0d6; }
.gamification-tip-infobox .gamification-tip-infobox-title span.gamification-tip-infobox-title-prefix2 { display: inline-block; height: 40px; padding-left: 30px; line-height: 40px; text-transform: none; font-size: 16px; font-weight: 500; margin-right: 10px; background: url("http://gamification.prestashop.com/images/interface/gamification-lightbulb.png") left top no-repeat; }
.gamification-tip-infobox .gamification-tip-infobox-content { display: block; width: 100%; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-image { float: left; width: 215px; height: 200px; background: url("http://gamification.prestashop.com/images/interface/gamification-infobox-separator.png") no-repeat right center; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-description { float: left; width: 335px; padding: 0 0 25px 25px; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-description p { line-height: 20px; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-description p ul li { padding: 0 0 0 20px; line-height: 25px; background: url("http://gamification.prestashop.com/images/interface/gamification-bullet-check.png") left center no-repeat; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-controls { padding: 20px 0 0 0; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-controls a.button { display: inline-block; height: 30px; padding: 0 20px; margin-right: 10px; border: none; line-height: 33px; text-transform: uppercase; font-weight: bold; color: #929292; border-radius: 3px; background: #d2d2d2; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-controls a.button.success { color: #384819; background: #a6c964; border-color: #739334; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-controls a.button:hover { color: #f8f8f8; background: #5f5f5f; border-color: #2c2c2c; }
.gamification-tip-infobox .gamification-tip-infobox-content .gamification-tip-infobox-content-controls a.button:active { color: white; background: #2c2c2c; border-color: black; }
.gamification-tip-infobox a.infobox-close { display: inline-block; width: 14px; height: 14px; position: absolute; top: 20px; right: 20px; text-indent: -9999px; background: url("http://gamification.prestashop.com/images/interface/gamification-infobox-close.png") no-repeat; }
.bootstrap { @-webkit-keyframes one { 0% { background-color: #00a4e7; }
100% { background-color: white; } }
@-webkit-keyframes two { 0% { -webkit-box-shadow: #00a4e7 0 0 0 20px inset; box-shadow: #00a4e7 0 0 0 20px inset; }
admin-dev/themes/default/scss/admin-theme.sass
+3
View File
@@ -63,6 +63,8 @@
@import "admin-theme/admin-nav"
@import "admin-theme/admin-login"
@import "admin-theme/admin-gamification"
.bootstrap
//components
@import "admin-theme/admin-commons"
@@ -79,6 +81,7 @@
@import "admin-theme/admin-modules"
@import "admin-theme/admin-dashboard"
@import "admin-theme/admin-search"
//backward compatibility
@import "admin-theme/admin-backward"
admin-dev/themes/default/scss/admin-theme/_admin-gamification.sass
+136
View File
@@ -0,0 +1,136 @@
.hide
display: none
.text-right
text-align: right
.text-left
text-align: left
.text-center
text-align: center
.gamification-tip
width: 100%
margin: 0 0 20px 0
position: relative
background-color: #f8f8f8
div.gamification-tip-title
position: absolute
top: 0
left: 0
height: 40px
line-height: 40px
width: 90px
padding: 0 0 0 40px
background: url("http://gamification.prestashop.com/images/interface/gamification-lightbulb.png") 10px 5px no-repeat
color: #556e26
font-size: 14px
font-weight: bold
div.gamification-tip-description-container
height: 40px
padding: 0 130px
display: table-cell
vertical-align: middle
font-size: 13px
color: #666666
background: url("http://gamification.prestashop.com/images/interface/gamification-tip-bg.png") 100px top no-repeat
span.gamification-tip-description
display: inline-block
font-size: 0.9em
line-height: 15px
max-height: 30px
overflow: hidden
span.gamification-tip-cta
position: absolute
line-height: 42px
height: 40px
top: 0
right: 0
padding: 0 10px 0 30px
background: url("http://gamification.prestashop.com/images/interface/gamification-cta-bg.png") left top no-repeat #a6c964
a
display: inline-block
width: 100%
padding: 0 35px 0 0
font-size: 14px
text-transform: uppercase
font-weight: bold
text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0
color: #556e26
background: url("http://gamification.prestashop.com/images/interface/gamification-popin.png") right 10px no-repeat
.gamification-tip-infobox
padding: 0 20px 20px 20px
position: relative
.gamification-tip-infobox-title
display: inline-block
margin: 0 0 20px -20px
width: 100%
padding: 10px 20px 5px
border-bottom: solid 3px #739334
font: 800 18px/20px arial
text-transform: uppercase
color: #556e26
background-color: #e7f0d6
span.gamification-tip-infobox-title-prefix2
display: inline-block
height: 40px
padding-left: 30px
line-height: 40px
text-transform: none
font-size: 16px
font-weight: 500
margin-right: 10px
background: url("http://gamification.prestashop.com/images/interface/gamification-lightbulb.png") left top no-repeat
.gamification-tip-infobox-content
display: block
width: 100%
.gamification-tip-infobox-content-image
float: left
width: 215px
height: 200px
background: url("http://gamification.prestashop.com/images/interface/gamification-infobox-separator.png") no-repeat right center
.gamification-tip-infobox-content-description
float: left
width: 335px
padding: 0 0 25px 25px
p
line-height: 20px
ul li
padding: 0 0 0 20px
line-height: 25px
background: url("http://gamification.prestashop.com/images/interface/gamification-bullet-check.png") left center no-repeat
.gamification-tip-infobox-content-controls
padding: 20px 0 0 0
a.button
display: inline-block
height: 30px
padding: 0 20px
margin-right: 10px
border: none
line-height: 33px
text-transform: uppercase
font-weight: bold
color: #929292
border-radius: 3px
background: #d2d2d2
a.button.success
color: #384819
background: #a6c964
border-color: #739334
a.button:hover
color: #f8f8f8
background: #5f5f5f
border-color: #2c2c2c
a.button:active
color: white
background: #2c2c2c
border-color: black
a.infobox-close
display: inline-block
width: 14px
height: 14px
position: absolute
top: 20px
right: 20px
text-indent: -9999px
background: url("http://gamification.prestashop.com/images/interface/gamification-infobox-close.png") no-repeat
admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl
+13 -19
View File
@@ -24,29 +24,23 @@
*}
{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
<div class="row alert alert-info">
<div class="panel clearfix">
<label class="control-label col-lg-3">
<i class="icon-sitemap"></i> {l s='Multistore'}
</label>
<div class="col-lg-9">
<div class="row">
<div class="col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="multishop_{$product_tab}" id="multishop_{$product_tab}_on" value="1" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', true); ProductMultishop.checkAll{$product_tab}()">
<label class="radio" for="multishop_{$product_tab}_on">
<i class="icon-check-sign color_success"></i> {l s='Yes'}
</label>
<input type="radio" name="multishop_{$product_tab}" id="multishop_{$product_tab}_off" value="0" checked="checked" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', false); ProductMultishop.checkAll{$product_tab}()">
<label class="radio" for="multishop_{$product_tab}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<a class="slide-button btn btn-default"></a>
</span>
</div>
<div class="col-lg-7">
<p class="form-control-static"><strong>{l s='Check / Uncheck all'}</strong> {l s='(If you are editing this page for several shops, some fields like "name" or "price" are may be disabled. You will need check these fields in order to edit them)'}</p>
</div>
</div>
<span class="switch prestashop-switch">
<input type="radio" name="multishop_{$product_tab}" id="multishop_{$product_tab}_on" value="1" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', true); ProductMultishop.checkAll{$product_tab}()">
<label for="multishop_{$product_tab}_on">
<i class="icon-check-sign color_success"></i> {l s='Yes'}
</label>
<input type="radio" name="multishop_{$product_tab}" id="multishop_{$product_tab}_off" value="0" checked="checked" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', false); ProductMultishop.checkAll{$product_tab}()">
<label for="multishop_{$product_tab}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<a class="slide-button btn btn-default"></a>
</span>
<p class="help-block"><strong>{l s='Check / Uncheck all'}</strong> {l s='(If you are editing this page for several shops, some fields like "name" or "price" are may be disabled. You will need check these fields in order to edit them)'}</p>
</div>
</div>
{/if}
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -351,7 +351,7 @@
{/if}
{if $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="panel multishop_toolbar">
<div class="panel multishop_toolbar clearfix">
<div class="col-lg-12 form-horizontal">
<label class="control-label col-lg-3"><i class="icon-sitemap"></i> {l s='Multistore configuration for'}</label>
<div class="col-lg-9">{$shop_list}</div>
admin-dev/themes/default/template/helpers/options/options.tpl
+9 -7
View File
@@ -56,28 +56,30 @@
{/if}
{if !$categoryData['hide_multishop_checkbox'] && $use_multishop}
<div class="row alert alert-info">
<div class="well clearfix">
<label class="control-label col-lg-3">
<i class="icon-sitemap"></i> {l s='Multistore'}
</label>
<div class="col-lg-9">
<div class="row">
<div class="col-lg-2">
<div class="col-lg-6">
<span class="switch prestashop-switch">
<input type="radio" name="{$table}_multishop_{$category}" id="{$table}_multishop_{$category}_on" value="1" onclick="toggleAllMultishopDefaultValue($('#{$table}_fieldset_{$category}'), true)">
<label class="radio" for="{$table}_multishop_{$category}_on">
<label for="{$table}_multishop_{$category}_on">
<i class="icon-check-sign color_success"></i> {l s='Yes'}
</label>
<input type="radio" name="{$table}_multishop_{$category}" id="{$table}_multishop_{$category}_off" value="0" checked="checked" onclick="toggleAllMultishopDefaultValue($('#{$table}_fieldset_{$category}'), false)">
<label class="radio" for="{$table}_multishop_{$category}_off">
<label for="{$table}_multishop_{$category}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<a class="slide-button btn btn-default"></a>
</span>
</div>
<div class="col-lg-7">
<p class="form-control-static"><strong>{l s='Check / Uncheck all'}</strong> {l s='(Check boxes if you want to set a custom value for this shop or group shop context)'}</p>
</div>
<p class="help-block">
<strong>{l s='Check / Uncheck all'}</strong>
{l s='(Check boxes if you want to set a custom value for this shop or group shop context)'}
</p>
</div>
</div>
</div>