Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

This commit is contained in:
Jerome Nadaud
2013-11-07 16:48:56 +01:00
729 changed files with 8289 additions and 30730 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
# Require any additional compass plugins here. # Require any additional compass plugins here.
http_path = "/" http_path = "/"
css_dir = "css" css_dir = "css"
sass_dir = "css" sass_dir = "scss"
images_dir = "img" images_dir = "img"
javascripts_dir = "js" javascripts_dir = "js"
fonts_dir = "font" fonts_dir = "font"
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
#nobootstrap{width:100%;background-color:#fff;margin:-20px 0 0 -20px;padding:20px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap fieldset h1,#nobootstrap fieldset h2,#nobootstrap fieldset h3,#nobootstrap fieldset h4,#nobootstrap fieldset h5,#nobootstrap fieldset h6{margin:0 !important;padding:0 !important;background-color:transparent !important;border:none !important;text-transform:none !important}#nobootstrap a{line-height:normal}#nobootstrap .categorieList a{line-height:20px}#nobootstrap p{line-height:normal}#nobootstrap legend{font-size:13px;line-height:20px;width:auto}#nobootstrap label{font-size:13px;display:inline;line-height:normal}#nobootstrap .breadcrumb{padding:0}#nobootstrap li{line-height:normal}#nobootstrap select,#nobootstrap textarea,#nobootstrap input{height:inherit}#nobootstrap label,#nobootstrap input,#nobootstrap button,#nobootstrap select,#nobootstrap textarea{font-size:12px;line-height:13px;border-radius:none !important}#nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"]{margin:0}#nobootstrap input[type="text"]{height:14px !important}#nobootstrap table.table{margin:0;padding:0;width:100%;border-collapse:collapse}#nobootstrap table.widthfull{width:100%}#nobootstrap .table thead th{vertical-align:top}#nobootstrap .table th,#nobootstrap .table td{line-height:normal;vertical-align:middle;border-top:none}#nobootstrap [class^="icon-"],#nobootstrap [class*=" icon-"]{width:auto}#nobootstrap .toolbarBox [class^="process-icon-"],#nobootstrap .toolbarBox [class*=" process-icon-"]{text-indent:-9000px;overflow:hidden}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,49 +0,0 @@
#nobootstrap a {
line-height: normal; }
#nobootstrap .categorieList a {
line-height: 20px; }
#nobootstrap p {
line-height: normal; }
#nobootstrap legend {
font-size: 13px;
line-height: 20px;
width: auto !important; }
#nobootstrap label {
font-size: 13px;
display: inline;
line-height: normal; }
#nobootstrap .breadcrumb {
padding: 0; }
#nobootstrap select, #nobootstrap textarea, #nobootstrap input {
height: auto !important;
font-size: 12px !important;
line-height: normal;
margin-bottom: auto;
font-family: Arial, Verdana, Helvetica, sans-serif;
margin-bottom: 0 !important;
width: auto; }
#nobootstrap label, #nobootstrap input, #nobootstrap button, #nobootstrap select, #nobootstrap textarea {
font-size: 12px;
line-height: 13px; }
#nobootstrap input[type="radio"], #nobootstrap input[type="checkbox"] {
margin: 0; }
#nobootstrap input[type="text"] {
height: 14px !important; }
#nobootstrap table.table {
margin: 0;
padding: 0;
width: 100%;
border-collapse: collapse; }
#nobootstrap table.widthfull {
width: 100%; }
#nobootstrap .table th, #nobootstrap .table td {
line-height: normal;
vertical-align: middle;
border-top: none; }
#nobootstrap #header #header_search #bo_search_submit {
height: 25px !important; }
#nobootstrap [class^="icon-"], #nobootstrap [class*=" icon-"] {
width: auto; }
#nobootstrap .toolbarBox [class^="process-icon-"], #nobootstrap .toolbarBox [class*=" process-icon-"] {
text-indent: -9000px;
overflow: hidden; }
@@ -9,6 +9,8 @@ html, body
height: 100% height: 100%
#main #main
float: left
width: 100%
min-height: 100% min-height: 100%
padding: 36px 0 60px padding: 36px 0 60px
margin: 0 0 -60px 0 margin: 0 0 -60px 0
@@ -21,7 +23,7 @@ html, body
@include transition-property(margin) @include transition-property(margin)
@include transition-duration(0.4s) @include transition-duration(0.4s)
@include transition-timing-function(ease-out) @include transition-timing-function(ease-out)
fieldset, .panel .panel
padding: 20px padding: 20px
margin-bottom: 20px margin-bottom: 20px
border: solid 1px darken($bg-content-color,10%) border: solid 1px darken($bg-content-color,10%)
@@ -4,7 +4,7 @@
.stepContainer .stepContainer
position: relative position: relative
display: block display: block
overflow: hidden //overflow: hidden
clear: both clear: both
div.content div.content
position: absolute position: absolute
@@ -20,6 +20,9 @@
background-color: white background-color: white
border-color: #ccc!important border-color: #ccc!important
.highlight
background-color: #FFFF00
.badge .badge
background-color: $secondary-color background-color: $secondary-color
&.badge-success &.badge-success
@@ -97,5 +100,6 @@
.overflow-y .overflow-y
height: 200px max-height: 200px
margin-bottom: 15px
overflow-y: auto overflow-y: auto
@@ -66,6 +66,7 @@
@include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset) @include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset)
border: solid 1px #ccc border: solid 1px #ccc
background-color: #eee background-color: #eee
cursor: n-resize
.module_col_icon .module_col_icon
display: table-cell display: table-cell
width: 50px width: 50px
@@ -1,6 +1,4 @@
.table .table
@extend .table-striped
@extend .table-hover
border-collapse: separate border-collapse: separate
border-spacing: 0 2px 0 0 border-spacing: 0 2px 0 0
margin-bottom: 5px margin-bottom: 5px
@@ -24,15 +22,20 @@
color: black color: black
input, select input, select
margin: 0 margin: 0
tbody > tr > td tbody
border-top: none > tr > td
background-color: white border-top: none
tbody > tr > td background-color: white
padding: 3px 7px padding: 3px 7px
vertical-align: middle vertical-align: middle
word-wrap: nowrap word-wrap: nowrap
font-size: 12px font-size: 12px
border-bottom: solid 1px #eee border-bottom: solid 1px #eee
> tr.odd > td
background-color: $table-bg-accent
> tr:hover > td
background-color: $table-bg-hover
td.center, th.center td.center, th.center
text-align: center text-align: center
td.pointer td.pointer
@@ -4,10 +4,10 @@
* *
* NOTICE OF LICENSE * NOTICE OF LICENSE
* *
* This source file is subject to the Academic Free License (AFL 3.0) * This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt. * that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL: * It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php * http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to * If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email * obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately. * to license@prestashop.com so we can send you a copy immediately.
@@ -20,7 +20,7 @@
* *
* @author PrestaShop SA <contact@prestashop.com> * @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA * @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
@@ -4,10 +4,10 @@
* *
* NOTICE OF LICENSE * NOTICE OF LICENSE
* *
* This source file is subject to the Academic Free License (AFL 3.0) * This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt. * that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL: * It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php * http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to * If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email * obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately. * to license@prestashop.com so we can send you a copy immediately.
@@ -20,7 +20,7 @@
* *
* @author PrestaShop SA <contact@prestashop.com> * @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA * @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
@@ -4,10 +4,10 @@
* *
* NOTICE OF LICENSE * NOTICE OF LICENSE
* *
* This source file is subject to the Academic Free License (AFL 3.0) * This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt. * that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL: * It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php * http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to * If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email * obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately. * to license@prestashop.com so we can send you a copy immediately.
@@ -20,7 +20,7 @@
* *
* @author PrestaShop SA <contact@prestashop.com> * @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA * @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
+35
View File
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
@@ -1,4 +1,19 @@
@import compass
#nobootstrap #nobootstrap
width: 100%
background-color: white
margin: -20px 0 0 -20px
padding: 20px
@include box-sizing(content-box)
*, *:before, *:after
@include box-sizing(content-box)
fieldset
h1, h2, h3, h4, h5, h6
margin: 0!important
padding: 0!important
background-color: transparent!important
border: none!important
text-transform: none!important
a a
line-height: normal line-height: normal
.categorieList a .categorieList a
@@ -8,7 +23,7 @@
legend legend
font-size: 13px font-size: 13px
line-height: 20px line-height: 20px
width: auto!important width: auto
label label
font-size: 13px font-size: 13px
display: inline display: inline
@@ -16,18 +31,14 @@
.breadcrumb .breadcrumb
padding: 0 padding: 0
li li
line-height:normal
select, textarea, input
height: auto!important
font-size: 12px!important
line-height: normal line-height: normal
margin-bottom: auto select, textarea, input
font-family: Arial,Verdana,Helvetica,sans-serif height: inherit
margin-bottom: 0!important
width: auto
label, input, button, select, textarea label, input, button, select, textarea
font-size: 12px font-size: 12px
line-height: 13px line-height: 13px
border-radius: none!important
input[type="radio"], input[type="checkbox"] input[type="radio"], input[type="checkbox"]
margin: 0 margin: 0
input[type="text"] input[type="text"]
@@ -40,13 +51,11 @@
table.widthfull table.widthfull
width: 100% width: 100%
.table thead th .table thead th
vertical-align:top vertical-align: top
.table th, .table td .table th, .table td
line-height: normal line-height: normal
vertical-align: middle vertical-align: middle
border-top: none border-top: none
#header #header_search #bo_search_submit
height: 25px!important
[class^="icon-"], [class*=" icon-"] [class^="icon-"], [class*=" icon-"]
width: auto width: auto
.toolbarBox [class^="process-icon-"], .toolbarBox [class*=" process-icon-"] .toolbarBox [class^="process-icon-"], .toolbarBox [class*=" process-icon-"]
@@ -1,6 +1,5 @@
#nobootstrap { #nobootstrap {
//old admin theme //old admin theme
body{font-family:Arial, Helvetica, sans-serif}
h1,h2,h3,h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em} h1,h2,h3,h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}
h2{font-size:1.7em} h2{font-size:1.7em}
h3{font-size:1.25em} h3{font-size:1.25em}
@@ -9,7 +8,7 @@
ul,ol{list-style:none;margin:0;padding:0} ul,ol{list-style:none;margin:0;padding:0}
ul li{color:#585A69} ul li{color:#585A69}
label{color:#585a69} label{color:#585a69}
fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;font-size:1.1em;margin:0;padding:1em} fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;margin:0;padding:1em}
.Bloc{background:none repeat scroll 0 0 #EBEDF4;background-color:#EBEDF4;border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em} .Bloc{background:none repeat scroll 0 0 #EBEDF4;background-color:#EBEDF4;border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left} legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
input[type=text],input[type=password],input[type=file],textarea{background-color:#fff;border:1px solid #ccc} input[type=text],input[type=password],input[type=file],textarea{background-color:#fff;border:1px solid #ccc}
@@ -121,14 +120,8 @@
.multishop_toolbar .chzn-container .chzn-results .first{background-color:#408BD5;color:#fff;font-weight:700} .multishop_toolbar .chzn-container .chzn-results .first{background-color:#408BD5;color:#fff;font-weight:700}
.multishop_toolbar .chzn-container .chzn-results .group{background-color:#C6DEFC;font-style:italic;font-weight:700;padding-left:15px} .multishop_toolbar .chzn-container .chzn-results .group{background-color:#C6DEFC;font-style:italic;font-weight:700;padding-left:15px}
.multishop_toolbar .chzn-container .chzn-results .shop{background-color:#EAF2FC;padding-left:30px} .multishop_toolbar .chzn-container .chzn-results .shop{background-color:#EAF2FC;padding-left:30px}
.toolbarBox{background-color:#F8F8F8;border:1px solid #CCC;margin-bottom:10px;padding:10px 0;position:relative}
.toolbarBox .pageTitle{line-height:48px;margin-left:10px}
.toolbarBox .pageTitle h3{font-size:2em;font-weight:700;line-height:48px;margin:0;padding:0}
.toolbarBox ul.cc_button{float:right;margin:0;padding:0}
.toolbarBox ul.cc_button li{color:#666;float:left;height:48px;list-style:none outside none;padding:1px 1px 3px 4px;text-align:center}
.toolbarBox a.toolbar_btn{border:1px solid #f8f8f8;border-width:1px;cursor:pointer;display:block;float:left;font-size:11px;min-width:50px;padding:1px 5px;white-space:nowrap}
.toolbarBox a.toolbar_btn:hover{background-color:#fff;border:1px inset #ccc}
.toolbarBox .toolbar_btn span{display:block;float:none;height:32px;margin:0 auto;position:relative}
.toolbarBox .process-icon-delete{background-image:url(../img/process-icon-delete.png)} .toolbarBox .process-icon-delete{background-image:url(../img/process-icon-delete.png)}
.toolbarBox .process-icon-duplicate{background-image:url(../img/process-icon-duplicate.png)} .toolbarBox .process-icon-duplicate{background-image:url(../img/process-icon-duplicate.png)}
.toolbarBox .process-icon-stats{background-image:url(../img/process-icon-stats.png)} .toolbarBox .process-icon-stats{background-image:url(../img/process-icon-stats.png)}
@@ -147,6 +140,7 @@
.toolbarBox .process-icon-help{background-image:url(../img/process-icon-help.png)} .toolbarBox .process-icon-help{background-image:url(../img/process-icon-help.png)}
.toolbarBox .process-icon-help-new{background-image:url(../img/process-icon-help-new.png)} .toolbarBox .process-icon-help-new{background-image:url(../img/process-icon-help-new.png)}
.toolbarBox .process-icon-modules-list{background-image:url(../img/process-icon-modules-list.png)} .toolbarBox .process-icon-modules-list{background-image:url(../img/process-icon-modules-list.png)}
.toolbarReduced{margin-right:221px} .toolbarReduced{margin-right:221px}
#modules_list_button{background-image:url(../img/modules_list_button.png);border:none;cursor:pointer;font-size:1.6em;height:63px;padding-left:45px;position:absolute;right:0;top:0;width:211px} #modules_list_button{background-image:url(../img/modules_list_button.png);border:none;cursor:pointer;font-size:1.6em;height:63px;padding-left:45px;position:absolute;right:0;top:0;width:211px}
.toolbarBox #modules_list_container{background:none repeat scroll 0 0 #FFF;border:solid 1px #CCC;display:block;float:right;height:auto;position:absolute;right:13px;top:63px;width:500px;z-index:100} .toolbarBox #modules_list_container{background:none repeat scroll 0 0 #FFF;border:solid 1px #CCC;display:block;float:right;height:auto;position:absolute;right:13px;top:63px;width:500px;z-index:100}
@@ -340,7 +334,7 @@
#moduleContainer .moduleGridDesc,#modules_list_container_tab .moduleGridDesc{display:block;height:30px;position:relative} #moduleContainer .moduleGridDesc,#modules_list_container_tab .moduleGridDesc{display:block;height:30px;position:relative}
#moduleContainer ul.listing-grid-module li select,#modules_list_container_tab ul.listing-grid-module li select{position:absolute;right:0;top:0} #moduleContainer ul.listing-grid-module li select,#modules_list_container_tab ul.listing-grid-module li select{position:absolute;right:0;top:0}
//root css //root css
*{font-family:Arial,Verdana,Helvetica,sans-serif}
body{color:#000;font-size:12px;margin:0;padding:0} body{color:#000;font-size:12px;margin:0;padding:0}
a img{border:0} a img{border:0}
a{color:#000;outline:0;text-decoration:none} a{color:#000;outline:0;text-decoration:none}
@@ -348,12 +342,7 @@
a.link,a.link:hover{color:#999} a.link,a.link:hover{color:#999}
p{color:#585A69;margin:.5em 0} p{color:#585A69;margin:.5em 0}
hr{border:none;margin-bottom:10px;margin-top:10px;padding:0} hr{border:none;margin-bottom:10px;margin-top:10px;padding:0}
h1{font-size:1.6em;margin:0 0 .67em} .blue{color:#268CCD}
h2{font-size:1.4em}
h3{font-size:1.1em}
h5{font-size:.83em}
h6{font-size:.67em}
h3.blue{color:#268CCD}
.red{color:red} .red{color:red}
form p{margin:.5em 0 0;padding:0 0 .5em} form p{margin:.5em 0 0;padding:0 0 .5em}
form sup{color:#C00;font-weight:700;vertical-align:text-top} form sup{color:#C00;font-weight:700;vertical-align:text-top}
@@ -696,45 +685,6 @@
#BoxUseSpecialSyntax .warn{margin:0 auto;width:500px} #BoxUseSpecialSyntax .warn{margin:0 auto;width:500px}
#BoxUseSpecialSyntax ul{list-style-type:disc;margin-left:30px} #BoxUseSpecialSyntax ul{list-style-type:disc;margin-left:30px}
.id_customization .customization_field{min-width:205px;width:205px} .id_customization .customization_field{min-width:205px;width:205px}
#carrier_wizard.swMain{display:block;float:left;margin:0;min-width:980px;padding:0;position:relative;width:100%}
#carrier_wizard.swMain .stepContainer{clear:both;display:block;margin:0;overflow:hidden;padding:0;position:relative}
#carrier_wizard.swMain .stepContainer div.content{clear:both;display:block;float:left;margin:0;overflow:visible;padding:0;position:absolute;text-align:left;width:100%;z-index:88}
#carrier_wizard.swMain div.actionBar{background-color:#f7f8f7;border:1px solid #caccca;clear:both;display:block;height:37px;margin-bottom:20px;overflow:auto;padding:0;position:relative;text-align:left;z-index:88}
#carrier_wizard.swMain .stepContainer .StepTitle{clear:both;display:block;margin:0;padding:5px;position:relative;text-align:left;z-index:88}
#carrier_wizard.swMain ul.anchor{clear:both;display:block;float:left;list-style:none;margin:0 0 10px;padding:0;position:relative;width:100%}
#carrier_wizard.swMain ul.anchor li{display:block;float:left;margin:0;padding:0;position:relative}
#carrier_wizard.swMain ul.nbr_steps_4.anchor li{width:25%}
#carrier_wizard.swMain ul.nbr_steps_5.anchor li{width:20%}
#carrier_wizard.swMain ul.anchor li a{display:block;height:32px;margin:0;outline-style:none;overflow:hidden;padding-right:25px;position:relative;text-decoration:none;z-index:99}
#carrier_wizard.swMain ul.anchor li a .stepNumber{color:#fffffe;float:left;font-size:30px;font-style:normal;font-weight:400;height:32px;line-height:32px;padding:0 5px;position:relative;text-align:center;width:24px}
#carrier_wizard.swMain ul.anchor li a .stepDesc{display:table-cell;font-size:15px;height:32px;line-height:13px;position:relative;text-align:left;vertical-align:middle}
#carrier_wizard.swMain ul.anchor li a.selected{background:#404956 url(../img/admin/steps-carrierwizard.png) no-repeat right -32px;color:#F8F8F8;cursor:text}
#carrier_wizard.swMain ul.anchor li a.done,#carrier_wizard.swMain ul.anchor li.done.selected a.selected{background:url(../img/admin/steps-carrierwizard.png) right 0 no-repeat #3f4856;color:#FFF;position:relative;z-index:99}
#carrier_wizard.swMain ul.anchor li a.disabled{background:url(../img/admin/steps-carrierwizard.png) right -64px no-repeat #cbcccb;color:#878787;cursor:text}
#carrier_wizard.swMain .buttonDisabled{background-color:#CCC!important;border:1px solid #CCC!important;color:#F8F8F8!important;cursor:text}
#carrier_wizard.swMain .buttonFinish{background-color:#5A5655;border:1px solid #5A5655;color:#FFF;display:block;float:right;margin:5px 10px 0 3px;outline-style:none;padding:5px;text-align:center;text-decoration:none;width:100px}
#carrier_logo_block{margin:0;padding:0;position:absolute;right:10px}
#carrier_wizard.swMain .msgBox{background-color:#FFD;border:1px solid #FFD700;color:#5A5655;display:none;float:left;margin:4px 0 0 5px;min-width:200px;padding:5px;position:relative;z-index:999}
#carrier_wizard.swMain .msgBox .content{float:left;padding:0}
#carrier_wizard.swMain .msgBox .close{border:1px solid #CCC;color:#CCC;display:block;float:right;margin:0 0 0 5px;outline-style:none;padding:0 2px;position:relative;text-align:center;text-decoration:none}
#carrier_wizard.swMain .msgBox .close:hover{border:1px solid #EA8511;color:#EA8511}
#carrier_wizard .border_top{border-top:solid 1px silver}
#carrier_wizard .border_bottom{border-bottom:solid 1px silver}
#carrier_wizard .border_left{border-left:solid 1px silver}
#carrier_wizard .border_right{border-right:solid 1px silver}
#carrier_wizard .border_all{border:solid 1px silver}
#carrier_wizard input.field_error{background-color:#FCC;border:solid 1px red}
#carrier_wizard .new_range,#carrier_wizard .validate_range{float:left;margin:35px 0 0 10px;width:130px}
#carrier_wizard tr.fees_all{background:#CCC}
#carrier_wizard #zones_table input[type=text]{width:45px}
#carrier_wizard #fieldset_form{min-height:190px}
#carrier_wizard #zone_ranges label{float:none;width:inherit}
#carrier_wizard #step_carrier_summary label{width:40px}
#carrier_wizard #step_carrier_summary .margin-form{padding-left:60px}
#carrier_wizard #summary_zones,#carrier_wizard #summary_groups,#carrier_wizard #summary_shops{list-style:disc;margin-left:20px;margin-top:10px}
#carrier_wizard .ranges_not_follow label{float:none;width:inherit}
#carrier_wizard .ranges_not_follow{margin-bottom:0;width:300px}
#carrier_wizard .assoShop{min-height:inherit}
.float,span.defaultSkin table.mceLayout tr.mceFirst td,#customer_part #customers ul,#MeaningStatus,#CustomerThreadContacts div#MeaningStatus,#conditions #condition_list a{float:left} .float,span.defaultSkin table.mceLayout tr.mceFirst td,#customer_part #customers ul,#MeaningStatus,#CustomerThreadContacts div#MeaningStatus,#conditions #condition_list a{float:left}
.floatr,#customer_part #customers ul li a.id_customer.button{float:right} .floatr,#customer_part #customers ul li a.id_customer.button{float:right}
a.link,.warn a,#content .conf a:hover,#content .warn a:hover,#content .error a:hover{text-decoration:underline} a.link,.warn a,#content .conf a:hover,#content .warn a:hover,#content .error a:hover{text-decoration:underline}
@@ -762,6 +712,4 @@
#conditions .condition_group h3,#conditions #condition_list h4{margin:0 0 10px} #conditions .condition_group h3,#conditions #condition_list h4{margin:0 0 10px}
#container-customer,#container-multishop{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;padding:10px} #container-customer,#container-multishop{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;padding:10px}
#block_tips,#block_partner_tips{float:right;width:48.1%} #block_tips,#block_partner_tips{float:right;width:48.1%}
#carrier_wizard.swMain .buttonNext,#carrier_wizard.swMain .buttonPrevious{background-color:#5A5655;border:1px solid #5A5655;color:#FFF;display:block;float:right;margin:5px 3px 0;outline-style:none;padding:5px;text-align:center;text-decoration:none;width:100px}
#carrier_wizard.swMain ul.anchor li a.done .stepNumber,#carrier_wizard.swMain ul.anchor li a.done .stepDesc{color:#A9B6C8}
} }
+35
View File
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
@@ -61,7 +61,7 @@
$(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); }); $(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); });
</script> </script>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title} {include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
<div class="leadin">{block name="leadin"}{/block}</div> <div class="leadin">{block name="leadin"}{/block}</div>
{if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if} {if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if}
@@ -58,6 +58,18 @@
{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>. {l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
</p> </p>
</div> </div>
<script>
$(document).ready(function(){
$('#attachement_fileselectbutton').click(function(e){
$('#carrier_logo_input').trigger('click');
});
$('#carrier_logo_input').change(function(e){
var val = $(this).val();
var file = val.split(/[\\/]/);
$('#attachement_filename').val(file[file.length-1]);
});
});
</script>
{/if} {/if}
{$smarty.block.parent} {$smarty.block.parent}
{/block} {/block}
@@ -50,7 +50,7 @@
<span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span> <span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span>
</td> </td>
<td> <td>
<input type="checkbox" onclick="checkAllZones(this);" > <input type="checkbox" onclick="checkAllZones(this);" class="form-control">
</td> </td>
{foreach from=$ranges key=r item=range} {foreach from=$ranges key=r item=range}
<td class="border_top border_bottom {if $range.id_range != 0} validated {/if}" > <td class="border_top border_bottom {if $range.id_range != 0} validated {/if}" >
@@ -27,11 +27,11 @@
{block name="label"} {block name="label"}
{if $input['type'] == 'modules'} {if $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
<label class="control-label col-lg-3">{l s='Authorized modules:'}</label> <label class="control-label col-lg-3">{l s='Authorized modules:'}</label>
</div> </div>
{elseif $input['type'] == 'group_discount_category'} {elseif $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
{$smarty.block.parent} {$smarty.block.parent}
</div> </div>
{else} {else}
@@ -39,10 +39,9 @@
{/if} {/if}
{/block} {/block}
{block name="field"} {block name="field"}
{if $input['type'] == 'group_discount_category'} {if $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#group_discount_category").fancybox({ $("#group_discount_category").fancybox({
@@ -143,7 +142,7 @@
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
</div>
<div style="display:none" id="group_discount_category_fancybox"> <div style="display:none" id="group_discount_category_fancybox">
<div class="panel form-horizontal"> <div class="panel form-horizontal">
<div class="col-lg-12"> <div class="col-lg-12">
@@ -168,8 +167,7 @@
</div> </div>
</div> </div>
{elseif $input['type'] == 'modules'} {elseif $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}"> <div {if !$form_id}class="hide"{/if}>
<div class="margin-form">
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('#authorized-modules').find('[value="0"]').click(function() { $('#authorized-modules').find('[value="0"]').click(function() {
@@ -185,7 +183,7 @@
<div class="col-lg-9" id="authorized-modules"> <div class="col-lg-9" id="authorized-modules">
{foreach $input['values']['auth_modules'] key=key item=module } {foreach $input['values']['auth_modules'] key=key item=module }
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label> <label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<div class="input-group col-lg-2"> <div class="input-group col-lg-2">
<span class="switch prestashop-switch"> <span class="switch prestashop-switch">
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1" checked="checked"> <input type="radio" name="{$module->name}" id="{$module->name}_on" value="1" checked="checked">
@@ -200,7 +198,7 @@
{/foreach} {/foreach}
{foreach $input['values']['unauth_modules'] key=key item=module } {foreach $input['values']['unauth_modules'] key=key item=module }
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label> <label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<div class="input-group col-lg-2"> <div class="input-group col-lg-2">
<span class="switch prestashop-switch"> <span class="switch prestashop-switch">
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1"> <input type="radio" name="{$module->name}" id="{$module->name}_on" value="1">
@@ -26,58 +26,62 @@
{extends file="helpers/view/view.tpl"} {extends file="helpers/view/view.tpl"}
{block name="override_tpl"} {block name="override_tpl"}
<div class="col-lg-6"> <div class="row">
<div class="panel"> <div class="col-lg-6">
<h3><i class="icon-group"></i> {l s='Group information'}</h3> <div class="panel">
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2> <h3><i class="icon-group"></i> {l s='Group information'}</h3>
<div class="form-horizontal"> <h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
<div class="form-group"> <div class="form-horizontal">
<label class="col-lg-3 control-label">{l s='Discount:'}</label> <div class="form-group">
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div> <label class="col-lg-3 control-label">{l s='Discount:'}</label>
</div> <div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
<div class="form-group"> </div>
<label class="col-lg-3 control-label">{l s='Price display method:'}</label> <div class="form-group">
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method} <label class="col-lg-3 control-label">{l s='Price display method:'}</label>
{l s='Tax excluded'} <div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
{else} {l s='Tax excluded'}
{l s='Tax included'} {else}
{/if}</p></div> {l s='Tax included'}
</div> {/if}</p></div>
<div class="form-group"> </div>
<label class="col-lg-3 control-label">{l s='Show prices:'}</label> <div class="form-group">
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div> <label class="col-lg-3 control-label">{l s='Show prices:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="col-lg-6">
<div class="col-lg-6"> <div class="panel">
<div class="panel"> <h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3> {if !$categorieReductions}
{if !$categorieReductions} <div class="alert alert-warning">{l s='None'}</div>
<div class="alert alert-warning">{l s='None'}</div> {else}
{else} <table class="table">
<table class="table"> <thead>
<thead> <tr>
<tr> <th><span class="title_box">{l s='Category'}</span></th>
<th><span class="title_box">{l s='Category'}</span></th> <th><span class="title_box">{l s='Discount'}</span></th>
<th><span class="title_box">{l s='Discount'}</span></th> </tr>
</tr> </thead>
</thead> <tbody>
<tbody> {foreach $categorieReductions key=key item=category }
{foreach $categorieReductions key=key item=category } <tr class="alt_row">
<tr class="alt_row"> <td>{$category.path}</td>
<td>{$category.path}</td> <td>{l s='%d%%' sprintf=$category.reduction}</td>
<td>{l s='%d%%' sprintf=$category.reduction}</td> </tr>
</tr> {/foreach}
{/foreach} <tbody>
<tbody> </table>
</table> {/if}
{/if} </div>
</div> </div>
</div> </div>
<div class="col-lg-12"> <div class="row">
<h2>{l s='Members of this customer group'}</h2> <div class="col-lg-12">
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p> <h2>{l s='Members of this customer group'}</h2>
{$customerList} <p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList}
</div>
</div> </div>
{/block} {/block}
@@ -30,95 +30,101 @@
{$list['title']} {$list['title']}
</h3> </h3>
<p class="help-block">{$list['desc']}</p> <p class="help-block">{$list['desc']}</p>
<div class="row table-responsive clearfix overflow-y"> <div class="row table-responsive clearfix ">
<table class="table"> <div class="overflow-y">
<tr> <table class="table">
<th width="40%"><span class="title_box">{$list['title']}<span></th> <thead>
{foreach $payment_modules as $module} <tr>
{if $module->active} <th width="40%"><span class="title_box">{$list['title']}<span></th>
<th class="center"> {foreach $payment_modules as $module}
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'} {if $module->active}
<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/> <th class="text-center">
<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')"> {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
{/if} <input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
&nbsp;<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}"/> <a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')">
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
</a>
{/if}
</th>
{/if}
{/foreach}
</tr>
{foreach $list['items'] as $item}
<tr>
<td>
<span>{$item['name']}</span>
</td>
{foreach $payment_modules as $key_module => $module}
{if $module->active}
<td class="center">
{assign var='type' value='null'}
{if !$item['check_list'][$key_module]}
{* Keep $type to null *}
{elseif $list['name_id'] === 'currency'}
{if $module->currencies && $module->currencies_mode == 'checkbox'}
{$type = 'checkbox'}
{elseif $module->currencies && $module->currencies_mode == 'radio'}
{$type = 'radio'}
{/if} {/if}
{else} {$module->displayName}
{$type = 'checkbox'} {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
{/if} </a>
{if $type != 'null'} {/if}
<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/> </th>
{else} {/if}
<input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>-- {/foreach}
{/if} </tr>
</td> </thead>
{/if} <tbody>
{/foreach} {foreach $list['items'] as $item}
</tr> <tr>
{/foreach} <td>
{if $list['name_id'] === 'currency'} <span>{$item['name']}</span>
<tr> </td>
<td> {foreach $payment_modules as $key_module => $module}
<span>{l s='Customer currency'}</span> {if $module->active}
</td> <td class="text-center">
{foreach $payment_modules as $module} {assign var='type' value='null'}
{if $module->active} {if !$item['check_list'][$key_module]}
<td> {* Keep $type to null *}
{if $module->currencies && $module->currencies_mode == 'radio'} {elseif $list['name_id'] === 'currency'}
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked" {if $module->currencies && $module->currencies_mode == 'checkbox'}
{/if} /> {$type = 'checkbox'}
{else} {elseif $module->currencies && $module->currencies_mode == 'radio'}
-- {$type = 'radio'}
{/if} {/if}
</td> {else}
{/if} {$type = 'checkbox'}
{/foreach} {/if}
</tr> {if $type != 'null'}
<tr> <input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
<td> {else}
<span>{l s='Shop default currency'}</span> <input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
</td> {/if}
{foreach $payment_modules as $module} </td>
{if $module->active} {/if}
<td> {/foreach}
{if $module->currencies && $module->currencies_mode == 'radio'} </tr>
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-2"{if in_array(-2, $module->$list['name_id'])} checked="checked" {/foreach}
{/if} {if $list['name_id'] === 'currency'}
/> <tr>
{else} <td>
-- <span>{l s='Customer currency'}</span>
{/if} </td>
</td> {foreach $payment_modules as $module}
{/if} {if $module->active}
{/foreach} <td class="text-center">
</tr> {if $module->currencies && $module->currencies_mode == 'radio'}
{/if} <input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked"
</table> {/if} />
{else}
--
{/if}
</td>
{/if}
{/foreach}
</tr>
<tr>
<td>
<span>{l s='Shop default currency'}</span>
</td>
{foreach $payment_modules as $module}
{if $module->active}
<td class="text-center">
{if $module->currencies && $module->currencies_mode == 'radio'}
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-2"{if in_array(-2, $module->$list['name_id'])} checked="checked"
{/if}
/>
{else}
--
{/if}
</td>
{/if}
{/foreach}
</tr>
{/if}
</tbody>
</table>
</div>
</div> </div>
<div class="row pull-right"> <div class="row">
<button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}"> <button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}">
<i class="icon-save"></i> <i class="icon-save"></i>
{l s='Save restrictions'} {l s='Save restrictions'}
@@ -25,11 +25,11 @@
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
$('body').highlight('{$query}'); $('#content .panel').highlight('{$query}');
}); });
</script> </script>
{if !$nb_results} {if !isset($nb_results) || !$nb_results}
<h2>{l s='There are no results matching your query "%s".' sprintf=$query}</h2> <h2>{l s='There are no results matching your query "%s".' sprintf=$query}</h2>
{else} {else}
<h2> <h2>
@@ -27,10 +27,11 @@
{foreach $list AS $index => $tr} {foreach $list AS $index => $tr}
<tr <tr
{if $position_identifier}id="tr_{$id_category}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if} {if $position_identifier}id="tr_{$id_category}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
class="{if isset($tr.class)} {$tr.class}{/if}" class="{if isset($tr.class)} {$tr.class}{/if} {if $tr@iteration is odd by 1}odd{/if}"
{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if} {if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
> >
<td class="center"> <td class="text-center">
{if $bulk_actions && $has_bulk_actions} {if $bulk_actions && $has_bulk_actions}
{if isset($list_skip_actions.delete)} {if isset($list_skip_actions.delete)}
{if !in_array($tr.$identifier, $list_skip_actions.delete)} {if !in_array($tr.$identifier, $list_skip_actions.delete)}
@@ -40,6 +41,7 @@
<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" /> <input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
{/if} {/if}
{/if} {/if}
</td> </td>
{foreach $fields_display AS $key => $params} {foreach $fields_display AS $key => $params}
{block name="open_td"} {block name="open_td"}
+1 -1
View File
@@ -450,7 +450,7 @@ class HookCore extends ObjectModel
//retro compat of controller names //retro compat of controller names
$matching_name = array( $matching_name = array(
'authentication' => 'auth', 'authentication' => 'auth',
'compare' => 'products-comparison', 'productscomparison' => 'compare'
); );
if (isset($matching_name[$controller]) && in_array($matching_name[$controller], $exceptions)) if (isset($matching_name[$controller]) && in_array($matching_name[$controller], $exceptions))
continue; continue;
+16 -10
View File
@@ -1918,6 +1918,14 @@ class AdminControllerCore extends Controller
$this->helper = $helper; $this->helper = $helper;
} }
public function setDeprecatedMedia()
{
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
}
public function setMedia() public function setMedia()
{ {
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_); $admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
@@ -1928,11 +1936,9 @@ class AdminControllerCore extends Controller
// Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility // Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility
if (!$this->bootstrap) if (!$this->bootstrap)
{ $this->setDeprecatedMedia();
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/admin.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/bootstrap_admin_reset.css', 'all');
}
//todo css for rtl support
if ($this->context->language->is_rtl) if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css'); $this->addCSS(_THEME_CSS_DIR_.'rtl.css');
@@ -1946,6 +1952,7 @@ class AdminControllerCore extends Controller
_PS_JS_DIR_.'ajax.js', _PS_JS_DIR_.'ajax.js',
_PS_JS_DIR_.'toolbar.js', _PS_JS_DIR_.'toolbar.js',
)); ));
//loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory //loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory
$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/bootstrap.js'); $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/bootstrap.js');
$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/admin-theme.js'); $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/admin-theme.js');
@@ -1970,14 +1977,13 @@ class AdminControllerCore extends Controller
* @param boolean $htmlentities if set to true(default), the return value will pass through htmlentities($string, ENT_QUOTES, 'utf-8') * @param boolean $htmlentities if set to true(default), the return value will pass through htmlentities($string, ENT_QUOTES, 'utf-8')
* @return string the translation if available, or the english default text. * @return string the translation if available, or the english default text.
*/ */
protected function l($string, $class = 'AdminTab', $addslashes = false, $htmlentities = true) protected function l($string, $class = null, $addslashes = false, $htmlentities = true)
{ {
// classname has changed, from AdminXXX to AdminXXXController if ($class === null || $class == 'AdminTab')
// So we remove 10 characters and we keep same keys
if (strtolower(substr($class, -10)) == 'controller')
$class = substr($class, 0, -10);
elseif ($class == 'AdminTab')
$class = substr(get_class($this), 0, -10); $class = substr(get_class($this), 0, -10);
// classname has changed, from AdminXXX to AdminXXXController, so we remove 10 characters and we keep same keys
elseif (strtolower(substr($class, -10)) == 'controller')
$class = substr($class, 0, -10);
return Translate::getAdminTranslation($string, $class, $addslashes, $htmlentities); return Translate::getAdminTranslation($string, $class, $addslashes, $htmlentities);
} }
-1
View File
@@ -748,7 +748,6 @@ class FrontControllerCore extends Controller
$this->addJqueryUI('ui.sortable'); $this->addJqueryUI('ui.sortable');
$this->addjqueryPlugin('fancybox'); $this->addjqueryPlugin('fancybox');
$this->addJS(_PS_JS_DIR_.'hookLiveEdit.js'); $this->addJS(_PS_JS_DIR_.'hookLiveEdit.js');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'all'); // @TODO
} }
if ($this->context->language->is_rtl) if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css'); $this->addCSS(_THEME_CSS_DIR_.'rtl.css');
+5 -3
View File
@@ -64,6 +64,8 @@ class HelperListCore extends Helper
public $position_identifier; public $position_identifier;
public $table_id;
/** /**
* @var string Customize list display * @var string Customize list display
* *
@@ -536,8 +538,8 @@ class HelperListCore extends Helper
isset($this->context->cookie->{$this->list_id.'_pagination'}) ? $this->context->cookie->{$this->list_id.'_pagination'} : null isset($this->context->cookie->{$this->list_id.'_pagination'}) ? $this->context->cookie->{$this->list_id.'_pagination'} : null
); );
if ($this->position_identifier && (int)Tools::getValue($this->position_identifier, 1)) if (!isset($this->table_id) && $this->position_identifier && (int)Tools::getValue($this->position_identifier, 1))
$table_id = substr($this->identifier, 3, strlen($this->identifier)); $this->table_id = substr($this->identifier, 3, strlen($this->identifier));
if ($this->position_identifier && ($this->orderBy == 'position' && $this->orderWay != 'DESC')) if ($this->position_identifier && ($this->orderBy == 'position' && $this->orderWay != 'DESC'))
$table_dnd = true; $table_dnd = true;
@@ -628,7 +630,7 @@ class HelperListCore extends Helper
'id_cat' => $id_cat, 'id_cat' => $id_cat,
'shop_link_type' => $this->shopLinkType, 'shop_link_type' => $this->shopLinkType,
'has_actions' => !empty($this->actions), 'has_actions' => !empty($this->actions),
'table_id' => isset($table_id) ? $table_id : null, 'table_id' => isset($this->table_id) ? $this->table_id : null,
'table_dnd' => isset($table_dnd) ? $table_dnd : null, 'table_dnd' => isset($table_dnd) ? $table_dnd : null,
'name' => isset($name) ? $name : null, 'name' => isset($name) ? $name : null,
'name_id' => isset($name_id) ? $name_id : null, 'name_id' => isset($name_id) ? $name_id : null,
@@ -196,9 +196,12 @@ class AdminAttributeGeneratorControllerCore extends AdminController
)); ));
} }
public function initToolbar() public function initPageHeaderToolbar()
{ {
$this->toolbar_btn['back'] = array( parent::initPageHeaderToolbar();
$this->page_header_toolbar_title = $this->l('Attributes generator');
$this->page_header_toolbar_btn['back'] = array(
'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations', 'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations',
'desc' => $this->l('Back to the product') 'desc' => $this->l('Back to the product')
); );
@@ -215,8 +218,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
} }
// Init toolbar // Init toolbar
$this->initToolbarTitle(); $this->initPageHeaderToolbar();
$this->initToolbar();
$this->initGroupTable(); $this->initGroupTable();
$attributes = Attribute::getAttributes(Context::getContext()->language->id, true); $attributes = Attribute::getAttributes(Context::getContext()->language->id, true);
@@ -239,7 +241,9 @@ class AdminAttributeGeneratorControllerCore extends AdminController
'attribute_js' => $attribute_js, 'attribute_js' => $attribute_js,
'toolbar_btn' => $this->toolbar_btn, 'toolbar_btn' => $this->toolbar_btn,
'toolbar_scroll' => true, 'toolbar_scroll' => true,
'title' => $this->toolbar_title, 'show_page_header_toolbar' => $this->show_page_header_toolbar,
'page_header_toolbar_title' => $this->page_header_toolbar_title,
'page_header_toolbar_btn' => $this->page_header_toolbar_btn
)); ));
} }
} }
@@ -149,10 +149,10 @@ class AdminCarrierWizardControllerCore extends AdminController
$this->toolbar_title = $bread_extended; $this->toolbar_title = $bread_extended;
} }
public function initToolbar() public function initPageHeaderToolbar()
{ {
parent::initToolbar(); parent::initPageHeaderToolbar();
$this->toolbar_btn['back']['href'] = $this->context->link->getAdminLink('AdminCarriers'); $this->page_header_toolbar_btn['back']['href'] = $this->context->link->getAdminLink('AdminCarriers');
} }
public function renderStepOne($carrier) public function renderStepOne($carrier)
@@ -254,7 +254,7 @@ class AdminCarrierWizardControllerCore extends AdminController
), ),
array( array(
'type' => 'switch', 'type' => 'switch',
'label' => $this->l('Apply shipping cost:'), 'label' => $this->l('Free Shipping:'),
'name' => 'is_free', 'name' => 'is_free',
'required' => false, 'required' => false,
'class' => 't', 'class' => 't',
@@ -270,7 +270,6 @@ class AdminCarrierWizardControllerCore extends AdminController
'label' => '<img src="../img/admin/enabled.gif" alt="'.$this->l('Yes').'" title="'.$this->l('Yes').'" />' '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( array(
'type' => 'radio', 'type' => 'radio',
@@ -351,7 +351,7 @@ class AdminCategoriesControllerCore extends AdminController
$helper->id = 'box-disabled-categories'; $helper->id = 'box-disabled-categories';
$helper->icon = 'icon-off'; $helper->icon = 'icon-off';
$helper->color = 'color1'; $helper->color = 'color1';
$helper->title = $this->l('Disabled Categories'); $helper->title = $this->l('Disabled Categories', null, null, false);
if (ConfigurationKPI::get('DISABLED_CATEGORIES') !== false) if (ConfigurationKPI::get('DISABLED_CATEGORIES') !== false)
$helper->value = ConfigurationKPI::get('DISABLED_CATEGORIES'); $helper->value = ConfigurationKPI::get('DISABLED_CATEGORIES');
if (ConfigurationKPI::get('DISABLED_CATEGORIES_EXPIRE') < $time) if (ConfigurationKPI::get('DISABLED_CATEGORIES_EXPIRE') < $time)
@@ -362,7 +362,7 @@ class AdminCategoriesControllerCore extends AdminController
$helper->id = 'box-empty-categories'; $helper->id = 'box-empty-categories';
$helper->icon = 'icon-bookmark-empty'; $helper->icon = 'icon-bookmark-empty';
$helper->color = 'color2'; $helper->color = 'color2';
$helper->title = $this->l('Empty Categories'); $helper->title = $this->l('Empty Categories', null, null, false);
if (ConfigurationKPI::get('EMPTY_CATEGORIES') !== false) if (ConfigurationKPI::get('EMPTY_CATEGORIES') !== false)
$helper->value = ConfigurationKPI::get('EMPTY_CATEGORIES'); $helper->value = ConfigurationKPI::get('EMPTY_CATEGORIES');
if (ConfigurationKPI::get('EMPTY_CATEGORIES_EXPIRE') < $time) if (ConfigurationKPI::get('EMPTY_CATEGORIES_EXPIRE') < $time)
@@ -373,8 +373,8 @@ class AdminCategoriesControllerCore extends AdminController
$helper->id = 'box-top-category'; $helper->id = 'box-top-category';
$helper->icon = 'icon-money'; $helper->icon = 'icon-money';
$helper->color = 'color3'; $helper->color = 'color3';
$helper->title = $this->l('Top Category'); $helper->title = $this->l('Top Category', null, null, false);
$helper->subtitle = $this->l('30 days'); $helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang) !== false) if (ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang) !== false)
$helper->value = ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang); $helper->value = ConfigurationKPI::get('TOP_CATEGORY', $this->context->employee->id_lang);
if (ConfigurationKPI::get('TOP_CATEGORY_EXPIRE', $this->context->employee->id_lang) < $time) if (ConfigurationKPI::get('TOP_CATEGORY_EXPIRE', $this->context->employee->id_lang) < $time)
@@ -478,7 +478,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$helper->id = 'box-pending-messages'; $helper->id = 'box-pending-messages';
$helper->icon = 'icon-envelope'; $helper->icon = 'icon-envelope';
$helper->color = 'color1'; $helper->color = 'color1';
$helper->title = $this->l('Pending Messages'); $helper->title = $this->l('Pending Messages', null, null, false);
if (ConfigurationKPI::get('PENDING_MESSAGES') !== false) if (ConfigurationKPI::get('PENDING_MESSAGES') !== false)
$helper->value = ConfigurationKPI::get('PENDING_MESSAGES'); $helper->value = ConfigurationKPI::get('PENDING_MESSAGES');
if (ConfigurationKPI::get('PENDING_MESSAGES_EXPIRE') < $time) if (ConfigurationKPI::get('PENDING_MESSAGES_EXPIRE') < $time)
@@ -489,8 +489,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
$helper->id = 'box-age'; $helper->id = 'box-age';
$helper->icon = 'icon-time'; $helper->icon = 'icon-time';
$helper->color = 'color2'; $helper->color = 'color2';
$helper->title = $this->l('Average Response Time'); $helper->title = $this->l('Average Response Time', null, null, false);
$helper->subtitle = $this->l('30 days'); $helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME') !== false) if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME') !== false)
$helper->value = ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME'); $helper->value = ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME');
if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME_EXPIRE') < $time) if (ConfigurationKPI::get('AVG_MSG_RESPONSE_TIME_EXPIRE') < $time)
@@ -501,8 +501,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
$helper->id = 'box-messages-per-thread'; $helper->id = 'box-messages-per-thread';
$helper->icon = 'icon-copy'; $helper->icon = 'icon-copy';
$helper->color = 'color3'; $helper->color = 'color3';
$helper->title = $this->l('Messages per Thread'); $helper->title = $this->l('Messages per Thread', null, null, false);
$helper->subtitle = $this->l('30 day'); $helper->subtitle = $this->l('30 day', null, null, false);
if (ConfigurationKPI::get('MESSAGES_PER_THREAD') !== false) if (ConfigurationKPI::get('MESSAGES_PER_THREAD') !== false)
$helper->value = ConfigurationKPI::get('MESSAGES_PER_THREAD'); $helper->value = ConfigurationKPI::get('MESSAGES_PER_THREAD');
if (ConfigurationKPI::get('MESSAGES_PER_THREAD_EXPIRE') < $time) if (ConfigurationKPI::get('MESSAGES_PER_THREAD_EXPIRE') < $time)
@@ -545,8 +545,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-gender'; $helper->id = 'box-gender';
$helper->icon = 'icon-male'; $helper->icon = 'icon-male';
$helper->color = 'color1'; $helper->color = 'color1';
$helper->title = $this->l('Customers'); $helper->title = $this->l('Customers', null, null, false);
$helper->subtitle = $this->l('All Time'); $helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER') !== false) if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER') !== false)
$helper->value = ConfigurationKPI::get('CUSTOMER_MAIN_GENDER'); $helper->value = ConfigurationKPI::get('CUSTOMER_MAIN_GENDER');
if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER_EXPIRE') < $time) if (ConfigurationKPI::get('CUSTOMER_MAIN_GENDER_EXPIRE') < $time)
@@ -557,8 +557,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-age'; $helper->id = 'box-age';
$helper->icon = 'icon-calendar'; $helper->icon = 'icon-calendar';
$helper->color = 'color2'; $helper->color = 'color2';
$helper->title = $this->l('Average Age'); $helper->title = $this->l('Average Age', 'AdminTab', null, false);
$helper->subtitle = $this->l('All Time'); $helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('AVG_CUSTOMER_AGE') !== false) if (ConfigurationKPI::get('AVG_CUSTOMER_AGE') !== false)
$helper->value = ConfigurationKPI::get('AVG_CUSTOMER_AGE'); $helper->value = ConfigurationKPI::get('AVG_CUSTOMER_AGE');
if (ConfigurationKPI::get('AVG_CUSTOMER_AGE_EXPIRE') < $time) if (ConfigurationKPI::get('AVG_CUSTOMER_AGE_EXPIRE') < $time)
@@ -569,8 +569,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-orders'; $helper->id = 'box-orders';
$helper->icon = 'icon-retweet'; $helper->icon = 'icon-retweet';
$helper->color = 'color3'; $helper->color = 'color3';
$helper->title = $this->l('Orders per Customer'); $helper->title = $this->l('Orders per Customer', null, null, false);
$helper->subtitle = $this->l('All Time'); $helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER') !== false) if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER') !== false)
$helper->value = ConfigurationKPI::get('ORDERS_PER_CUSTOMER'); $helper->value = ConfigurationKPI::get('ORDERS_PER_CUSTOMER');
if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER_EXPIRE') < $time) if (ConfigurationKPI::get('ORDERS_PER_CUSTOMER_EXPIRE') < $time)
@@ -581,8 +581,8 @@ class AdminCustomersControllerCore extends AdminController
$helper->id = 'box-newsletter'; $helper->id = 'box-newsletter';
$helper->icon = 'icon-envelope'; $helper->icon = 'icon-envelope';
$helper->color = 'color4'; $helper->color = 'color4';
$helper->title = $this->l('Newsletter Registrations'); $helper->title = $this->l('Newsletter Registrations', null, null, false);
$helper->subtitle = $this->l('All Time'); $helper->subtitle = $this->l('All Time', null, null, false);
if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS') !== false) if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS') !== false)
$helper->value = ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS'); $helper->value = ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS');
if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS_EXPIRE') < $time) if (ConfigurationKPI::get('NEWSLETTER_REGISTRATIONS_EXPIRE') < $time)
+22 -7
View File
@@ -49,7 +49,7 @@ class AdminDashboardControllerCore extends AdminController
_PS_JS_DIR_.'/admin-dashboard.js', _PS_JS_DIR_.'/admin-dashboard.js',
)); ));
$this->addCSS(array( $this->addCSS(array(
__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css', __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/vendor/nv.d3.css',
)); ));
} }
@@ -86,7 +86,7 @@ class AdminDashboardControllerCore extends AdminController
{ {
$forms['payment']['fields']['CONF_'.strtoupper($module->name).'_FIXED'] = array( $forms['payment']['fields']['CONF_'.strtoupper($module->name).'_FIXED'] = array(
'title' => $module->displayName, 'title' => $module->displayName,
'desc' => sprintf($this->l('Choose a fixed fee for each order placed in %s with %s.'), $currency->iso_code, $module->displayName), 'desc' => sprintf($this->l('Choose a fixed fee for each order placed in %1$s with %2$s.'), $currency->iso_code, $module->displayName),
'validation' => 'isPrice', 'validation' => 'isPrice',
'cast' => 'floatval', 'cast' => 'floatval',
'type' => 'text', 'type' => 'text',
@@ -95,7 +95,7 @@ class AdminDashboardControllerCore extends AdminController
); );
$forms['payment']['fields']['CONF_'.strtoupper($module->name).'_VAR'] = array( $forms['payment']['fields']['CONF_'.strtoupper($module->name).'_VAR'] = array(
'title' => $module->displayName, 'title' => $module->displayName,
'desc' => sprintf($this->l('Choose a variable fee for each order placed in %s with %s. It will be applied on the total paid with taxes.'), $currency->iso_code, $module->displayName), 'desc' => sprintf($this->l('Choose a variable fee for each order placed in %1$s with %2$s. It will be applied on the total paid with taxes.'), $currency->iso_code, $module->displayName),
'validation' => 'isPercentage', 'validation' => 'isPercentage',
'cast' => 'floatval', 'cast' => 'floatval',
'type' => 'text', 'type' => 'text',
@@ -325,6 +325,7 @@ class AdminDashboardControllerCore extends AdminController
{ {
if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description)) if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description))
$return['rss'][] = array( $return['rss'][] = array(
'date' => Tools::displayDate(date('Y-m-d', strtotime((string)$item->pubDate))),
'title' => (string)$item->title, 'title' => (string)$item->title,
'short_desc' => substr((string)$item->description, 0, 100).'...', 'short_desc' => substr((string)$item->description, 0, 100).'...',
'link' => (string)$item->link, 'link' => (string)$item->link,
@@ -339,21 +340,35 @@ class AdminDashboardControllerCore extends AdminController
public function ajaxProcessSaveDashConfig() public function ajaxProcessSaveDashConfig()
{ {
$return = array('has_errors' => false); $return = array('has_errors' => false, 'errors' => array());
$module = Tools::getValue('module'); $module = Tools::getValue('module');
$hook = Tools::getValue('hook'); $hook = Tools::getValue('hook');
$configs = Tools::getValue('configs'); $configs = Tools::getValue('configs');
$params = array(
'date_from' => $this->context->employee->stats_date_from,
'date_to' => $this->context->employee->stats_date_to
);
if (Validate::isModuleName($module) && $module_obj = Module::getInstanceByName($module)) if (Validate::isModuleName($module) && $module_obj = Module::getInstanceByName($module))
if (Validate::isLoadedObject($module_obj) && method_exists($module_obj, 'saveDashConfig')) {
$return['has_errors'] = $module_obj->saveDashConfig($configs); if (Validate::isLoadedObject($module_obj) && method_exists($module_obj, 'validateDashConfig'))
$return['errors'] = $module_obj->validateDashConfig($configs);
if (!count($return['errors']))
{
if (Validate::isLoadedObject($module_obj) && method_exists($module_obj, 'saveDashConfig'))
$return['has_errors'] = $module_obj->saveDashConfig($configs);
}
else
$return['has_errors'] = true;
}
else if (is_array($configs) && count($configs)) else if (is_array($configs) && count($configs))
foreach ($configs as $name => $value) foreach ($configs as $name => $value)
if (Validate::isConfigName($name)) if (Validate::isConfigName($name))
Configuration::updateValue($name, $value); Configuration::updateValue($name, $value);
if (Validate::isHookName($hook) && method_exists($module_obj, $hook)) if (Validate::isHookName($hook) && method_exists($module_obj, $hook))
$return['widget_html'] = $module_obj->$hook(array()); $return['widget_html'] = $module_obj->$hook($params);
die(Tools::jsonEncode($return)); die(Tools::jsonEncode($return));
} }
+7 -6
View File
@@ -246,7 +246,7 @@ class AdminGroupsControllerCore extends AdminController
'input' => array( 'input' => array(
array( array(
'type' => 'text', 'type' => 'text',
'label' => $this->l('Name:'), 'label' => $this->l('Name'),
'name' => 'name', 'name' => 'name',
'required' => true, 'required' => true,
'lang' => true, 'lang' => true,
@@ -255,14 +255,15 @@ class AdminGroupsControllerCore extends AdminController
), ),
array( array(
'type' => 'text', 'type' => 'text',
'label' => $this->l('Discount (%):'), 'label' => $this->l('Discount'),
'name' => 'reduction', 'name' => 'reduction',
'col' => 2, 'suffix' => '%',
'col' => 1,
'hint' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.') 'hint' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.')
), ),
array( array(
'type' => 'select', 'type' => 'select',
'label' => $this->l('Price display method:'), 'label' => $this->l('Price display method'),
'name' => 'price_display_method', 'name' => 'price_display_method',
'col' => 2, 'col' => 2,
'hint' => $this->l('How prices are displayed in the order summary for this customer group.'), 'hint' => $this->l('How prices are displayed in the order summary for this customer group.'),
@@ -283,7 +284,7 @@ class AdminGroupsControllerCore extends AdminController
), ),
array( array(
'type' => 'switch', 'type' => 'switch',
'label' => $this->l('Show prices:'), 'label' => $this->l('Show prices'),
'name' => 'show_prices', 'name' => 'show_prices',
'required' => false, 'required' => false,
'class' => 't', 'class' => 't',
@@ -310,7 +311,7 @@ class AdminGroupsControllerCore extends AdminController
), ),
array( array(
'type' => 'modules', 'type' => 'modules',
'label' => array('auth_modules' => $this->l('Authorized modules:'), 'unauth_modules' => $this->l('Unauthorized modules:')), 'label' => $this->l('Modules Authorization'),
'name' => 'auth_modules', 'name' => 'auth_modules',
'values' => $this->formatModuleListAuth($group->id) 'values' => $this->formatModuleListAuth($group->id)
) )
@@ -506,7 +506,6 @@ class AdminImportControllerCore extends AdminController
$this->toolbar_btn = array(); $this->toolbar_btn = array();
// adds fancybox // adds fancybox
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
$this->addJqueryPlugin(array('fancybox')); $this->addJqueryPlugin(array('fancybox'));
$entity_selected = 0; $entity_selected = 0;
+5 -3
View File
@@ -694,6 +694,8 @@ class AdminModulesControllerCore extends AdminController
if ($key == 'configure' && Module::isInstalled($module->name)) if ($key == 'configure' && Module::isInstalled($module->name))
{ {
$this->bootstrap = (isset($module->bootstrap) && $module->bootstrap); $this->bootstrap = (isset($module->bootstrap) && $module->bootstrap);
if (!$this->bootstrap)
$this->setDeprecatedMedia();
if (isset($module->multishop_context)) if (isset($module->multishop_context))
$this->multishop_context = $module->multishop_context; $this->multishop_context = $module->multishop_context;
@@ -987,7 +989,7 @@ class AdminModulesControllerCore extends AdminController
$helper->id = 'box-installed-modules'; $helper->id = 'box-installed-modules';
$helper->icon = 'icon-puzzle-piece'; $helper->icon = 'icon-puzzle-piece';
$helper->color = 'color1'; $helper->color = 'color1';
$helper->title = html_entity_decode($this->l('Installed Modules')); $helper->title = $this->l('Installed Modules', null, null, false);
if (ConfigurationKPI::get('INSTALLED_MODULES') !== false) if (ConfigurationKPI::get('INSTALLED_MODULES') !== false)
$helper->value = ConfigurationKPI::get('INSTALLED_MODULES'); $helper->value = ConfigurationKPI::get('INSTALLED_MODULES');
if (ConfigurationKPI::get('INSTALLED_MODULES_EXPIRE') < $time) if (ConfigurationKPI::get('INSTALLED_MODULES_EXPIRE') < $time)
@@ -998,7 +1000,7 @@ class AdminModulesControllerCore extends AdminController
$helper->id = 'box-disabled-modules'; $helper->id = 'box-disabled-modules';
$helper->icon = 'icon-off'; $helper->icon = 'icon-off';
$helper->color = 'color2'; $helper->color = 'color2';
$helper->title = html_entity_decode($this->l('Disabled Modules')); $helper->title = $this->l('Disabled Modules', null, null, false);
if (ConfigurationKPI::get('DISABLED_MODULES') !== false) if (ConfigurationKPI::get('DISABLED_MODULES') !== false)
$helper->value = ConfigurationKPI::get('DISABLED_MODULES'); $helper->value = ConfigurationKPI::get('DISABLED_MODULES');
if (ConfigurationKPI::get('DISABLED_MODULES_EXPIRE') < $time) if (ConfigurationKPI::get('DISABLED_MODULES_EXPIRE') < $time)
@@ -1009,7 +1011,7 @@ class AdminModulesControllerCore extends AdminController
$helper->id = 'box-update-modules'; $helper->id = 'box-update-modules';
$helper->icon = 'icon-refresh'; $helper->icon = 'icon-refresh';
$helper->color = 'color3'; $helper->color = 'color3';
$helper->title = html_entity_decode($this->l('Modules to update')); $helper->title = $this->l('Modules to update', null, null, false);
if (ConfigurationKPI::get('UPDATE_MODULES') !== false) if (ConfigurationKPI::get('UPDATE_MODULES') !== false)
$helper->value = ConfigurationKPI::get('UPDATE_MODULES'); $helper->value = ConfigurationKPI::get('UPDATE_MODULES');
if (ConfigurationKPI::get('UPDATE_MODULES_EXPIRE') < $time) if (ConfigurationKPI::get('UPDATE_MODULES_EXPIRE') < $time)
+8 -8
View File
@@ -1263,8 +1263,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->icon = 'icon-sort-by-attributes-alt'; $helper->icon = 'icon-sort-by-attributes-alt';
//$helper->chart = true; //$helper->chart = true;
$helper->color = 'color1'; $helper->color = 'color1';
$helper->title = $this->l('Conversion Rate'); $helper->title = $this->l('Conversion Rate', null, null, false);
$helper->subtitle = $this->l('30 days'); $helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('CONVERSION_RATE') !== false) if (ConfigurationKPI::get('CONVERSION_RATE') !== false)
$helper->value = ConfigurationKPI::get('CONVERSION_RATE'); $helper->value = ConfigurationKPI::get('CONVERSION_RATE');
if (ConfigurationKPI::get('CONVERSION_RATE_CHART') !== false) if (ConfigurationKPI::get('CONVERSION_RATE_CHART') !== false)
@@ -1277,8 +1277,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-carts'; $helper->id = 'box-carts';
$helper->icon = 'icon-shopping-cart'; $helper->icon = 'icon-shopping-cart';
$helper->color = 'color2'; $helper->color = 'color2';
$helper->title = $this->l('Abandoned Carts'); $helper->title = $this->l('Abandoned Carts', null, null, false);
$helper->subtitle = $this->l('Today'); $helper->subtitle = $this->l('Today', null, null, false);
$helper->href = $this->context->link->getAdminLink('AdminCarts'); $helper->href = $this->context->link->getAdminLink('AdminCarts');
if (ConfigurationKPI::get('ABANDONED_CARTS') !== false) if (ConfigurationKPI::get('ABANDONED_CARTS') !== false)
$helper->value = ConfigurationKPI::get('ABANDONED_CARTS'); $helper->value = ConfigurationKPI::get('ABANDONED_CARTS');
@@ -1290,8 +1290,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-average-order'; $helper->id = 'box-average-order';
$helper->icon = 'icon-money'; $helper->icon = 'icon-money';
$helper->color = 'color3'; $helper->color = 'color3';
$helper->title = $this->l('Average Order Value'); $helper->title = $this->l('Average Order Value', null, null, false);
$helper->subtitle = $this->l('30 days'); $helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('AVG_ORDER_VALUE') !== false) if (ConfigurationKPI::get('AVG_ORDER_VALUE') !== false)
$helper->value = ConfigurationKPI::get('AVG_ORDER_VALUE'); $helper->value = ConfigurationKPI::get('AVG_ORDER_VALUE');
if (ConfigurationKPI::get('AVG_ORDER_VALUE_EXPIRE') < $time) if (ConfigurationKPI::get('AVG_ORDER_VALUE_EXPIRE') < $time)
@@ -1302,8 +1302,8 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-net-profit-visitor'; $helper->id = 'box-net-profit-visitor';
$helper->icon = 'icon-user'; $helper->icon = 'icon-user';
$helper->color = 'color4'; $helper->color = 'color4';
$helper->title = $this->l('Net Profit per Visitor'); $helper->title = $this->l('Net Profit per Visitor', null, null, false);
$helper->subtitle = $this->l('30 days'); $helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('NETPROFIT_VISITOR') !== false) if (ConfigurationKPI::get('NETPROFIT_VISITOR') !== false)
$helper->value = ConfigurationKPI::get('NETPROFIT_VISITOR'); $helper->value = ConfigurationKPI::get('NETPROFIT_VISITOR');
if (ConfigurationKPI::get('NETPROFIT_VISITOR_EXPIRE') < $time) if (ConfigurationKPI::get('NETPROFIT_VISITOR_EXPIRE') < $time)
@@ -2311,7 +2311,7 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-products-stock'; $helper->id = 'box-products-stock';
$helper->icon = 'icon-archive'; $helper->icon = 'icon-archive';
$helper->color = 'color1'; $helper->color = 'color1';
$helper->title = $this->l('Items in Stock'); $helper->title = $this->l('Items in Stock', null, null, false);
if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK') !== false) if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK') !== false)
$helper->value = ConfigurationKPI::get('PERCENT_PRODUCT_STOCK'); $helper->value = ConfigurationKPI::get('PERCENT_PRODUCT_STOCK');
if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK_EXPIRE') < $time) if (ConfigurationKPI::get('PERCENT_PRODUCT_STOCK_EXPIRE') < $time)
@@ -2323,7 +2323,7 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-avg-gross-margin'; $helper->id = 'box-avg-gross-margin';
$helper->icon = 'icon-tags'; $helper->icon = 'icon-tags';
$helper->color = 'color2'; $helper->color = 'color2';
$helper->title = $this->l('Average Gross Margin'); $helper->title = $this->l('Average Gross Margin', null, null, false);
if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN') !== false) if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN') !== false)
$helper->value = ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN'); $helper->value = ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN');
if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN_EXPIRE') < $time) if (ConfigurationKPI::get('PRODUCT_AVG_GROSS_MARGIN_EXPIRE') < $time)
@@ -2334,8 +2334,8 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-8020-sales-catalog'; $helper->id = 'box-8020-sales-catalog';
$helper->icon = 'icon-beaker'; $helper->icon = 'icon-beaker';
$helper->color = 'color3'; $helper->color = 'color3';
$helper->title = $this->l('80% of your sales'); $helper->title = $this->l('80% of your sales', null, null, false);
$helper->subtitle = $this->l('30 days'); $helper->subtitle = $this->l('30 days', null, null, false);
if (ConfigurationKPI::get('8020_SALES_CATALOG') !== false) if (ConfigurationKPI::get('8020_SALES_CATALOG') !== false)
$helper->value = ConfigurationKPI::get('8020_SALES_CATALOG'); $helper->value = ConfigurationKPI::get('8020_SALES_CATALOG');
if (ConfigurationKPI::get('8020_SALES_CATALOG_EXPIRE') < $time) if (ConfigurationKPI::get('8020_SALES_CATALOG_EXPIRE') < $time)
@@ -2346,7 +2346,7 @@ class AdminProductsControllerCore extends AdminController
$helper->id = 'box-disabled-products'; $helper->id = 'box-disabled-products';
$helper->icon = 'icon-off'; $helper->icon = 'icon-off';
$helper->color = 'color4'; $helper->color = 'color4';
$helper->title = $this->l('Disabled Products'); $helper->title = $this->l('Disabled Products', null, null, false);
if (ConfigurationKPI::get('DISABLED_PRODUCTS') !== false) if (ConfigurationKPI::get('DISABLED_PRODUCTS') !== false)
$helper->value = ConfigurationKPI::get('DISABLED_PRODUCTS'); $helper->value = ConfigurationKPI::get('DISABLED_PRODUCTS');
if (ConfigurationKPI::get('DISABLED_PRODUCTS_EXPIRE') < $time) if (ConfigurationKPI::get('DISABLED_PRODUCTS_EXPIRE') < $time)
@@ -3883,6 +3883,7 @@ class AdminProductsControllerCore extends AdminController
$helper = new HelperList(); $helper = new HelperList();
$helper->identifier = 'id_product_attribute'; $helper->identifier = 'id_product_attribute';
$helper->table_id = 'combinations-list';
$helper->token = $this->token; $helper->token = $this->token;
$helper->currentIndex = self::$currentIndex; $helper->currentIndex = self::$currentIndex;
$helper->no_link = true; $helper->no_link = true;
@@ -1294,7 +1294,7 @@ class AdminTranslationsControllerCore extends AdminController
$helper->id = 'box-languages'; $helper->id = 'box-languages';
$helper->icon = 'icon-microphone'; $helper->icon = 'icon-microphone';
$helper->color = 'color1'; $helper->color = 'color1';
$helper->title = $this->l('Enabled Languages'); $helper->title = $this->l('Enabled Languages', null, null, false);
if (ConfigurationKPI::get('ENABLED_LANGUAGES') !== false) if (ConfigurationKPI::get('ENABLED_LANGUAGES') !== false)
$helper->value = ConfigurationKPI::get('ENABLED_LANGUAGES'); $helper->value = ConfigurationKPI::get('ENABLED_LANGUAGES');
if (ConfigurationKPI::get('ENABLED_LANGUAGES_EXPIRE') < $time) if (ConfigurationKPI::get('ENABLED_LANGUAGES_EXPIRE') < $time)
@@ -1305,8 +1305,8 @@ class AdminTranslationsControllerCore extends AdminController
$helper->id = 'box-country'; $helper->id = 'box-country';
$helper->icon = 'icon-home'; $helper->icon = 'icon-home';
$helper->color = 'color2'; $helper->color = 'color2';
$helper->title = $this->l('Main Country'); $helper->title = $this->l('Main Country', null, null, false);
$helper->subtitle = $this->l('30 Days'); $helper->subtitle = $this->l('30 Days', null, null, false);
if (ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id) !== false) if (ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id) !== false)
$helper->value = ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id); $helper->value = ConfigurationKPI::get('MAIN_COUNTRY', $this->context->language->id);
if (ConfigurationKPI::get('MAIN_COUNTRY_EXPIRE', $this->context->language->id) < $time) if (ConfigurationKPI::get('MAIN_COUNTRY_EXPIRE', $this->context->language->id) < $time)
@@ -1317,7 +1317,7 @@ class AdminTranslationsControllerCore extends AdminController
$helper->id = 'box-translations'; $helper->id = 'box-translations';
$helper->icon = 'icon-list'; $helper->icon = 'icon-list';
$helper->color = 'color3'; $helper->color = 'color3';
$helper->title = $this->l('Front Office Translations'); $helper->title = $this->l('Front Office Translations', null, null, false);
if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS') !== false) if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS') !== false)
$helper->value = ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS'); $helper->value = ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS');
if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS_EXPIRE') < $time) if (ConfigurationKPI::get('FRONTOFFICE_TRANSLATIONS_EXPIRE') < $time)
@@ -97,7 +97,7 @@ class AdminWebserviceControllerCore extends AdminController
if (empty($this->display)) if (empty($this->display))
$this->page_header_toolbar_btn['new_webservice'] = array( $this->page_header_toolbar_btn['new_webservice'] = array(
'href' => self::$currentIndex.'&amp;addwebservice_account&amp;token='.$this->token, 'href' => self::$currentIndex.'&amp;addwebservice_account&amp;token='.$this->token,
'desc' => $this->l('Add new webservice'), 'desc' => $this->l('Add new webservice key'),
'icon' => 'process-icon-new' 'icon' => 'process-icon-new'
); );
-1
View File
@@ -46,7 +46,6 @@ class ProductControllerCore extends FrontController
if ($this->context->getMobileDevice() == false) if ($this->context->getMobileDevice() == false)
{ {
$this->addCSS(_THEME_CSS_DIR_.'product.css'); $this->addCSS(_THEME_CSS_DIR_.'product.css');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll')); $this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll'));
$this->addJS(array( $this->addJS(array(
_THEME_JS_DIR_.'tools.js', _THEME_JS_DIR_.'tools.js',
-2
View File
@@ -66,8 +66,6 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`)
SELECT m.id_module, s.id_shop, h.id_hook, 3 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashproducts') AND h.name IN ('dashboardZoneTwo') SELECT m.id_module, s.id_shop, h.id_hook, 3 FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h WHERE m.name IN ('dashproducts') AND h.name IN ('dashboardZoneTwo')
); );
/* PHP:update_order_messages(); */;
ALTER TABLE `PREFIX_employee` ADD `stats_compare_from` DATE NULL DEFAULT NULL AFTER `stats_date_to` , ADD `stats_compare_to` DATE NULL DEFAULT NULL AFTER `stats_compare_from`; ALTER TABLE `PREFIX_employee` ADD `stats_compare_from` DATE NULL DEFAULT NULL AFTER `stats_date_to` , ADD `stats_compare_to` DATE NULL DEFAULT NULL AFTER `stats_compare_from`;
INSERT INTO `PREFIX_hook` (`id_hook` , `name` , `title` , `description` , `position` , `live_edit`) INSERT INTO `PREFIX_hook` (`id_hook` , `name` , `title` , `description` , `position` , `live_edit`)
+137 -118
View File
@@ -22,127 +22,115 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
$(document).ready( function () { // This variables are defined in the dashboard view.tpl
// dashboard_ajax_url
$('#calendar_form input[type="submit"]').on('click', function (elt) { // adminstats_ajax_url
setDashboardDateRange(elt.currentTarget.name); // no_results_translation
return false; // dashboard_use_push
}); // read_more
$(".preactivationLink").click(function() {
preactivationLinkClick($(this).attr("rel"));
});
refreshDashboard(false, false);
getBlogRss();
bindSubmitDashConfig();
bindCancelDashConfig();
});
function refreshDashboard(module_name, use_push, extra)
{
module_list = new Array();
if (module_name === false)
{
$('.widget').each( function () {
module_list.push($(this).attr('id'));
if (!use_push)
$(this).addClass('loading');
});
}
else
{
module_list.push(module_name);
if (!use_push)
$('#'+module_name+' section').each( function (){
$(this).addClass('loading');
});
}
for (var module_id in module_list)
{
if (use_push && !$('#'+module_list[module_id]).hasClass('allow_push'))
continue;
function refreshDashboard(module_name, use_push, extra) {
var module_list = [];
this.getWidget = function(module_id) {
$.ajax({ $.ajax({
url : dashboard_ajax_url, url : dashboard_ajax_url,
data : { data : {
ajax:true, ajax: true,
action:'refreshDashboard', action:'refreshDashboard',
module:module_list[module_id], module: module_list[module_id],
dashboard_use_push:Number(use_push), dashboard_use_push: Number(use_push),
extra:extra extra: extra
}, },
dataType: 'json', dataType: 'json',
success : function(widgets){ success : function(widgets){
for (var widget_name in widgets) for (var widget_name in widgets) {
for (data_type in widgets[widget_name]) for (var data_type in widgets[widget_name]) {
window[data_type](widget_name, widgets[widget_name][data_type]); window[data_type](widget_name, widgets[widget_name][data_type]);
}
if (parseInt(dashboard_use_push) == 1) }
if (parseInt(dashboard_use_push) === 1) {
refreshDashboard(false, true); refreshDashboard(false, true);
}
},
contentType: 'application/json'
});
};
if (module_name === false) {
$('.widget').each( function () {
module_list.push($(this).attr('id'));
if (!use_push) {
$(this).addClass('loading');
} }
}); });
} }
else {
module_list.push(module_name);
if (!use_push) {
$('#'+module_name+' section').each( function (){
$(this).addClass('loading');
});
}
}
for (var module_id in module_list) {
if (use_push && !$('#'+module_list[module_id]).hasClass('allow_push')) {
continue;
}
this.getWidget(module_id);
}
} }
function setDashboardDateRange(action) function setDashboardDateRange(action) {
{
$('#datepickerFrom, #datepickerTo').parent('.input-group').removeClass('has-error'); $('#datepickerFrom, #datepickerTo').parent('.input-group').removeClass('has-error');
data = 'ajax=true&action=setDashboardDateRange&submitDatePicker=true&'+$('#calendar_form').serialize()+'&'+action+'=1'; var data = 'ajax=true&action=setDashboardDateRange&submitDatePicker=true&'+$('#calendar_form').serialize()+'&'+action+'=1';
$.ajax({ $.ajax({
url : adminstats_ajax_url, url : adminstats_ajax_url,
data : data, data : data,
dataType: 'json', dataType: 'json',
type: 'POST', type: 'POST',
success : function(jsonData){ success : function(jsonData){
if (!jsonData.has_errors) if (!jsonData.has_errors) {
{
refreshDashboard(false, false); refreshDashboard(false, false);
$('#datepickerFrom').val(jsonData.date_from); $('#datepickerFrom').val(jsonData.date_from);
$('#datepickerTo').val(jsonData.date_to); $('#datepickerTo').val(jsonData.date_to);
} }
else else {
$('#datepickerFrom, #datepickerTo').parent('.input-group').addClass('has-error'); $('#datepickerFrom, #datepickerTo').parent('.input-group').addClass('has-error');
}
} }
}); });
} }
function data_value(widget_name, data) function data_value(widget_name, data) {
{ for (var data_id in data) {
for (var data_id in data)
{
$('#'+data_id+' ').html(data[data_id]); $('#'+data_id+' ').html(data[data_id]);
$('#'+data_id+', #'+widget_name).closest('section').removeClass('loading'); $('#'+data_id+', #'+widget_name).closest('section').removeClass('loading');
} }
} }
function data_trends(widget_name, data) function data_trends(widget_name, data) {
{ for (var data_id in data) {
for (var data_id in data) this.el = $('#'+data_id);
{ this.el.html(data[data_id].value);
$('#'+data_id).html(data[data_id]['value']); if (data[data_id].way === 'up') {
if (data[data_id]['way'] == 'up') this.el.parent().removeClass('dash_trend_down').removeClass('dash_trend_right').addClass('dash_trend_up');
$('#'+data_id).parent().removeClass('dash_trend_down').removeClass('dash_trend_right').addClass('dash_trend_up'); }
else if (data[data_id]['way'] == 'down') else if (data[data_id].way === 'down') {
$('#'+data_id).parent().removeClass('dash_trend_up').removeClass('dash_trend_right').addClass('dash_trend_down'); this.el.parent().removeClass('dash_trend_up').removeClass('dash_trend_right').addClass('dash_trend_down');
else }
$('#'+data_id).parent().removeClass('dash_trend_down').removeClass('dash_trend_up').addClass('dash_trend_right'); else {
$('#'+data_id).closest('section').removeClass('loading'); this.el.parent().removeClass('dash_trend_down').removeClass('dash_trend_up').addClass('dash_trend_right');
}
this.el.closest('section').removeClass('loading');
} }
} }
function data_table(widget_name, data) function data_table(widget_name, data) {
{ for (var data_id in data) {
for (var data_id in data)
{
//fill header //fill header
tr = '<tr>'; var tr = '<tr>';
for (var header in data[data_id].header) for (var header in data[data_id].header) {
{ var head = data[data_id].header[header];
head = data[data_id].header[header]; var th = '<th '+ (head.class ? ' class="'+head.class+'" ' : '' )+ ' '+(head.id ? ' id="'+head.id+'" ' : '' )+'>';
th = '<th '+ (head.class ? ' class="'+head.class+'" ' : '' )+ ' '+(head.id ? ' id="'+head.id+'" ' : '' )+'>';
th += (head.wrapper_start ? ' '+head.wrapper_start+' ' : '' ); th += (head.wrapper_start ? ' '+head.wrapper_start+' ' : '' );
th += head.title; th += head.title;
th += (head.wrapper_stop ? ' '+head.wrapper_stop+' ' : '' ); th += (head.wrapper_stop ? ' '+head.wrapper_stop+' ' : '' );
@@ -154,14 +142,12 @@ function data_table(widget_name, data)
//fill body //fill body
$('#'+data_id+' tbody').html(''); $('#'+data_id+' tbody').html('');
if (data[data_id].body.length) if (data[data_id].body.length) {
for (var body_content_id in data[data_id].body) for (var body_content_id in data[data_id].body) {
{
tr = '<tr>'; tr = '<tr>';
for (var body_content in data[data_id].body[body_content_id]) for (var body_content in data[data_id].body[body_content_id]) {
{ var body = data[data_id].body[body_content_id][body_content];
body = data[data_id].body[body_content_id][body_content]; var td = '<td '+ (body.class ? ' class="'+body.class+'" ' : '' )+ ' '+(body.id ? ' id="'+body.id+'" ' : '' )+'>';
td = '<td '+ (body.class ? ' class="'+body.class+'" ' : '' )+ ' '+(body.id ? ' id="'+body.id+'" ' : '' )+'>';
td += (body.wrapper_start ? ' '+body.wrapper_start+' ' : '' ); td += (body.wrapper_start ? ' '+body.wrapper_start+' ' : '' );
td += body.value; td += body.value;
td += (body.wrapper_stop ? ' '+body.wrapper_stop+' ' : '' ); td += (body.wrapper_stop ? ' '+body.wrapper_stop+' ' : '' );
@@ -171,41 +157,42 @@ function data_table(widget_name, data)
tr += '</tr>'; tr += '</tr>';
$('#'+data_id+' tbody').append(tr); $('#'+data_id+' tbody').append(tr);
} }
else }
else {
$('#'+data_id+' tbody').html('<tr><td class="text-center" colspan="'+data[data_id].header.length+'">'+no_results_translation+'</td></tr>'); $('#'+data_id+' tbody').html('<tr><td class="text-center" colspan="'+data[data_id].header.length+'">'+no_results_translation+'</td></tr>');
}
} }
} }
function data_chart(widget_name, charts) function data_chart(widget_name, charts) {
{ for (var chart_id in charts) {
for (chart_id in charts)
window[charts[chart_id].chart_type](widget_name, charts[chart_id]); window[charts[chart_id].chart_type](widget_name, charts[chart_id]);
}
} }
function data_list_small(widget_name, data) function data_list_small(widget_name, data) {
{
for (var data_id in data) for (var data_id in data)
{ {
$('#'+data_id).html(''); $('#'+data_id).html('');
for (var item in data[data_id]) for (var item in data[data_id]) {
$('#'+data_id).append('<li><span class="data_label">'+item+'</span><span class="data_value size_s">'+data[data_id][item]+'</span></li>'); $('#'+data_id).append('<li><span class="data_label">'+item+'</span><span class="data_value size_s">'+data[data_id][item]+'</span></li>');
}
$('#'+data_id+', #'+widget_name).closest('section').removeClass('loading'); $('#'+data_id+', #'+widget_name).closest('section').removeClass('loading');
} }
} }
function getBlogRss() function getBlogRss() {
{
$.ajax({ $.ajax({
url : dashboard_ajax_url, url : dashboard_ajax_url,
data : { data : {
ajax:true, ajax:true,
action:'getBlogRss' action:'getBlogRss'
}, },
dataType: 'json', dataType: 'json',
success : function(jsonData){ success : function(jsonData) {
if (!jsonData.has_errors) { if (!jsonData.has_errors) {
for (var article in jsonData.rss) { for (var article in jsonData.rss) {
article_html = '<article><h4><a href="'+jsonData.rss[article].link+'">'+jsonData.rss[article].title+'</a></h4><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>'; var article_html = '<article><h4><a href="'+jsonData.rss[article].link+'">'+jsonData.rss[article].title+'</a></h4><span class="dash-news-date text-muted">'+jsonData.rss[article].date+'</span><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>';
$('.dash_news .dash_news_content').append(article_html); $('.dash_news .dash_news_content').append(article_html);
} }
} }
@@ -216,8 +203,7 @@ function getBlogRss()
}); });
} }
function toggleDashConfig(widget) function toggleDashConfig(widget) {
{
if ($('#'+widget+' section.dash_config').hasClass('hide')) if ($('#'+widget+' section.dash_config').hasClass('hide'))
{ {
$('#'+widget+' section').not('.dash_config').slideUp(500, function () { $('#'+widget+' section').not('.dash_config').slideUp(500, function () {
@@ -228,42 +214,48 @@ function toggleDashConfig(widget)
{ {
$('#'+widget+' section.dash_config').slideUp(500, function () { $('#'+widget+' section.dash_config').slideUp(500, function () {
$('#'+widget+' section').not('.dash_config').slideDown(500).removeClass('hide'); $('#'+widget+' section').not('.dash_config').slideDown(500).removeClass('hide');
$('#'+widget+' section.dash_config').addClass('hide') $('#'+widget+' section.dash_config').addClass('hide');
}); });
} }
} }
function bindSubmitDashConfig() function bindSubmitDashConfig() {
{ $('.submit_dash_config').on('click', function () {
$('.cancel_dash_config').on('click', function () {
saveDashConfig($(this).closest('section.widget').attr('id')); saveDashConfig($(this).closest('section.widget').attr('id'));
return false; return false;
}); });
} }
function bindCancelDashConfig() function bindCancelDashConfig() {
{
$('.cancel_dash_config').on('click', function () { $('.cancel_dash_config').on('click', function () {
toggleDashConfig($(this).closest('section.widget').attr('id')); toggleDashConfig($(this).closest('section.widget').attr('id'));
return false; return false;
}); });
} }
function saveDashConfig(widget_name) function saveDashConfig(widget_name) {
{ $('section#'+widget_name+' .form-group').removeClass('has-error');
$('#'+widget_name+'_errors').remove();
configs = ''; configs = '';
$('#'+widget_name+' form input, #'+widget_name+' form textarea , #'+widget_name+' form select').each( function () { $('#'+widget_name+' form input, #'+widget_name+' form textarea , #'+widget_name+' form select').each( function () {
if ($(this).attr('type') == 'radio' && !$(this).attr('checked')) if ($(this).attr('type') === 'radio' && !$(this).attr('checked')) {
return; return;
}
configs += '&configs['+$(this).attr('name')+']='+$(this).val(); configs += '&configs['+$(this).attr('name')+']='+$(this).val();
}); });
data = 'ajax=true&action=saveDashConfig&module='+widget_name+configs+'&hook='+$('#'+widget_name).closest('[id^=hook]').attr('id'); data = 'ajax=true&action=saveDashConfig&module='+widget_name+configs+'&hook='+$('#'+widget_name).closest('[id^=hook]').attr('id');
$.ajax({ $.ajax({
url : dashboard_ajax_url, url : dashboard_ajax_url,
data : data, data : data,
dataType: 'json', dataType: 'json',
error: function(XMLHttpRequest, textStatus, errorThrown) {
jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
},
success : function(jsonData){ success : function(jsonData){
if (!jsonData.has_errors) if (!jsonData.has_errors)
{ {
$('#'+widget_name).find('section').not('.dash_config').remove(); $('#'+widget_name).find('section').not('.dash_config').remove();
@@ -271,23 +263,50 @@ function saveDashConfig(widget_name)
refreshDashboard(widget_name); refreshDashboard(widget_name);
toggleDashConfig(widget_name); toggleDashConfig(widget_name);
} }
else
{
errors_str = '<div class="alert alert-danger" id="'+widget_name+'_errors">';
for (error in jsonData.errors)
{
errors_str += jsonData.errors[error]+'<br/>';
$('#'+error).closest('.form-group').addClass('has-error');
}
errors_str += '</div>';
$('section#'+widget_name+'_config header').after(errors_str);
errors_str += '</div>';
}
} }
}); });
} }
function preactivationLinkClick(module) function preactivationLinkClick(module) {
{
$.ajax({ $.ajax({
url : adminstats_ajax_url, url : adminstats_ajax_url,
data : { data : {
ajax : "1", ajax : "1",
controller : "AdminDashboard", controller : "AdminDashboard",
action : "savePreactivationRequest", action : "savePreactivationRequest",
module : module, module : module,
}, },
type: 'POST', type: 'POST',
success : function(jsonData){ success : function(jsonData){
} }
}); });
} }
$(document).ready( function () {
$('#calendar_form input[type="submit"]').on('click', function(elt) {
elt.preventDefault();
setDashboardDateRange(elt.currentTarget.name);
});
$(".preactivationLink").on('click', function() {
preactivationLinkClick($(this).attr("rel"));
});
refreshDashboard(false, false);
getBlogRss();
bindSubmitDashConfig();
bindCancelDashConfig();
});
+3 -3
View File
@@ -35,7 +35,7 @@ product_tabs['Customization'] = new function(){
product_tabs['Combinations'] = new function(){ product_tabs['Combinations'] = new function(){
var self = this; var self = this;
this.bindEdit = function(){ this.bindEdit = function(){
$('table[name=list_table]').delegate('a.edit', 'click', function(e){ $('table[id=combinations-list]').delegate('a.edit', 'click', function(e){
e.preventDefault(); e.preventDefault();
editProductAttribute(this.href, $(this).closest('tr')); editProductAttribute(this.href, $(this).closest('tr'));
}); });
@@ -143,7 +143,7 @@ product_tabs['Combinations'] = new function(){
}; };
this.bindDefault = function(){ this.bindDefault = function(){
$('table[name=list_table]').delegate('a.default', 'click', function(e){ $('table[id=combinations-list]').delegate('a.default', 'click', function(e){
e.preventDefault(); e.preventDefault();
console.log('ok'); console.log('ok');
self.defaultProductAttribute(this.href, this); self.defaultProductAttribute(this.href, this);
@@ -175,7 +175,7 @@ product_tabs['Combinations'] = new function(){
}; };
this.bindDelete = function() { this.bindDelete = function() {
$('table[name=list_table]').delegate('a.delete', 'click', function(e){ $('table[id=combinations-list]').delegate('a.delete', 'click', function(e){
e.preventDefault(); e.preventDefault();
self.deleteProductAttribute(this.href, $(this).closest('tr')); self.deleteProductAttribute(this.href, $(this).closest('tr'));
}); });
+3 -3
View File
@@ -848,13 +848,13 @@ $(document).ready(function()
toggleMultishopDefaultValue(v, key.substr(24, len - 25)); toggleMultishopDefaultValue(v, key.substr(24, len - 25));
}); });
$(".copy2friendlyUrl").live('keyup change',function(e){ $(document).on('keyup change', '.copy2friendlyUrl', function(e){
if(!isArrowKey(e)) if(!isArrowKey(e))
return copy2friendlyURL(); return copy2friendlyURL();
}); });
// on live will make this binded for dynamic content // on live will make this binded for dynamic content
$(".updateCurrentText").live('keyup change',function(e){ $(document).on('keyup change', '.updateCurrentText', function(e){
if(typeof e == KeyboardEvent) if(typeof e == KeyboardEvent)
if(isArrowKey(e)) if(isArrowKey(e))
return; return;
@@ -862,7 +862,7 @@ $(document).ready(function()
updateCurrentText(); updateCurrentText();
}); });
$(".copyMeta2friendlyURL").live('keyup change',function(e){ $(document).on('keyup change', '.copyMeta2friendlyURL', function(e){
if(!isArrowKey(e)) if(!isArrowKey(e))
return copyMeta2friendlyURL() return copyMeta2friendlyURL()
}); });
+3 -3
View File
@@ -1,6 +1,6 @@
/* /*
highlight v3 highlight v4
Highlights arbitrary terms. Highlights arbitrary terms.
@@ -37,9 +37,9 @@ jQuery.fn.highlight = function(pat) {
} }
return skip; return skip;
} }
return this.each(function() { return this.length && pat && pat.length ? this.each(function() {
innerHighlight(this, pat.toUpperCase()); innerHighlight(this, pat.toUpperCase());
}); }) : this;
}; };
jQuery.fn.removeHighlight = function() { jQuery.fn.removeHighlight = function() {
+4 -4
View File
@@ -36,7 +36,7 @@ $(document).ready(function(){
}); // end bind }); // end bind
// if count errors // if count errors
$('#hideError').live('click', function(e) $('#hideError').on('click', function(e)
{ {
e.preventDefault(); e.preventDefault();
$('.error').hide('slow', function (){ $('.error').hide('slow', function (){
@@ -46,21 +46,21 @@ $(document).ready(function(){
}); });
// if count warnings // if count warnings
$('#linkSeeMore').live('click', function(e){ $(document).on('click', '#linkSeeMore', function(e){
e.preventDefault(); e.preventDefault();
$('#seeMore').show(); $('#seeMore').show();
$(this).hide(); $(this).hide();
$('#linkHide').show(); $('#linkHide').show();
return false; return false;
}); });
$('#linkHide').live('click', function(e){ $(document).on('click', '#linkHide', function(e){
e.preventDefault(); e.preventDefault();
$('#seeMore').hide(); $('#seeMore').hide();
$(this).hide(); $(this).hide();
$('#linkSeeMore').show(); $('#linkSeeMore').show();
return false; return false;
}); });
$('#hideWarn').live('click', function(e){ $(document).on('click', '#hideWarn', function(e){
e.preventDefault(); e.preventDefault();
$('.warn').hide('slow', function (){ $('.warn').hide('slow', function (){
$('.warn').remove(); $('.warn').remove();
+63 -57
View File
@@ -11,63 +11,69 @@ var unicode_hack = (function() {
Extracted from Unicode specification, version 5.0.0, source: Extracted from Unicode specification, version 5.0.0, source:
http://unicode.org/versions/Unicode5.0.0/ http://unicode.org/versions/Unicode5.0.0/
*/ */
var unicodeCategories = { var unicodeCategories = {
Pi:'[\u00ab\u2018\u201b\u201c\u201f\u2039\u2e02\u2e04\u2e09\u2e0c\u2e1c]', Pi:'[\u00ab\u2018\u201b\u201c\u201f\u2039\u2e02\u2e04\u2e09\u2e0c\u2e1c]',
Sk:'[\u005e\u0060\u00a8\u00af\u00b4\u00b8\u02c2-\u02c5\u02d2-\u02df\u02e5-\u02ed\u02ef-\u02ff\u0374\u0375\u0384\u0385\u1fbd\u1fbf-\u1fc1\u1fcd-\u1fcf\u1fdd-\u1fdf\u1fed-\u1fef\u1ffd\u1ffe\u309b\u309c\ua700-\ua716\ua720\ua721\uff3e\uff40\uffe3]', Sk:'[\u005e\u0060\u00a8\u00af\u00b4\u00b8\u02c2-\u02c5\u02d2-\u02df\u02e5-\u02ed\u02ef-\u02ff\u0374\u0375\u0384\u0385\u1fbd\u1fbf-\u1fc1\u1fcd-\u1fcf\u1fdd-\u1fdf\u1fed-\u1fef\u1ffd\u1ffe\u309b\u309c\ua700-\ua716\ua720\ua721\uff3e\uff40\uffe3]',
Sm:'[\u002b\u003c-\u003e\u007c\u007e\u00ac\u00b1\u00d7\u00f7\u03f6\u2044\u2052\u207a-\u207c\u208a-\u208c\u2140-\u2144\u214b\u2190-\u2194\u219a\u219b\u21a0\u21a3\u21a6\u21ae\u21ce\u21cf\u21d2\u21d4\u21f4-\u22ff\u2308-\u230b\u2320\u2321\u237c\u239b-\u23b3\u23dc-\u23e1\u25b7\u25c1\u25f8-\u25ff\u266f\u27c0-\u27c4\u27c7-\u27ca\u27d0-\u27e5\u27f0-\u27ff\u2900-\u2982\u2999-\u29d7\u29dc-\u29fb\u29fe-\u2aff\ufb29\ufe62\ufe64-\ufe66\uff0b\uff1c-\uff1e\uff5c\uff5e\uffe2\uffe9-\uffec]', Sm:'[\u002b\u003c-\u003e\u007c\u007e\u00ac\u00b1\u00d7\u00f7\u03f6\u2044\u2052\u207a-\u207c\u208a-\u208c\u2140-\u2144\u214b\u2190-\u2194\u219a\u219b\u21a0\u21a3\u21a6\u21ae\u21ce\u21cf\u21d2\u21d4\u21f4-\u22ff\u2308-\u230b\u2320\u2321\u237c\u239b-\u23b3\u23dc-\u23e1\u25b7\u25c1\u25f8-\u25ff\u266f\u27c0-\u27c4\u27c7-\u27ca\u27d0-\u27e5\u27f0-\u27ff\u2900-\u2982\u2999-\u29d7\u29dc-\u29fb\u29fe-\u2aff\ufb29\ufe62\ufe64-\ufe66\uff0b\uff1c-\uff1e\uff5c\uff5e\uffe2\uffe9-\uffec]',
So:'[\u00a6\u00a7\u00a9\u00ae\u00b0\u00b6\u0482\u060e\u060f\u06e9\u06fd\u06fe\u07f6\u09fa\u0b70\u0bf3-\u0bf8\u0bfa\u0cf1\u0cf2\u0f01-\u0f03\u0f13-\u0f17\u0f1a-\u0f1f\u0f34\u0f36\u0f38\u0fbe-\u0fc5\u0fc7-\u0fcc\u0fcf\u1360\u1390-\u1399\u1940\u19e0-\u19ff\u1b61-\u1b6a\u1b74-\u1b7c\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211e-\u2123\u2125\u2127\u2129\u212e\u213a\u213b\u214a\u214c\u214d\u2195-\u2199\u219c-\u219f\u21a1\u21a2\u21a4\u21a5\u21a7-\u21ad\u21af-\u21cd\u21d0\u21d1\u21d3\u21d5-\u21f3\u2300-\u2307\u230c-\u231f\u2322-\u2328\u232b-\u237b\u237d-\u239a\u23b4-\u23db\u23e2-\u23e7\u2400-\u2426\u2440-\u244a\u249c-\u24e9\u2500-\u25b6\u25b8-\u25c0\u25c2-\u25f7\u2600-\u266e\u2670-\u269c\u26a0-\u26b2\u2701-\u2704\u2706-\u2709\u270c-\u2727\u2729-\u274b\u274d\u274f-\u2752\u2756\u2758-\u275e\u2761-\u2767\u2794\u2798-\u27af\u27b1-\u27be\u2800-\u28ff\u2b00-\u2b1a\u2b20-\u2b23\u2ce5-\u2cea\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u2ff0-\u2ffb\u3004\u3012\u3013\u3020\u3036\u3037\u303e\u303f\u3190\u3191\u3196-\u319f\u31c0-\u31cf\u3200-\u321e\u322a-\u3243\u3250\u3260-\u327f\u328a-\u32b0\u32c0-\u32fe\u3300-\u33ff\u4dc0-\u4dff\ua490-\ua4c6\ua828-\ua82b\ufdfd\uffe4\uffe8\uffed\uffee\ufffc\ufffd]', So:'[\u00a6\u00a7\u00a9\u00ae\u00b0\u00b6\u0482\u060e\u060f\u06e9\u06fd\u06fe\u07f6\u09fa\u0b70\u0bf3-\u0bf8\u0bfa\u0cf1\u0cf2\u0f01-\u0f03\u0f13-\u0f17\u0f1a-\u0f1f\u0f34\u0f36\u0f38\u0fbe-\u0fc5\u0fc7-\u0fcc\u0fcf\u1360\u1390-\u1399\u1940\u19e0-\u19ff\u1b61-\u1b6a\u1b74-\u1b7c\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211e-\u2123\u2125\u2127\u2129\u212e\u213a\u213b\u214a\u214c\u214d\u2195-\u2199\u219c-\u219f\u21a1\u21a2\u21a4\u21a5\u21a7-\u21ad\u21af-\u21cd\u21d0\u21d1\u21d3\u21d5-\u21f3\u2300-\u2307\u230c-\u231f\u2322-\u2328\u232b-\u237b\u237d-\u239a\u23b4-\u23db\u23e2-\u23e7\u2400-\u2426\u2440-\u244a\u249c-\u24e9\u2500-\u25b6\u25b8-\u25c0\u25c2-\u25f7\u2600-\u266e\u2670-\u269c\u26a0-\u26b2\u2701-\u2704\u2706-\u2709\u270c-\u2727\u2729-\u274b\u274d\u274f-\u2752\u2756\u2758-\u275e\u2761-\u2767\u2794\u2798-\u27af\u27b1-\u27be\u2800-\u28ff\u2b00-\u2b1a\u2b20-\u2b23\u2ce5-\u2cea\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u2ff0-\u2ffb\u3004\u3012\u3013\u3020\u3036\u3037\u303e\u303f\u3190\u3191\u3196-\u319f\u31c0-\u31cf\u3200-\u321e\u322a-\u3243\u3250\u3260-\u327f\u328a-\u32b0\u32c0-\u32fe\u3300-\u33ff\u4dc0-\u4dff\ua490-\ua4c6\ua828-\ua82b\ufdfd\uffe4\uffe8\uffed\uffee\ufffc\ufffd]',
Po:'[\u0021-\u0023\u0025-\u0027\u002a\u002c\u002e\u002f\u003a\u003b\u003f\u0040\u005c\u00a1\u00b7\u00bf\u037e\u0387\u055a-\u055f\u0589\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f85\u0fd0\u0fd1\u104a-\u104f\u10fb\u1361-\u1368\u166d\u166e\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u1805\u1807-\u180a\u1944\u1945\u19de\u19df\u1a1e\u1a1f\u1b5a-\u1b60\u2016\u2017\u2020-\u2027\u2030-\u2038\u203b-\u203e\u2041-\u2043\u2047-\u2051\u2053\u2055-\u205e\u2cf9-\u2cfc\u2cfe\u2cff\u2e00\u2e01\u2e06-\u2e08\u2e0b\u2e0e-\u2e16\u3001-\u3003\u303d\u30fb\ua874-\ua877\ufe10-\ufe16\ufe19\ufe30\ufe45\ufe46\ufe49-\ufe4c\ufe50-\ufe52\ufe54-\ufe57\ufe5f-\ufe61\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff07\uff0a\uff0c\uff0e\uff0f\uff1a\uff1b\uff1f\uff20\uff3c\uff61\uff64\uff65]', Po:'[\u0021-\u0023\u0025-\u0027\u002a\u002c\u002e\u002f\u003a\u003b\u003f\u0040\u005c\u00a1\u00b7\u00bf\u037e\u0387\u055a-\u055f\u0589\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f85\u0fd0\u0fd1\u104a-\u104f\u10fb\u1361-\u1368\u166d\u166e\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u1805\u1807-\u180a\u1944\u1945\u19de\u19df\u1a1e\u1a1f\u1b5a-\u1b60\u2016\u2017\u2020-\u2027\u2030-\u2038\u203b-\u203e\u2041-\u2043\u2047-\u2051\u2053\u2055-\u205e\u2cf9-\u2cfc\u2cfe\u2cff\u2e00\u2e01\u2e06-\u2e08\u2e0b\u2e0e-\u2e16\u3001-\u3003\u303d\u30fb\ua874-\ua877\ufe10-\ufe16\ufe19\ufe30\ufe45\ufe46\ufe49-\ufe4c\ufe50-\ufe52\ufe54-\ufe57\ufe5f-\ufe61\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff07\uff0a\uff0c\uff0e\uff0f\uff1a\uff1b\uff1f\uff20\uff3c\uff61\uff64\uff65]',
Mn:'[\u0300-\u036f\u0483-\u0486\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u0615\u064b-\u065e\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0901\u0902\u093c\u0941-\u0948\u094d\u0951-\u0954\u0962\u0963\u0981\u09bc\u09c1-\u09c4\u09cd\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a70\u0a71\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3f\u0b41-\u0b43\u0b4d\u0b56\u0b82\u0bc0\u0bcd\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0cbc\u0cbf\u0cc6\u0ccc\u0ccd\u0ce2\u0ce3\u0d41-\u0d43\u0d4d\u0dca\u0dd2-\u0dd4\u0dd6\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032\u1036\u1037\u1039\u1058\u1059\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1dc0-\u1dca\u1dfe\u1dff\u20d0-\u20dc\u20e1\u20e5-\u20ef\u302a-\u302f\u3099\u309a\ua806\ua80b\ua825\ua826\ufb1e\ufe00-\ufe0f\ufe20-\ufe23]', Mn:'[\u0300-\u036f\u0483-\u0486\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u0615\u064b-\u065e\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0901\u0902\u093c\u0941-\u0948\u094d\u0951-\u0954\u0962\u0963\u0981\u09bc\u09c1-\u09c4\u09cd\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a70\u0a71\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3f\u0b41-\u0b43\u0b4d\u0b56\u0b82\u0bc0\u0bcd\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0cbc\u0cbf\u0cc6\u0ccc\u0ccd\u0ce2\u0ce3\u0d41-\u0d43\u0d4d\u0dca\u0dd2-\u0dd4\u0dd6\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032\u1036\u1037\u1039\u1058\u1059\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1dc0-\u1dca\u1dfe\u1dff\u20d0-\u20dc\u20e1\u20e5-\u20ef\u302a-\u302f\u3099\u309a\ua806\ua80b\ua825\ua826\ufb1e\ufe00-\ufe0f\ufe20-\ufe23]',
Ps:'[\u0028\u005b\u007b\u0f3a\u0f3c\u169b\u201a\u201e\u2045\u207d\u208d\u2329\u2768\u276a\u276c\u276e\u2770\u2772\u2774\u27c5\u27e6\u27e8\u27ea\u2983\u2985\u2987\u2989\u298b\u298d\u298f\u2991\u2993\u2995\u2997\u29d8\u29da\u29fc\u3008\u300a\u300c\u300e\u3010\u3014\u3016\u3018\u301a\u301d\ufd3e\ufe17\ufe35\ufe37\ufe39\ufe3b\ufe3d\ufe3f\ufe41\ufe43\ufe47\ufe59\ufe5b\ufe5d\uff08\uff3b\uff5b\uff5f\uff62]', Ps:'[\u0028\u005b\u007b\u0f3a\u0f3c\u169b\u201a\u201e\u2045\u207d\u208d\u2329\u2768\u276a\u276c\u276e\u2770\u2772\u2774\u27c5\u27e6\u27e8\u27ea\u2983\u2985\u2987\u2989\u298b\u298d\u298f\u2991\u2993\u2995\u2997\u29d8\u29da\u29fc\u3008\u300a\u300c\u300e\u3010\u3014\u3016\u3018\u301a\u301d\ufd3e\ufe17\ufe35\ufe37\ufe39\ufe3b\ufe3d\ufe3f\ufe41\ufe43\ufe47\ufe59\ufe5b\ufe5d\uff08\uff3b\uff5b\uff5f\uff62]',
Cc:'[\u0000-\u001f\u007f-\u009f]', Cc:'[\u0000-\u001f\u007f-\u009f]',
Cf:'[\u00ad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200b-\u200f\u202a-\u202e\u2060-\u2063\u206a-\u206f\ufeff\ufff9-\ufffb]', Cf:'[\u00ad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200b-\u200f\u202a-\u202e\u2060-\u2063\u206a-\u206f\ufeff\ufff9-\ufffb]',
Ll:'[\u0061-\u007a\u00aa\u00b5\u00ba\u00df-\u00f6\u00f8-\u00ff\u0101\u0103\u0105\u0107\u0109\u010b\u010d\u010f\u0111\u0113\u0115\u0117\u0119\u011b\u011d\u011f\u0121\u0123\u0125\u0127\u0129\u012b\u012d\u012f\u0131\u0133\u0135\u0137\u0138\u013a\u013c\u013e\u0140\u0142\u0144\u0146\u0148\u0149\u014b\u014d\u014f\u0151\u0153\u0155\u0157\u0159\u015b\u015d\u015f\u0161\u0163\u0165\u0167\u0169\u016b\u016d\u016f\u0171\u0173\u0175\u0177\u017a\u017c\u017e-\u0180\u0183\u0185\u0188\u018c\u018d\u0192\u0195\u0199-\u019b\u019e\u01a1\u01a3\u01a5\u01a8\u01aa\u01ab\u01ad\u01b0\u01b4\u01b6\u01b9\u01ba\u01bd-\u01bf\u01c6\u01c9\u01cc\u01ce\u01d0\u01d2\u01d4\u01d6\u01d8\u01da\u01dc\u01dd\u01df\u01e1\u01e3\u01e5\u01e7\u01e9\u01eb\u01ed\u01ef\u01f0\u01f3\u01f5\u01f9\u01fb\u01fd\u01ff\u0201\u0203\u0205\u0207\u0209\u020b\u020d\u020f\u0211\u0213\u0215\u0217\u0219\u021b\u021d\u021f\u0221\u0223\u0225\u0227\u0229\u022b\u022d\u022f\u0231\u0233-\u0239\u023c\u023f\u0240\u0242\u0247\u0249\u024b\u024d\u024f-\u0293\u0295-\u02af\u037b-\u037d\u0390\u03ac-\u03ce\u03d0\u03d1\u03d5-\u03d7\u03d9\u03db\u03dd\u03df\u03e1\u03e3\u03e5\u03e7\u03e9\u03eb\u03ed\u03ef-\u03f3\u03f5\u03f8\u03fb\u03fc\u0430-\u045f\u0461\u0463\u0465\u0467\u0469\u046b\u046d\u046f\u0471\u0473\u0475\u0477\u0479\u047b\u047d\u047f\u0481\u048b\u048d\u048f\u0491\u0493\u0495\u0497\u0499\u049b\u049d\u049f\u04a1\u04a3\u04a5\u04a7\u04a9\u04ab\u04ad\u04af\u04b1\u04b3\u04b5\u04b7\u04b9\u04bb\u04bd\u04bf\u04c2\u04c4\u04c6\u04c8\u04ca\u04cc\u04ce\u04cf\u04d1\u04d3\u04d5\u04d7\u04d9\u04db\u04dd\u04df\u04e1\u04e3\u04e5\u04e7\u04e9\u04eb\u04ed\u04ef\u04f1\u04f3\u04f5\u04f7\u04f9\u04fb\u04fd\u04ff\u0501\u0503\u0505\u0507\u0509\u050b\u050d\u050f\u0511\u0513\u0561-\u0587\u1d00-\u1d2b\u1d62-\u1d77\u1d79-\u1d9a\u1e01\u1e03\u1e05\u1e07\u1e09\u1e0b\u1e0d\u1e0f\u1e11\u1e13\u1e15\u1e17\u1e19\u1e1b\u1e1d\u1e1f\u1e21\u1e23\u1e25\u1e27\u1e29\u1e2b\u1e2d\u1e2f\u1e31\u1e33\u1e35\u1e37\u1e39\u1e3b\u1e3d\u1e3f\u1e41\u1e43\u1e45\u1e47\u1e49\u1e4b\u1e4d\u1e4f\u1e51\u1e53\u1e55\u1e57\u1e59\u1e5b\u1e5d\u1e5f\u1e61\u1e63\u1e65\u1e67\u1e69\u1e6b\u1e6d\u1e6f\u1e71\u1e73\u1e75\u1e77\u1e79\u1e7b\u1e7d\u1e7f\u1e81\u1e83\u1e85\u1e87\u1e89\u1e8b\u1e8d\u1e8f\u1e91\u1e93\u1e95-\u1e9b\u1ea1\u1ea3\u1ea5\u1ea7\u1ea9\u1eab\u1ead\u1eaf\u1eb1\u1eb3\u1eb5\u1eb7\u1eb9\u1ebb\u1ebd\u1ebf\u1ec1\u1ec3\u1ec5\u1ec7\u1ec9\u1ecb\u1ecd\u1ecf\u1ed1\u1ed3\u1ed5\u1ed7\u1ed9\u1edb\u1edd\u1edf\u1ee1\u1ee3\u1ee5\u1ee7\u1ee9\u1eeb\u1eed\u1eef\u1ef1\u1ef3\u1ef5\u1ef7\u1ef9\u1f00-\u1f07\u1f10-\u1f15\u1f20-\u1f27\u1f30-\u1f37\u1f40-\u1f45\u1f50-\u1f57\u1f60-\u1f67\u1f70-\u1f7d\u1f80-\u1f87\u1f90-\u1f97\u1fa0-\u1fa7\u1fb0-\u1fb4\u1fb6\u1fb7\u1fbe\u1fc2-\u1fc4\u1fc6\u1fc7\u1fd0-\u1fd3\u1fd6\u1fd7\u1fe0-\u1fe7\u1ff2-\u1ff4\u1ff6\u1ff7\u2071\u207f\u210a\u210e\u210f\u2113\u212f\u2134\u2139\u213c\u213d\u2146-\u2149\u214e\u2184\u2c30-\u2c5e\u2c61\u2c65\u2c66\u2c68\u2c6a\u2c6c\u2c74\u2c76\u2c77\u2c81\u2c83\u2c85\u2c87\u2c89\u2c8b\u2c8d\u2c8f\u2c91\u2c93\u2c95\u2c97\u2c99\u2c9b\u2c9d\u2c9f\u2ca1\u2ca3\u2ca5\u2ca7\u2ca9\u2cab\u2cad\u2caf\u2cb1\u2cb3\u2cb5\u2cb7\u2cb9\u2cbb\u2cbd\u2cbf\u2cc1\u2cc3\u2cc5\u2cc7\u2cc9\u2ccb\u2ccd\u2ccf\u2cd1\u2cd3\u2cd5\u2cd7\u2cd9\u2cdb\u2cdd\u2cdf\u2ce1\u2ce3\u2ce4\u2d00-\u2d25\ufb00-\ufb06\ufb13-\ufb17\uff41-\uff5a]', Ll:'[\u0061-\u007a\u00aa\u00b5\u00ba\u00df-\u00f6\u00f8-\u00ff\u0101\u0103\u0105\u0107\u0109\u010b\u010d\u010f\u0111\u0113\u0115\u0117\u0119\u011b\u011d\u011f\u0121\u0123\u0125\u0127\u0129\u012b\u012d\u012f\u0131\u0133\u0135\u0137\u0138\u013a\u013c\u013e\u0140\u0142\u0144\u0146\u0148\u0149\u014b\u014d\u014f\u0151\u0153\u0155\u0157\u0159\u015b\u015d\u015f\u0161\u0163\u0165\u0167\u0169\u016b\u016d\u016f\u0171\u0173\u0175\u0177\u017a\u017c\u017e-\u0180\u0183\u0185\u0188\u018c\u018d\u0192\u0195\u0199-\u019b\u019e\u01a1\u01a3\u01a5\u01a8\u01aa\u01ab\u01ad\u01b0\u01b4\u01b6\u01b9\u01ba\u01bd-\u01bf\u01c6\u01c9\u01cc\u01ce\u01d0\u01d2\u01d4\u01d6\u01d8\u01da\u01dc\u01dd\u01df\u01e1\u01e3\u01e5\u01e7\u01e9\u01eb\u01ed\u01ef\u01f0\u01f3\u01f5\u01f9\u01fb\u01fd\u01ff\u0201\u0203\u0205\u0207\u0209\u020b\u020d\u020f\u0211\u0213\u0215\u0217\u0219\u021b\u021d\u021f\u0221\u0223\u0225\u0227\u0229\u022b\u022d\u022f\u0231\u0233-\u0239\u023c\u023f\u0240\u0242\u0247\u0249\u024b\u024d\u024f-\u0293\u0295-\u02af\u037b-\u037d\u0390\u03ac-\u03ce\u03d0\u03d1\u03d5-\u03d7\u03d9\u03db\u03dd\u03df\u03e1\u03e3\u03e5\u03e7\u03e9\u03eb\u03ed\u03ef-\u03f3\u03f5\u03f8\u03fb\u03fc\u0430-\u045f\u0461\u0463\u0465\u0467\u0469\u046b\u046d\u046f\u0471\u0473\u0475\u0477\u0479\u047b\u047d\u047f\u0481\u048b\u048d\u048f\u0491\u0493\u0495\u0497\u0499\u049b\u049d\u049f\u04a1\u04a3\u04a5\u04a7\u04a9\u04ab\u04ad\u04af\u04b1\u04b3\u04b5\u04b7\u04b9\u04bb\u04bd\u04bf\u04c2\u04c4\u04c6\u04c8\u04ca\u04cc\u04ce\u04cf\u04d1\u04d3\u04d5\u04d7\u04d9\u04db\u04dd\u04df\u04e1\u04e3\u04e5\u04e7\u04e9\u04eb\u04ed\u04ef\u04f1\u04f3\u04f5\u04f7\u04f9\u04fb\u04fd\u04ff\u0501\u0503\u0505\u0507\u0509\u050b\u050d\u050f\u0511\u0513\u0561-\u0587\u1d00-\u1d2b\u1d62-\u1d77\u1d79-\u1d9a\u1e01\u1e03\u1e05\u1e07\u1e09\u1e0b\u1e0d\u1e0f\u1e11\u1e13\u1e15\u1e17\u1e19\u1e1b\u1e1d\u1e1f\u1e21\u1e23\u1e25\u1e27\u1e29\u1e2b\u1e2d\u1e2f\u1e31\u1e33\u1e35\u1e37\u1e39\u1e3b\u1e3d\u1e3f\u1e41\u1e43\u1e45\u1e47\u1e49\u1e4b\u1e4d\u1e4f\u1e51\u1e53\u1e55\u1e57\u1e59\u1e5b\u1e5d\u1e5f\u1e61\u1e63\u1e65\u1e67\u1e69\u1e6b\u1e6d\u1e6f\u1e71\u1e73\u1e75\u1e77\u1e79\u1e7b\u1e7d\u1e7f\u1e81\u1e83\u1e85\u1e87\u1e89\u1e8b\u1e8d\u1e8f\u1e91\u1e93\u1e95-\u1e9b\u1ea1\u1ea3\u1ea5\u1ea7\u1ea9\u1eab\u1ead\u1eaf\u1eb1\u1eb3\u1eb5\u1eb7\u1eb9\u1ebb\u1ebd\u1ebf\u1ec1\u1ec3\u1ec5\u1ec7\u1ec9\u1ecb\u1ecd\u1ecf\u1ed1\u1ed3\u1ed5\u1ed7\u1ed9\u1edb\u1edd\u1edf\u1ee1\u1ee3\u1ee5\u1ee7\u1ee9\u1eeb\u1eed\u1eef\u1ef1\u1ef3\u1ef5\u1ef7\u1ef9\u1f00-\u1f07\u1f10-\u1f15\u1f20-\u1f27\u1f30-\u1f37\u1f40-\u1f45\u1f50-\u1f57\u1f60-\u1f67\u1f70-\u1f7d\u1f80-\u1f87\u1f90-\u1f97\u1fa0-\u1fa7\u1fb0-\u1fb4\u1fb6\u1fb7\u1fbe\u1fc2-\u1fc4\u1fc6\u1fc7\u1fd0-\u1fd3\u1fd6\u1fd7\u1fe0-\u1fe7\u1ff2-\u1ff4\u1ff6\u1ff7\u2071\u207f\u210a\u210e\u210f\u2113\u212f\u2134\u2139\u213c\u213d\u2146-\u2149\u214e\u2184\u2c30-\u2c5e\u2c61\u2c65\u2c66\u2c68\u2c6a\u2c6c\u2c74\u2c76\u2c77\u2c81\u2c83\u2c85\u2c87\u2c89\u2c8b\u2c8d\u2c8f\u2c91\u2c93\u2c95\u2c97\u2c99\u2c9b\u2c9d\u2c9f\u2ca1\u2ca3\u2ca5\u2ca7\u2ca9\u2cab\u2cad\u2caf\u2cb1\u2cb3\u2cb5\u2cb7\u2cb9\u2cbb\u2cbd\u2cbf\u2cc1\u2cc3\u2cc5\u2cc7\u2cc9\u2ccb\u2ccd\u2ccf\u2cd1\u2cd3\u2cd5\u2cd7\u2cd9\u2cdb\u2cdd\u2cdf\u2ce1\u2ce3\u2ce4\u2d00-\u2d25\ufb00-\ufb06\ufb13-\ufb17\uff41-\uff5a]',
Lm:'[\u02b0-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ee\u037a\u0559\u0640\u06e5\u06e6\u07f4\u07f5\u07fa\u0e46\u0ec6\u10fc\u17d7\u1843\u1d2c-\u1d61\u1d78\u1d9b-\u1dbf\u2090-\u2094\u2d6f\u3005\u3031-\u3035\u303b\u309d\u309e\u30fc-\u30fe\ua015\ua717-\ua71a\uff70\uff9e\uff9f]', Lm:'[\u02b0-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ee\u037a\u0559\u0640\u06e5\u06e6\u07f4\u07f5\u07fa\u0e46\u0ec6\u10fc\u17d7\u1843\u1d2c-\u1d61\u1d78\u1d9b-\u1dbf\u2090-\u2094\u2d6f\u3005\u3031-\u3035\u303b\u309d\u309e\u30fc-\u30fe\ua015\ua717-\ua71a\uff70\uff9e\uff9f]',
Lo:'[\u01bb\u01c0-\u01c3\u0294\u05d0-\u05ea\u05f0-\u05f2\u0621-\u063a\u0641-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u076d\u0780-\u07a5\u07b1\u07ca-\u07ea\u0904-\u0939\u093d\u0950\u0958-\u0961\u097b-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d60\u0d61\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e45\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0edc\u0edd\u0f00\u0f40-\u0f47\u0f49-\u0f6a\u0f88-\u0f8b\u1000-\u1021\u1023-\u1027\u1029\u102a\u1050-\u1055\u10d0-\u10fa\u1100-\u1159\u115f-\u11a2\u11a8-\u11f9\u1200-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u1676\u1681-\u169a\u16a0-\u16ea\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17dc\u1820-\u1842\u1844-\u1877\u1880-\u18a8\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19a9\u19c1-\u19c7\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u2135-\u2138\u2d30-\u2d65\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3006\u303c\u3041-\u3096\u309f\u30a1-\u30fa\u30ff\u3105-\u312c\u3131-\u318e\u31a0-\u31b7\u31f0-\u31ff\u3400\u4db5\u4e00\u9fbb\ua000-\ua014\ua016-\ua48c\ua800\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\uac00\ud7a3\uf900-\ufa2d\ufa30-\ufa6a\ufa70-\ufad9\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff66-\uff6f\uff71-\uff9d\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]', Lo:'[\u01bb\u01c0-\u01c3\u0294\u05d0-\u05ea\u05f0-\u05f2\u0621-\u063a\u0641-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u076d\u0780-\u07a5\u07b1\u07ca-\u07ea\u0904-\u0939\u093d\u0950\u0958-\u0961\u097b-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d60\u0d61\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e45\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0edc\u0edd\u0f00\u0f40-\u0f47\u0f49-\u0f6a\u0f88-\u0f8b\u1000-\u1021\u1023-\u1027\u1029\u102a\u1050-\u1055\u10d0-\u10fa\u1100-\u1159\u115f-\u11a2\u11a8-\u11f9\u1200-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u1676\u1681-\u169a\u16a0-\u16ea\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17dc\u1820-\u1842\u1844-\u1877\u1880-\u18a8\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19a9\u19c1-\u19c7\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u2135-\u2138\u2d30-\u2d65\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3006\u303c\u3041-\u3096\u309f\u30a1-\u30fa\u30ff\u3105-\u312c\u3131-\u318e\u31a0-\u31b7\u31f0-\u31ff\u3400\u4db5\u4e00\u9fbb\ua000-\ua014\ua016-\ua48c\ua800\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\uac00\ud7a3\uf900-\ufa2d\ufa30-\ufa6a\ufa70-\ufad9\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff66-\uff6f\uff71-\uff9d\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]',
Co:'[\ue000\uf8ff]', Co:'[\ue000\uf8ff]',
Nd:'[\u0030-\u0039\u0660-\u0669\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1b50-\u1b59\uff10-\uff19]', Nd:'[\u0030-\u0039\u0660-\u0669\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1b50-\u1b59\uff10-\uff19]',
Lt:'[\u01c5\u01c8\u01cb\u01f2\u1f88-\u1f8f\u1f98-\u1f9f\u1fa8-\u1faf\u1fbc\u1fcc\u1ffc]', Lt:'[\u01c5\u01c8\u01cb\u01f2\u1f88-\u1f8f\u1f98-\u1f9f\u1fa8-\u1faf\u1fbc\u1fcc\u1ffc]',
Lu:'[\u0041-\u005a\u00c0-\u00d6\u00d8-\u00de\u0100\u0102\u0104\u0106\u0108\u010a\u010c\u010e\u0110\u0112\u0114\u0116\u0118\u011a\u011c\u011e\u0120\u0122\u0124\u0126\u0128\u012a\u012c\u012e\u0130\u0132\u0134\u0136\u0139\u013b\u013d\u013f\u0141\u0143\u0145\u0147\u014a\u014c\u014e\u0150\u0152\u0154\u0156\u0158\u015a\u015c\u015e\u0160\u0162\u0164\u0166\u0168\u016a\u016c\u016e\u0170\u0172\u0174\u0176\u0178\u0179\u017b\u017d\u0181\u0182\u0184\u0186\u0187\u0189-\u018b\u018e-\u0191\u0193\u0194\u0196-\u0198\u019c\u019d\u019f\u01a0\u01a2\u01a4\u01a6\u01a7\u01a9\u01ac\u01ae\u01af\u01b1-\u01b3\u01b5\u01b7\u01b8\u01bc\u01c4\u01c7\u01ca\u01cd\u01cf\u01d1\u01d3\u01d5\u01d7\u01d9\u01db\u01de\u01e0\u01e2\u01e4\u01e6\u01e8\u01ea\u01ec\u01ee\u01f1\u01f4\u01f6-\u01f8\u01fa\u01fc\u01fe\u0200\u0202\u0204\u0206\u0208\u020a\u020c\u020e\u0210\u0212\u0214\u0216\u0218\u021a\u021c\u021e\u0220\u0222\u0224\u0226\u0228\u022a\u022c\u022e\u0230\u0232\u023a\u023b\u023d\u023e\u0241\u0243-\u0246\u0248\u024a\u024c\u024e\u0386\u0388-\u038a\u038c\u038e\u038f\u0391-\u03a1\u03a3-\u03ab\u03d2-\u03d4\u03d8\u03da\u03dc\u03de\u03e0\u03e2\u03e4\u03e6\u03e8\u03ea\u03ec\u03ee\u03f4\u03f7\u03f9\u03fa\u03fd-\u042f\u0460\u0462\u0464\u0466\u0468\u046a\u046c\u046e\u0470\u0472\u0474\u0476\u0478\u047a\u047c\u047e\u0480\u048a\u048c\u048e\u0490\u0492\u0494\u0496\u0498\u049a\u049c\u049e\u04a0\u04a2\u04a4\u04a6\u04a8\u04aa\u04ac\u04ae\u04b0\u04b2\u04b4\u04b6\u04b8\u04ba\u04bc\u04be\u04c0\u04c1\u04c3\u04c5\u04c7\u04c9\u04cb\u04cd\u04d0\u04d2\u04d4\u04d6\u04d8\u04da\u04dc\u04de\u04e0\u04e2\u04e4\u04e6\u04e8\u04ea\u04ec\u04ee\u04f0\u04f2\u04f4\u04f6\u04f8\u04fa\u04fc\u04fe\u0500\u0502\u0504\u0506\u0508\u050a\u050c\u050e\u0510\u0512\u0531-\u0556\u10a0-\u10c5\u1e00\u1e02\u1e04\u1e06\u1e08\u1e0a\u1e0c\u1e0e\u1e10\u1e12\u1e14\u1e16\u1e18\u1e1a\u1e1c\u1e1e\u1e20\u1e22\u1e24\u1e26\u1e28\u1e2a\u1e2c\u1e2e\u1e30\u1e32\u1e34\u1e36\u1e38\u1e3a\u1e3c\u1e3e\u1e40\u1e42\u1e44\u1e46\u1e48\u1e4a\u1e4c\u1e4e\u1e50\u1e52\u1e54\u1e56\u1e58\u1e5a\u1e5c\u1e5e\u1e60\u1e62\u1e64\u1e66\u1e68\u1e6a\u1e6c\u1e6e\u1e70\u1e72\u1e74\u1e76\u1e78\u1e7a\u1e7c\u1e7e\u1e80\u1e82\u1e84\u1e86\u1e88\u1e8a\u1e8c\u1e8e\u1e90\u1e92\u1e94\u1ea0\u1ea2\u1ea4\u1ea6\u1ea8\u1eaa\u1eac\u1eae\u1eb0\u1eb2\u1eb4\u1eb6\u1eb8\u1eba\u1ebc\u1ebe\u1ec0\u1ec2\u1ec4\u1ec6\u1ec8\u1eca\u1ecc\u1ece\u1ed0\u1ed2\u1ed4\u1ed6\u1ed8\u1eda\u1edc\u1ede\u1ee0\u1ee2\u1ee4\u1ee6\u1ee8\u1eea\u1eec\u1eee\u1ef0\u1ef2\u1ef4\u1ef6\u1ef8\u1f08-\u1f0f\u1f18-\u1f1d\u1f28-\u1f2f\u1f38-\u1f3f\u1f48-\u1f4d\u1f59\u1f5b\u1f5d\u1f5f\u1f68-\u1f6f\u1fb8-\u1fbb\u1fc8-\u1fcb\u1fd8-\u1fdb\u1fe8-\u1fec\u1ff8-\u1ffb\u2102\u2107\u210b-\u210d\u2110-\u2112\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u2130-\u2133\u213e\u213f\u2145\u2183\u2c00-\u2c2e\u2c60\u2c62-\u2c64\u2c67\u2c69\u2c6b\u2c75\u2c80\u2c82\u2c84\u2c86\u2c88\u2c8a\u2c8c\u2c8e\u2c90\u2c92\u2c94\u2c96\u2c98\u2c9a\u2c9c\u2c9e\u2ca0\u2ca2\u2ca4\u2ca6\u2ca8\u2caa\u2cac\u2cae\u2cb0\u2cb2\u2cb4\u2cb6\u2cb8\u2cba\u2cbc\u2cbe\u2cc0\u2cc2\u2cc4\u2cc6\u2cc8\u2cca\u2ccc\u2cce\u2cd0\u2cd2\u2cd4\u2cd6\u2cd8\u2cda\u2cdc\u2cde\u2ce0\u2ce2\uff21-\uff3a]', Lu:'[\u0041-\u005a\u00c0-\u00d6\u00d8-\u00de\u0100\u0102\u0104\u0106\u0108\u010a\u010c\u010e\u0110\u0112\u0114\u0116\u0118\u011a\u011c\u011e\u0120\u0122\u0124\u0126\u0128\u012a\u012c\u012e\u0130\u0132\u0134\u0136\u0139\u013b\u013d\u013f\u0141\u0143\u0145\u0147\u014a\u014c\u014e\u0150\u0152\u0154\u0156\u0158\u015a\u015c\u015e\u0160\u0162\u0164\u0166\u0168\u016a\u016c\u016e\u0170\u0172\u0174\u0176\u0178\u0179\u017b\u017d\u0181\u0182\u0184\u0186\u0187\u0189-\u018b\u018e-\u0191\u0193\u0194\u0196-\u0198\u019c\u019d\u019f\u01a0\u01a2\u01a4\u01a6\u01a7\u01a9\u01ac\u01ae\u01af\u01b1-\u01b3\u01b5\u01b7\u01b8\u01bc\u01c4\u01c7\u01ca\u01cd\u01cf\u01d1\u01d3\u01d5\u01d7\u01d9\u01db\u01de\u01e0\u01e2\u01e4\u01e6\u01e8\u01ea\u01ec\u01ee\u01f1\u01f4\u01f6-\u01f8\u01fa\u01fc\u01fe\u0200\u0202\u0204\u0206\u0208\u020a\u020c\u020e\u0210\u0212\u0214\u0216\u0218\u021a\u021c\u021e\u0220\u0222\u0224\u0226\u0228\u022a\u022c\u022e\u0230\u0232\u023a\u023b\u023d\u023e\u0241\u0243-\u0246\u0248\u024a\u024c\u024e\u0386\u0388-\u038a\u038c\u038e\u038f\u0391-\u03a1\u03a3-\u03ab\u03d2-\u03d4\u03d8\u03da\u03dc\u03de\u03e0\u03e2\u03e4\u03e6\u03e8\u03ea\u03ec\u03ee\u03f4\u03f7\u03f9\u03fa\u03fd-\u042f\u0460\u0462\u0464\u0466\u0468\u046a\u046c\u046e\u0470\u0472\u0474\u0476\u0478\u047a\u047c\u047e\u0480\u048a\u048c\u048e\u0490\u0492\u0494\u0496\u0498\u049a\u049c\u049e\u04a0\u04a2\u04a4\u04a6\u04a8\u04aa\u04ac\u04ae\u04b0\u04b2\u04b4\u04b6\u04b8\u04ba\u04bc\u04be\u04c0\u04c1\u04c3\u04c5\u04c7\u04c9\u04cb\u04cd\u04d0\u04d2\u04d4\u04d6\u04d8\u04da\u04dc\u04de\u04e0\u04e2\u04e4\u04e6\u04e8\u04ea\u04ec\u04ee\u04f0\u04f2\u04f4\u04f6\u04f8\u04fa\u04fc\u04fe\u0500\u0502\u0504\u0506\u0508\u050a\u050c\u050e\u0510\u0512\u0531-\u0556\u10a0-\u10c5\u1e00\u1e02\u1e04\u1e06\u1e08\u1e0a\u1e0c\u1e0e\u1e10\u1e12\u1e14\u1e16\u1e18\u1e1a\u1e1c\u1e1e\u1e20\u1e22\u1e24\u1e26\u1e28\u1e2a\u1e2c\u1e2e\u1e30\u1e32\u1e34\u1e36\u1e38\u1e3a\u1e3c\u1e3e\u1e40\u1e42\u1e44\u1e46\u1e48\u1e4a\u1e4c\u1e4e\u1e50\u1e52\u1e54\u1e56\u1e58\u1e5a\u1e5c\u1e5e\u1e60\u1e62\u1e64\u1e66\u1e68\u1e6a\u1e6c\u1e6e\u1e70\u1e72\u1e74\u1e76\u1e78\u1e7a\u1e7c\u1e7e\u1e80\u1e82\u1e84\u1e86\u1e88\u1e8a\u1e8c\u1e8e\u1e90\u1e92\u1e94\u1ea0\u1ea2\u1ea4\u1ea6\u1ea8\u1eaa\u1eac\u1eae\u1eb0\u1eb2\u1eb4\u1eb6\u1eb8\u1eba\u1ebc\u1ebe\u1ec0\u1ec2\u1ec4\u1ec6\u1ec8\u1eca\u1ecc\u1ece\u1ed0\u1ed2\u1ed4\u1ed6\u1ed8\u1eda\u1edc\u1ede\u1ee0\u1ee2\u1ee4\u1ee6\u1ee8\u1eea\u1eec\u1eee\u1ef0\u1ef2\u1ef4\u1ef6\u1ef8\u1f08-\u1f0f\u1f18-\u1f1d\u1f28-\u1f2f\u1f38-\u1f3f\u1f48-\u1f4d\u1f59\u1f5b\u1f5d\u1f5f\u1f68-\u1f6f\u1fb8-\u1fbb\u1fc8-\u1fcb\u1fd8-\u1fdb\u1fe8-\u1fec\u1ff8-\u1ffb\u2102\u2107\u210b-\u210d\u2110-\u2112\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u2130-\u2133\u213e\u213f\u2145\u2183\u2c00-\u2c2e\u2c60\u2c62-\u2c64\u2c67\u2c69\u2c6b\u2c75\u2c80\u2c82\u2c84\u2c86\u2c88\u2c8a\u2c8c\u2c8e\u2c90\u2c92\u2c94\u2c96\u2c98\u2c9a\u2c9c\u2c9e\u2ca0\u2ca2\u2ca4\u2ca6\u2ca8\u2caa\u2cac\u2cae\u2cb0\u2cb2\u2cb4\u2cb6\u2cb8\u2cba\u2cbc\u2cbe\u2cc0\u2cc2\u2cc4\u2cc6\u2cc8\u2cca\u2ccc\u2cce\u2cd0\u2cd2\u2cd4\u2cd6\u2cd8\u2cda\u2cdc\u2cde\u2ce0\u2ce2\uff21-\uff3a]',
Cs:'[\ud800\udb7f\udb80\udbff\udc00\udfff]', Cs:'[\ud800\udb7f\udb80\udbff\udc00\udfff]',
Zl:'[\u2028]', Zl:'[\u2028]',
Nl:'[\u16ee-\u16f0\u2160-\u2182\u3007\u3021-\u3029\u3038-\u303a]', Nl:'[\u16ee-\u16f0\u2160-\u2182\u3007\u3021-\u3029\u3038-\u303a]',
Zp:'[\u2029]', Zp:'[\u2029]',
No:'[\u00b2\u00b3\u00b9\u00bc-\u00be\u09f4-\u09f9\u0bf0-\u0bf2\u0f2a-\u0f33\u1369-\u137c\u17f0-\u17f9\u2070\u2074-\u2079\u2080-\u2089\u2153-\u215f\u2460-\u249b\u24ea-\u24ff\u2776-\u2793\u2cfd\u3192-\u3195\u3220-\u3229\u3251-\u325f\u3280-\u3289\u32b1-\u32bf]', No:'[\u00b2\u00b3\u00b9\u00bc-\u00be\u09f4-\u09f9\u0bf0-\u0bf2\u0f2a-\u0f33\u1369-\u137c\u17f0-\u17f9\u2070\u2074-\u2079\u2080-\u2089\u2153-\u215f\u2460-\u249b\u24ea-\u24ff\u2776-\u2793\u2cfd\u3192-\u3195\u3220-\u3229\u3251-\u325f\u3280-\u3289\u32b1-\u32bf]',
Zs:'[\u0020\u00a0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000]', Zs:'[\u0020\u00a0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000]',
Sc:'[\u0024\u00a2-\u00a5\u060b\u09f2\u09f3\u0af1\u0bf9\u0e3f\u17db\u20a0-\u20b5\ufdfc\ufe69\uff04\uffe0\uffe1\uffe5\uffe6]', Sc:'[\u0024\u00a2-\u00a5\u060b\u09f2\u09f3\u0af1\u0bf9\u0e3f\u17db\u20a0-\u20b5\ufdfc\ufe69\uff04\uffe0\uffe1\uffe5\uffe6]',
Pc:'[\u005f\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f]', Pc:'[\u005f\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f]',
Pd:'[\u002d\u058a\u1806\u2010-\u2015\u2e17\u301c\u3030\u30a0\ufe31\ufe32\ufe58\ufe63\uff0d]', Pd:'[\u002d\u058a\u1806\u2010-\u2015\u2e17\u301c\u3030\u30a0\ufe31\ufe32\ufe58\ufe63\uff0d]',
Pe:'[\u0029\u005d\u007d\u0f3b\u0f3d\u169c\u2046\u207e\u208e\u232a\u2769\u276b\u276d\u276f\u2771\u2773\u2775\u27c6\u27e7\u27e9\u27eb\u2984\u2986\u2988\u298a\u298c\u298e\u2990\u2992\u2994\u2996\u2998\u29d9\u29db\u29fd\u3009\u300b\u300d\u300f\u3011\u3015\u3017\u3019\u301b\u301e\u301f\ufd3f\ufe18\ufe36\ufe38\ufe3a\ufe3c\ufe3e\ufe40\ufe42\ufe44\ufe48\ufe5a\ufe5c\ufe5e\uff09\uff3d\uff5d\uff60\uff63]', Pe:'[\u0029\u005d\u007d\u0f3b\u0f3d\u169c\u2046\u207e\u208e\u232a\u2769\u276b\u276d\u276f\u2771\u2773\u2775\u27c6\u27e7\u27e9\u27eb\u2984\u2986\u2988\u298a\u298c\u298e\u2990\u2992\u2994\u2996\u2998\u29d9\u29db\u29fd\u3009\u300b\u300d\u300f\u3011\u3015\u3017\u3019\u301b\u301e\u301f\ufd3f\ufe18\ufe36\ufe38\ufe3a\ufe3c\ufe3e\ufe40\ufe42\ufe44\ufe48\ufe5a\ufe5c\ufe5e\uff09\uff3d\uff5d\uff60\uff63]',
Pf:'[\u00bb\u2019\u201d\u203a\u2e03\u2e05\u2e0a\u2e0d\u2e1d]', Pf:'[\u00bb\u2019\u201d\u203a\u2e03\u2e05\u2e0a\u2e0d\u2e1d]',
Me:'[\u0488\u0489\u06de\u20dd-\u20e0\u20e2-\u20e4]', Me:'[\u0488\u0489\u06de\u20dd-\u20e0\u20e2-\u20e4]',
Mc:'[\u0903\u093e-\u0940\u0949-\u094c\u0982\u0983\u09be-\u09c0\u09c7\u09c8\u09cb\u09cc\u09d7\u0a03\u0a3e-\u0a40\u0a83\u0abe-\u0ac0\u0ac9\u0acb\u0acc\u0b02\u0b03\u0b3e\u0b40\u0b47\u0b48\u0b4b\u0b4c\u0b57\u0bbe\u0bbf\u0bc1\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcc\u0bd7\u0c01-\u0c03\u0c41-\u0c44\u0c82\u0c83\u0cbe\u0cc0-\u0cc4\u0cc7\u0cc8\u0cca\u0ccb\u0cd5\u0cd6\u0d02\u0d03\u0d3e-\u0d40\u0d46-\u0d48\u0d4a-\u0d4c\u0d57\u0d82\u0d83\u0dcf-\u0dd1\u0dd8-\u0ddf\u0df2\u0df3\u0f3e\u0f3f\u0f7f\u102c\u1031\u1038\u1056\u1057\u17b6\u17be-\u17c5\u17c7\u17c8\u1923-\u1926\u1929-\u192b\u1930\u1931\u1933-\u1938\u19b0-\u19c0\u19c8\u19c9\u1a19-\u1a1b\u1b04\u1b35\u1b3b\u1b3d-\u1b41\u1b43\u1b44\ua802\ua823\ua824\ua827]' Mc:'[\u0903\u093e-\u0940\u0949-\u094c\u0982\u0983\u09be-\u09c0\u09c7\u09c8\u09cb\u09cc\u09d7\u0a03\u0a3e-\u0a40\u0a83\u0abe-\u0ac0\u0ac9\u0acb\u0acc\u0b02\u0b03\u0b3e\u0b40\u0b47\u0b48\u0b4b\u0b4c\u0b57\u0bbe\u0bbf\u0bc1\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcc\u0bd7\u0c01-\u0c03\u0c41-\u0c44\u0c82\u0c83\u0cbe\u0cc0-\u0cc4\u0cc7\u0cc8\u0cca\u0ccb\u0cd5\u0cd6\u0d02\u0d03\u0d3e-\u0d40\u0d46-\u0d48\u0d4a-\u0d4c\u0d57\u0d82\u0d83\u0dcf-\u0dd1\u0dd8-\u0ddf\u0df2\u0df3\u0f3e\u0f3f\u0f7f\u102c\u1031\u1038\u1056\u1057\u17b6\u17be-\u17c5\u17c7\u17c8\u1923-\u1926\u1929-\u192b\u1930\u1931\u1933-\u1938\u19b0-\u19c0\u19c8\u19c9\u1a19-\u1a1b\u1b04\u1b35\u1b3b\u1b3d-\u1b41\u1b43\u1b44\ua802\ua823\ua824\ua827]'
}; };
/* Also supports the general category (only the first letter) */ /* Also supports the general category (only the first letter) */
var firstLetters = {}; var firstLetters = {};
for ( var p in unicodeCategories ) { for (var p in unicodeCategories)
if ( firstLetters[p[0]] ) {
firstLetters[p[0]] = unicodeCategories[p].substring(0,unicodeCategories[p].length-1) + firstLetters[p[0]].substring(1); if (firstLetters[p[0]])
else firstLetters[p[0]] = unicodeCategories[p].substring(0,unicodeCategories[p].length-1) + firstLetters[p[0]].substring(1);
firstLetters[p[0]] = unicodeCategories[p]; else
} firstLetters[p[0]] = unicodeCategories[p];
for ( var p in firstLetters ) }
unicodeCategories[p] = firstLetters[p]; for (var p in firstLetters)
unicodeCategories[p] = firstLetters[p];
/* Gets a regex written in a dialect that supports unicode categories and
translates it to a dialect supported by JavaScript. */
return function(regexpString, classes)
{
var modifiers = "";
if ( regexpString instanceof RegExp ) {
modifiers = (regexpString.global ? "g" : "") +
(regexpString.ignoreCase ? "i" : "") +
(regexpString.multiline ? "m" : "");
regexpString = regexpString.source;
}
regexpString = regexpString.replace(/\\p\{(..?)\}/g, function(match,group) {
var unicode_categorie = unicodeCategories[group];
if (!classes)
unicode_category = unicode_categorie.replace(/\[(.*?)\]/g,"$1")
return unicode_category || match;
});
return new RegExp(regexpString,modifiers);
};
/* Gets a regex written in a dialect that supports unicode categories and
translates it to a dialect supported by JavaScript. */
return function(regexpString) {
var modifiers = "";
if ( regexpString instanceof RegExp ) {
modifiers = (regexpString.global ? "g" : "") +
(regexpString.ignoreCase ? "i" : "") +
(regexpString.multiline ? "m" : "");
regexpString = regexpString.source;
}
regexpString = regexpString.replace(/\\p\{(..?)\}/g, function(match,group) {
return unicodeCategories[group] || match;
});
return new RegExp(regexpString,modifiers);
};
})(); })();
/* /*
* 2007-2013 PrestaShop * 2007-2013 PrestaShop
@@ -143,7 +149,7 @@ function validate_isDniLite(s)
function validate_isEmail(s) function validate_isEmail(s)
{ {
var reg = unicode_hack('^[a-z\p{L}0-9!#$%&\'*+\/=?^`{}|~_-]+[.a-z\p{L}0-9!#$%&\'*+\/=?^`{}|~_-]*@[a-z\p{L}0-9]+[._a-z\p{L}0-9-]*\.[a-z0-9]+$'); var reg = unicode_hack(/^[a-z\p{L}0-9!#$%&'*+\/=?^`{}|~_-]+[.a-z\p{L}0-9!#$%&'*+\/=?^`{}|~_-]*@[a-z\p{L}0-9]+[._a-z\p{L}0-9-]*\.[a-z\p{L}0-9]+$/i, false);
return reg.test(s); return reg.test(s);
} }
+72 -17
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,17 +77,17 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span><br/> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:14px;text-transform:uppercase;line-height:18px;padding-top:10px;display:block">Thank you for creating a customer account at {shop_name}.</span> <span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for creating a customer account at {shop_name}.</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your {shop_name} login details </p> Your {shop_name} login details </p>
<span style="color:#777"> <span style="color:#777">
Here are your login details:<br /> Here are your login details:<br />
@@ -42,11 +97,11 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">Important Security Tips:</p> <p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">Important Security Tips:</p>
<ol> <ol>
<li>Always keep your account details safe.</li> <li>Always keep your account details safe.</li>
<li>Never disclose your login details to anyone.</li> <li>Never disclose your login details to anyone.</li>
@@ -56,19 +111,19 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span>You can now place orders on our shop: <a href="{shop_url}" style="color:#337ff1">{shop_name}</a></span> <span>You can now place orders on our shop: <a href="{shop_url}" style="color:#337ff1">{shop_name}</a></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+2 -2
View File
@@ -5,9 +5,9 @@ Hi {firstname} {lastname},
Thank you for creating a customer account at {shop_name}. Thank you for creating a customer account at {shop_name}.
Your {shop_name} login details Here are your login details: Here are your login details:
E-MAIL ADDRESS: {EMAIL} E-MAIL ADDRESS: {email}
PASSWORD: {passwd} PASSWORD: {passwd}
+66 -11
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
A new order has been generated on your behalf. </p> A new order has been generated on your behalf. </p>
<span style="color:#777"> <span style="color:#777">
Please go on <a href="{order_link}" style="color:#337ff1">{order_link}</a> to finalize the payment. </span> Please go on <a href="{order_link}" style="color:#337ff1">{order_link}</a> to finalize the payment. </span>
@@ -40,10 +95,10 @@
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+4 -3
View File
@@ -3,9 +3,10 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
A new order has been generated on your behalf. Please go on A new order has been generated on your behalf.
{order_link} [{order_link}] to finalize the
payment. Please go on {order_link} [{order_link}] to
finalize the payment.
{shop_name} [{shop_url}] powered by {shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/] PrestaShop(tm) [http://www.prestashop.com/]
+73 -18
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,17 +77,17 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span><br/> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:14px;text-transform:uppercase;line-height:18px;padding-top:10px;display:block">Thank you for shopping with {shop_name}!</span> <span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping with {shop_name}!</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Awaiting wire payment Order {order_name}&nbsp;-&nbsp;Awaiting wire payment
</p> </p>
<span style="color:#777"> <span style="color:#777">
@@ -40,11 +95,11 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
You have selected to pay by wire transfer. </p> You have selected to pay by wire transfer. </p>
<span style="color:#777"> <span style="color:#777">
Here are the bank details for your transfer:<br /> Here are the bank details for your transfer:<br />
@@ -56,26 +111,26 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span> You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span> If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+5 -5
View File
@@ -5,12 +5,12 @@ Hi {firstname} {lastname},
Thank you for shopping with {shop_name}! Thank you for shopping with {shop_name}!
Order {order_name} - Awaiting wire payment Your order with the Your order with the reference {order_name} has been placed
reference {ORDER_NAME} has been placed successfully and will be successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
You have selected to pay by wire transfer. Here are the bank details You have selected to pay by wire transfer.
for your transfer:
Here are the bank details for your transfer:
AMOUNT: {total_paid} AMOUNT: {total_paid}
+73 -18
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,28 +77,28 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span><br/> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:14px;text-transform:uppercase;line-height:18px;padding-top:10px;display:block">Thank you for shopping with {shop_name}!</span> <span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping with {shop_name}!</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Awaiting check payment </p> Order {order_name}&nbsp;-&nbsp;Awaiting check payment </p>
<span style="color:#777"> <span style="color:#777">
Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>. </span> Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
You have selected to pay by check. </p> You have selected to pay by check. </p>
<span style="color:#777"> <span style="color:#777">
Here are the bank details for your check:<br /> Here are the bank details for your check:<br />
@@ -55,16 +110,16 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span> You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span> If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span>
</td> </td>
@@ -72,10 +127,10 @@
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+5 -5
View File
@@ -5,12 +5,12 @@ Hi {firstname} {lastname},
Thank you for shopping with {shop_name}! Thank you for shopping with {shop_name}!
Order {order_name} - Awaiting check payment Your order with the Your order with the reference {order_name} has been placed
reference {ORDER_NAME} has been placed successfully and will be successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
You have selected to pay by check. Here are the bank details for your You have selected to pay by check.
check:
Here are the bank details for your check:
AMOUNT: {total_paid} AMOUNT: {total_paid}
+66 -11
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Message from a {shop_name} customer </p> Message from a {shop_name} customer </p>
<span style="color:#777"> <span style="color:#777">
<span style="color:#333"><strong>Customer e-mail address: <a href="mailto:{email}" style="color:#337ff1">{email}</a></strong></span><br /><br /> <span style="color:#333"><strong>Customer e-mail address: <a href="mailto:{email}" style="color:#337ff1">{email}</a></strong></span><br /><br />
@@ -43,10 +98,10 @@
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+3 -1
View File
@@ -3,7 +3,9 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Message from a {shop_name} customer CUSTOMER E-MAIL ADDRESS: {EMAIL} Message from a {shop_name} customer
CUSTOMER E-MAIL ADDRESS: {email}
CUSTOMER MESSAGE: {message} CUSTOMER MESSAGE: {message}
+68 -13
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your message to {shop_name} Customer Service </p> Your message to {shop_name} Customer Service </p>
<span style="color:#777"> <span style="color:#777">
Your message has been sent successfully.<br /><br /> Your message has been sent successfully.<br /><br />
@@ -43,20 +98,20 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
We will answer as soon as possible. </span> We will answer as soon as possible. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Your message to {shop_name} Customer Service Your message has been Your message has been sent successfully.
sent successfully.
MESSAGE: {message} MESSAGE: {message}
+68 -13
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,36 +77,36 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;Credit slip created </p> Order {order_name}&nbsp;-&nbsp;Credit slip created </p>
<span style="color:#777"> <span style="color:#777">
We have generated a credit slip in your name for order with the reference <span style="color:#333"><strong>{order_name}</strong></span>. </span> We have generated a credit slip in your name for order with the reference <span style="color:#333"><strong>{order_name}</strong></span>. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
You can review this credit slip and download your invoice from the <a href="{history_url}" style="color:#337ff1">"My credit slips"</a> section of your account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span> You can review this credit slip and download your invoice from the <a href="{history_url}" style="color:#337ff1">"My credit slips"</a> section of your account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+2 -2
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Order {order_name} - Credit slip created We have generated a credit We have generated a credit slip in your name for order with the
slip in your name for order with the reference {ORDER_NAME}. reference {order_name}.
You can review this credit slip and download your invoice from the You can review this credit slip and download your invoice from the
"My credit slips" [{history_url}] section of your "My credit slips" [{history_url}] section of your
+70 -15
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,17 +77,17 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span><br/> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:14px;text-transform:uppercase;line-height:18px;padding-top:10px;display:block">Thank you for your order with the reference {order_name} from <strong>{shop_name}</strong></span> <span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for your order with the reference {order_name} from <strong>{shop_name}</strong></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Product(s) now available for download </p> Product(s) now available for download </p>
<span style="color:#777"> <span style="color:#777">
You have <span style="color:#333"><strong>{nbProducts}</strong></span> product(s) now available for download using the following link(s):<br/><br/> You have <span style="color:#333"><strong>{nbProducts}</strong></span> product(s) now available for download using the following link(s):<br/><br/>
@@ -41,26 +96,26 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span> You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}?id_order={order_name}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span> If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}?id_order={order_name}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+4 -4
View File
@@ -4,12 +4,12 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Thank you for your order with the reference {order_name} from Thank you for your order with the reference {order_name} from
{SHOP_NAME} {shop_name}
Product(s) now available for download You have {NBPRODUCTS} You have {nbproducts} product(s) now available for download using the
product(s) now available for download using the following link(s): following link(s):
{virtualProducts} {virtualproducts}
You can review your order and download your invoice from the You can review your order and download your invoice from the
"Order history" [{history_url}] section of your "Order history" [{history_url}] section of your
+66 -11
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your {shop_name} login information </p> Your {shop_name} login information </p>
<span style="color:#777"> <span style="color:#777">
Here is your personal login information for <span style="color:#333"><strong>{shop_name}</strong></span>:<br/><br/> Here is your personal login information for <span style="color:#333"><strong>{shop_name}</strong></span>:<br/><br/>
@@ -44,10 +99,10 @@
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Your {shop_name} login information Here is your personal login Here is your personal login information for {shop_name}:
information for {SHOP_NAME}:
FIRST NAME: {firstname} FIRST NAME: {firstname}
+66 -11
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Customer service - Forwarded discussion </p> Customer service - Forwarded discussion </p>
<span style="color:#777"> <span style="color:#777">
<span style="color:#333"><strong>{employee}</strong></span> wanted to forward this discussion to you. <br /><br /> <span style="color:#333"><strong>{employee}</strong></span> wanted to forward this discussion to you. <br /><br />
@@ -42,10 +97,10 @@
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+2 -3
View File
@@ -3,12 +3,11 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Customer service - Forwarded discussion {EMPLOYEE} wanted to forward {employee} wanted to forward this discussion to you.
this discussion to you.
DISCUSSION HISTORY: {messages} DISCUSSION HISTORY: {messages}
{EMPLOYEE} added "{COMMENT}" {employee} added "{comment}"
{shop_name} [{shop_url}] powered by {shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/] PrestaShop(tm) [http://www.prestashop.com/]
+69 -14
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your customer account creation </p> Your customer account creation </p>
<span style="color:#777"> <span style="color:#777">
Your guest account for <span style="color:#333"><strong>{shop_name}</strong></span> has been transformed into a customer account. <br /><br /> Your guest account for <span style="color:#333"><strong>{shop_name}</strong></span> has been transformed into a customer account. <br /><br />
@@ -41,16 +96,16 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
Please be careful when sharing these login details with others. </span> Please be careful when sharing these login details with others. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
You can access your customer account on our shop: <strong>{shop_url}</strong> You can access your customer account on our shop: <strong>{shop_url}</strong>
</span> </span>
@@ -58,10 +113,10 @@
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+3 -3
View File
@@ -3,8 +3,8 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Your customer account creation Your guest account for {SHOP_NAME} has Your guest account for {shop_name} has been transformed into a
been transformed into a customer account. customer account.
E-MAIL ADDRESS: {email} E-MAIL ADDRESS: {email}
@@ -12,7 +12,7 @@ PASSWORD: {passwd}
Please be careful when sharing these login details with others. Please be careful when sharing these login details with others.
You can access your customer account on our shop: {SHOP_URL} You can access your customer account on our shop: {shop_url}
{shop_name} [{shop_url}] powered by {shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/] PrestaShop(tm) [http://www.prestashop.com/]
+59 -4
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
+69 -14
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order {order_name}&nbsp;-&nbsp;In transit </p> Order {order_name}&nbsp;-&nbsp;In transit </p>
<span style="color:#777"> <span style="color:#777">
Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> is currently in transit. <br /><br /> Your order with the reference <span style="color:#333"><strong>{order_name}</strong></span> is currently in transit. <br /><br />
@@ -40,26 +95,26 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span> You can review your order and download your invoice from the <a href="{history_url}" style="color:#337ff1">"Order history"</a> section of your customer account by clicking <a href="{my_account_url}" style="color:#337ff1">"My account"</a> on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
<span> <span>
If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span> If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}" style="color:#337ff1">"Guest Tracking"</a> section on our shop. </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
Order {order_name} - In transit Your order with the reference Your order with the reference {order_name} is currently in transit.
{ORDER_NAME} is currently in transit.
You can track your package using the following link: {followup} You can track your package using the following link: {followup}
[{followup}] [{followup}]
+66 -11
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,16 +77,16 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block"> <td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px"> <p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
You have received a new log alert </p> You have received a new log alert </p>
<span style="color:#777"> <span style="color:#777">
<span style="color:#333"><strong>Warning:</strong></span> you have received a new log alert in your Back Office.<br /><br /> <span style="color:#333"><strong>Warning:</strong></span> you have received a new log alert in your Back Office.<br /><br />
@@ -40,10 +95,10 @@
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>
+1 -2
View File
@@ -3,8 +3,7 @@
Hi {firstname} {lastname}, Hi {firstname} {lastname},
You have received a new log alert WARNING: you have received a new WARNING: you have received a new log alert in your Back Office.
log alert in your Back Office.
You can check for it in the "TOOLS" > "LOGS" section of your Back You can check for it in the "TOOLS" > "LOGS" section of your Back
Office. Office.
+64 -9
View File
@@ -6,15 +6,70 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head> </head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto"> <body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto"> <table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr> <tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td> <td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0"> <td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff"> <table class="table" style="width:100%;background-color:#fff">
<tr> <tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1"> <a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" /> <img src="{shop_logo}" alt="{shop_name}" />
</a> </a>
@@ -22,21 +77,21 @@
</tr> </tr>
<tr> <tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0"> <td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span> <span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0"> <td class="linkbelow" style="border:none;padding:7px 0">
{message} {message}
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td> <td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0"> <td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span> <span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td> </td>
</tr> </tr>

Some files were not shown because too many files have changed in this diff Show More