# HG changeset patch
# User durandn
# Date 1427806798 -7200
# Node ID 54eb90122a72e568eb2acb794e9bab5ff87d5306
# Parent  ef0bef32f490e492989a2abae3003594cda58222
Fixed javascript unexpected behavior with Chrome and toggling the details of categories in tab + Fixed javascript bug for adding a property in the editor + Now displaying the repo name in the changeset list and in the discussion list (previously was still "Atelier" unlike everywhere else)

diff -r ef0bef32f490 -r 54eb90122a72 src/catedit/static/js/property_functions.js
--- a/src/catedit/static/js/property_functions.js	Thu Mar 26 16:03:05 2015 +0100
+++ b/src/catedit/static/js/property_functions.js	Tue Mar 31 14:59:58 2015 +0200
@@ -19,8 +19,9 @@
         if (selectElement.options[selectElement.selectedIndex].id != "property_type_default") {
           var selectedOptionValue = selectElement.options[selectElement.selectedIndex].value;
           var selectedOptionText = selectElement.options[selectElement.selectedIndex].text;
-          var propertyOptionObjectType = selectElement.options[selectElement.selectedIndex].label;
+          var propertyOptionObjectType = selectElement.options[selectElement.selectedIndex].className;
           var propertyObjectValue = "default: something went wrong"
+          console.log(propertyOptionObjectType)
           switch(propertyOptionObjectType) {
             case "literal":
               propertyObjectValue = document.getElementById('literal-field').value;
diff -r ef0bef32f490 -r 54eb90122a72 src/catedit/templates/categories/editor.html
--- a/src/catedit/templates/categories/editor.html	Thu Mar 26 16:03:05 2015 +0100
+++ b/src/catedit/templates/categories/editor.html	Tue Mar 31 14:59:58 2015 +0200
@@ -60,7 +60,7 @@
     <label>Propriétés </label>
     <div class="form-inline">
       <select id="property_selector" class="form-control" onChange="CatEditScripts.displayCorrespondingField();" {{readonly}}>
-        <option label="Liste des propriétés ..." selected="selected">
+        <option id="property_type_default" label="Liste des propriétés ..." selected="selected">
           Liste des propriétés ...
         </option>
         {% for predicate in config["PROPERTY_LIST"] %}
diff -r ef0bef32f490 -r 54eb90122a72 src/catedit/templates/categories/workshop.html
--- a/src/catedit/templates/categories/workshop.html	Thu Mar 26 16:03:05 2015 +0100
+++ b/src/catedit/templates/categories/workshop.html	Tue Mar 31 14:59:58 2015 +0200
@@ -7,7 +7,7 @@
 {% block title %}{{current_repository}}: Atelier{% endblock title %}
 {% block head %}
   {{ super() }}
-  <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}" language="Javascript" type="text/javascript"></script>
+  <script src="{{ url_for('static', filename='js/jquery-1.11.2.min.js') }}" language="Javascript" type="text/javascript"></script>
   <script>
     $(document).ready(function(){
       $(".cat-delete-div").hide();
@@ -22,10 +22,10 @@
         $("#delete_confirm_"+evt.target.id.split('_').slice(2,5).join('_')).slideToggle();
       });
       $(".cat-info-toggle").click(function(evt){
-        $("#properties_"+evt.target.id.split('_').slice(2,5).join('_')).slideToggle(function(){
-          $("#info_button_"+evt.target.id.split('_').slice(2,5).join('_')).children().toggleClass("glyphicon-plus-sign");
-          $("#info_button_"+evt.target.id.split('_').slice(2,5).join('_')).children().toggleClass("glyphicon-minus-sign");
-        });
+   		$("#properties_"+evt.target.id.split('_').slice(2,5).join('_')).slideToggle(function(){
+       		 $("#info_button_"+evt.target.id.split('_').slice(2,5).join('_')).children().toggleClass("glyphicon-plus-sign");
+             $("#info_button_"+evt.target.id.split('_').slice(2,5).join('_')).children().toggleClass("glyphicon-minus-sign");
+   	    });	
       });
     });
   </script>
diff -r ef0bef32f490 -r 54eb90122a72 src/catedit/templates/macros.html
--- a/src/catedit/templates/macros.html	Thu Mar 26 16:03:05 2015 +0100
+++ b/src/catedit/templates/macros.html	Tue Mar 31 14:59:58 2015 +0200
@@ -15,7 +15,9 @@
         <td class="col-md-7">{{ cat.cat_description}}</td>
         <td class="col-md-1 text-center">
           <a title="Détails catégorie">
-            <button class="btn btn-default cat-info-toggle" id="info_button_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{ cat.cat_id }}"><span class="glyphicon glyphicon-plus-sign"/></button>
+            <button class="btn btn-default cat-info-toggle" id="info_button_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{ cat.cat_id }}">
+              <span id="info_icon_{% if ((cat.state != 'untouched') and (cat.state != 'original')) %}edited_{% endif %}{{ cat.cat_id }}" class="glyphicon glyphicon-plus-sign"/>
+            </button>
           </a>
         </td>
         {% if interactive %}
@@ -29,13 +31,17 @@
           {% if (cat.state == "untouched") or (cat.state == "original") %}
           <td class="col-md-1 text-center">
             <a title="Supprimer catégorie">
-              <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_{{ cat.cat_id }}"><span class="glyphicon glyphicon-trash"/></button>
+              <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_{{ cat.cat_id }}">
+                <span id="delete_icon_{{ cat.cat_id }}" class="glyphicon glyphicon-trash"/>
+              </button>
             </a>
           </td>
           {% elif (cat.state == "created" or cat.state == "modified") %}
           <td class="col-md-1 text-center">
             <a title="Supprimer changements">
-              <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_edited_{{ cat.cat_id }}"><span class="glyphicon glyphicon-remove-sign"/></button>
+              <button class="btn btn-default cat-delete-toggle {% if readonly %}disabled{% endif %}" id="delete_button_edited_{{ cat.cat_id }}">
+                <span id="delete_icon_edited_{{ cat.cat_id }}"class="glyphicon glyphicon-remove-sign"/>
+              </button>
             </a>
           </td>
           {% else %}
diff -r ef0bef32f490 -r 54eb90122a72 src/catedit/templates/social/changesets_index.html
--- a/src/catedit/templates/social/changesets_index.html	Thu Mar 26 16:03:05 2015 +0100
+++ b/src/catedit/templates/social/changesets_index.html	Tue Mar 31 14:59:58 2015 +0200
@@ -12,7 +12,7 @@
   {{ super() }}
   {% if session.get("user_logged", None) %}
     <li><a class="navbar-decorative">></a></li>
-    <li><a href="{{ url_for('categories.workshop', repository=current_repository) }}">Atelier</a></li>
+    <li><a href="{{ url_for('categories.workshop', repository=current_repository) }}">{{current_repository}}</a></li>
     <li><a class="navbar-decorative">></a></li>
     <li class="active"><a>Changements</a></li>
   {% endif %}
diff -r ef0bef32f490 -r 54eb90122a72 src/catedit/templates/social/discussions_index.html
--- a/src/catedit/templates/social/discussions_index.html	Thu Mar 26 16:03:05 2015 +0100
+++ b/src/catedit/templates/social/discussions_index.html	Tue Mar 31 14:59:58 2015 +0200
@@ -12,7 +12,7 @@
   {{ super() }}
   {% if session.get("user_logged", None) %}
     <li><a class="navbar-decorative">></a></li>
-    <li><a href="{{ url_for('categories.workshop', repository=current_repository) }}">Atelier</a></li>
+    <li><a href="{{ url_for('categories.workshop', repository=current_repository) }}">{{current_repository}}</a></li>
     <li><a class="navbar-decorative">></a></li>
     <li class="active"><a>Social</a></li>
   {% endif %}