From dbf98d37222e73147f2f83080348e293360d1b0f Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 20 Nov 2013 12:02:15 +0100 Subject: [PATCH 1/7] // Put suffix after input field --- admin-dev/themes/default/template/helpers/options/options.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index 7f0bbed18..0b1c15c16 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -179,21 +179,21 @@ {elseif $field['type'] == 'text'}
+ {if isset($field['suffix'])} {$field['suffix']|strval} {/if} -
{elseif $field['type'] == 'password'}
+ {if isset($field['suffix'])} {$field['suffix']|strval} {/if} -
{elseif $field['type'] == 'textarea'}
From 62a149ebe6461507915e6879d449974e67c874ba Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 20 Nov 2013 14:50:31 +0100 Subject: [PATCH 2/7] [-] BO : FixBug #PSCSX-33 Misplaced save button --- .../default/template/controllers/emails/content.tpl | 4 +++- controllers/admin/AdminEmailsController.php | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl index c97d4fad6..c67c5ffb2 100644 --- a/admin-dev/themes/default/template/controllers/emails/content.tpl +++ b/admin-dev/themes/default/template/controllers/emails/content.tpl @@ -32,7 +32,9 @@ var errorMail = "{l s='This email address is not valid' js=1}"; $(document).ready(function() { if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2) - $('#smtp').show(); + $('#configuration_fieldset_smtp').show(); + else + $('#configuration_fieldset_smtp').hide(); }); diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index a6d1d1b64..85c6c6b7d 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -62,9 +62,9 @@ class AdminEmailsControllerCore extends AdminController 2 => $this->l('Set my own SMTP parameters. For advanced users ONLY') ), 'js' => array( - 1 => 'onclick="$(\'#smtp\').slideUp();"', - 2 => 'onclick="$(\'#smtp\').slideDown();"', - 3 => 'onclick="$(\'#smtp\').slideUp();"' + 1 => 'onclick="$(\'#configuration_fieldset_smtp\').slideUp();"', + 2 => 'onclick="$(\'#configuration_fieldset_smtp\').slideDown();"', + 3 => 'onclick="$(\'#configuration_fieldset_smtp\').slideUp();"' ), 'visibility' => Shop::CONTEXT_ALL ), @@ -79,8 +79,6 @@ class AdminEmailsControllerCore extends AdminController ), 'smtp' => array( 'title' => $this->l('Email'), - 'top' => '
', - 'bottom' => '
', 'fields' => array( 'PS_MAIL_DOMAIN' => array( 'title' => $this->l('Mail domain name:'), From 0299f3f0cd59c1f9fcb956a02cb7bda24218cc88 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 20 Nov 2013 14:56:31 +0100 Subject: [PATCH 3/7] [-] BO : fixed bug #PSCSX-32 class-danger on mail send error --- js/sendMailTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/sendMailTest.js b/js/sendMailTest.js index b14727067..150d902ce 100644 --- a/js/sendMailTest.js +++ b/js/sendMailTest.js @@ -76,7 +76,7 @@ function verifyMail(testMsg, testSubject) else { mailIsOk = false; - $("#mailResultCheck").addClass("alert-success").removeClass("alert-danger").removeClass('userInfos').html(textSendError + '
' + ret); + $("#mailResultCheck").addClass("alert-danger").removeClass("alert-success").removeClass('userInfos').html(textSendError + '
' + ret); } } } From e2aa776a642e92ddf1230255a7c44e7f77bda4c0 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 20 Nov 2013 15:19:07 +0100 Subject: [PATCH 4/7] // update cms controller title --- .../admin/AdminCmsContentController.php | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php index e08e75233..7a4fc68e5 100644 --- a/controllers/admin/AdminCmsContentController.php +++ b/controllers/admin/AdminCmsContentController.php @@ -116,6 +116,7 @@ class AdminCmsContentControllerCore extends AdminController public function renderPageHeaderToolbar() { $id_cms_category = (int)Tools::getValue('id_cms_category'); + $id_cms_page = Tools::getValue('id_cms'); if (!$id_cms_category) $id_cms_category = 1; @@ -124,7 +125,24 @@ class AdminCmsContentControllerCore extends AdminController $this->toolbar_title[] = 'CMS'; if ($this->display == 'edit_category') - $this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]); + { + if (Tools::getValue('addcms_category') !== false) + $this->toolbar_title[] =$this->l('Add new'); + else + $this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]); + } + elseif ($this->display == 'edit_page') + { + $this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang]; + + if (Tools::getValue('addcms') !== false) + $this->toolbar_title[] = $this->l('Add new'); + elseif ($id_cms_page) + { + $cms_page = new CMS($id_cms_page); + $this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_page->meta_title[$this->context->employee->id_lang]); + } + } else $this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang]; From 8148d5696dc406e5aef865f52dd4dc0bb73e35a3 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 20 Nov 2013 15:20:44 +0100 Subject: [PATCH 5/7] [-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos --- .../controllers/carrier_wizard/summary.tpl | 36 ++++++++++--------- js/admin_carrier_wizard.js | 4 +-- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl index 353dedab5..b8b71bb86 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl @@ -37,24 +37,26 @@
- {l s='Carrier name:'} -
-
-
-
+
{l s='Carrier name:'}
+
+

+

+

+
{l s='This carrier will be proposed for those delivery zones:'} -
    +
      +
      +
      + {l s='And it will be proposed for those client groups:'} +
        +
        + {if $is_multishop} +
        + {l s='Finally, this carrier will be proposed in those shops:'} +
          +
          + {/if}
          -
          - {l s='And it will be proposed for those client groups:'} -
            -
            - {if $is_multishop} -
            - {l s='Finally, this carrier will be proposed in those shops:'} -
              -
              - {/if} - {$active_form}
              + {$active_form}
              diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js index 3edfbc8aa..b762d488e 100644 --- a/js/admin_carrier_wizard.js +++ b/js/admin_carrier_wizard.js @@ -175,14 +175,14 @@ function displaySummary() $('#summary_zones').html(''); $('.input_zone').each(function(){ if ($(this).attr('checked')) - $('#summary_zones').html($('#summary_zones').html() + '
            • ' + $(this).closest().prev().text() + '
              • '); + $('#summary_zones').html($('#summary_zones').html() + '
            • ' + $(this).closest('tr').find('label').text() + '
              • '); }); // Group restrictions $('#summary_groups').html(''); $('input[name$="groupBox[]"]').each(function(){ if ($(this).attr('checked')) - $('#summary_groups').html($('#summary_groups').html() + '
            • ' + $(this).closest().next().next().text() + '
              • '); + $('#summary_groups').html($('#summary_groups').html() + '
            • ' + $(this).closest('tr').find('td:eq(2)').text() + '
              • '); }); // shop restrictions From 0b3c08acbecfe76ec1142c5fc97e3c69f12d8893 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 20 Nov 2013 15:37:25 +0100 Subject: [PATCH 6/7] // Add language iso code to language select --- .../themes/default/template/helpers/options/options.tpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index 0b1c15c16..ded4c15bb 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -235,7 +235,9 @@
                @@ -263,7 +265,9 @@
                From e5d03f4e7c3533a158380d813a97aa6e9ee01b75 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 20 Nov 2013 16:11:37 +0100 Subject: [PATCH 7/7] // Csv import fix hide checkbox --- .../controllers/import/helpers/form/form.tpl | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 7186f2e76..f6d4c2012 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -201,11 +201,11 @@

              -
              - + @@ -228,22 +228,22 @@
              - -
              - +
              +
              +
              + + {if empty($files_to_import)} +
              {l s='You must upload a file in order to proceed to the next step'}
              + {/if} - {if empty($files_to_import)} -
              {l s='You must upload a file in order to proceed to the next step'}
              - {/if} - -
              -

              {l s='Note that the category import does not support categories of the same name.'}

              -

              {l s='Note that you can have several products with the same reference.'}

              -
              -
              -

              {l s='Importing Supply Order Details will reset products ordered, if there are any.'}

              -
              +
              +

              {l s='Note that the category import does not support categories of the same name.'}

              +

              {l s='Note that you can have several products with the same reference.'}

              +
              +
              +

              {l s='Importing Supply Order Details will reset products ordered, if there are any.'}

              +
              {if !count($files_to_import)}

              {l s='There is no CSV file available. Please upload one using the \'Upload\' button above.'}

              @@ -305,9 +305,9 @@ $('input[name=multiple_value_separator]').val('{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected}{else},{/if}'); } if ($("#entity > option:selected").val() == 1) - $("label[for=match_ref], #match_ref").show(); + $("#match_ref").closest('.form-group.').show(); else - $("label[for=match_ref], #match_ref").hide(); + $("#match_ref").closest('.form-group.').hide(); if ($("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 0) $(".import_products_categories").show(); @@ -316,14 +316,14 @@ if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6) - $("label[for=regenerate], #regenerate").show() + $("#regenerate").closest('.form-group.').show(); else - $("label[for=regenerate], #regenerate").hide(); + $("#regenerate").closest('.form-group.').hide(); if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6 || $("#entity > option:selected").val() == 7) - $("label[for=forceIDs], #forceIDs").show(); + $("#forceIDs").closest('.form-group.').show(); else - $("label[for=forceIDs], #forceIDs").hide(); + $("#forceIDs").closest('.form-group.').hide(); $("#entitie").html($("#entity > option:selected").text().toLowerCase()); $.ajax({ url: 'ajax.php',