# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1323393677 -3600
# Node ID 0b02ad8fa85c9790da4f905d681a0a49b3322b9c
# Parent  6f888f1c4f495863153544dce6c8a996e0679718# Parent  4d062b0fac556749095307d2a49c176aee9d6ea8
Merge

diff -r 6f888f1c4f49 -r 0b02ad8fa85c .hgsubstate
--- a/.hgsubstate	Thu Dec 08 23:48:55 2011 +0100
+++ b/.hgsubstate	Fri Dec 09 02:21:17 2011 +0100
@@ -1,1 +1,1 @@
-87bf6ec8af90d455f30eea6d1cb4ebcdf76ac353 vendor/bundles/IRI/Bundle/WikiTagBundle
+ea562f37d7a5a9fa439ec7e69604ae12f43fbcc6 vendor/bundles/IRI/Bundle/WikiTagBundle
diff -r 6f888f1c4f49 -r 0b02ad8fa85c app/config/config.yml
--- a/app/config/config.yml	Thu Dec 08 23:48:55 2011 +0100
+++ b/app/config/config.yml	Fri Dec 09 02:21:17 2011 +0100
@@ -84,14 +84,15 @@
         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, AND the button to sort tags.
-    # The list can be "sort_tag, order, id, move_up_down, label, wikipedia_link, wikipedia_permalink, dbpedia_link, category, remove_wikipedia_link, alias, remove_tag_from_list"
+    # The list can contain "sort_tag, order, id, move_up_down, label, wikipedia_link, wikipedia_permalink, dbpedia_link, category, remove_wikipedia_link, alias, remove_tag_from_list, alternative_label, alternative_wikipedia_url"
     # Exemple of list : ['sort_tag', 'order', 'move_up_down', 'label', 'wikipedia_link', 'remove_tag_from_list' ]
     # If document_list_profile in not defined, all columns and the sort tag button will be displayed.
     document_list_profile:
-        all:         [ 'sort_tag', 'order', 'id', 'move_up_down', 'label', 'wikipedia_link', 'wikipedia_permalink', 'dbpedia_link', 'category', 'remove_wikipedia_link', 'alias', 'remove_tag_from_list' ]
+        all:         [ 'sort_tag', 'order', 'id', 'move_up_down', 'label', 'wikipedia_link', 'wikipedia_permalink', 'dbpedia_link', 'category', 'remove_wikipedia_link', 'alias', 'remove_tag_from_list', 'alternative_label', 'alternative_wikipedia_url' ]
         editor :     [ 'sort_tag', '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:     [ 'sort_tag', 'order', 'move_up_down', 'id', 'label', 'wikipedia_link', 'remove_tag_from_list' ]
+        test:        [ 'order', 'id', 'move_up_down', 'label', 'wikipedia_link', 'wikipedia_permalink', 'dbpedia_link', 'remove_wikipedia_link', 'remove_tag_from_list', 'alternative_wikipedia_url' ]
 
 
 services:
diff -r 6f888f1c4f49 -r 0b02ad8fa85c src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig
--- a/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Thu Dec 08 23:48:55 2011 +0100
+++ b/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Fri Dec 09 02:21:17 2011 +0100
@@ -8,7 +8,7 @@
 
 {% block js_declaration %}
 {{ parent() }}
-{% render "WikiTagBundle:WikiTag:addJavascript" %}
+{% render "WikiTagBundle:WikiTag:addJavascript" with {'profile_name': 'editor'} %}
 {% render "WikiTagBundle:WikiTag:addJavascriptForContextSearch" with {'context_name': "only_p"} %}
 {% endblock %}