Mercurial Mercurial > hdabo_sf / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ModifyTag from tag list. Add Reset Wikipedia info from tag list. Enable boolean from addJavascript controller/template to switch from list or document context.
authorcavaliet
Fri, 28 Oct 2011 14:57:11 +0200
changeset 23 6b24cd6b51c5
parent 22 c41d4e7759e1
child 24 57ff6d39f88c
Add ModifyTag from tag list. Add Reset Wikipedia info from tag list. Enable boolean from addJavascript controller/template to switch from list or document context.
.hgsubstate file | annotate | diff | comparison | revisions
src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig file | annotate | diff | comparison | revisions
src/Company/BaseBundle/Resources/views/Index/taglist_embedder.html.twig file | annotate | diff | comparison | revisions 
--- a/.hgsubstate	Thu Oct 27 22:22:55 2011 +0200
+++ b/.hgsubstate	Fri Oct 28 14:57:11 2011 +0200
@@ -1,1 +1,1 @@
-780ef37e63b922fb20f49e7e08ada12fd8f74a2b vendor/bundles/IRI/Bundle/WikiTagBundle
+99c15cfe420b623bddca280fd7d1fea675e1cbfc vendor/bundles/IRI/Bundle/WikiTagBundle
--- a/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Thu Oct 27 22:22:55 2011 +0200
+++ b/src/Company/BaseBundle/Resources/views/Index/tag_embedder.html.twig	Fri Oct 28 14:57:11 2011 +0200
@@ -24,21 +24,6 @@
       <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} %}
-        {#
-        <div id="tags_commands" style="float:left;width: 100%" >
-            {% if valid != "2" %}
-            <div style="float:right;" id="tags_actions">
-              <span>Trier les tags : <input type="image" src="{{STATIC_URL}}hdabo/img/sort-descending.png" width="16" height="16" name="trier" id="tags_sort" /></span>
-              <span>Ajouter un tag : <input type="text" name="wp_search" id="wp_search" size="35" /> <span id="ok_search" class="hand_cursor"><b>OK</b></span></span>
-            </div>
-            {% endif %}
-            {% csrf_token %}
-            <input type="hidden" name="datasheet_id" value="{{ds.hda_id}}" id="datasheet_id" />
-        </div>
-        <div id="tag_table_container" style="float:left; width: 100%">
-        {% include "partial/tag_table.html" %}
-        </div>
-        #}
       </div>
     </div>            
   </div>
--- a/src/Company/BaseBundle/Resources/views/Index/taglist_embedder.html.twig	Thu Oct 27 22:22:55 2011 +0200
+++ b/src/Company/BaseBundle/Resources/views/Index/taglist_embedder.html.twig	Fri Oct 28 14:57:11 2011 +0200
@@ -8,7 +8,7 @@
 
 {% block js_declaration %}
 {{ parent() }}
-{% render "WikiTagBundle:WikiTag:addJavascript" %}
+{% render "WikiTagBundle:WikiTag:addJavascript" with {'tags_list': true} %}
 {% endblock %}
 
 {% block content %}
hdabo_sf