diff --git a/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl deleted file mode 100644 index dc390fa91..000000000 --- a/admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 8971 $ -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{extends file="helpers/form/form.tpl"} - -{block name="label"} - {if $input.type == 'table'} - - - - - - {foreach $table_status AS $table} - - - - {/foreach} -
{l s='Table'}{l s='Table Engine'}
{$table['Name']}{$table['Engine']}
- {/if} - {if isset($input.label)} - - {/if} -{/block} diff --git a/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl deleted file mode 100644 index e2f5bfd98..000000000 --- a/admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl +++ /dev/null @@ -1,93 +0,0 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 9548 $ -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{extends file="helpers/options/options.tpl"} -{block name="defaultOptions"} -
-
{l s='Htaccess file generation'} -
- {l s='Warning:'} - {l s='this tool can ONLY be used if you are hosted by an Apache web server. Please ask your webhost.'} -
-

- {l s='This tool will automatically generate a ".htaccess" file that will give you the ability to do URL rewriting and to catch 404 errors.'} -

- {if $checkConfiguration_ht} -
 
- -
- -

{l s='This will add directives to your .htaccess file which should improve caching and compression.'}

-
-
 
- -
- {if $mod_rewrite} - -

{l s='Enable only if your server allows URL rewriting.'}

- {else} - - {l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you have to active this mod.'} - -
- {/if} - -
-
 
- -
- -

{l s='Enable this option only if you have problems with some pages URL rewriting.'}

-
-

{l s='Generate your ".htaccess" file by clicking on the following button:'} -

-

{l s='This will erase your'} {l s='old'} {l s='.htaccess file!'}

- {else} - -

{l s='Before being able to use this tool, you need to:'}

-

{l s='- create a'} {l s='.htaccess'} {l s='blank file in directory'} {$smarty.const.__PS_BASE_URI__} -
{l s='- give it write permissions (CHMOD 666 on Unix system)'}

- {/if} -

- -

-
-
{l s='Robots file generation'} -

{l s='Warning:'} {l s='Your file robots.txt MUST be in your website\'s root directory and nowhere else.'}

-

{l s='eg: http://www.yoursite.com/robots.txt'}

-

{l s='This tool will automatically generate a "robots.txt" file that you can configure to deny access to search engines for some pages.'}

- {if $checkConfiguration_rb} - -

{l s='Generate your "robots.txt" file by clicking on the following button:'} -

-

{l s='This will erase your'} {l s='old'} {l s='robots.txt file!'}

- {else} -

{l s='Before being able to use this tool, you need to:'}

-

{l s='- create a'} {l s='robots.txt'} {l s='blank file in dir:'} {$smarty.const.__PS_BASE_URI__} -
{l s='- give it write permissions (CHMOD 666 on Unix system)'}

- {/if} -

-
-{/block} diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 77a88be39..4844d678e 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -53,6 +53,7 @@ class AdminMetaControllerCore extends AdminController ); $this->_group = 'GROUP BY a.id_meta'; + // Options to generate friendly urls $mod_rewrite = Tools::modRewriteActive(); $general_fields = array( 'PS_REWRITING_SETTINGS' => array( @@ -72,6 +73,7 @@ class AdminMetaControllerCore extends AdminController ), ); + $url_description = ''; if ($this->checkConfiguration($this->ht_file)) $general_fields['PS_HTACCESS_DISABLE_MULTIVIEWS'] = array( 'title' => $this->l('Disable apache multiviews'), @@ -80,6 +82,12 @@ class AdminMetaControllerCore extends AdminController 'cast' => 'intval', 'type' => 'bool', ); + else + { + $url_description = $this->l('Before being able to use this tool, you need to:'); + $url_description .= '
- '.$this->l('create a .htaccess blank file your root dir'); + $url_description .= '
- '.$this->l('give it write permissions (CHMOD 666 on Unix system)'); + } // Options to generate robot.txt $robots_description = $this->l('Your file robots.txt MUST be in your website\'s root directory and nowhere else.'); @@ -108,6 +116,7 @@ class AdminMetaControllerCore extends AdminController $this->options = array( 'general' => array( 'title' => $this->l('URLs Setup'), + 'description' => $url_description, 'fields' => $general_fields, 'submit' => array() ), diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 8e455ea63..e0fdc8621 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -964,8 +964,6 @@ $_LANGADM['AdminCustomersf2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; $_LANGADM['AdminCustomersf81f334947c006163040911e694fc3ec'] = 'Erreur : votre note n\'est pas valide'; $_LANGADM['AdminCustomersfc26e55e0993a75e892175deb02aae15'] = 'Paniers'; $_LANGADM['AdminCustomersff398a1c3434e160c655aa1613e0eace'] = 'Affiliés'; -$_LANGADM['AdminDb51c45b795d5d18a3e4e0c37e8b20a141'] = 'Table'; -$_LANGADM['AdminDbb0d1963f24d64313f9c8d83662cc551a'] = 'Moteur de la table'; $_LANGADM['AdminDeliverySlip067af5895a7ced3197520b591f9a41eb'] = 'Générer un fichier PDF'; $_LANGADM['AdminDeliverySlip071e16ef4a5515728cc97ed028d85711'] = 'Le prochain bon de livraison commencera à ce numéro, qui augmentera à chaque nouveau bon'; $_LANGADM['AdminDeliverySlip0b1fb1278454d848f968d419e29c253b'] = 'Format : 2007-12-31 (inclus)'; @@ -1092,36 +1090,6 @@ $_LANGADM['AdminGendersd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélec $_LANGADM['AdminGenderse25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer les éléments sélectionnés ?'; $_LANGADM['AdminGenderse659b52eba1f0299b2d8ca3483919e72'] = 'Type :'; $_LANGADM['AdminGenderse9bb5320b3890b6747c91b5a71ae5a01'] = 'Neutre'; -$_LANGADM['AdminGenerator067b367b527d0a275f99b9071dd69e28'] = 'Cela va écraser votre'; -$_LANGADM['AdminGenerator149603e6c03516362a8da23f624db945'] = 'ancien'; -$_LANGADM['AdminGenerator15970c4fdbca1fc48c5b412d94e798c0'] = 'Optimisation'; -$_LANGADM['AdminGenerator1dec4f55522b828fe5dacf8478021a9e'] = 'URL simplifiées'; -$_LANGADM['AdminGenerator2129c4f9bb14dcddabb6453bfbeff246'] = 'Cet outil va générer automatiquement le fichier robots.txt offrant la possibilité de refuser l\'accès à certaines pages aux moteurs de recherche.'; -$_LANGADM['AdminGenerator223cf855cfa657eeb99550e1acd8eaa3'] = 'N\'activez cette option que si votre serveur autorise la réécriture d\'URL.'; -$_LANGADM['AdminGenerator32d593fb52ab5e4ae3f16844b576867d'] = 'En cochant cette case, votre fichier .htaccess sera complété automatiquement avec des directives améliorant le cache et la compression.'; -$_LANGADM['AdminGenerator345d6249c20c6319bb09edaaf536744b'] = 'Génération du fichier robots.txt'; -$_LANGADM['AdminGenerator3b823baba7abb920bd1c18104ae7537b'] = 'Votre fichier robots.txt DOIT être dans le dossier racine de votre site web, et nulle part ailleurs.'; -$_LANGADM['AdminGenerator3c108dd1d7338dcc6a9face1824db1dd'] = 'Générer le fichier .htaccess'; -$_LANGADM['AdminGenerator3f3e336e2f1fa10375efd923fca18b55'] = 'Avertissement :'; -$_LANGADM['AdminGenerator53bdd80ab93282cc38ef9c605f058eba'] = 'Cet outil va automatiquement générer le fichier .htaccess, offrant la possibilité de procéder à la réécriture d\'URL de la boutique et de personnaliser les erreurs 404.'; -$_LANGADM['AdminGenerator5b1315f64379c20167cc186f3cfed249'] = 'fichier .htaccess !'; -$_LANGADM['AdminGenerator6049980ef775b17f7f0b3624ae121733'] = 'L\'URL rewriting (mod_rewrite) n\'est pas activé sur votre serveur. Si vous voulez utiliser les URL simplifiées, veuillez activer ce module Apache.'; -$_LANGADM['AdminGenerator60e4943ad37920b1f95133fae1420b59'] = ' - lui donner les permissions (CHMOD 666 sur les systèmes Unix)'; -$_LANGADM['AdminGenerator620da2256fdfaa8c903cc870221450ca'] = 'cet outil peut SEULEMENT être utilisé si vous êtes hébergé par un serveur web Apache. Renseignez-vous auprès de votre hébergeur.'; -$_LANGADM['AdminGenerator76bdc7d3324595e5c6430ba466690cba'] = 'fichier robots.txt !'; -$_LANGADM['AdminGenerator7959e21ff0b83542251ca0b4e9a62eea'] = 'Générer le fichier robots.txt'; -$_LANGADM['AdminGenerator7dc12aaf3ebf9e01ef5b2ec91761c26a'] = 'N\'activez cette option que si vous rencontrez des problèmes avec la redirection d\'URL de certaines pages.'; -$_LANGADM['AdminGenerator8052c42ab3b8aa06a3f5f788a4ddccc2'] = 'fichier .htaccess'; -$_LANGADM['AdminGenerator93f711fc90428ec9589a70706e1866a2'] = 'vide dans le dossier'; -$_LANGADM['AdminGeneratoraa2646a667ee1cd83235786dccef4a26'] = 'robots.txt'; -$_LANGADM['AdminGeneratoracaa02ab1d800ce9a0b3df2e4ab8909a'] = 'Désactiver l\'option Apache MultiViews'; -$_LANGADM['AdminGeneratorad11acdc8759d7a20ca3b868a8db30ae'] = 'Génération du fichier .htaccess'; -$_LANGADM['AdminGeneratorb65cc08420e484602c7c313336933452'] = 'Ex. : http://www.monsite.com/robots.txt'; -$_LANGADM['AdminGeneratorb696dfaf5a833f70d71d26d052c6eaa3'] = 'Générer le fichier .htaccess en cliquant sur le bouton suivant :'; -$_LANGADM['AdminGeneratorb8a27e47e64caa3e36c8894c3745357b'] = 'Avant de pouvoir utiliser cet outil, vous devez :'; -$_LANGADM['AdminGeneratorc03c063bb390b0042cabd4e08ac92347'] = 'vide dans le dossier :'; -$_LANGADM['AdminGeneratord443c06bc05c5f7d35d95aba3ddcf817'] = '- créer un'; -$_LANGADM['AdminGeneratorffd4c6a67eb0c56d04a5ebca5e8cbf80'] = 'Générer le fichier robots.txt en cliquant sur le bouton suivant :'; $_LANGADM['AdminGeolocation2eef60563335b16d4a98900298fe7841'] = 'Comportement de la géolocalisation pour les pays restreints :'; $_LANGADM['AdminGeolocation38e8888ae62868f7ec6cc940ffcaf373'] = 'Comportement de la géolocalisation pour les pays non-reconnus :'; $_LANGADM['AdminGeolocation3d3aa857bbce5746c7156f447f6bdc60'] = 'et le décompresser dans le dossier tools/geoip/'; @@ -1554,7 +1522,6 @@ $_LANGADM['AdminInformation2e62fff336f9fdfefe4f87168f223f8b'] = 'Des changements $_LANGADM['AdminInformation3685800496ee1d4fd5cc25d805589f0e'] = 'Méthode d\'envoi de mail'; $_LANGADM['AdminInformation3aea774cdcd8f2c45549f10758a71323'] = 'Informations sur votre boutique'; $_LANGADM['AdminInformation3cffa2fabd5519beaf4c2fbd0610899b'] = 'Mot de passe SMTP'; -$_LANGADM['AdminInformation3f79383ea69a630b2928b4cf279cc9f0'] = 'Outils: Informations'; $_LANGADM['AdminInformation3ff44d56eb2bfbb8f0903e99a28a0819'] = 'Informations sur la configuration mail'; $_LANGADM['AdminInformation4c663c632162a23d0f65510f7064aa87'] = 'Définir les droits d\'écriture sur le dossier /config/'; $_LANGADM['AdminInformation60aaf44d4b562252c04db7f98497e9aa'] = 'Port'; @@ -1844,6 +1811,7 @@ $_LANGADM['AdminMeta7959e21ff0b83542251ca0b4e9a62eea'] = 'Générer le fichier r $_LANGADM['AdminMeta7dc12aaf3ebf9e01ef5b2ec91761c26a'] = 'N\'activez cette option que si vous rencontrez des problèmes avec la redirection d\'URL de certaines pages.'; $_LANGADM['AdminMeta82fa9d45784fa48b4a37f4e225de5451'] = 'Une courte description'; $_LANGADM['AdminMeta83495f05c4aa5f326f23b6d58d0da5e6'] = 'Route vers les catégories CMS'; +$_LANGADM['AdminMeta84e2bd6cb02b2ed581449b1ed5dd3d03'] = 'donnez les permissions d\'écriture au fichier (CHMOD 666 sur un système Unix)'; $_LANGADM['AdminMeta8eee2883d683841b6ab08c1bb6d13fb7'] = 'Route vers les pages CMS'; $_LANGADM['AdminMeta8f815100fbc9398e9441b28d219e0ca4'] = 'Route vers les marques'; $_LANGADM['AdminMeta93cba07454f06a4a960172bbd6e2a435'] = 'Oui'; @@ -1856,6 +1824,7 @@ $_LANGADM['AdminMetab78a3223503896721cca1303f776159b'] = 'Titre'; $_LANGADM['AdminMetab8a27e47e64caa3e36c8894c3745357b'] = 'Avant de pouvoir utiliser cet outil, vous devez :'; $_LANGADM['AdminMetabafd7322c6e97d25b6299b5d6fe8920b'] = 'Non'; $_LANGADM['AdminMetabc5d446bc10f94f2132fa898d11a423a'] = 'Configuration des URL'; +$_LANGADM['AdminMetabd8a009ea1eab1b40ade8985f4b8c776'] = 'créez un fichier .htaccess vide à la racine de votre site'; $_LANGADM['AdminMetac12e753c3108c17350db4e5990ff626e'] = 'Liste des mots-clés'; $_LANGADM['AdminMetac9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer'; $_LANGADM['AdminMetad3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';