# HG changeset patch
# User cavaliet
# Date 1337169771 -7200
# Node ID 5d10273e892a97ca42141407a056b89f7a8dba52
# Parent  95ccb352452282e764fb69ef5df2484dcb003a60
update configuration for document_list_profile and column names

diff -r 95ccb3524522 -r 5d10273e892a Controller/WikiTagController.php
--- a/Controller/WikiTagController.php	Wed May 16 12:46:57 2012 +0200
+++ b/Controller/WikiTagController.php	Wed May 16 14:02:51 2012 +0200
@@ -64,7 +64,6 @@
         $categories = json_encode($ar);
         // Management of profiles for the list of displayed columns and reorder tag button
         $profile_array = $this->container->getParameter("wiki_tag.document_list_profile");
-        #var_dump($profile_array[$profile_name]);
         $columns_array = null;
         if($profile_array!=null && $profile_name!=null && $profile_name!=""){
             $columns_array = $profile_array[$profile_name];
diff -r 95ccb3524522 -r 5d10273e892a Resources/views/WikiTag/javascript.html.twig
--- a/Resources/views/WikiTag/javascript.html.twig	Wed May 16 12:46:57 2012 +0200
+++ b/Resources/views/WikiTag/javascript.html.twig	Wed May 16 14:02:51 2012 +0200
@@ -37,6 +37,7 @@
     var update_tag_alias_url = "{{ url('wikitag_update_tag_alias') }}";
     var update_tag_category_url = "{{ url('wikitag_update_tag_category') }}";
     var categories_list = '{{ categories|raw }}';
+    
     // We prepare the list of the columns to hide
     var columsToHide = [];
     var notInList = [];
@@ -93,22 +94,6 @@
         {% if columns['alternative_wikipedia_url'].visibility==2 %}columsToHide.push(13);{% endif %}
         {% if columns['alternative_wikipedia_url'].visibility==0 %}columsToHide.push(13);notInList.push(13);{% endif %}
     {% else %}columsToHide.push(13);notInList.push(13);{% endif %}
-
-    
-    
-    /*{% if columns is not null and 'order' not in columns %}columsToHide.push(1);{% endif %}
-    {% if columns is not null and 'move_up_down' not in columns %}columsToHide.push(3);{% endif %}
-    {% if columns is not null and 'id' not in columns %}columsToHide.push(2);{% endif %}
-    {% if columns is not null and 'label' not in columns %}columsToHide.push(4);{% endif %}
-    {% if columns is not null and 'wikipedia_link' not in columns %}columsToHide.push(5);{% endif %}
-    {% if columns is not null and 'wikipedia_permalink' not in columns %}columsToHide.push(6);{% endif %}
-    {% if columns is not null and 'dbpedia_link' not in columns %}columsToHide.push(7);{% endif %}
-    {% if columns is not null and 'category' not in columns %}columsToHide.push(8);{% endif %}
-    {% if columns is not null and 'remove_wikipedia_link' not in columns %}columsToHide.push(9);{% endif %}
-    {% if columns is not null and 'alias' not in columns %}columsToHide.push(10);{% endif %}
-    {% if columns is not null and 'remove_tag_from_list' not in columns %}columsToHide.push(11);{% endif %}
-    {% if columns is not null and 'alternative_label' not in columns %}columsToHide.push(12);{% endif %}
-    {% if columns is not null and 'alternative_wikipedia_url' not in columns %}columsToHide.push(13);{% endif %}*/
     
     notInList.push(14);
     
diff -r 95ccb3524522 -r 5d10273e892a Resources/views/WikiTag/tagTable.html.twig
--- a/Resources/views/WikiTag/tagTable.html.twig	Wed May 16 12:46:57 2012 +0200
+++ b/Resources/views/WikiTag/tagTable.html.twig	Wed May 16 14:02:51 2012 +0200
@@ -10,19 +10,19 @@
   <table id="wikitag_table">
    <thead>
    <tr class="nodrop nodrag">
-     <th>#</th>
+     <th>{% if columns["order"].label is defined %}{{columns["order"].label}}{% else %}#{% endif %}</th>
      <th class="wikitag_updown_td wikitag_td_icon"><span>Haut Bas</span></th>
-     <th>id</th>
-     <th>label</th>
-     <th class="wikitag_text_centered">Lien W</th>
-     <th class="wikitag_text_centered">pLien W</th>
-     <th class="wikitag_text_centered">Lien D</th>
-     <th>Catégorie</th>
-     <th class="wikitag_large_25 wikitag_text_centered">Supprimer<br/> le lien W</th>
-     <th>Alias</th>
-     <th class="wikitag_large_25 wikitag_text_centered">Retirer le tag</th>
-     <th>Label redirigé</th>
-     <th class="wikitag_text_centered">Lien<br/> redirigé</th>
+     <th>{% if columns["id"].label is defined %}{{columns["id"].label}}{% else %}id{% endif %}</th>
+     <th>{% if columns["label"].label is defined %}{{columns["label"].label}}{% else %}label{% endif %}</th>
+     <th class="wikitag_text_centered">{% if columns["wikipedia_link"].label is defined %}{{columns["wikipedia_link"].label}}{% else %}Lien W{% endif %}</th>
+     <th class="wikitag_text_centered">{% if columns["wikipedia_permalink"].label is defined %}{{columns["wikipedia_permalink"].label}}{% else %}pLien W{% endif %}</th>
+     <th class="wikitag_text_centered">{% if columns["dbpedia_link"].label is defined %}{{columns["dbpedia_link"].label}}{% else %}Lien D{% endif %}</th>
+     <th>{% if columns["category"].label is defined %}{{columns["category"].label}}{% else %}Catégorie{% endif %}</th>
+     <th class="wikitag_large_25 wikitag_text_centered">{% if columns["remove_wikipedia_link"].label is defined %}{{columns["remove_wikipedia_link"].label}}{% else %}Supprimer le lien W{% endif %}</th>
+     <th>{% if columns["alias"].label is defined %}{{columns["alias"].label}}{% else %}Alias{% endif %}</th>
+     <th class="wikitag_large_25 wikitag_text_centered">{% if columns["remove_tag_from_list"].label is defined %}{{columns["remove_tag_from_list"].label}}{% else %}Retirer le tag{% endif %}</th>
+     <th>{% if columns["alternative_label"].label is defined %}{{columns["alternative_label"].label}}{% else %}Label redirigé{% endif %}</th>
+     <th class="wikitag_text_centered">{% if columns["alternative_wikipedia_url"].label is defined %}{{columns["alternative_wikipedia_url"].label}}{% else %}Lien redirigé{% endif %}</th>
      <th id="wikitag_thSelectColumn"><ul id="wikitag_ulSelectColumn"><li><img src="{{ asset('bundles/wikitag/images/sort-desc.png') }}" alt="select columns" title="select columns" />
       <ul id="wikitag_ul_target"></ul></li></ul>
      </th>