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

[-] BO : #PSCFV-2606 - Fix bug with FastCGI/CGI and url multishopping (we cannot be sure the mod_rewrite is enable or disable)

Browse Source
This commit is contained in:
mDeflotte committed 2012-05-30 07:54:12 +00:00
1 parent e4e0758853
commit 52d054e006
3 files changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminShopUrlController.php
+2 -2
View File
@@ -103,7 +103,7 @@ class AdminShopUrlControllerCore extends AdminController
$this->multiple_fieldsets = true; $this->multiple_fieldsets = true;
if (!$update_htaccess) if (!$update_htaccess)
$desc_virtual_uri = array( $desc_virtual_uri = array(
$this->l('You need to activate the URL Rewriting if you want to add a virtual URI.') '<span class="warning_mod_rewrite">'.$this->l('You need to activate the URL Rewriting if you want to add a virtual URI.').'</span>'
); );
else else
$desc_virtual_uri = array( $desc_virtual_uri = array(
@@ -219,9 +219,9 @@ class AdminShopUrlControllerCore extends AdminController
'type' => 'text', 'type' => 'text',
'label' => $this->l('Virtual URI:'), 'label' => $this->l('Virtual URI:'),
'name' => 'virtual_uri', 'name' => 'virtual_uri',
'disabled' => !$update_htaccess,
'desc' => $desc_virtual_uri, 'desc' => $desc_virtual_uri,
'size' => 50, 'size' => 50,
'hint' => (!$update_htaccess) ? $this->l('Warning: The URL rewriting (mod_rewrite) seems to be disable.') : '',
), ),
array( array(
'type' => 'text', 'type' => 'text',
css/admin.css
+7 -4
View File
@@ -1723,14 +1723,14 @@ a.blue:hover {
margin-left: -10px; margin-left: -10px;
} }
.multishop_config div{ .multishop_config div{
background-color: #DFFAD3; background-color: #DFFAD3;
border: 1px solid #DFD5C3; border: 1px solid #DFD5C3;
display: none; display: none;
margin-top: 2px; margin-top: 2px;
padding: 5px; padding: 5px;
width: 200px; width: 200px;
} }
.multishop_product_checkbox{ .multishop_product_checkbox{
position: absolute; position: absolute;
@@ -1817,12 +1817,15 @@ p.preference_description .light-warning {
} }
.warning_mod_rewrite{ .warning_mod_rewrite{
background: #FEEFB3 url(../img/admin/warning.gif) no-repeat; background: #FEEFB3 url(../img/admin/warning.gif) 2px 0 no-repeat;
color: #9E6014; color: #9E6014;
font-weight: bold; font-weight: bold;
padding-left: 22px; padding-left: 22px;
padding-top: 1px; padding-top: 2px;
padding-bottom: 2px;
padding-right: 5px;
height:20px; height:20px;
line-height: 20px;
} }
translations/fr/admin.php
+1
View File
@@ -3195,6 +3195,7 @@ $_LANGADM['AdminShopUrl37d00f4554dc3c0baeb34a9c22d787d9'] = 'URL de la boutique'
$_LANGADM['AdminShopUrl3cbc37f94997d23bfe2824165dc45549'] = 'Ajouter une URL'; $_LANGADM['AdminShopUrl3cbc37f94997d23bfe2824165dc45549'] = 'Ajouter une URL';
$_LANGADM['AdminShopUrl676e457154510d142765d535fbf11df0'] = 'URL principale'; $_LANGADM['AdminShopUrl676e457154510d142765d535fbf11df0'] = 'URL principale';
$_LANGADM['AdminShopUrl873646ada13763eda1a5393d99973204'] = 'Domaine SSL :'; $_LANGADM['AdminShopUrl873646ada13763eda1a5393d99973204'] = 'Domaine SSL :';
$_LANGADM['AdminShopUrl8d3057653243d8dc92ef854144b299cc'] = 'Attention : La réécriture d\'url (mod_rewrite) semble être desactivée.';
$_LANGADM['AdminShopUrl9b5ee5e0b5aed007f4192b3252a0eccf'] = 'Vous devez activer la réécriture d\'url si vous voulez ajouter une URL virtuelle.'; $_LANGADM['AdminShopUrl9b5ee5e0b5aed007f4192b3252a0eccf'] = 'Vous devez activer la réécriture d\'url si vous voulez ajouter une URL virtuelle.';
$_LANGADM['AdminShopUrl9c8417aa5dbcccb5b4c48b4176ae1e8a'] = 'URI physique :'; $_LANGADM['AdminShopUrl9c8417aa5dbcccb5b4c48b4176ae1e8a'] = 'URI physique :';
$_LANGADM['AdminShopUrl9efaaad2d5b51cd643529cd6872e169a'] = 'URL principale :'; $_LANGADM['AdminShopUrl9efaaad2d5b51cd643529cd6872e169a'] = 'URL principale :';