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

// Fix bug when fixtures are disabled + move install type (fixtures or not) to configure step

Browse Source
This commit is contained in:
rMalie
2012-02-07 13:37:37 +00:00
parent b63c04a22b
commit 85bee87920
7 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/theme/js/process.js
+2 -2
View File
@@ -12,7 +12,7 @@ function start_install()
if (is_installing)
return;
is_installing = true;
$('.process_step').removeClass('fail').removeClass('success').hide();
$('.error_log').hide();
$('#progress_bar').show();
@@ -88,7 +88,7 @@ function install_error(step, errors)
var list_errors = errors;
if ($.type(list_errors) == 'string')
list_errors = [list_errors];
var display = '<ol>';
$.each(list_errors, function(k, v)
{
install-dev/theme/view.css
+5 -1
View File
@@ -215,9 +215,13 @@ div.field {
width:245px;
vertical-align: top;
}
div.field div.contentinput label {
display:inline;
margin-right: 10px;
}
div.field .userInfos {
display:inline-block;
width:200px;
width:210px;
font-size:11px;
font-family:Georgia;
font-style:italic;
install-dev/theme/views/configure.phtml
+16
View File
@@ -34,6 +34,22 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<p class="userInfos aligned"><?php echo $this->l('This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.') ?></p>
</div>
<!-- Install type (with fixtures or not) -->
<div class="field clearfix">
<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; ?> />
<?php echo $this->l('Yes') ?>
</label>
<label>
<input value="lite" type="radio" name="db_mode" style="vertical-align: middle;" <?php if ($this->install_type == 'lite'): ?>checked="checked"<?php endif; ?> />
<?php echo $this->l('No'); ?>
</label>
</div>
<p class="userInfos aligned"><?php echo $this->l('Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.') ?></p>
</div>
<!-- Country list -->
<div class="field clearfix">
<label for="infosCountry" class="aligned"><?php echo $this->l('Default country:') ?></label>
install-dev/theme/views/database.phtml
-14
View File
@@ -57,20 +57,6 @@
</div>
</div>
<!-- Install type (with fixtures or not) -->
<div id="dbTableParam">
<div>
<h2><?php echo $this->l('Installation type') ?></h2>
<p id="dbModeSetter" style="line-height: 20px;">
<input value="lite" type="radio" name="db_mode" id="db_mode_simple" style="vertical-align: middle;" <?php if ($this->install_type == 'lite'): ?>checked="checked"<?php endif; ?> />
<label for="db_mode_simple"><?php echo $this->l('Simple mode: Basic installation (FREE)'); ?></label><br />
<input value="full" type="radio" name="db_mode" id="db_mode_complet" style="vertical-align: middle;" <?php if ($this->install_type == 'full'): ?>checked="checked"<?php endif; ?> />
<label for="db_mode_complet"><?php echo $this->l('Sandbox mode: includes demo products (FREE)') ?></label>
</p>
</div>
</div>
<!-- Email configuration -->
<div id="mailPart">
<h2><?php echo $this->l('E-mail delivery set-up') ?></h2>