Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop in…

…to release
  • Loading branch information...
commit 9c4008d7b5e45e3ba2fc989c6fecc8980a0d29ed 2 parents 70b0469 + 66c9c1f
Rémi Gaillard rGaillard authored
16 install-dev/upgrade/php/update_genders_images.php
@@ -26,12 +26,12 @@
26 26
27 27 function update_genders_images()
28 28 {
29   - if (file_exists(_PS_IMG_DIR_.'genders/Mr.jpg'))
30   - @rename(_PS_IMG_DIR_.'genders/Mr.jpg', _PS_IMG_DIR_.'genders/1.jpg');
31   - if (file_exists(_PS_IMG_DIR_.'genders/Ms.jpg'))
32   - @rename(_PS_IMG_DIR_.'genders/Ms.jpg', _PS_IMG_DIR_.'genders/2.jpg');
33   - if (file_exists(_PS_IMG_DIR_.'genders/Miss.jpg'))
34   - @rename(_PS_IMG_DIR_.'genders/Miss.jpg', _PS_IMG_DIR_.'genders/3.jpg');
35   - if (file_exists(_PS_IMG_DIR_.'genders/unknown.jpg'))
36   - @rename(_PS_IMG_DIR_.'unknown.jpg', _PS_IMG_DIR_.'Unknown.jpg');
  29 + if (file_exists(_PS_ROOT_DIR_.'/img/genders/Mr.jpg'))
  30 + @rename(_PS_ROOT_DIR_.'/img/genders/Mr.jpg', _PS_ROOT_DIR_.'/img/genders/1.jpg');
  31 + if (file_exists(_PS_ROOT_DIR_.'/img/genders/Ms.jpg'))
  32 + @rename(_PS_ROOT_DIR_.'/img/genders/Ms.jpg', _PS_ROOT_DIR_.'/img/genders/2.jpg');
  33 + if (file_exists(_PS_ROOT_DIR_.'/img/genders/Miss.jpg'))
  34 + @rename(_PS_ROOT_DIR_.'/img/genders/Miss.jpg', _PS_ROOT_DIR_.'/img/genders/3.jpg');
  35 + if (file_exists(_PS_ROOT_DIR_.'genders/unknown.jpg'))
  36 + @rename(_PS_ROOT_DIR_.'/img/genders/unknown.jpg', _PS_ROOT_DIR_.'/img/genders/Unknown.jpg');
37 37 }
2  install-dev/upgrade/sql/1.5.1.0.sql
@@ -16,5 +16,5 @@ ALTER TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT N
16 16 ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
17 17 ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
18 18 ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
19   -ALTER TABLE `PREFIX_stock_available` ADD UNIQUE (`id_product`, `id_product_attribute`, `id_shop`);
  19 +ALTER TABLE `PREFIX_stock_available` ADD UNIQUE `product_sqlstock` (`id_product`, `id_product_attribute`, `id_shop`);
20 20 ALTER TABLE `PREFIX_cms` ADD INDEX (`id_cms_category`);
2  themes/default/address.tpl
@@ -86,7 +86,7 @@ $(function(){ldelim}
86 86
87 87 <p class="required"><sup>*</sup> {l s='Required field'}</p>
88 88
89   -<form action="{$link->getPageLink('address', true)}" method="post" class="std" id="add_adress">
  89 +<form action="{$link->getPageLink('address', true)}" method="post" class="std" id="add_address">
90 90 <fieldset>
91 91 <h3>{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}</h3>
92 92 <p class="required text dni">
42 themes/default/css/global.css
@@ -1415,13 +1415,13 @@ a.iframe {font-weight:bold}
1415 1415 #address #left_column {display:none}
1416 1416 #address #center_column{width:757px}
1417 1417
1418   -form#add_adress {}
1419   -#add_adress fieldset {
  1418 +form#add_address {}
  1419 +#add_address fieldset {
1420 1420 margin:0;
1421 1421 border:1px solid #ccc;
1422 1422 background:#F8F8F8
1423 1423 }
1424   -#add_adress h3 {
  1424 +#add_address h3 {
1425 1425 margin:0 0 15px 0;
1426 1426 padding:8px;
1427 1427 font-size:14px;
@@ -1429,24 +1429,24 @@ form#add_adress {}
1429 1429 text-transform:uppercase;
1430 1430 background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898
1431 1431 }
1432   -#center_column #add_adress p {margin:0; padding:0 0 10px 0}
1433   -#add_adress p.required {color:#222}
1434   -#add_adress p.required sup {color:#990000}
  1432 +#center_column #add_address p {margin:0; padding:0 0 10px 0}
  1433 +#add_address p.required {color:#222}
  1434 +#add_address p.required sup {color:#990000}
1435 1435
1436   -#add_adress p.text label,
1437   -#add_adress p.password label,
1438   -#add_adress p.select label,
1439   -#add_adress p.select span,
1440   -#add_adress p.textarea label {
  1436 +#add_address p.text label,
  1437 +#add_address p.password label,
  1438 +#add_address p.select label,
  1439 +#add_address p.select span,
  1440 +#add_address p.textarea label {
1441 1441 display:inline-block;
1442 1442 padding:6px 15px;
1443 1443 width:230px;/* 260 */
1444 1444 font-size:14px;
1445 1445 text-align:right
1446 1446 }
1447   -#add_adress p.text input,
1448   -#add_adress p.password input,
1449   -#add_adress p.select input {
  1447 +#add_address p.text input,
  1448 +#add_address p.password input,
  1449 +#add_address p.select input {
1450 1450 padding:0 5px;
1451 1451 height:22px;
1452 1452 width:360px;/* 370 */
@@ -1455,30 +1455,30 @@ form#add_adress {}
1455 1455 color:#666;
1456 1456 line-height:22px
1457 1457 }
1458   -#add_adress p.checkbox input {
  1458 +#add_address p.checkbox input {
1459 1459 margin-left:260px;
1460 1460 }
1461   -#add_adress p.select select {
  1461 +#add_address p.select select {
1462 1462 margin-right:10px;
1463 1463 border:1px solid #ccc;
1464 1464 font-size: 12px;
1465 1465 color:#666
1466 1466 }
1467   -#add_adress p.textarea label {vertical-align:top}
1468   -#add_adress p.textarea textarea {
  1467 +#add_address p.textarea label {vertical-align:top}
  1468 +#add_address p.textarea textarea {
1469 1469 height:80px;
1470 1470 width:370px;
1471 1471 border:1px solid #ccc;
1472 1472 font-size: 12px;
1473 1473 color:#666
1474 1474 }
1475   -#center_column #add_adress p.submit2 {
  1475 +#center_column #add_address p.submit2 {
1476 1476 margin-top:20px;
1477 1477 text-align:right
1478 1478 }
1479 1479
1480   -#add_adress span.form_info,
1481   -#add_adress span.inline-infos {
  1480 +#add_address span.form_info,
  1481 +#add_address span.inline-infos {
1482 1482 display:block;
1483 1483 margin:5px 0 0 265px;
1484 1484 color:#666
2  themes/default/mobile/address.tpl
@@ -84,7 +84,7 @@ $(document).ready(function() {
84 84 {/if}
85 85 </p>
86 86
87   - <form action="{$link->getPageLink('address', true)}" method="post" id="add_adress">
  87 + <form action="{$link->getPageLink('address', true)}" method="post" id="add_address" data-ajax="false">
88 88 <legend><h3>{if isset($id_address) && $id_address != 0}{l s='Your address'}{else}{l s='New address'}{/if}</h3></legend>
89 89 <div class="required text dni">
90 90 <label for="dni">{l s='Identification number'}</label>

0 comments on commit 9c4008d

Please sign in to comment.
Something went wrong with that request. Please try again.