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

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

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-14 17:31:50 +02:00
parent 7e9cdbb163 3eeac7f2bb
commit 7e4329a4dc
330 changed files with 9160 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/index.php
+3
View File
@@ -27,6 +27,9 @@
$timer_start = microtime(true);
define('_PS_ADMIN_DIR_', getcwd());
if (!defined('PS_ADMIN_DIR'))
define('PS_ADMIN_DIR', _PS_ADMIN_DIR_);
require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
require(_PS_ADMIN_DIR_.'/functions.php');
admin-dev/init.php
+6 -3
View File
@@ -49,9 +49,12 @@ try
AdminTab::$currentIndex = $currentIndex;
$iso = $context->language->iso_code;
include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'))
include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'))
include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'))
include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
/* Server Params */
$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
admin-dev/themes/default/css/admin-theme.css
+48
View File
@@ -9565,6 +9565,54 @@ textarea {
.ladda-button[data-size=xl] .ladda-label {
font-size: 1.5em; }
/* line 1, admin-theme/_admin-login.sass */
#login-panel {
margin: 0 auto;
width: 420px; }
/* line 5, admin-theme/_admin-login.sass */
#login-panel .flip-container {
height: 500px;
-webkit-perspective: 1000px;
-moz-perspective: 1000px;
-ms-perspective: 1000px;
-o-perspective: 1000px;
perspective: 1000px; }
/* line 8, admin-theme/_admin-login.sass */
#login-panel .flip-container.flip .flipper {
-webkit-transform: rotateY(180deg);
-moz-transform: rotateY(180deg);
-ms-transform: rotateY(180deg);
-o-transform: rotateY(180deg);
transform: rotateY(180deg); }
/* line 13, admin-theme/_admin-login.sass */
#login-panel .flipper {
-webkit-transition-duration: 0.6s;
transition-duration: 0.6s;
-webkit-transform-style: preserve-3d;
-moz-transform-style: preserve-3d;
-ms-transform-style: preserve-3d;
-o-transform-style: preserve-3d;
transform-style: preserve-3d;
position: relative; }
/* line 18, admin-theme/_admin-login.sass */
#login-panel .front, #login-panel .back {
-webkit-backface-visibility: hidden;
-moz-backface-visibility: hidden;
backface-visibility: hidden;
position: absolute;
top: 0;
left: 0; }
/* line 24, admin-theme/_admin-login.sass */
#login-panel .front {
z-index: 2; }
/* line 27, admin-theme/_admin-login.sass */
#login-panel .back {
-webkit-transform: rotateY(180deg);
-moz-transform: rotateY(180deg);
-ms-transform: rotateY(180deg);
-o-transform: rotateY(180deg);
transform: rotateY(180deg); }
/* line 1, admin-theme/_admin-carrier-wizard.sass */
#carrier_wizard {
position: relative;
admin-dev/themes/default/css/admin-theme.sass
+1 -1
View File
@@ -106,8 +106,8 @@ fieldset > .row
@import "admin-theme/ladda"
@import "admin-theme/ladda-theme"
//page specific
@import "admin-theme/admin-login"
@import "admin-theme/admin-carrier-wizard"
@import "admin-theme/admin-modules"
@import "admin-theme/admin-dashboard"
admin-dev/themes/default/css/admin-theme/_admin-login.sass
+28
View File
@@ -0,0 +1,28 @@
#login-panel
margin: 0 auto
width: 420px
.flip-container
height: 500px
@include perspective(1000px)
&.flip .flipper
@include rotateY(180deg)
.flip-container, .front, .back
.flipper
@include transition-duration(0.6s)
@include transform-style(preserve-3d)
position: relative
.front, .back
@include backface-visibility(hidden)
position: absolute
top: 0
left: 0
.front
z-index: 2
.back
@include rotateY(180deg)
admin-dev/themes/default/js/date-range-picker.js
+8 -16
View File
@@ -24,11 +24,7 @@
// Picker object
var Datepicker = function(element, options){
this.element = $(element);
if (typeof options.dates != 'undefined')
DPGlobal.dates = options.dates;
this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'Y-m-d');
this.format = DPGlobal.parseFormat(options.format||this.element.data('date-format')||'mm/dd/yyyy');
this.picker = $(DPGlobal.template).appendTo(this.element).show()
.on({
click: $.proxy(this.click, this),
@@ -287,7 +283,7 @@
$(".start-selected").removeClass("start-selected");
target.addClass("start-selected");
start = target.data("val");
$("#date-start").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d')));
$("#date-start").val(start);
if(!switched) {click = 1;} else {click = 2;}
if(!switched){
$("#date-end").val(null).focus().addClass("input-selected");
@@ -300,7 +296,7 @@
$(".end-selected").removeClass("end-selected");
target.addClass("end-selected");
end = target.data("val");
$("#date-end").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d')));
$("#date-end").val(end);
click = 2;
$("#date-end").removeClass("input-selected").addClass("input-complete");
//this.range();
@@ -357,14 +353,14 @@
//switch
if (start && over < start ){
end = start;
$("#date-end").val(DPGlobal.formatDate(new Date(start), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$("#date-end").val(start).removeClass("input-selected");
$("#date-start").val(null).focus().addClass("input-selected");
$("#datepicker .start-selected").removeClass("start-selected").addClass("end-selected");
start = null;
switched = true;
} else if (end && over > end ){
start = end;
$("#date-start").val(DPGlobal.formatDate(new Date(end), DPGlobal.parseFormat('Y-m-d'))).removeClass("input-selected");
$("#date-start").val(end).removeClass("input-selected");
$("#date-end").val(null).focus().addClass("input-selected");
$("#datepicker .end-selected").removeClass("end-selected").addClass("start-selected");
end = null;
@@ -489,12 +485,10 @@
date.setMonth(val - 1);
break;
case 'yy':
case 'y':
year = 2000 + val;
date.setFullYear(2000 + val);
break;
case 'yyyy':
case 'Y':
year = val;
date.setFullYear(val);
break;
@@ -509,12 +503,10 @@
d: date.getDate(),
m: date.getMonth() + 1,
yy: date.getFullYear().toString().substring(2),
y: date.getFullYear().toString().substring(2),
yyyy: date.getFullYear(),
Y: date.getFullYear()
yyyy: date.getFullYear()
};
val.d = (val.d < 10 ? '0' : '') + val.d;
val.m = (val.m < 10 ? '0' : '') + val.m;
val.dd = (val.d < 10 ? '0' : '') + val.d;
val.mm = (val.m < 10 ? '0' : '') + val.m;
var date = [];
for (var i=0, cnt = format.parts.length; i < cnt; i++) {
date.push(val[format.parts[i]]);
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+14 -10
View File
@@ -112,11 +112,11 @@
<li>
{l s='Newsletter:'} {if $customer->newsletter}
<span class="label label-success">
<i class="icon-check-sign"></i> {l s='Yes'}
<i class="icon-check-sign"></i> {l s='Registered'}
</span>
{else}
<span class="label label-warning">
<i class="icon-ban-circle"></i> {l s='No'}
<i class="icon-ban-circle"></i> {l s='Unregistered'}
</span>
{/if}
</li>
@@ -125,19 +125,23 @@
{if $customer->optin}
<span class="label label-success">
<i class="icon-check-sign"></i>
{l s='Yes'}
{l s='Registered'}
</span>
{else}
<span class="label label-warning">
<i class="icon-ban-circle"></i>
{l s='No'}
{l s='Unregistered'}
</span>
{/if}
</li>
<li>
{l s='Age:'}
{$customer_stats['age']}
{if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='Unknown'}{/if}</li>
{if isset($customer->birthday)}
{$customer_stats['age']} {l s='years old'} ({l s='Birth date:'} {$customer_birthday})
{else}
{l s='Unknown'}
{/if}
</li>
<li>
{l s='Last update:'}
<span>{$last_update}</span>
@@ -147,12 +151,12 @@
{if $customer->active}
<span class="label label-success">
<i class="icon-check-sign"></i>
{l s='Yes'}
{l s='Active'}
</span>
{else}
<span class="label label-warning">
<i class="icon-ban-circle"></i>
{l s='No'}
{l s='Inactive'}
</span>
{/if}
</li>
@@ -193,11 +197,11 @@
<div class="row">
<div class="col-lg-6">
<i class="icon-ok-circle icon-big"></i>
{l s='Valid orders:'} <span class="badge badge-success">{$count_ok}</span> {l s='for'} {$total_ok}
{l s='Valid orders:'} <span class="label label-success">{$count_ok}</span> {l s='for'} {$total_ok}
</div>
<div class="col-lg-6">
<i class="icon-exclamation-sign icon-big"></i>
{l s='Invalid orders:'} <span class="badge badge-warning">{$count_ko}</span>
{l s='Invalid orders:'} <span class="label label-danger">{$count_ko}</span>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+2
View File
@@ -76,6 +76,8 @@
</fieldset>
</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>
{/block}
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+45 -23
View File
@@ -71,37 +71,60 @@
{if count($files_to_import)}
<select name="csv">
{foreach $files_to_import AS $filename}
<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename}</option>
<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
{/if}
&nbsp;
<a href="#upload_file_import" id="upload_file_import_link" class="btn btn-default">
<i class="icon-plus-sign-alt"></i>
{l s='Upload'}
</a>
</div>
</div>
<div class="form-group">
<p class="alert alert-info col-lg-offset-3">
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">
{l s='Click to view our sample import csv files.'}
</a>
</p>
<div id="sample_files_import" style="display:none" class="list-group">
<a class="list-group-item" href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a>
<a class="list-group-item" href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a>
<a class="list-group-item" href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a>
<a class="list-group-item" href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a>
<a class="list-group-item" href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a>
<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a>
<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a>
{if $PS_ADVANCED_STOCK_MANAGEMENT}
<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a>
<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a>
{/if}
<div class="col-lg-6">
<p class="alert alert-info">
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">
{l s='Click to view our sample import csv files.'}
</a>
</p>
<div id="sample_files_import" style="display:none" class="list-group">
<a class="list-group-item" href="../docs/csv_import/categories_import.csv" target="_blank">{l s='Sample Categories file'}</a>
<a class="list-group-item" href="../docs/csv_import/products_import.csv" target="_blank">{l s='Sample Products file'}</a>
<a class="list-group-item" href="../docs/csv_import/combinations_import.csv" target="_blank">{l s='Sample Combinations file'}</a>
<a class="list-group-item" href="../docs/csv_import/customers_import.csv" target="_blank">{l s='Sample Customers file'}</a>
<a class="list-group-item" href="../docs/csv_import/addresses_import.csv" target="_blank">{l s='Sample Addresses file'}</a>
<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv" target="_blank">{l s='Sample Manufacturers file'}</a>
<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv" target="_blank">{l s='Sample Suppliers file'}</a>
{if $PS_ADVANCED_STOCK_MANAGEMENT}
<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv" target="_blank">{l s='Supply Orders sample file'}</a>
<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv" target="_blank">{l s='Supply Orders Details sample file'}</a>
{/if}
</div>
</div>
<div class="col-lg-6">
<p class="alert alert-info">
<a href="#" onclick="$('#csv_files_import').slideToggle(); return false;">
{l s='Click to view your csv files.'}
</a>
</p>
<ul id="csv_files_import" style="display:none;">
{foreach $files_to_import AS $filename}
<li>
<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}">{$filename}</a>
<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}&delete=1" class="btn btn-default">
<i class="icon-trash"></i> {l s='Delete'}
</a>
</li>
{/foreach}
</ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='What kind of entity would you like to import?'} </label>
<div class="col-lg-6">
@@ -140,14 +163,14 @@
<label class="control-label col-lg-3">{l s='Field separator'} </label>
<div class="col-lg-6 input-group">
<span class="input-group-addon">{l s='e.g. '}"1; Ipod; 129.90; 5"</span>
<input type="text" size="2" value=";" name="separator"/>
<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'htmlall':'UTF-8'}{else};{/if}" name="separator"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Multiple value separator'} </label>
<div class="col-lg-6 input-group">
<span class="input-group-addon">{l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"</span>
<input type="text" size="2" value="," name="multiple_value_separator"/>
<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'htmlall':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
</div>
</div>
<div class="form-group">
@@ -172,7 +195,6 @@
<input name="regenerate" id="regenerate" type="checkbox" />
</div>
</div>
<div class="form-group">
<label for="forceIDs" class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='If you don\'t use this option, all ID\'s will be auto-incremented.'}">
@@ -263,7 +285,7 @@
else
{
$(".import_supply_orders_details").hide();
$('input[name=multiple_value_separator]').val(',');
$('input[name=multiple_value_separator]').val('{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected}{else},{/if}');
}
if ($("#entity > option:selected").val() == 1)
$("label[for=match_ref], #match_ref, label[for=regenerate], #regenerate").show();
admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
+2 -2
View File
@@ -25,7 +25,7 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<script type="text/javascript">
var errorEmpty = '{l s='Please name your matching configuration to save.' js='1'}';
var errorEmpty = '{l s='Please name your matching configuration to save.' js=1}';
var token = '{$token}';
var current = 0;
function showTable(nb)
@@ -126,4 +126,4 @@
</table>
</form>
</div>
{/block}
{/block}
admin-dev/themes/default/template/controllers/login/content.tpl
+125 -121
View File
@@ -28,16 +28,14 @@
var label_errors = '{l s='errors'}';
var label_error = '{l s='error'}';
</script>
<div id="container">
<div class="row">
<div id="login" class="col-md-4 col-md-offset-4 panel">
<div id="login-panel">
<div id="login-header" class="panel">
<h1 class="text-center">
<img width="40px" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iNjEycHgiIGhlaWdodD0iNzkycHgiIHZpZXdCb3g9IjAgMCA2MTIgNzkyIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA2MTIgNzkyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8cGF0aCBkPSJNMjA0LDg2Yy0zNiwyMy00Nyw2MS00MiwxMjBsLTI3LDNDMTMxLDE0NywxNjEsOTgsMjA0LDg2eiBNMjQ1LDc4YzY0LDgsMTAwLDM1LDExNSwxMDVsLTE2OSwyMEMxODUsMTQwLDE5OSwxMDUsMjQ1LDc4eg0KCSBNMjgwLDY0YzcyLDAsMTIwLDI1LDEzNSwxMTJsLTI3LDNDMzc1LDExMiwzNDEsNzYsMjgwLDY0eiBNNDQyLDE3NEM0MjksNTQsMzE0LDE5LDI0MCw1NmMtODMtMi0xNDAsNzMtMTMzLDE1N2wtOTYsMTBsNTgsNTUwDQoJbDI2MS0yNmMtNDctNTMtMTAwLTEzMy0xMjQtMTUyYy0yNy0yMy0zMC0zMS0yMy00NWMxMi0xNCwyNC0xMiw0NSw0bDQ4LDM3bDcsMzZsMTQtMWwtMzctMjMxYy00LTI0LDEtMzUsMTktNDBjMTgtMiwyNyw3LDMxLDM0DQoJbDIzLDE0MWwxOC0yYy03LTUwLTMtNTcsMTctNjJjMTktMywyOCwxMCwzNSw2NGwxNy0xYy01LTUwLTEtNTcsMTktNjBjMjItMSwyNSwxMiwzMiw2NWwxNiwyYy00LTQwLTQtNTEsMTgtNTNjMjEsMCwyNSwxNCwzMSw1OA0KCWMxNSwxMDAsMTMsMTU0LTYsMTgzbDcyLTdsLTU4LTU1NUw0NDIsMTc0eiIvPg0KPC9zdmc+DQo="/>
PRESTASHOP
PRESTASHOP
</h1>
<h4 class="text-center">{$shop_name}</h4>
<hr/>
<h4 class="text-center">{$shop_name}</h4>
<div id="error" class="hide alert alert-danger">
{if isset($errors)}
<h4>
@@ -53,104 +51,112 @@
</ol>
{/if}
</div>
{if isset($warningSslMessage)}
<div class="alert alert-warning">{$warningSslMessage}</div>
{/if}
</div>
<div class="flip-container">
<div class="flipper">
<div class="front panel">
{if !isset($wrong_folder_name) && !isset($wrong_install_name)}
<form action="#" id="login_form" method="post">
<div class="form-group">
<label class="control-label" for="email">{l s='Email address'}</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-envelope"></i></span>
<input
name="email"
type="text"
id="email"
class="form-control"
value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}"
autofocus="autofocus"
tabindex="1"
placeholder="test@example.com" />
</div>
</div>
<div class="form-group">
<a href="#" class="show-forgot-password pull-right" >
{l s='Lost password'}&hellip;
</a>
<label class="control-label" for="passwd">
{l s='Password'}
</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input
name="passwd"
type="password"
id="passwd"
class="form-control"
value="{if isset($password)}{$password}{/if}"
tabindex="2"
placeholder="{l s='Password'}" />
</div>
</div>
<div class="form-group">
<div class="checkbox">
<label for="stay_logged_in">
<input name="stay_logged_in" type="checkbox" id="stay_logged_in" value="1" tabindex="3"/>
{l s='Keep me logged in'}
</label>
</div>
</div>
<hr/>
<div class="panel-footer">
<button name="submitLogin" type="submit" tabindex="4" class="btn btn-default btn-lg btn-block ladda-button" data-style="slide-up" data-spinner-color="black" >
<span class="ladda-label">
<i class="icon-ok text-success"></i>
{l s='Log in'}
</span>
</button>
</div>
<input type="hidden" name="redirect" id="redirect" value="{$redirect}"/>
</form>
</div>
{if !isset($wrong_folder_name) && !isset($wrong_install_name)}
<form action="#" id="login_form" method="post">
<div class="form-group">
<label class="control-label" for="email">{l s='Email address'}</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-envelope"></i></span>
<input
name="email"
type="text"
id="email"
class="form-control"
value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}"
autofocus="autofocus"
tabindex="1"
placeholder="test@example.com" />
</div>
<div class="back panel">
<form action="#" id="forgot_password_form" method="post" class="hide">
<div class="alert alert-info">
<h4 class="text-center">
<i class="icon-exclamation-sign"></i>
{l s='Forgot your password?'}
</h4>
<p>{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}</p>
</div>
<div class="form-group">
<label class="control-label" for="email_forgot">
{l s='Email address'}
</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-envelope"></i></span>
<input
type="text"
name="email_forgot"
id="email_forgot"
class="form-control"
autofocus="autofocus"
tabindex="1"
placeholder="test@example.com" />
</div>
</div>
<hr/>
<div class="panel-footer">
<button href="#" class="btn btn-default show-login-form" tabindex="3">
<i class="icon-caret-left"></i>
{l s='Back to login'}
</button>
<button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="2">
<i class="icon-ok text-success"></i>
{l s='Send'}
</button>
</div>
</form>
</div>
<div class="form-group">
<a href="#" class="show-forgot-password pull-right" >
{l s='Lost password'}&hellip;
</a>
<label class="control-label" for="passwd">
{l s='Password'}
</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input
name="passwd"
type="password"
id="passwd"
class="form-control"
value="{if isset($password)}{$password}{/if}"
tabindex="2"
placeholder="{l s='Password'}" />
</div>
</div>
<div class="form-group">
<div class="checkbox">
<label for="stay_logged_in">
<input name="stay_logged_in" type="checkbox" id="stay_logged_in" value="1" tabindex="3"/>
{l s='Keep me logged in'}
</label>
</div>
</div>
<hr/>
<div class="form-group">
<button name="submitLogin" type="submit" tabindex="4" class="btn btn-default btn-lg btn-block ladda-button" data-style="slide-up" data-spinner-color="black" >
<span class="ladda-label">
<i class="icon-ok text-success"></i>
{l s='Log in'}
</span>
</button>
</div>
<input type="hidden" name="redirect" id="redirect" value="{$redirect}"/>
</form>
<form action="#" id="forgot_password_form" method="post" class="hide">
<div class="alert alert-info">
<h4 class="text-center">
<i class="icon-exclamation-sign"></i>
{l s='Forgot your password?'}
</h4>
<p>{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}</p>
</div>
<div class="form-group">
<label class="control-label" for="email_forgot">
{l s='Email address'}
</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-envelope"></i></span>
<input
type="text"
name="email_forgot"
id="email_forgot"
class="form-control"
autofocus="autofocus"
tabindex="1"
placeholder="test@example.com" />
</div>
</div>
<hr/>
<div class="form-group">
<button href="#" class="btn btn-default show-login-form" tabindex="3">
<i class="icon-caret-left text-danger"></i>
{l s='Back to login'}
</button>
<button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="2">
<i class="icon-ok text-success"></i>
{l s='Send'}
</button>
</div>
</form>
</div>
{else}
<div class="col-lg-12">
<div class="alert alert-danger">
<p>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}</p>
<ul>
{if isset($wrong_install_name) && $wrong_install_name == true}
@@ -168,27 +174,25 @@
</div>
{/if}
</div>
<div class="col-md-4 col-md-offset-4">
<p class="text-center text-muted">
<a href="http://www.prestashop.com">
&copy; PrestaShop 2005-{$smarty.now|date_format:"%Y"} - All rights reserved.
</a>
</p>
<p class="text-center">
<a class="link-social link-twitter" href="#" title="Twitter">
<i class="icon-twitter"></i>
</a>
<a class="link-social link-facebook" href="#" title="Facebook">
<i class="icon-facebook"></i>
</a>
<a class="link-social link-github" href="#" title="Github">
<i class="icon-github"></i>
</a>
<a class="link-social link-google" href="#" title="Google">
<i class="icon-google-plus"></i>
</a>
</p>
</div>
</div>
</div>
<div id="login-footer">
<p class="text-center text-muted">
<a href="http://www.prestashop.com">
&copy; PrestaShop 2005-{$smarty.now|date_format:"%Y"} - All rights reserved.
</a>
</p>
<p class="text-center">
<a class="link-social link-twitter" href="#" title="Twitter">
<i class="icon-twitter"></i>
</a>
<a class="link-social link-facebook" href="#" title="Facebook">
<i class="icon-facebook"></i>
</a>
<a class="link-social link-github" href="#" title="Github">
<i class="icon-github"></i>
</a>
<a class="link-social link-google" href="#" title="Google">
<i class="icon-google-plus"></i>
</a>
</p>
</div>
admin-dev/themes/default/template/controllers/modules/list.tpl
+1 -1
View File
@@ -104,7 +104,7 @@
{$module->description}
{/if}
</p>
{if isset($module->message) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="alert alert-success">{$module->message}</div>{/if}
{if isset($module->message) && (empty($module->name) !== false) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="alert alert-success">{$module->message}</div>{/if}
</div>
</td>
<td>
admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+1 -1
View File
@@ -64,7 +64,7 @@
</span>
{/if}
</td>
{if $display_warehouse}<td>{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
{if $display_warehouse}<td align="center">{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
{if ($order->hasBeenPaid())}
<td class="productQuantity">
{$product['product_quantity_refunded']}
admin-dev/themes/default/template/controllers/orders/form.tpl
+71 -44
View File
@@ -38,6 +38,11 @@
var defaults_order_state = new Array();
var customization_errors = false;
var pic_dir = '{$pic_dir}';
var currency_format = 5;
var currency_sign = '';
var currency_blank = false;
var priceDisplayPrecision = 2;
{foreach from=$defaults_order_state key='module' item='id_order_state'}
defaults_order_state['{$module}'] = '{$id_order_state}';
{/foreach}
@@ -505,7 +510,6 @@
}
displaySummary(res);
resetBind();
updateCurrencySign();
}
});
}
@@ -652,11 +656,12 @@
var id_product = Number(this.id_product);
var id_product_attribute = Number(this.id_product_attribute);
cart_quantity[Number(this.id_product)+'_'+Number(this.id_product_attribute)+'_'+Number(this.id_customization)] = this.cart_quantity;
cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="'+this.price+'" />&nbsp;<span class="currency_sign"></span></td><td>';
cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="' + formatCurrency(parseFloat(this.price.replace(',', '.')), currency_format, currency_sign, currency_blank) + '" /></td><td>';
cart_content += (!this.id_customization ? '<div style="float:left;"><a href="#" class="increaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><img src="../img/admin/up.gif" /></a><br /><a href="#" class="decreaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'"><img src="../img/admin/down.gif" /></a></div>' : '');
cart_content += (!this.id_customization ? '<div style="float:left;"><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" class="cart_quantity" size="2" value="'+this.cart_quantity+'" />' : '');
cart_content += (!this.id_customization ? '<a href="#" class="delete_product" rel="delete_'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><img src="../img/admin/delete.gif" /></a></div>' : '');
cart_content += '</td><td>'+this.total+'&nbsp;<span class="currency_sign"></span></td></tr>';
cart_content += '</td><td>' + formatCurrency(parseFloat(this.total.replace(',', '.')), currency_format, currency_sign, currency_blank) + '</td></tr>';
if (this.id_customization && this.id_customization != 0)
{
$.each(this.customized_datas[this.id_product][this.id_product_attribute][id_address_delivery], function() {
@@ -712,6 +717,11 @@
function displaySummary(jsonSummary)
{
currency_format = jsonSummary.currency.format;
currency_sign = jsonSummary.currency.sign;
currency_blank = jsonSummary.currency.blank;
priceDisplayPrecision = jsonSummary.currency.decimals ? 2 : 0;
updateCartProducts(jsonSummary.summary.products, jsonSummary.summary.gift_products, jsonSummary.cart.id_address_delivery);
updateCartVouchers(jsonSummary.summary.discounts);
updateAddressesList(jsonSummary.addresses, jsonSummary.cart.id_address_delivery, jsonSummary.cart.id_address_invoice);
@@ -737,20 +747,19 @@
$('#free_shipping').removeAttr('checked');
$('#gift_message').html(jsonSummary.cart.gift_message);
if(!changed_shipping_price)
$('#shipping_price').html('<b>'+jsonSummary.summary.total_shipping+'</b>');
if (!changed_shipping_price)
$('#shipping_price').html('<b>' + formatCurrency(parseFloat(jsonSummary.summary.total_shipping), currency_format, currency_sign, currency_blank) + '</b>');
shipping_price_selected_carrier = jsonSummary.summary.total_shipping;
$('#total_vouchers').html(jsonSummary.summary.total_discounts_tax_exc);
$('#total_shipping').html(jsonSummary.summary.total_shipping_tax_exc);
$('#total_taxes').html(jsonSummary.summary.total_tax);
$('#total_without_taxes').html(jsonSummary.summary.total_price_without_tax);
$('#total_with_taxes').html(jsonSummary.summary.total_price);
$('#total_products').html(jsonSummary.summary.total_products);
$('#total_vouchers').html(formatCurrency(parseFloat(jsonSummary.summary.total_discounts_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank));
$('#total_shipping').html(formatCurrency(parseFloat(jsonSummary.summary.total_shipping_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank));
$('#total_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_tax.replace(',', '.')), currency_format, currency_sign, currency_blank));
$('#total_without_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price_without_tax.replace(',', '.')), currency_format, currency_sign, currency_blank));
$('#total_with_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price.replace(',', '.')), currency_format, currency_sign, currency_blank));
$('#total_products').html(formatCurrency(parseFloat(jsonSummary.summary.total_products.replace(',', '.')), currency_format, currency_sign, currency_blank));
id_currency = jsonSummary.cart.id_currency;
$('#id_currency option').removeAttr('selected');
$('#id_currency option[value="'+id_currency+'"]').attr('selected', true);
updateCurrencySign();
id_lang = jsonSummary.cart.id_lang;
$('#id_lang option').removeAttr('selected');
$('#id_lang option[value="'+id_lang+'"]').attr('selected', true);
@@ -778,21 +787,21 @@
qty: qty,
id_customer: id_customer,
id_cart: id_cart,
},
},
success : function(res)
{
displaySummary(res);
var errors = '';
if(res.errors.length)
{
$.each(res.errors, function() {
errors += this+'<br />';
});
$('#products_err').show();
}
else
$('#products_err').hide();
$('#products_err').html(errors);
displaySummary(res);
var errors = '';
if (res.errors.length)
{
$.each(res.errors, function() {
errors += this + '<br />';
});
$('#products_err').show();
}
else
$('#products_err').hide();
$('#products_err').html(errors);
}
});
}
@@ -888,11 +897,6 @@
});
}
function updateCurrencySign()
{
$('.currency_sign').html(currencies[id_currency]);
}
function sendMailToCustomer()
{
$.ajax({
@@ -925,11 +929,33 @@
var addresses_invoice_options = '';
var address_invoice_detail = '';
var address_delivery_detail = '';
var delivery_address_edit_link = '';
var invoice_address_edit_link = '';
$.each(addresses, function() {
if (this.id_address == id_address_invoice)
address_invoice_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city+' '+this.country;
{
address_invoice_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city;
if (this.state != null)
address_invoice_detail += ' '+this.state;
address_invoice_detail += '</br>'+this.country;
invoice_address_edit_link = "{$link->getAdminLink('AdminAddresses')}&id_address="+this.id_address+"&updateaddress&realedit=1&liteDisplaying=1&submitFormAjax=1#";
}
if(this.id_address == id_address_delivery)
address_delivery_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city+' '+this.country;
{
address_delivery_detail = this.company+' '+this.firstname+' '+this.lastname+'<br />'+this.address1+'<br />'+this.address2+'<br />'+this.postcode+' '+this.city;
if (this.state != null)
address_delivery_detail += ' '+this.state;
address_delivery_detail += '</br>'+this.country;
delivery_address_edit_link = "{$link->getAdminLink('AdminAddresses')}&id_address="+this.id_address+"&updateaddress&realedit=1&liteDisplaying=1&submitFormAjax=1#";
}
addresses_delivery_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_delivery ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
addresses_invoice_options += '<option value="'+this.id_address+'" '+(this.id_address == id_address_invoice ? 'selected="selected"' : '')+'>'+this.alias+'</option>';
@@ -949,6 +975,8 @@
$('#id_address_invoice').html(addresses_invoice_options);
$('#address_delivery_detail').html(address_delivery_detail);
$('#address_invoice_detail').html(address_invoice_detail);
$('#edit_delivery_address').attr('href', delivery_address_edit_link);
$('#edit_invoice_address').attr('href', invoice_address_edit_link);
}
function updateAddresses()
@@ -992,7 +1020,7 @@
</a>
</div>
<label class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search a customer by tapping the first letters of his/her name'}">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search a customer by typping the first letters of his/her name'}">
{l s='Search customers'}
</span>
</label>
@@ -1013,7 +1041,7 @@
</h3>
<div class="row">
<label class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search a product by tapping the first letters of his/her name.'}">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search a product by typping the first letters of his/her name.'}">
{l s='Search for a product'}
</span>
</label>
@@ -1132,7 +1160,7 @@
<i class="icon-folder-close"></i>
{l s='Carts'}
</h4>
<table cellspacing="0" cellpadding="0" class="table width5">
<table cellspacing="0" cellpadding="0" class="table width5">
<colgroup>
<col width="10">
<col width="200">
@@ -1204,7 +1232,6 @@
<input type="text" id="voucher" value="" />
</div>
</div>
<div class="margin-form">
<table cellspacing="0" cellpadding="0" class="table" id="voucher_list">
<thead>
@@ -1278,7 +1305,7 @@
{l s='Shipping price:'}
</label>
<div class="col-lg-6">
<span id="shipping_price" name="shipping_price"></span>&nbsp;<span class="currency_sign"></span>&nbsp;
<span id="shipping_price" name="shipping_price"></span>
</div>
</div>
<div class="row">
@@ -1311,12 +1338,12 @@
<div class="row">
<div id="cart_summary" class="col-lg-12">
<ul class="nav navbar-nav">
<li><span>{l s='Total products:'}</span>&nbsp;<span id="total_products"></span><span class="currency_sign"></span> |</li>
<li><span>{l s='Total vouchers:'}</span>&nbsp;<span id="total_vouchers"></span><span class="currency_sign"></span> |</li>
<li><span>{l s='Total shipping:'}</span>&nbsp;<span id="total_shipping"></span><span class="currency_sign"></span> |</li>
<li><span>{l s='Total taxes:'}</span>&nbsp;<span id="total_taxes"></span><span class="currency_sign"></span> |</li>
<li><span>{l s='Total without taxes:'}</span>&nbsp;<span id="total_without_taxes"></span><span class="currency_sign"></span> |</li>
<li><span>{l s='Total with taxes'}</span>&nbsp;<span id="total_with_taxes"></span><span class="currency_sign"></span></li>
<li><span>{l s='Total products:'}</span>&nbsp;<span id="total_products"></span></li>
<li><span>{l s='Total vouchers:'}</span>&nbsp;<span id="total_vouchers"></span></li>
<li><span>{l s='Total shipping:'}</span>&nbsp;<span id="total_shipping"></span></li>
<li><span>{l s='Total taxes:'}</span>&nbsp;<span id="total_taxes"></span></li>
<li><span>{l s='Total without taxes:'}</span>&nbsp;<span id="total_without_taxes"></span></li>
<li><span>{l s='Total with taxes'}</span>&nbsp;<span id="total_with_taxes"></span></li>
</ul>
</div>
</div>
admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+1 -1
View File
@@ -42,7 +42,7 @@
<div class="col-lg-8">
<select id="id_category" name="id_category">
{foreach from=$categories item='category'}
<option value="{$category.id_category}">{$category.name}</option>
<option value="{$category.id_category|intval}">({$category.id_category|intval}) {$category.name}</option>
{/foreach}
</select>
</div>
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+2 -11
View File
@@ -68,17 +68,8 @@
</div>
<script type="text/javascript">
$(function() {
var translated_dates = {
days: ["{l s='Sunday'}", "{l s='Monday'}", "{l s='Tuesday'}", "{l s='Wednesday'}", "{l s='Thursday'}", "{l s='Friday'}", "{l s='Saturday'}", "{l s='Sunday'}"],
daysShort: ["{l s='Sun'}", "{l s='Mon'}", "{l s='Tue'}", "{l s='Wed'}", "{l s='Thu'}", "{l s='Fri'}", "{l s='Sat'}", "{l s='Sun'}"],
daysMin: ["{l s='Su'}", "{l s='Mo'}", "{l s='Tu'}", "{l s='We'}", "{l s='Th'}", "{l s='Fr'}", "{l s='Sa'}", "{l s='Su'}"],
months: ["{l s='January'}", "{l s='February'}", "{l s='March'}", "{l s='April'}", "{l s='May'}", "{l s='June'}", "{l s='July'}", "{l s='August'}", "{l s='September'}", "{l s='October'}", "{l s='November'}", "{l s='December'}"],
monthsShort: ["{l s='Jan'}", "{l s='Feb'}", "{l s='Mar'}", "{l s='Apr'}", "{l s='May'}", "{l s='Jun'}", "{l s='Jul'}", "{l s='Aug'}", "{l s='Sep'}", "{l s='Oct'}", "{l s='Nov'}", "{l s='Dec'}"]
}
{literal}
$('.datepicker1').datepicker({"dates": translated_dates, "weekStart": 1});
$('.datepicker2').datepicker({"dates": translated_dates, "weekStart": 1});
{/literal}
$('.datepicker1').datepicker();
$('.datepicker2').datepicker();
$("#date-start").focus().addClass("input-selected");
});
</script>
admin-dev/themes/default/template/helpers/form/form.tpl
-1
View File
@@ -360,7 +360,6 @@
{/if}
{elseif $input.type == 'radio'}
{foreach $input.values as $value}
<div class="radio {if isset($input.class)}"{$input.class}"{/if}">
<label>
<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"