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

// W3C compatibility on installer

Browse Source
This commit is contained in:
rMalie
2012-02-03 16:02:16 +00:00
parent a2aeff5436
commit eedc04461b
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/theme/preactivation.css
+1 -1
View File
@@ -25,7 +25,7 @@
width:180px;/* 190 */
}
.moduleTable .field label.radiolabel {width:auto;}
.moduleTable .field span.contentinput {
.moduleTable .field div.contentinput {
display:inline-block;
width:245px;
font-size: 11px;
install-dev/theme/view.css
+2 -2
View File
@@ -210,7 +210,7 @@ div.field {
vertical-align: top;
}
div.field label.radiolabel {width:auto;}
div.field span.contentinput {
div.field div.contentinput {
display:inline-block;
width:245px;
vertical-align: top;
@@ -686,7 +686,7 @@ ul#optional_update {list-style-type:none;}
float: left;
}
#sheet_configure div.field span.contentinput {
#sheet_configure div.field div.contentinput {
display: block;
float: left;
}
install-dev/theme/views/configure.phtml
+28 -28
View File
@@ -13,16 +13,16 @@ 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>
<span class="contentinput">
<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>
</span>
</div>
<?php echo $this->displayError('shop_name') ?>
</div>
<!-- Activity -->
<div class="field clearfix">
<label for="infosActivity" class="aligned"><?php echo $this->l('Main activity:') ?></label>
<span class="contentinput">
<div class="contentinput">
<select id="infosActivity" name="shop_activity">
<option value="0" <?php if (!$this->session->shop_activity): ?>selected="selected"<?php endif; ?>><?php echo $this->l('-- Please choose your main activity --') ?></option>
<?php foreach ($this->list_activities as $i => $activity): ?>
@@ -30,14 +30,14 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<?php endforeach; ?>
<option value="0"><?php echo $this->l('Other activity...') ?></option>
</select>
</span>
</div>
<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>
<!-- Country list -->
<div class="field clearfix">
<label for="infosCountry" class="aligned"><?php echo $this->l('Default country:') ?></label>
<span class="contentinput">
<div class="contentinput">
<select name="shop_country" id="infosCountry">
<option value="0"><?php echo $this->l('-- Select your country --') ?></option>
<?php foreach ($this->language->getCountries() as $iso => $country_name): ?>
@@ -45,14 +45,14 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<?php endforeach; ?>
</select>
<sup class="required">*</sup>
</span>
</div>
<?php echo $this->displayError('shop_country') ?>
</div>
<!-- Timezone list -->
<div class="field clearfix">
<label for="infosTimezone" class="aligned"><?php echo $this->l('Shop timezone:') ?></label>
<span class="contentinput">
<div class="contentinput">
<select name="shop_timezone" id="infosTimezone">
<option value="0"><?php echo $this->l('-- Select your timezone --') ?></option>
<?php foreach ($this->getTimezones() as $timezone): ?>
@@ -60,82 +60,82 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<?php endforeach; ?>
</select>
<sup class="required">*</sup>
</span>
</div>
<?php echo $this->displayError('shop_timezone') ?>
</div>
<!-- Shop logo -->
<div class="field clearfix">
<label for="infosLogo" class="aligned logo"><?php echo $this->l('Shop logo:') ?></label>
<span class="contentinput">
<p id="alignedLogo"><img id="uploadedImage" src="../img/logo.jpg" alt="Logo" /></p>
</span>
<p class="userInfos aligned"><?php echo $this->l('Recommended dimensions:') ?><br />209px x 52px</p>
<label for="uploadedImage" class="aligned logo"><?php echo $this->l('Shop logo:') ?></label>
<div class="contentinput">
<p id="alignedLogo"><img id="uploadedImage" src="../img/logo.jpg" alt="Logo" /></p>
</div>
<p class="userInfos aligned"><?php echo $this->l('Recommended dimensions:') ?><br />209px x 52px</p>
<span id="inputFileLogo" class="contentinput">
<input type="file" name="fileToUpload" id="fileToUpload"/>
</span>
<div id="inputFileLogo" class="contentinput">
<input type="file" name="fileToUpload" id="fileToUpload"/>
</div>
<span id="resultInfosLogo" class="result"></span>
</div>
<!-- Admin firstname -->
<div class="field clearfix">
<label for="infosFirstname" class="aligned"><?php echo $this->l('First name:') ?> </label>
<span class="contentinput">
<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>
</span>
</div>
<?php echo $this->displayError('admin_firstname') ?>
</div>
<!-- Admin lastname -->
<div class="field clearfix">
<label for="infosName" class="aligned"><?php echo $this->l('Last name:') ?> </label>
<span class="contentinput">
<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>
</span>
</div>
<?php echo $this->displayError('admin_lastname') ?>
</div>
<!-- Admin email -->
<div class="field clearfix">
<label for="infosEmail" class="aligned"><?php echo $this->l('E-mail address:') ?> </label>
<span class="contentinput">
<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>
</span>
</div>
<?php echo $this->displayError('admin_email') ?>
</div>
<!-- Admin password -->
<div class="field clearfix">
<label for="infosPassword" class="aligned"><?php echo $this->l('Shop password:') ?> </label>
<span class="contentinput">
<div class="contentinput">
<input autocomplete="off" type="password" class="text required" id="infosPassword" name="admin_password" />
<sup class="required">*</sup>
</span>
</div>
<?php echo $this->displayError('admin_password') ?>
</div>
<!-- Admin password confirm -->
<div class="field clearfix">
<label class="aligned" for="infosPasswordRepeat"><?php echo $this->l('Re-type to confirm:') ?> </label>
<span class="contentinput">
<div class="contentinput">
<input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat" name="admin_password_confirm" />
<sup class="required">*</sup>
</span>
</div>
<?php echo $this->displayError('admin_password_confirm') ?>
</div>
<!-- Recieve by email -->
<div class="field clearfix" id="contentInfosNotification">
<span class="contentinput">
<div class="contentinput">
<input type="checkbox" name="send_informations" id="infosNotification" class="aligned" style="vertical-align: middle;" <?php if ($this->session->send_informations): ?>checked="checked"<?php endif; ?> />
<label for="infosNotification"><?php echo $this->l('Receive this information by e-mail') ?></label>
<br/>
<span id="resultInfosNotification" class="result aligned"></span>
</span>
</div>
<p class="userInfos aligned"><?php echo $this->l('Warning: You will recieve these informations only if your e-mail configuration is correct.') ?></p>
</div>
</div>
install-dev/theme/views/process.phtml
+6 -6
View File
@@ -40,8 +40,8 @@ var process_percent = <?php echo 100 / count($this->process_steps) ?>;
<p><?php echo $this->l('Here is your shop information. You can modify it once you are logged in.') ?></p>
<table cellpadding="0" cellspacing="0" border="0" id="resultInstall" width="620">
<tr class="odd">
<td width="220" class="label"><?php echo $this->l('Shop name:') ?></td>
<td width="400" class="resultEnd"><?php echo htmlspecialchars($this->session->shop_name) ?></td>
<td style="width: 220px" class="label"><?php echo $this->l('Shop name:') ?></td>
<td style="width: 400px" class="resultEnd"><?php echo htmlspecialchars($this->session->shop_name) ?></td>
</tr>
<tr>
<td class="label"><?php echo $this->l('First name:') ?></td>
@@ -60,16 +60,16 @@ var process_percent = <?php echo 100 / count($this->process_steps) ?>;
<h3 class="infosBlock"><?php echo $this->l('WARNING: For security purposes, you must delete the "install" folder.') ?></h3>
<div id="boBlock" class="blockInfoEnd clearfix">
<img src="theme/img/visu_boBlock.png" />
<img src="theme/img/visu_boBlock.png" alt="" />
<h3><?php echo $this->l('Back Office'); ?></h3>
<p class="description"><?php echo $this->l('Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.') ?></p>
<a href="../admin" id="access" class="BO" target="_blank"><span><?php echo $this->l('Manage your store') ?></span></a>
<a href="../admin" class="BO" target="_blank"><span><?php echo $this->l('Manage your store') ?></span></a>
</div>
<div id="foBlock" class="blockInfoEnd last clearfix">
<img src="theme/img/visu_foBlock.png" />
<img src="theme/img/visu_foBlock.png" alt="" />
<h3><?php echo $this->l('Front Office'); ?></h3>
<p class="description"><?php echo $this->l('Discover your store as your future customers will see it!') ?></p>
<a href="../" id="access" class="FO" target="_blank"><span><?php echo $this->l('Discover your store') ?></span></a>
<a href="../" class="FO" target="_blank"><span><?php echo $this->l('Discover your store') ?></span></a>
</div>
</div>
</div>
install-dev/theme/views/welcome.phtml
+5 -5
View File
@@ -2,7 +2,7 @@
<h2><?php echo $this->l('Welcome to the PrestaShop %s Installer.', _PS_INSTALL_VERSION_) ?></h2>
<p><?php echo $this->l('Please allow 5-15 minutes to complete the installation process.') ?></p>
<p><?php echo $this->l('The installation should only take a few minutes: 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><?php echo $this->l('The installation should only take a few minutes: 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>
<!-- List of languages -->
<?php if (count($this->language->getIsoList()) > 1): ?>
@@ -36,7 +36,7 @@
<p>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
<h4>Licensed under the Open Software License version 3.0</h4>
<p><strong>1. Grant of Copyright License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
<ol type="a">
<ol style="list-style-type: lower-alpha; margin-left: 20px">
<li>to reproduce the Original Work in copies, either alone or as part of a collective work</li>
<li>to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work</li>
<li>to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License</li>
@@ -63,10 +63,10 @@
<p>This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
<h4>Licensed under the Academic Free License version 3.0</h4>
<p><strong>1. Grant of Copyright License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
<ol type="a">
<ol style="list-style-type: lower-alpha; margin-left: 20px">
<li>to reproduce the Original Work in copies, either alone or as part of a collective work;</li>
<li>to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;</li>
<li>to distribute or communicate copies of the Original Work and Derivative Works to the public, <u>under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License</u>;</li>
<li>to distribute or communicate copies of the Original Work and Derivative Works to the public, <span style="text-decoration: underline">under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License</span>;</li>
<li>to perform the Original Work publicly; and</li>
<li>to display the Original Work publicly.</li>
</ol>
@@ -84,7 +84,7 @@
<p><strong>13. Miscellaneous.</strong> If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.</p>
<p><strong>14. Definition of "You" in This License.</strong> "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p>
<p><strong>15. Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
<p><strong>16. Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
<p><strong>16. Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under &lt;insert your license name here&gt;" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
</div>
<p>