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

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

Browse Source
This commit is contained in:
Rémi Gaillard
2013-03-25 18:09:33 +01:00
parent 70b0469d4a 66c9c1f66e
commit 9c4008d7b5
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/update_genders_images.php
+8 -8
View File
@@ -26,12 +26,12 @@
function update_genders_images() function update_genders_images()
{ {
if (file_exists(_PS_IMG_DIR_.'genders/Mr.jpg')) if (file_exists(_PS_ROOT_DIR_.'/img/genders/Mr.jpg'))
@rename(_PS_IMG_DIR_.'genders/Mr.jpg', _PS_IMG_DIR_.'genders/1.jpg'); @rename(_PS_ROOT_DIR_.'/img/genders/Mr.jpg', _PS_ROOT_DIR_.'/img/genders/1.jpg');
if (file_exists(_PS_IMG_DIR_.'genders/Ms.jpg')) if (file_exists(_PS_ROOT_DIR_.'/img/genders/Ms.jpg'))
@rename(_PS_IMG_DIR_.'genders/Ms.jpg', _PS_IMG_DIR_.'genders/2.jpg'); @rename(_PS_ROOT_DIR_.'/img/genders/Ms.jpg', _PS_ROOT_DIR_.'/img/genders/2.jpg');
if (file_exists(_PS_IMG_DIR_.'genders/Miss.jpg')) if (file_exists(_PS_ROOT_DIR_.'/img/genders/Miss.jpg'))
@rename(_PS_IMG_DIR_.'genders/Miss.jpg', _PS_IMG_DIR_.'genders/3.jpg'); @rename(_PS_ROOT_DIR_.'/img/genders/Miss.jpg', _PS_ROOT_DIR_.'/img/genders/3.jpg');
if (file_exists(_PS_IMG_DIR_.'genders/unknown.jpg')) if (file_exists(_PS_ROOT_DIR_.'genders/unknown.jpg'))
@rename(_PS_IMG_DIR_.'unknown.jpg', _PS_IMG_DIR_.'Unknown.jpg'); @rename(_PS_ROOT_DIR_.'/img/genders/unknown.jpg', _PS_ROOT_DIR_.'/img/genders/Unknown.jpg');
} }
install-dev/upgrade/sql/1.5.1.0.sql
+1 -1
View File
@@ -16,5 +16,5 @@ ALTER TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT N
ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0'; ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`; ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
ALTER TABLE `PREFIX_stock_available` ADD UNIQUE (`id_product`, `id_product_attribute`, `id_shop`); ALTER TABLE `PREFIX_stock_available` ADD UNIQUE `product_sqlstock` (`id_product`, `id_product_attribute`, `id_shop`);
ALTER TABLE `PREFIX_cms` ADD INDEX (`id_cms_category`); ALTER TABLE `PREFIX_cms` ADD INDEX (`id_cms_category`);
themes/default/address.tpl
+1 -1
View File
@@ -86,7 +86,7 @@ $(function(){ldelim}
<p class="required"><sup>*</sup> {l s='Required field'}</p> <p class="required"><sup>*</sup> {l s='Required field'}</p>
<form action="{$link->getPageLink('address', true)}" method="post" class="std" id="add_adress"> <form action="{$link->getPageLink('address', true)}" method="post" class="std" id="add_address">
<fieldset> <fieldset>
<h3>{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}</h3> <h3>{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}</h3>
<p class="required text dni"> <p class="required text dni">
themes/default/css/global.css
+21 -21
View File
@@ -1415,13 +1415,13 @@ a.iframe {font-weight:bold}
#address #left_column {display:none} #address #left_column {display:none}
#address #center_column{width:757px} #address #center_column{width:757px}
form#add_adress {} form#add_address {}
#add_adress fieldset { #add_address fieldset {
margin:0; margin:0;
border:1px solid #ccc; border:1px solid #ccc;
background:#F8F8F8 background:#F8F8F8
} }
#add_adress h3 { #add_address h3 {
margin:0 0 15px 0; margin:0 0 15px 0;
padding:8px; padding:8px;
font-size:14px; font-size:14px;
@@ -1429,24 +1429,24 @@ form#add_adress {}
text-transform:uppercase; text-transform:uppercase;
background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898 background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898
} }
#center_column #add_adress p {margin:0; padding:0 0 10px 0} #center_column #add_address p {margin:0; padding:0 0 10px 0}
#add_adress p.required {color:#222} #add_address p.required {color:#222}
#add_adress p.required sup {color:#990000} #add_address p.required sup {color:#990000}
#add_adress p.text label, #add_address p.text label,
#add_adress p.password label, #add_address p.password label,
#add_adress p.select label, #add_address p.select label,
#add_adress p.select span, #add_address p.select span,
#add_adress p.textarea label { #add_address p.textarea label {
display:inline-block; display:inline-block;
padding:6px 15px; padding:6px 15px;
width:230px;/* 260 */ width:230px;/* 260 */
font-size:14px; font-size:14px;
text-align:right text-align:right
} }
#add_adress p.text input, #add_address p.text input,
#add_adress p.password input, #add_address p.password input,
#add_adress p.select input { #add_address p.select input {
padding:0 5px; padding:0 5px;
height:22px; height:22px;
width:360px;/* 370 */ width:360px;/* 370 */
@@ -1455,30 +1455,30 @@ form#add_adress {}
color:#666; color:#666;
line-height:22px line-height:22px
} }
#add_adress p.checkbox input { #add_address p.checkbox input {
margin-left:260px; margin-left:260px;
} }
#add_adress p.select select { #add_address p.select select {
margin-right:10px; margin-right:10px;
border:1px solid #ccc; border:1px solid #ccc;
font-size: 12px; font-size: 12px;
color:#666 color:#666
} }
#add_adress p.textarea label {vertical-align:top} #add_address p.textarea label {vertical-align:top}
#add_adress p.textarea textarea { #add_address p.textarea textarea {
height:80px; height:80px;
width:370px; width:370px;
border:1px solid #ccc; border:1px solid #ccc;
font-size: 12px; font-size: 12px;
color:#666 color:#666
} }
#center_column #add_adress p.submit2 { #center_column #add_address p.submit2 {
margin-top:20px; margin-top:20px;
text-align:right text-align:right
} }
#add_adress span.form_info, #add_address span.form_info,
#add_adress span.inline-infos { #add_address span.inline-infos {
display:block; display:block;
margin:5px 0 0 265px; margin:5px 0 0 265px;
color:#666 color:#666
themes/default/mobile/address.tpl
+1 -1
View File
@@ -84,7 +84,7 @@ $(document).ready(function() {
{/if} {/if}
</p> </p>
<form action="{$link->getPageLink('address', true)}" method="post" id="add_adress"> <form action="{$link->getPageLink('address', true)}" method="post" id="add_address" data-ajax="false">
<legend><h3>{if isset($id_address) && $id_address != 0}{l s='Your address'}{else}{l s='New address'}{/if}</h3></legend> <legend><h3>{if isset($id_address) && $id_address != 0}{l s='Your address'}{else}{l s='New address'}{/if}</h3></legend>
<div class="required text dni"> <div class="required text dni">
<label for="dni">{l s='Identification number'}</label> <label for="dni">{l s='Identification number'}</label>