antadis/chocolatdemariage
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage

Browse Source
This commit is contained in:
Preprod mutu 2017-08-30 10:42:24 +02:00
commit c78f94d9f1
13 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/modules/antadissimulator/views/css/simulate.css
View File

@ -88,7 +88,7 @@ border-top: 1px solid #C7AC9F; }
#errors-holder{ width:560px; margin-top:20px;}
#errors{ color:red; font-size:11px; line-height:16px; color:#e2007a; padding-right:20px; }
#simu-box { width: 100%; height: 562px; position:relative; background-color: #eaeaea; }
#simu-box h2, #simu-chocos h2 { position:absolute; background:#2e1e0e;color:#FFF;padding:5px 10px;margin:-1px 0 0 -1px; font-size:18px; }
#simu-box h2, #simu-chocos h2 { position:absolute; background:#2e1e0e;color:#FFF;padding:5px 10px;margin: 0px 0 0 0px; font-size:18px; }
.doublecube-holder{perspective:1000px;position:relative;left:50%;top:50%;width:0;height:0;}
.chocos-box-holder{width:562px;height:562px;line-height:562px;position:absolute;text-align:center;display:none;}

38
www/modules/antadissimulator/views/templates/hook/productbloc/doublecube-bicolor.tpl
View File

@ -81,7 +81,7 @@
<div class="back"></div>
</div>
</div>
</div>
</div>
</div>
<!--BICOLORE-->
@ -237,9 +237,9 @@
<!--DOUBLECUBE-->
<div class="box-holder doublecube-holder">
<div class="simu-container container-db"></div>
</div>
</div>
</div>
<div id="simu-chocos" class="mgin-t-20">
<div id="simu-chocos" class="mgin-t-20">
<h2>{l s='Simulation chocolats' mod='antadissimulator'}</h2>
<div class="chocos-holder">
</div>
@ -259,19 +259,19 @@
<option value="#159033" data-id="vert">{l s='Vert' mod='antadissimulator'}</option>
<option value="#6B1687" data-id="violet">{l s='Violet' mod='antadissimulator'}</option>
<option value="#E37222" data-id="orange">{l s='Orange' mod='antadissimulator'}</option>
<option value="#E37222" data-id="orange">{l s='Orange' mod='antadissimulator'}</option>
<option value="#10147E" data-id="bleuf">{l s='Bleu foncé' mod='antadissimulator'}</option>
<option value="#7F0700" data-id="bordeaux">{l s='Bordeaux' mod='antadissimulator'}</option>
<option value="#7F0700" data-id="bordeaux">{l s='Bordeaux' mod='antadissimulator'}</option>
<option value="#F88CC4" data-id="rose">{l s='Rose' mod='antadissimulator'}</option>
<option value="#D198CA" data-id="parme">{l s='Parme' mod='antadissimulator'}</option>
<option value="#F50003" data-id="rouge">{l s='Rouge' mod='antadissimulator'}</option>
<option value="#C42B68" data-id="framboise">{l s='Framboise' mod='antadissimulator'}</option>
<option value="#D198CA" data-id="parme">{l s='Parme' mod='antadissimulator'}</option>
<option value="#F50003" data-id="rouge">{l s='Rouge' mod='antadissimulator'}</option>
<option value="#C42B68" data-id="framboise">{l s='Framboise' mod='antadissimulator'}</option>
<option value="#3C1503" data-id="marron">{l s='Marron' mod='antadissimulator'}</option>
<option value="#FFFFFF" data-id="blanc">{l s='Blanc' mod='antadissimulator'}</option>
<option value="#FFFAD7" data-id="ivoire">{l s='Ivoire' mod='antadissimulator'}</option>
<option value="#CCC6AB" data-id="taupe">{l s='Taupe' mod='antadissimulator'}</option>
<option value="#FFFFFF" data-id="blanc">{l s='Blanc' mod='antadissimulator'}</option>
<option value="#FFFAD7" data-id="ivoire">{l s='Ivoire' mod='antadissimulator'}</option>
<option value="#CCC6AB" data-id="taupe">{l s='Taupe' mod='antadissimulator'}</option>
<option value="#C2C2C2" data-id="argent">{l s='Argent/Gris clair' mod='antadissimulator'}</option>
<option value="#000000" data-id="noir">{l s='Noir' mod='antadissimulator'}</option>
</select>
@ -289,19 +289,19 @@
<option value="#159033" data-id="vert">{l s='Vert' mod='antadissimulator'}</option>
<option value="#6B1687" data-id="violet">{l s='Violet' mod='antadissimulator'}</option>
<option value="#E37222" data-id="orange">{l s='Orange' mod='antadissimulator'}</option>
<option value="#E37222" data-id="orange">{l s='Orange' mod='antadissimulator'}</option>
<option value="#10147E" data-id="bleuf">{l s='Bleu foncé' mod='antadissimulator'}</option>
<option value="#7F0700" data-id="bordeaux">{l s='Bordeaux' mod='antadissimulator'}</option>
<option value="#7F0700" data-id="bordeaux">{l s='Bordeaux' mod='antadissimulator'}</option>
<option value="#F88CC4" data-id="rose">{l s='Rose' mod='antadissimulator'}</option>
<option value="#D198CA" data-id="parme">{l s='Parme' mod='antadissimulator'}</option>
<option value="#F50003" data-id="rouge">{l s='Rouge' mod='antadissimulator'}</option>
<option value="#C42B68" data-id="framboise">{l s='Framboise' mod='antadissimulator'}</option>
<option value="#D198CA" data-id="parme">{l s='Parme' mod='antadissimulator'}</option>
<option value="#F50003" data-id="rouge">{l s='Rouge' mod='antadissimulator'}</option>
<option value="#C42B68" data-id="framboise">{l s='Framboise' mod='antadissimulator'}</option>
<option value="#3C1503" data-id="marron">{l s='Marron' mod='antadissimulator'}</option>
<option value="#FFFFFF" data-id="blanc">{l s='Blanc' mod='antadissimulator'}</option>
<option value="#FFFAD7" data-id="ivoire">{l s='Ivoire' mod='antadissimulator'}</option>
<option value="#CCC6AB" data-id="taupe">{l s='Taupe' mod='antadissimulator'}</option>
<option value="#FFFFFF" data-id="blanc">{l s='Blanc' mod='antadissimulator'}</option>
<option value="#FFFAD7" data-id="ivoire">{l s='Ivoire' mod='antadissimulator'}</option>
<option value="#CCC6AB" data-id="taupe">{l s='Taupe' mod='antadissimulator'}</option>
<option value="#C2C2C2" data-id="argent">{l s='Argent/Gris clair' mod='antadissimulator'}</option>
<option value="#000000" data-id="noir">{l s='Noir' mod='antadissimulator'}</option>
</select>

40
www/modules/antadissimulator/views/templates/hook/productbloc/doublecube-exclusif.tpl
View File

@ -147,29 +147,29 @@
<div class="mgin-b-5">
<span class="c-maroon" style="padding-right:8px">{l s='Couleur 1 :' mod='antadissimulator'}</span>
<select name="colorpicker" id="colorpicker1" style="display: none;" >
<option value="#B5DC10" data-id="anis">Anis</option>
<option value="#F0037F" data-id="fuschia">Fuchsia</option>
<option value="#FFC211" data-id="or">Or/Jaune</option>
<option value="#7FCDD0" data-id="turquoise">Turquoise</option>
<option value="#766546" data-id="grisf">Gris foncé</option>
<option value="#B5DC10" data-id="anis">{l s='Anis' mod='antadissimulator'}</option>
<option value="#F0037F" data-id="fuschia">{l s='Fuchsia' mod='antadissimulator'}</option>
<option value="#FFC211" data-id="or">{l s='Or/Jaune' mod='antadissimulator'}</option>
<option value="#7FCDD0" data-id="turquoise">{l s='Turquoise' mod='antadissimulator'}</option>
<option value="#766546" data-id="grisf">{l s='Gris foncé' mod='antadissimulator'}</option>
<option value="#159033" data-id="vert">Vert</option>
<option value="#6B1687" data-id="violet">Violet</option>
<option value="#E37222" data-id="orange">Orange</option>
<option value="#10147E" data-id="bleuf">Bleu foncé</option>
<option value="#7F0700" data-id="bordeaux">Bordeaux</option>
<option value="#159033" data-id="vert">{l s='Vert' mod='antadissimulator'}</option>
<option value="#6B1687" data-id="violet">{l s='Violet' mod='antadissimulator'}</option>
<option value="#E37222" data-id="orange">{l s='Orange' mod='antadissimulator'}</option>
<option value="#10147E" data-id="bleuf">{l s='Bleu foncé' mod='antadissimulator'}</option>
<option value="#7F0700" data-id="bordeaux">{l s='Bordeaux' mod='antadissimulator'}</option>
<option value="#F88CC4" data-id="rose">Rose</option>
<option value="#D198CA" data-id="parme">Parme</option>
<option value="#F50003" data-id="rouge">Rouge</option>
<option value="#C42B68" data-id="framboise">Framboise</option>
<option value="#3C1503" data-id="marron">Marron</option>
<option value="#F88CC4" data-id="rose">{l s='Rose' mod='antadissimulator'}</option>
<option value="#D198CA" data-id="parme">{l s='Parme' mod='antadissimulator'}</option>
<option value="#F50003" data-id="rouge">{l s='Rouge' mod='antadissimulator'}</option>
<option value="#C42B68" data-id="framboise">{l s='Framboise' mod='antadissimulator'}</option>
<option value="#3C1503" data-id="marron">{l s='Marron' mod='antadissimulator'}</option>
<option value="#FFFFFF" data-id="blanc">Blanc</option>
<option value="#FFFAD7" data-id="ivoire">Ivoire</option>
<option value="#CCC6AB" data-id="taupe">Taupe</option>
<option value="#C2C2C2" data-id="argent">Argent/Gris clair</option>
<option value="#000000" data-id="noir">Noir</option>
<option value="#FFFFFF" data-id="blanc">{l s='Blanc' mod='antadissimulator'}</option>
<option value="#FFFAD7" data-id="ivoire">{l s='Ivoire' mod='antadissimulator'}</option>
<option value="#CCC6AB" data-id="taupe">{l s='Taupe' mod='antadissimulator'}</option>
<option value="#C2C2C2" data-id="argent">{l s='Argent/Gris clair' mod='antadissimulator'}</option>
<option value="#000000" data-id="noir">{l s='Noir' mod='antadissimulator'}</option>
</select>
<span style="font-size:18px; padding-right:8px;">￬</span>
<span class="color1text">{l s='Bleu foncé' mod='antadissimulator'}</span>

6
www/modules/antadissimulator/views/templates/hook/productbloc/doublecube-thematique.tpl
View File

@ -26,8 +26,8 @@
<!-- SIMULATION -->
<div id="simu-box">
<h2>Simulation contenant</h2>
<div class="legende-move c-maroon font11">Faites tourner l’objet avec votre souris</div>
<h2>{l s='Simulation contenant' mod='antadissimulator'}</h2>
<div class="legende-move c-maroon font11">{l s='Faites tourner l\'objet avec votre souris' mod='antadissimulator'}</div>
<!--DOUBLECUBE-->
<div class="box-holder doublecube-holder">
<div class="simu-container container-db">
@ -56,7 +56,7 @@
</div>
<div id="simu-chocos" class="mgin-t-20">
<h2>Simulation chocolats</h2>
<h2>{l s='Simulation chocolats' mod='antadissimulator'}</h2>
<div class="chocos-holder">
<!--chocos-->
<div class="chocos">

2
www/modules/antadissimulator/views/templates/hook/productbloc/pochette-bicolor.tpl
View File

@ -260,7 +260,7 @@
<span class="color1text">{l s='Bleu foncé' mod='antadissimulator'}</span>
</div>
<div>
<span class="c-maroon" style="padding-right:8px">Couleur 2 : </span>
<span class="c-maroon" style="padding-right:8px">{l s='Couleur 2 :' mod='antadissimulator'} </span>
<select name="colorpicker" id="colorpicker2" style="display: none;">
<option value="#B5DC10" data-id="anis">{l s='Anis' mod='antadissimulator'}</option>
<option value="#F0037F" data-id="fuschia">{l s='Fuchsia' mod='antadissimulator'}</option>

7
www/modules/antadissimulator/views/templates/hook/productbloc/pochette-thematique.tpl
View File

@ -25,12 +25,11 @@
</div>
<br/><br/><br/><br/><br/><br/><br/><br/>
<!-- SIMULATION -->
<div id="simu-box">
<h2>Simulation contenant</h2>
<div class="legende-move c-maroon font11">Faites tourner l’objet avec votre souris</div>
<h2>{l s='Simulation contenant' mod='antadissimulator'}</h2>
<div class="legende-move c-maroon font11">{l s='Faites tourner l\'objet avec votre souris' mod='antadissimulator'}</div>
<div class="box-holder">
<div class="simu-container container-pochette">
<div class="pochettes">
@ -72,7 +71,7 @@
</div>
<div id="simu-chocos" class="mgin-t-20">
<h2>Simulation chocolats</h2>
<h2>{l s='Simulation chocolats' mod='antadissimulator'}</h2>
<div class="chocos-holder">
<div class="chocos">
<div class="choco1 flip-container" ontouchstart="this.classList.toggle('hover');">

10
www/modules/antadissimulator/views/templates/hook/productbloc/pochette6-bicolor.tpl
View File

@ -3,12 +3,12 @@
<div id="custom_elmts">
<!--COMMONS-->
<div class="nom-holder">Prénom</div>
<div class="event-holder">Mariage</div>
<div class="nom-holder">{l s='Prénom' mod='antadissimulator'}</div>
<div class="event-holder">{l s='Mariage' mod='antadissimulator'}</div>
<div class="date-holder-line">
<span class="date day">22</span>
<span class="date month">juin</span>
<span class="date year">2017</span>
<span class="date day">{l s='22' mod='antadissimulator'}</span>
<span class="date month">{l s='juin' mod='antadissimulator'}</span>
<span class="date year">{l s='2017' mod='antadissimulator'}</span>
</div>
</div>

22
www/modules/antadissimulator/views/templates/hook/productbloc/sachet-bicolor.tpl
View File

@ -4,29 +4,29 @@
<div id="custom_elmts">
<!--COMMONS-->
<div class="noms-holder">
<div class="nom nom_1">Marié(e)</div>
<div class="nom nom_1">{l s='Marié(e)' mod='antadissimulator'}</div>
<div class="nom et">&amp;</div>
<div class="nom nom_2">Marié(e)</div>
<div class="nom nom_2">{l s='Marié(e)' mod='antadissimulator'}</div>
</div>
<div class="date-holder">
<div class="date day">16</div>
<div class="date month">Juin</div>
<div class="date year">2017</div>
<div class="date day">{l s='16' mod='antadissimulator'}</div>
<div class="date month">{l s='Juin' mod='antadissimulator'}</div>
<div class="date year">{l s='2017' mod='antadissimulator'}</div>
</div>
<div class="date-holder-line">
<span class="date day">16</span>
<span class="date month">Juin</span>
<span class="date year">2017</span>
<span class="date day">{l s='16' mod='antadissimulator'}</span>
<span class="date month">{l s='Juin' mod='antadissimulator'}</span>
<span class="date year">{l s='2017' mod='antadissimulator'}</span>
</div>
<div class="initiales-holder">
<div class="initiale initiale_1">M</div>
<div class="initiale initiale_2">M</div>
<div class="initiale initiale_1">{l s='M' mod='antadissimulator'}]</div>
<div class="initiale initiale_2">{l s='M' mod='antadissimulator'}</div>
</div>
<div id="temp-base">
<div id="temp-base">
<!--chocos-->
<div class="chocos">
<div class="choco1 flip-container" ontouchstart="this.classList.toggle('hover');">

2
www/modules/antadissimulator/views/templates/hook/productbloc/sachet-thematique.tpl
View File

@ -30,7 +30,7 @@
<!-- SIMULATION -->
<div id="simu-chocos" class="mgin-t-20">
<h2>Simulation chocolats</h2>
<h2>{l s='Simulation chocolats' mod='antadissimulator'}</h2>
<div class="chocos-holder">
<div class="chocos">
<div class="choco1 flip-container argent" ontouchstart="this.classList.toggle('hover');">

2
www/modules/antadissimulator/views/templates/hook/productbloc/vrac-thematique.tpl
View File

@ -30,7 +30,7 @@
<!-- SIMULATION -->
<div id="simu-chocos" class="mgin-t-20">
<h2>Simulation chocolats</h2>
<h2>{l s='Simulation chocolats' mod='antadissimulator'}</h2>
<div class="chocos-holder">
<div class="chocos">
<div class="choco1 flip-container argent" ontouchstart="this.classList.toggle('hover');">

1
www/themes/chocolatdemariage/css/global.css
View File

@ -4697,6 +4697,7 @@ body.content_only { margin: 0; }
#new_comment_form .form-group .form-control {
border: 0;
height: 40px;
z-index: 1;
}
#new_comment_form .form-group textarea.form-control {
height: 120px;

3
www/themes/chocolatdemariage/css/k2000.css
View File

@ -311,7 +311,7 @@ a { color: inherit; }
font-family: 'icomoon';
color: #fff;
position: absolute;
top: 0;
top: -1px;
bottom: 0;
left: 0;
font-size: 13px;
@ -592,6 +592,7 @@ input[disabled].btn { background: #fff; border-color: #fff; color: #363842; curs
position: relative;
color: #bd0132;
background: transparent;
z-index: 1;
}
.form-group .form-control.hasDatepicker {
z-index: 1;

6
www/themes/chocolatdemariage/menu-account.tpl
View File

@ -30,14 +30,14 @@
</a>
</li>
{*{if $returnAllowed}
{if $returnAllowed}
<li>
<a class="icon-left {if isset($active) && $active == 'order-follow'}active{/if}" href="{$link->getPageLink('order-follow', true)|escape:'html':'UTF-8'}" title="{l s='Your product returns'}">
<i class="icon icon-arrow-right"></i>
<i class="icon icon-slip"></i>
<span>{l s='Your product returns'}</span>
</a>
</li>
{/if}*}
{/if}
<li>
<a class="icon-left {if isset($active) && $active == 'order-slip'}active{/if}" href="{$link->getPageLink('order-slip', true)|escape:'html':'UTF-8'}" title="{l s='Your order slips'}">
<i class="icon icon-slip"></i>