Version 1.2

thelia-modules · Jul 16, 2015 · 489d14e · 489d14e
1 parent 761b963
commit 489d14e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Add static methods getAttributeAv and getAttributeAvs in model AttributeType
 - Fix the slug length to 50 characters in the template
+- Add link to the tutorial
 
 # 1.1.1
 

diff --git a/Config/module.xml b/Config/module.xml
@@ -16,13 +16,13 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.1.1</version>
+    <version>1.2</version>
     <author>
         <name>Gilles Bourgeat</name>
         <email>gbourgeat@openstudio.fr</email>
         <website>https://github.com/gillesbourgeat</website>
     </author>
     <type>classic</type>
     <thelia>2.1.0</thelia>
-    <stability>other</stability>
+    <stability>prod</stability>
 </module>
diff --git a/I18n/backOffice/default/fr_FR.php b/I18n/backOffice/default/fr_FR.php
@@ -43,4 +43,6 @@
     'Update action' => 'Mettre à jour',
     'Update attribute type' => 'Mettre à jour le type de déclinaison',
     'Used by' => 'Utilisé par',
+    "http://thelia-school.com/create-types-of-features-and-attributes.html" => "http://thelia-school.com/types-de-caracteristiques-et-declinaisons-avec-featuretype-et-attributetype.html",
+    "Tutorial" => "Tutoriel",
 );
diff --git a/Readme.md b/Readme.md
@@ -28,7 +28,7 @@ Thelia >= 2.1
 Add it in your main thelia composer.json file
 
 ```
-composer require thelia/attribute-type-module:~1.1.1
+composer require thelia/attribute-type-module:~1.2.*
 ```
 
 ## Usage

diff --git a/templates/backOffice/default/attribute-type/configuration-js.html b/templates/backOffice/default/attribute-type/configuration-js.html
@@ -194,8 +194,6 @@
       $module.find('button').attr('disabled', true);
     });
 
-    $module.find('.modal.open').modal('show');
-
   }(jQuery, jQuery("#module-attribute-type")));
 </script>
 

diff --git a/templates/backOffice/default/attribute-type/configuration.html b/templates/backOffice/default/attribute-type/configuration.html
@@ -28,7 +28,8 @@
                     data-html="true"
                     data-content="{intl l="To ask for help" d="attributetype.bo.default"}
                     </br> <a target='_blank' href='https://github.com/thelia-modules/AttributeType/issues'>Github</a>
-                    , <a target='_blank' href='http://thelia.net/forum/'>Thelia forum</a>
+                    , <a target='_blank' href='http://thelia.net/forum'>Thelia forum</a>
+                    , <a target='_blank' href='{intl l="http://thelia-school.com/create-types-of-features-and-attributes.html" d="attributetype.bo.default"}'>{intl l="Tutorial" d="attributetype.bo.default"}</a>
                     "
                     >
               <span class="glyphicon glyphicon-info-sign"></span>
@@ -142,7 +143,7 @@
               <input type="hidden" name="{$name}" value="{url path='/admin/attribute-type'}" />
             {/form_field}
 
-            <div class="modal fade js-modal-delete {if $form_error}open{/if}" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal fade js-modal-delete {if $form_error}modal-force-show{/if}" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog">
                 <div class="modal-content">
                   <div class="modal-header bg-primary">

diff --git a/templates/backOffice/default/attribute-type/include/form-create.html b/templates/backOffice/default/attribute-type/include/form-create.html
@@ -9,7 +9,7 @@
         <input type="hidden" name="{$name}" value="{url path='/admin/attribute-type'}" />
     {/form_field}
 
-    <div class="modal fade js-modal-create {if $form_error}open{/if}" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal fade js-modal-create {if $form_error}modal-force-show{/if}" tabindex="-1" role="dialog" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header bg-primary">

diff --git a/templates/backOffice/default/attribute-type/include/form-update.html b/templates/backOffice/default/attribute-type/include/form-update.html
@@ -17,7 +17,7 @@
         <input type="hidden" name="{$name}" value="{$value}" required />
     {/form_field}
 
-    <div class="modal fade js-modal-edit {if $form_error || $attribute_type_id}open{/if}" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal fade js-modal-edit {if $form_error || $attribute_type_id}modal-force-show{/if}" tabindex="-1" role="dialog" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header bg-primary">