# HG changeset patch
# User cavaliet
# Date 1322479196 -3600
# Node ID 8836f21d6ac08488579eabd8d70620c471f9871f
# Parent  dc31a49ad590dff2eee5c7f4071df460ab4fa54b# Parent  d67ff36f17e2dbcdb2a3eeeda185150bb9d2a4e6
merge

diff -r d67ff36f17e2 -r 8836f21d6ac0 .hgsubstate
--- a/.hgsubstate	Sun Nov 27 22:36:22 2011 +0100
+++ b/.hgsubstate	Mon Nov 28 12:19:56 2011 +0100
@@ -1,1 +1,1 @@
-54f204bceb28e10bb1f9776e5d6bbde138d6aa35 vendor/bundles/IRI/Bundle/WikiTagBundle
+34718ebfb3c0b4875239f6e27d997eb132134719 vendor/bundles/IRI/Bundle/WikiTagBundle
diff -r d67ff36f17e2 -r 8836f21d6ac0 app/config/config.yml
--- a/app/config/config.yml	Sun Nov 27 22:36:22 2011 +0100
+++ b/app/config/config.yml	Mon Nov 28 12:19:56 2011 +0100
@@ -83,6 +83,16 @@
         all:      [ '.left_sheet', '#p_title .sheet_title', '#p_description' ]
         only_p:   [ '#p_title .sheet_title', '#p_description' ]
         document: [ 'document' ]
+    # document_list_profile is the list of the columns displayed in a document's tag list.
+    # The columns can be "order, id, move_up_down, label, wikipedia_link, wikipedia_permalink, dbpedia_link, category, remove_wikipedia_link, alias, remove_tag_from_list"
+    # Exemple of list : [ 'order', 'move_up_down', 'label', 'wikipedia_link', 'remove_tag_from_list' ]
+    # If document_list_profile in not defined, all columns and the button will be displayed.
+    document_list_profile:
+        all:         [ 'order', 'id', 'move_up_down', 'label', 'wikipedia_link', 'wikipedia_permalink', 'dbpedia_link', 'category', 'remove_wikipedia_link', 'alias', 'remove_tag_from_list' ]
+        editor :     [ 'order', 'id', 'move_up_down', 'label', 'wikipedia_link', 'wikipedia_permalink', 'dbpedia_link', 'category', 'remove_wikipedia_link', 'alias', 'remove_tag_from_list' ]
+        contributor: [ 'order', 'label', 'wikipedia_link', 'wikipedia_permalink', 'delete_wikipedia_link', 'remove_tag_from_list' ]
+        another:     [ 'order', 'label', 'wikipedia_link', 'remove_tag_from_list' ]
+
 
 services:
     wiki_tag.tag_test_listener:
diff -r d67ff36f17e2 -r 8836f21d6ac0 app/config/config_task.yml
diff -r d67ff36f17e2 -r 8836f21d6ac0 src/Company/BaseBundle/Event/TestListener.php
diff -r d67ff36f17e2 -r 8836f21d6ac0 src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig
--- a/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Sun Nov 27 22:36:22 2011 +0100
+++ b/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Mon Nov 28 12:19:56 2011 +0100
@@ -24,10 +24,10 @@
       </div>
       <div class="right_sheet">
         <p style="float:right;"><a href="{{ url('document_with_tags', { 'idDoc': (doc.id-1) }) }}">&nbsp;&lt;&nbsp;</a> - <a href="{{ url('document_with_tags', { 'idDoc': (doc.id+1) }) }}">&nbsp;&gt;&nbsp;</a></p>
-        {% render "WikiTagBundle:WikiTag:documentTags" with {'id_doc': doc.id} %}
+        {% render "WikiTagBundle:WikiTag:documentTags" with {'id_doc': doc.id, 'profile_name': 'editor'} %}
         {% include 'WikiTagBundle:WikiTag:contextSearchDiv.html.twig' %}
       </div>
-    </div>            
+    </div>
   </div>
 </div>
 {% endblock %}
\ No newline at end of file