changeset 2839:73cad6a551be

add moin- prefix to basic theme user-actions, view-options, and item-actions IDs
author RogerHaase <haaserd@gmail.com>
date Wed, 22 Oct 2014 09:31:57 -0700
parents 40fd6fac76f8
children 9fd268defb04
files MoinMoin/static/js/common.js MoinMoin/templates/ticket/base.html MoinMoin/themes/basic/templates/show.html
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/js/common.js	Wed Oct 22 09:01:44 2014 -0700
+++ b/MoinMoin/static/js/common.js	Wed Oct 22 09:31:57 2014 -0700
@@ -651,17 +651,17 @@
     });
 
     $('.moin-useractions').click(function () {
-        $('#user-actions').toggleClass('hidden');
+        $('#moin-user-actions').toggleClass('hidden');
         return false;
     });
 
     $('.moin-viewoptions').click(function () {
-        $('#view-options').toggleClass('hidden');
+        $('#moin-view-options').toggleClass('hidden');
         return false;
     });
 
     $('.moin-itemactions').click(function () {
-        $('#item-actions').toggleClass('hidden');
+        $('#moin-item-actions').toggleClass('hidden');
         return false;
     });
 
--- a/MoinMoin/templates/ticket/base.html	Wed Oct 22 09:01:44 2014 -0700
+++ b/MoinMoin/templates/ticket/base.html	Wed Oct 22 09:31:57 2014 -0700
@@ -52,7 +52,7 @@
                 {{ _("User Actions") }}
                 <a class="moin-showhide moin-useractions" href="#" >[+]</a>
             </div>
-            <div id="user-actions" class="hidden">
+            <div id="moin-user-actions" class="hidden">
                 <a href="{{ url_for('frontend.quicklink_item', item_name=item.fqname) }}" class="list-group-item" rel="nofollow" title="Create or remove a navigation link to this item">
                     <i class="fa fa-link fa-fw"></i>
                     {%- if user.is_quicklinked_to([item.fqname]) %}
--- a/MoinMoin/themes/basic/templates/show.html	Wed Oct 22 09:01:44 2014 -0700
+++ b/MoinMoin/themes/basic/templates/show.html	Wed Oct 22 09:31:57 2014 -0700
@@ -34,7 +34,7 @@
                 {{ _("User Actions") }}
                 <a class="moin-showhide moin-useractions" href="#" >[+]</a>
             </div>
-            <div id="user-actions" class="hidden">{{ self.user_actions() }}</div>
+            <div id="moin-user-actions" class="hidden">{{ self.user_actions() }}</div>
         </div>
     {% endif %}
 
@@ -44,7 +44,7 @@
             <a class="moin-showhide moin-viewoptions" href="#">[+]</a>
         </div>
 
-        <div id="view-options" class="hidden">
+        <div id="moin-view-options" class="hidden">
             <div class="moin-toggle-comments-button list-group-item" style="">
                 <a class="moin-toggle-comments-tooltip" href="#" title="Show comments">
                     <i class="fa fa-comment fa-fw"></i>
@@ -66,7 +66,7 @@
                 {{ _("Item Actions") }}
                 <a class="moin-showhide moin-itemactions" href="#" >[+]</a>
             </div>
-            <div id="item-actions" class="hidden">{{ self.item_actions() }}</div>
+            <div id="moin-item-actions" class="hidden">{{ self.item_actions() }}</div>
         </div>
     {% endif %}
 {% endblock %}