# HG changeset patch
# User cavaliet
# Date 1322472864 -3600
# Node ID dc31a49ad590dff2eee5c7f4071df460ab4fa54b
# Parent  bbdc7f9aa25e10ef7c17d419d0b61fd532e0a895
commit changes before update.

diff -r bbdc7f9aa25e -r dc31a49ad590 .hgsubstate
--- a/.hgsubstate	Fri Nov 18 17:54:18 2011 +0100
+++ b/.hgsubstate	Mon Nov 28 10:34:24 2011 +0100
@@ -1,1 +1,1 @@
-e48c2e5039459d5e1a90a077b740fbbf53663456 vendor/bundles/IRI/Bundle/WikiTagBundle
+6f643fc1de26d521dbfea7b2d2b929f480029b83 vendor/bundles/IRI/Bundle/WikiTagBundle
diff -r bbdc7f9aa25e -r dc31a49ad590 app/config/config.yml
--- a/app/config/config.yml	Fri Nov 18 17:54:18 2011 +0100
+++ b/app/config/config.yml	Mon Nov 28 10:34:24 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 bbdc7f9aa25e -r dc31a49ad590 app/config/config_task.yml
diff -r bbdc7f9aa25e -r dc31a49ad590 src/Company/BaseBundle/Event/TestListener.php
diff -r bbdc7f9aa25e -r dc31a49ad590 src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig
--- a/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Fri Nov 18 17:54:18 2011 +0100
+++ b/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Mon Nov 28 10:34:24 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