From a30181d09db93ce4355a234a2e464391f7bba104 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 30 Apr 2014 11:15:01 +0200
Subject: [PATCH 1/2] seo title field is not mandatory anymore

---
 core/lib/Thelia/Form/SeoFieldsTrait.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Form/SeoFieldsTrait.php b/core/lib/Thelia/Form/SeoFieldsTrait.php
index 3a17240ef..d0af736bf 100644
--- a/core/lib/Thelia/Form/SeoFieldsTrait.php
+++ b/core/lib/Thelia/Form/SeoFieldsTrait.php
@@ -44,13 +44,11 @@ trait SeoFieldsTrait
         if (! in_array('meta_title', $exclude))
             $this->formBuilder
                 ->add('meta_title', 'text', array(
-                    'constraints' => array(
-                        new NotBlank()
-                    ),
                     'label' => Translator::getInstance()->trans('Page Title'),
                     'label_attr' => array(
                         'for' => 'meta_title'
-                    )
+                    ),
+                    'required' => false
                 )
             );
 

From ca2194b7ea8a85cf38515fa4a7f9a5e8c8f534b6 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 30 Apr 2014 11:26:23 +0200
Subject: [PATCH 2/2] rediplay SEO tab after submit. Fix #352

---
 templates/backOffice/default/content-edit.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/backOffice/default/content-edit.html b/templates/backOffice/default/content-edit.html
index c30dac683..b42b8d56a 100644
--- a/templates/backOffice/default/content-edit.html
+++ b/templates/backOffice/default/content-edit.html
@@ -216,6 +216,8 @@ form_content    = {$smarty.capture.delete_folder_dialog nofilter}
     {/javascripts}
     <script>
         $(function() {
+            // Load active tab
+
             $.imageUploadManager.initImageDropZone();
             $.documentUploadManager.initDocumentDropZone();
 
@@ -227,7 +229,7 @@ form_content    = {$smarty.capture.delete_folder_dialog nofilter}
 
             // Show proper tab, if defined
             {if ! empty($current_tab)}
-            $('#tabbed-menu a[href="#{$current_tab}"]').tab('show')
+                $('.nav-tabs a[href="#{$current_tab}"]').trigger("click");
             {/if}
 
             $('a.delete-folder').click(function(e) {
@@ -267,9 +269,6 @@ form_content    = {$smarty.capture.delete_folder_dialog nofilter}
             });
 
             // Initialize folder (id=
-            {$folder_id})
-            select
-            value
             {if $folder_id != 0}
             $('#folder_id').val("{$folder_id}").change();
             {/if}