diff --git a/install-dev/theme/preactivation.css b/install-dev/theme/preactivation.css index 06c67e122..10cccd0ed 100644 --- a/install-dev/theme/preactivation.css +++ b/install-dev/theme/preactivation.css @@ -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; diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css index a960a45de..13e14e782 100644 --- a/install-dev/theme/view.css +++ b/install-dev/theme/view.css @@ -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; } diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml index 823accc0b..f51374093 100644 --- a/install-dev/theme/views/configure.phtml +++ b/install-dev/theme/views/configure.phtml @@ -13,16 +13,16 @@ var default_iso = 'session->shop_country ?>';
- +
* - +
displayError('shop_name') ?>
- +
- +

l('This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.') ?>

- +
* - +
displayError('shop_country') ?>
- +
* - +
displayError('shop_timezone') ?>
- - - - -

l('Recommended dimensions:') ?>
209px x 52px

+ +
+ +
+

l('Recommended dimensions:') ?>
209px x 52px

- +
- +
* - +
displayError('admin_firstname') ?>
- +
* - +
displayError('admin_lastname') ?>
- +
* - +
displayError('admin_email') ?>
- +
* - +
displayError('admin_password') ?>
- +
* - +
displayError('admin_password_confirm') ?>
- +
session->send_informations): ?>checked="checked" />
- +

l('Warning: You will recieve these informations only if your e-mail configuration is correct.') ?>

diff --git a/install-dev/theme/views/process.phtml b/install-dev/theme/views/process.phtml index 760cd028c..66561f97c 100644 --- a/install-dev/theme/views/process.phtml +++ b/install-dev/theme/views/process.phtml @@ -40,8 +40,8 @@ var process_percent = process_steps) ?>;

l('Here is your shop information. You can modify it once you are logged in.') ?>

- - + + @@ -60,16 +60,16 @@ var process_percent = process_steps) ?>;

l('WARNING: For security purposes, you must delete the "install" folder.') ?>

- +

l('Back Office'); ?>

l('Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.') ?>

- l('Manage your store') ?> + l('Manage your store') ?>
- +

l('Front Office'); ?>

l('Discover your store as your future customers will see it!') ?>

- l('Discover your store') ?> + l('Discover your store') ?>
diff --git a/install-dev/theme/views/welcome.phtml b/install-dev/theme/views/welcome.phtml index e6721b765..65456cd23 100644 --- a/install-dev/theme/views/welcome.phtml +++ b/install-dev/theme/views/welcome.phtml @@ -2,7 +2,7 @@

l('Welcome to the PrestaShop %s Installer.', _PS_INSTALL_VERSION_) ?>

l('Please allow 5-15 minutes to complete the installation process.') ?>

-

l('The installation should only take a few minutes: if you need help, do not hesitate to check our documentation or to contact our support team: %2$s', $this->getDocumentationLink(), $this->getPhone()) ?> +

l('The installation should only take a few minutes: if you need help, do not hesitate to check our documentation or to contact our support team: %2$s', $this->getDocumentationLink(), $this->getPhone()) ?>

language->getIsoList()) > 1): ?> @@ -36,7 +36,7 @@

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:

Licensed under the Open Software License version 3.0

1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:

-
    +
    1. to reproduce the Original Work in copies, either alone or as part of a collective work
    2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work
    3. 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
      4. @@ -63,10 +63,10 @@

      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:

      Licensed under the Academic Free License version 3.0

      1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:

      -
        +
        1. to reproduce the Original Work in copies, either alone or as part of a collective work;
        2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
          3. -
        3. to distribute or communicate copies of the Original Work and Derivative Works to the public, 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;
          4. +
        4. to distribute or communicate copies of the Original Work and Derivative Works to the public, 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;
        5. to perform the Original Work publicly; and
        6. to display the Original Work publicly.
        @@ -84,7 +84,7 @@

        13. Miscellaneous. 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.

        14. Definition of "You" in This License. "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.

        15. Right to Use. 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.

        -

        16. Modification of This License. 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 " 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.

        +

        16. Modification of This License. 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.

l('Shop name:') ?>session->shop_name) ?>l('Shop name:') ?>session->shop_name) ?>
l('First name:') ?>