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

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

Browse Source 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
This commit is contained in:
Kevin Granger
2013-11-04 14:43:01 +01:00
parent c4d18e5e9f d49c4cf62e
commit 889a2006ec
169 changed files with 2783 additions and 1759 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/theme/js/process.js
+2 -2
View File
@@ -31,7 +31,7 @@ function process_install(step)
if (!step)
step = process_steps[0];
$('.installing').hide().html(step.lang + ' ...').fadeIn('slow');
$('.installing').hide().html(step.lang + '...').fadeIn('slow');
$.ajax({
url: 'index.php',
@@ -81,7 +81,7 @@ function process_install(step)
function process_install_subtasks(step)
{
$('.installing').hide().html(step.lang+' ...').fadeIn('slow');
$('.installing').hide().html(step.lang+'...').fadeIn('slow');
process_install_subtask(step, 0);
}
install-dev/theme/views/configure.phtml
+10 -10
View File
@@ -12,7 +12,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Shop name -->
<div class="field clearfix">
<label for="infosShop" class="aligned"><?php echo $this->l('Shop name:') ?> </label>
<label for="infosShop" class="aligned"><?php echo $this->l('Shop name') ?> </label>
<div class="contentinput">
<input class="text required" type="text" id="infosShop" name="shop_name" value="<?php echo htmlspecialchars($this->session->shop_name) ?>" /> <sup class="required">*</sup>
</div>
@@ -21,7 +21,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Activity -->
<div class="field clearfix">
<label for="infosActivity" class="aligned"><?php echo $this->l('Main activity:') ?></label>
<label for="infosActivity" class="aligned"><?php echo $this->l('Main activity') ?></label>
<div class="contentinput">
<select id="infosActivity" name="shop_activity" class="chosen">
<option value="0" style="font-weight: bold" <?php if (!$this->session->shop_activity): ?>selected="selected"<?php endif; ?>><?php echo $this->l('Please choose your main activity') ?></option>
@@ -37,7 +37,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<?php if (_PS_MODE_DEV_): ?>
<!-- Install type (with fixtures or not) -->
<div class="field clearfix">
<label class="aligned"><?php echo $this->l('Install demo products:') ?></label>
<label class="aligned"><?php echo $this->l('Install demo products') ?></label>
<div class="contentinput">
<label>
<input value="full" type="radio" name="db_mode" style="vertical-align: middle;" <?php if ($this->install_type == 'full'): ?>checked="checked"<?php endif; ?> autocomplete="off" />
@@ -56,7 +56,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Country list -->
<div class="field clearfix">
<label for="infosCountry" class="aligned"><?php echo $this->l('Country:') ?></label>
<label for="infosCountry" class="aligned"><?php echo $this->l('Country') ?></label>
<div class="contentinput">
<select name="shop_country" id="infosCountry" class="chosen">
<option value="0" style="font-weight: bold"><?php echo $this->l('Select your country') ?></option>
@@ -103,7 +103,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Admin firstname -->
<div class="field clearfix">
<label for="infosFirstname" class="aligned"><?php echo $this->l('First name:') ?> </label>
<label for="infosFirstname" class="aligned"><?php echo $this->l('First name') ?> </label>
<div class="contentinput">
<input class="text required" type="text" id="infosFirstname" name="admin_firstname" value="<?php echo htmlspecialchars($this->session->admin_firstname) ?>" />
<sup class="required">*</sup>
@@ -113,7 +113,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Admin lastname -->
<div class="field clearfix">
<label for="infosName" class="aligned"><?php echo $this->l('Last name:') ?> </label>
<label for="infosName" class="aligned"><?php echo $this->l('Last name') ?> </label>
<div class="contentinput">
<input class="text required" type="text" id="infosName" name="admin_lastname" value="<?php echo htmlspecialchars($this->session->admin_lastname) ?>" />
<sup class="required">*</sup>
@@ -123,7 +123,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Admin email -->
<div class="field clearfix">
<label for="infosEmail" class="aligned"><?php echo $this->l('E-mail address:') ?> </label>
<label for="infosEmail" class="aligned"><?php echo $this->l('E-mail address') ?> </label>
<div class="contentinput">
<input type="text" class="text required" id="infosEmail" name="admin_email" value="<?php echo htmlspecialchars($this->session->admin_email) ?>" />
<sup class="required">*</sup>
@@ -134,7 +134,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Admin password -->
<div class="field clearfix">
<label for="infosPassword" class="aligned"><?php echo $this->l('Shop password:') ?> </label>
<label for="infosPassword" class="aligned"><?php echo $this->l('Shop password') ?> </label>
<div class="contentinput">
<input autocomplete="off" type="password" class="text required" id="infosPassword" name="admin_password" value="<?php echo htmlspecialchars($this->session->admin_password) ?>" />
<sup class="required">*</sup>
@@ -142,13 +142,13 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<?php if ($this->displayError('admin_password')): ?>
<?php echo $this->displayError('admin_password') ?>
<?php else: ?>
<p class="userInfos aligned"><?php echo $this->l('Must be letters and numbers with at least 8 characters') ?></p>
<p class="userInfos aligned"><?php echo $this->l('Must be at least 8 characters') ?></p>
<?php endif; ?>
</div>
<!-- Admin password confirm -->
<div class="field clearfix">
<label class="aligned" for="infosPasswordRepeat"><?php echo $this->l('Re-type to confirm:') ?> </label>
<label class="aligned" for="infosPasswordRepeat"><?php echo $this->l('Re-type to confirm') ?> </label>
<div class="contentinput">
<input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat" name="admin_password_confirm" value="<?php echo htmlspecialchars($this->session->admin_password_confirm) ?>" />
<sup class="required">*</sup>
install-dev/theme/views/database.phtml
+8 -8
View File
@@ -2,7 +2,7 @@
<!-- Database configuration -->
<div id="dbPart">
<h2><?php echo $this->l('Configure your database by filling out the following fields:') ?></h2>
<h2><?php echo $this->l('Configure your database by filling out the following fields') ?></h2>
<p>
<?php echo $this->l('To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.') ?>
<br />
@@ -11,20 +11,20 @@
<div id="formCheckSQL">
<p class="first" style="margin-top: 15px;">
<label for="dbServer"><?php echo $this->l('Database server address:') ?> </label>
<label for="dbServer"><?php echo $this->l('Database server address') ?> </label>
<input size="25" class="text" type="text" id="dbServer" name="dbServer" value="<?php echo htmlspecialchars($this->database_server) ?>" />
<span class="userInfos aligned"><?php echo $this->l('The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".') ?></span>
</p>
<p>
<label for="dbName"><?php echo $this->l('Database name:') ?> </label>
<label for="dbName"><?php echo $this->l('Database name') ?> </label>
<input size="10" class="text" type="text" id="dbName" name="dbName" value="<?php echo htmlspecialchars($this->database_name) ?>" />
</p>
<p>
<label for="dbLogin"><?php echo $this->l('Database login:') ?> </label>
<label for="dbLogin"><?php echo $this->l('Database login') ?> </label>
<input class="text" size="10" type="text" id="dbLogin" name="dbLogin" value="<?php echo htmlspecialchars($this->database_login) ?>" />
</p>
<p>
<label for="dbPassword"><?php echo $this->l('Database password:') ?> </label>
<label for="dbPassword"><?php echo $this->l('Database password') ?> </label>
<input class="text" size="10" type="password" id="dbPassword" name="dbPassword" value="<?php echo htmlspecialchars($this->database_password) ?>" />
</p>
<!--
@@ -36,12 +36,12 @@
</select>
</p>-->
<p>
<label for="db_prefix"><?php echo $this->l('Tables prefix:')?></label>
<label for="db_prefix"><?php echo $this->l('Tables prefix')?></label>
<input class="text" type="text" id="db_prefix" name="db_prefix" value="<?php echo htmlspecialchars($this->database_prefix) ?>" />
</p>
<?php if (_PS_MODE_DEV_): ?>
<p>
<label for="db_clear"><?php echo $this->l('Drop existing tables (mode dev):')?></label>
<label for="db_clear"><?php echo $this->l('Drop existing tables (mode dev)')?></label>
<input type="checkbox" name="database_clear" id="db_clear" value="1" <?php if ($this->database_clear): ?>checked="checked"<?php endif; ?> />
</p>
<?php endif; ?>
@@ -95,7 +95,7 @@
</p>
<p>
<label for="smtpPassword"><?php echo $this->l('Password:') ?> </label>
<label for="smtpPassword"><?php echo $this->l('Password') ?> </label>
<input autocomplete="off" class="text" type="password" size="10" id="smtpPassword" name="smtpPassword" value="<?php echo htmlspecialchars($this->smtp_password) ?>" />
</p>
</div>
install-dev/theme/views/process.phtml
+3 -3
View File
@@ -36,10 +36,10 @@ var process_steps = <?php echo Tools::jsonEncode($this->process_steps) ?>;
<div class="clearfix">
<h2><?php echo $this->l('Your installation is finished!'); ?></h2>
<p><?php echo $this->l('You have just finished installing your shop. Thank you for using PrestaShop!'); ?></p>
<p><?php echo $this->l('Please remember your login information:') ?></p>
<p><?php echo $this->l('Please remember your login information') ?></p>
<table cellpadding="0" cellspacing="0" border="0" id="resultInstall" width="620">
<tr class="odd">
<td class="label"><?php echo $this->l('E-mail:') ?></td>
<td class="label"><?php echo $this->l('E-mail') ?></td>
<td class="resultEnd"><?php echo htmlspecialchars($this->session->admin_email) ?></td>
<td rowspan="2" class="print" onclick="$('#password_content').html('<?php echo htmlspecialchars(addslashes($this->session->admin_password)) ?>'); $('#password_display').hide(); window.print();">
<img src="theme/img/print.png" alt="" style="vertical-align:top">
@@ -47,7 +47,7 @@ var process_steps = <?php echo Tools::jsonEncode($this->process_steps) ?>;
</td>
</tr>
<tr>
<td class="label"><?php echo $this->l('Password:') ?></td>
<td class="label"><?php echo $this->l('Password') ?></td>
<td class="resultEnd">
<span id="password_content"><?php echo preg_replace('#.#', '*', $this->session->admin_password) ?></span>
<span id="password_display">
install-dev/theme/views/welcome.phtml
+1 -1
View File
@@ -13,7 +13,7 @@
) ?></div>
<?php endif; ?>
<h2><?php echo $this->l('Welcome to the PrestaShop %s Installer.', _PS_INSTALL_VERSION_) ?></h2>
<h2><?php echo $this->l('Welcome to the PrestaShop %s Installer', _PS_INSTALL_VERSION_) ?></h2>
<p><?php echo $this->l('The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.') ?></p>
<p><?php echo $this->l('If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s', $this->getDocumentationLink(), $this->getPhone()) ?></p>