Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
Jerome Nadaud
@@ -1,7 +1,7 @@
|
||||
# Require any additional compass plugins here.
|
||||
http_path = "/"
|
||||
css_dir = "css"
|
||||
sass_dir = "css"
|
||||
sass_dir = "scss"
|
||||
images_dir = "img"
|
||||
javascripts_dir = "js"
|
||||
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; }
|
||||
+35
@@ -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;
|
||||
+3
-1
@@ -9,6 +9,8 @@ html, body
|
||||
height: 100%
|
||||
|
||||
#main
|
||||
float: left
|
||||
width: 100%
|
||||
min-height: 100%
|
||||
padding: 36px 0 60px
|
||||
margin: 0 0 -60px 0
|
||||
@@ -21,7 +23,7 @@ html, body
|
||||
@include transition-property(margin)
|
||||
@include transition-duration(0.4s)
|
||||
@include transition-timing-function(ease-out)
|
||||
fieldset, .panel
|
||||
.panel
|
||||
padding: 20px
|
||||
margin-bottom: 20px
|
||||
border: solid 1px darken($bg-content-color,10%)
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
.stepContainer
|
||||
position: relative
|
||||
display: block
|
||||
overflow: hidden
|
||||
//overflow: hidden
|
||||
clear: both
|
||||
div.content
|
||||
position: absolute
|
||||
+5
-1
@@ -20,6 +20,9 @@
|
||||
background-color: white
|
||||
border-color: #ccc!important
|
||||
|
||||
.highlight
|
||||
background-color: #FFFF00
|
||||
|
||||
.badge
|
||||
background-color: $secondary-color
|
||||
&.badge-success
|
||||
@@ -97,5 +100,6 @@
|
||||
|
||||
|
||||
.overflow-y
|
||||
height: 200px
|
||||
max-height: 200px
|
||||
margin-bottom: 15px
|
||||
overflow-y: auto
|
||||
+1
@@ -66,6 +66,7 @@
|
||||
@include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset)
|
||||
border: solid 1px #ccc
|
||||
background-color: #eee
|
||||
cursor: n-resize
|
||||
.module_col_icon
|
||||
display: table-cell
|
||||
width: 50px
|
||||
+14
-11
@@ -1,6 +1,4 @@
|
||||
.table
|
||||
@extend .table-striped
|
||||
@extend .table-hover
|
||||
border-collapse: separate
|
||||
border-spacing: 0 2px 0 0
|
||||
margin-bottom: 5px
|
||||
@@ -24,15 +22,20 @@
|
||||
color: black
|
||||
input, select
|
||||
margin: 0
|
||||
tbody > tr > td
|
||||
border-top: none
|
||||
background-color: white
|
||||
tbody > tr > td
|
||||
padding: 3px 7px
|
||||
vertical-align: middle
|
||||
word-wrap: nowrap
|
||||
font-size: 12px
|
||||
border-bottom: solid 1px #eee
|
||||
tbody
|
||||
> tr > td
|
||||
border-top: none
|
||||
background-color: white
|
||||
padding: 3px 7px
|
||||
vertical-align: middle
|
||||
word-wrap: nowrap
|
||||
font-size: 12px
|
||||
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
|
||||
text-align: center
|
||||
td.pointer
|
||||
+35
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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
@@ -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;
|
||||
+21
-12
@@ -1,4 +1,19 @@
|
||||
@import compass
|
||||
#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
|
||||
line-height: normal
|
||||
.categorieList a
|
||||
@@ -8,7 +23,7 @@
|
||||
legend
|
||||
font-size: 13px
|
||||
line-height: 20px
|
||||
width: auto!important
|
||||
width: auto
|
||||
label
|
||||
font-size: 13px
|
||||
display: inline
|
||||
@@ -16,18 +31,14 @@
|
||||
.breadcrumb
|
||||
padding: 0
|
||||
li
|
||||
line-height:normal
|
||||
select, textarea, 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
|
||||
select, textarea, input
|
||||
height: inherit
|
||||
label, input, button, select, textarea
|
||||
font-size: 12px
|
||||
line-height: 13px
|
||||
border-radius: none!important
|
||||
|
||||
input[type="radio"], input[type="checkbox"]
|
||||
margin: 0
|
||||
input[type="text"]
|
||||
@@ -40,13 +51,11 @@
|
||||
table.widthfull
|
||||
width: 100%
|
||||
.table thead th
|
||||
vertical-align:top
|
||||
vertical-align: top
|
||||
.table th, .table td
|
||||
line-height: normal
|
||||
vertical-align: middle
|
||||
border-top: none
|
||||
#header #header_search #bo_search_submit
|
||||
height: 25px!important
|
||||
[class^="icon-"], [class*=" icon-"]
|
||||
width: auto
|
||||
.toolbarBox [class^="process-icon-"], .toolbarBox [class*=" process-icon-"]
|
||||
+6
-58
@@ -1,6 +1,5 @@
|
||||
#nobootstrap {
|
||||
//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}
|
||||
h2{font-size:1.7em}
|
||||
h3{font-size:1.25em}
|
||||
@@ -9,7 +8,7 @@
|
||||
ul,ol{list-style:none;margin:0;padding:0}
|
||||
ul li{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}
|
||||
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}
|
||||
@@ -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 .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}
|
||||
.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-duplicate{background-image:url(../img/process-icon-duplicate.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-new{background-image:url(../img/process-icon-help-new.png)}
|
||||
.toolbarBox .process-icon-modules-list{background-image:url(../img/process-icon-modules-list.png)}
|
||||
|
||||
.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}
|
||||
.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 ul.listing-grid-module li select,#modules_list_container_tab ul.listing-grid-module li select{position:absolute;right:0;top:0}
|
||||
//root css
|
||||
*{font-family:Arial,Verdana,Helvetica,sans-serif}
|
||||
|
||||
body{color:#000;font-size:12px;margin:0;padding:0}
|
||||
a img{border:0}
|
||||
a{color:#000;outline:0;text-decoration:none}
|
||||
@@ -348,12 +342,7 @@
|
||||
a.link,a.link:hover{color:#999}
|
||||
p{color:#585A69;margin:.5em 0}
|
||||
hr{border:none;margin-bottom:10px;margin-top:10px;padding:0}
|
||||
h1{font-size:1.6em;margin:0 0 .67em}
|
||||
h2{font-size:1.4em}
|
||||
h3{font-size:1.1em}
|
||||
h5{font-size:.83em}
|
||||
h6{font-size:.67em}
|
||||
h3.blue{color:#268CCD}
|
||||
.blue{color:#268CCD}
|
||||
.red{color:red}
|
||||
form p{margin:.5em 0 0;padding:0 0 .5em}
|
||||
form sup{color:#C00;font-weight:700;vertical-align:text-top}
|
||||
@@ -696,45 +685,6 @@
|
||||
#BoxUseSpecialSyntax .warn{margin:0 auto;width:500px}
|
||||
#BoxUseSpecialSyntax ul{list-style-type:disc;margin-left:30px}
|
||||
.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}
|
||||
.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}
|
||||
@@ -762,6 +712,4 @@
|
||||
#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}
|
||||
#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}
|
||||
}
|
||||
Executable
+35
@@ -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); }); });
|
||||
</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>
|
||||
|
||||
{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>.
|
||||
</p>
|
||||
</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}
|
||||
{$smarty.block.parent}
|
||||
{/block}
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@
|
||||
<span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span>
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" onclick="checkAllZones(this);" >
|
||||
<input type="checkbox" onclick="checkAllZones(this);" class="form-control">
|
||||
</td>
|
||||
{foreach from=$ranges key=r item=range}
|
||||
<td class="border_top border_bottom {if $range.id_range != 0} validated {/if}" >
|
||||
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
{block name="label"}
|
||||
{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>
|
||||
</div>
|
||||
{elseif $input['type'] == 'group_discount_category'}
|
||||
<div style="{if !$form_id}display:none{/if}">
|
||||
<div {if !$form_id}class="hide"{/if}>
|
||||
{$smarty.block.parent}
|
||||
</div>
|
||||
{else}
|
||||
@@ -39,10 +39,9 @@
|
||||
{/if}
|
||||
{/block}
|
||||
|
||||
|
||||
{block name="field"}
|
||||
{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">
|
||||
$(document).ready(function() {
|
||||
$("#group_discount_category").fancybox({
|
||||
@@ -143,7 +142,7 @@
|
||||
</tr>
|
||||
{/foreach}
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<div style="display:none" id="group_discount_category_fancybox">
|
||||
<div class="panel form-horizontal">
|
||||
<div class="col-lg-12">
|
||||
@@ -168,8 +167,7 @@
|
||||
</div>
|
||||
</div>
|
||||
{elseif $input['type'] == 'modules'}
|
||||
<div style="{if !$form_id}display:none{/if}">
|
||||
<div class="margin-form">
|
||||
<div {if !$form_id}class="hide"{/if}>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#authorized-modules').find('[value="0"]').click(function() {
|
||||
@@ -185,7 +183,7 @@
|
||||
<div class="col-lg-9" id="authorized-modules">
|
||||
{foreach $input['values']['auth_modules'] key=key item=module }
|
||||
<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">
|
||||
<span class="switch prestashop-switch">
|
||||
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1" checked="checked">
|
||||
@@ -200,7 +198,7 @@
|
||||
{/foreach}
|
||||
{foreach $input['values']['unauth_modules'] key=key item=module }
|
||||
<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">
|
||||
<span class="switch prestashop-switch">
|
||||
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1">
|
||||
@@ -218,4 +216,4 @@
|
||||
{else}
|
||||
{$smarty.block.parent}
|
||||
{/if}
|
||||
{/block}
|
||||
{/block}
|
||||
@@ -26,58 +26,62 @@
|
||||
{extends file="helpers/view/view.tpl"}
|
||||
|
||||
{block name="override_tpl"}
|
||||
<div class="col-lg-6">
|
||||
<div class="panel">
|
||||
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
|
||||
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group">
|
||||
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
|
||||
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
|
||||
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
|
||||
{l s='Tax excluded'}
|
||||
{else}
|
||||
{l s='Tax included'}
|
||||
{/if}</p></div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<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 class="row">
|
||||
<div class="col-lg-6">
|
||||
<div class="panel">
|
||||
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
|
||||
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group">
|
||||
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
|
||||
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
|
||||
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
|
||||
{l s='Tax excluded'}
|
||||
{else}
|
||||
{l s='Tax included'}
|
||||
{/if}</p></div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<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 class="col-lg-6">
|
||||
<div class="panel">
|
||||
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
|
||||
{if !$categorieReductions}
|
||||
<div class="alert alert-warning">{l s='None'}</div>
|
||||
{else}
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><span class="title_box">{l s='Category'}</span></th>
|
||||
<th><span class="title_box">{l s='Discount'}</span></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach $categorieReductions key=key item=category }
|
||||
<tr class="alt_row">
|
||||
<td>{$category.path}</td>
|
||||
<td>{l s='%d%%' sprintf=$category.reduction}</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
<tbody>
|
||||
</table>
|
||||
{/if}
|
||||
<div class="col-lg-6">
|
||||
<div class="panel">
|
||||
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
|
||||
{if !$categorieReductions}
|
||||
<div class="alert alert-warning">{l s='None'}</div>
|
||||
{else}
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><span class="title_box">{l s='Category'}</span></th>
|
||||
<th><span class="title_box">{l s='Discount'}</span></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach $categorieReductions key=key item=category }
|
||||
<tr class="alt_row">
|
||||
<td>{$category.path}</td>
|
||||
<td>{l s='%d%%' sprintf=$category.reduction}</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
<tbody>
|
||||
</table>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-12">
|
||||
<h2>{l s='Members of this customer group'}</h2>
|
||||
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
|
||||
{$customerList}
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h2>{l s='Members of this customer group'}</h2>
|
||||
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
|
||||
{$customerList}
|
||||
</div>
|
||||
</div>
|
||||
{/block}
|
||||
@@ -30,95 +30,101 @@
|
||||
{$list['title']}
|
||||
</h3>
|
||||
<p class="help-block">{$list['desc']}</p>
|
||||
<div class="row table-responsive clearfix overflow-y">
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th width="40%"><span class="title_box">{$list['title']}<span></th>
|
||||
{foreach $payment_modules as $module}
|
||||
{if $module->active}
|
||||
<th class="center">
|
||||
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
|
||||
<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
|
||||
<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')">
|
||||
{/if}
|
||||
<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}"/>
|
||||
{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'}
|
||||
<div class="row table-responsive clearfix ">
|
||||
<div class="overflow-y">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="40%"><span class="title_box">{$list['title']}<span></th>
|
||||
{foreach $payment_modules as $module}
|
||||
{if $module->active}
|
||||
<th class="text-center">
|
||||
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
|
||||
<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
|
||||
<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')">
|
||||
{/if}
|
||||
{else}
|
||||
{$type = 'checkbox'}
|
||||
{/if}
|
||||
{if $type != 'null'}
|
||||
<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
|
||||
{else}
|
||||
<input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
|
||||
{/if}
|
||||
</td>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</tr>
|
||||
{/foreach}
|
||||
{if $list['name_id'] === 'currency'}
|
||||
<tr>
|
||||
<td>
|
||||
<span>{l s='Customer currency'}</span>
|
||||
</td>
|
||||
{foreach $payment_modules as $module}
|
||||
{if $module->active}
|
||||
<td>
|
||||
{if $module->currencies && $module->currencies_mode == 'radio'}
|
||||
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked"
|
||||
{/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>
|
||||
{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}
|
||||
</table>
|
||||
{$module->displayName}
|
||||
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
|
||||
</a>
|
||||
{/if}
|
||||
</th>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach $list['items'] as $item}
|
||||
<tr>
|
||||
<td>
|
||||
<span>{$item['name']}</span>
|
||||
</td>
|
||||
{foreach $payment_modules as $key_module => $module}
|
||||
{if $module->active}
|
||||
<td class="text-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}
|
||||
{else}
|
||||
{$type = 'checkbox'}
|
||||
{/if}
|
||||
{if $type != 'null'}
|
||||
<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
|
||||
{else}
|
||||
<input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
|
||||
{/if}
|
||||
</td>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</tr>
|
||||
{/foreach}
|
||||
{if $list['name_id'] === 'currency'}
|
||||
<tr>
|
||||
<td>
|
||||
<span>{l s='Customer 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="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked"
|
||||
{/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 class="row pull-right">
|
||||
<div class="row">
|
||||
<button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}">
|
||||
<i class="icon-save"></i>
|
||||
{l s='Save restrictions'}
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
$('body').highlight('{$query}');
|
||||
$('#content .panel').highlight('{$query}');
|
||||
});
|
||||
</script>
|
||||
|
||||
{if !$nb_results}
|
||||
{if !isset($nb_results) || !$nb_results}
|
||||
<h2>{l s='There are no results matching your query "%s".' sprintf=$query}</h2>
|
||||
{else}
|
||||
<h2>
|
||||
|
||||
@@ -27,10 +27,11 @@
|
||||
{foreach $list AS $index => $tr}
|
||||
<tr
|
||||
{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}
|
||||
|
||||
>
|
||||
<td class="center">
|
||||
<td class="text-center">
|
||||
{if $bulk_actions && $has_bulk_actions}
|
||||
{if isset($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" />
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
</td>
|
||||
{foreach $fields_display AS $key => $params}
|
||||
{block name="open_td"}
|
||||
|
||||
Reference in New Issue
Block a user