Removing the change done in Revision 952, the removing of the JS cache can cause...

[osqa.git] / forum / skins / default / templates / osqaadmin / nodeman.html

diff --git a/forum/skins/default/templates/osqaadmin/nodeman.html b/forum/skins/default/templates/osqaadmin/nodeman.html
index 500e05bf2f883d5186d598263653f7cc3162722b..997fab57864b732991ccad268cbf9cd75cc6cdca 100644 (file)
--- a/forum/skins/default/templates/osqaadmin/nodeman.html
+++ b/forum/skins/default/templates/osqaadmin/nodeman.html
@@ -1,6 +1,6 @@
 {% extends basetemplate %}
 
 {% extends basetemplate %}
 

-{% load i18n user_tags extra_tags %}
+{% load i18n user_tags extra_tags extra_filters %}

 
 {% block adminjs %}
     <script type="text/javascript">
 
 {% block adminjs %}
     <script type="text/javascript">


@@ -186,20 +186,14 @@
             margin-right: 12px;
         }
 
             margin-right: 12px;
         }
 

-        #result_list tr.row1 td.deleted {
+        #result_list tr td.deleted {

             background-color: #FDD;
             background-color: #FDD;

+            border-bottom: 1px solid #a9a9a9;

         }
 
         }
 

-        #result_list tr.row2 td.deleted {
-            background-color: #FEE;
-        }
-
-        #result_list tr.row1 td.accepted {
+        #result_list tr td.accepted {

             background-color: #DFD;
             background-color: #DFD;

-        }
-
-        #result_list tr.row2 td.accepted {
-            background-color: #EFD;
+            border-bottom: 1px solid #a9a9a9;

         }
 
         span.question-deleted {
         }
 
         span.question-deleted {


@@ -335,7 +329,7 @@
                     <a id="all-node-type-link" href="#all" title="{% trans "click to clear the type filter" %}">{% trans "all" %}</a>
                 </li>
                 {% for type, name in node_types %}
                     <a id="all-node-type-link" href="#all" title="{% trans "click to clear the type filter" %}">{% trans "all" %}</a>
                 </li>
                 {% for type, name in node_types %}

-                <li{% if type in type_filter %} class="selected" title="{% trans "click to remove from the filter" %}"{% else %} title="{% trans "click to add to the filter" %}"{% endif %}>
+                <li{% if type|contained_in:type_filter %} class="selected" title="{% trans "click to remove from the filter" %}"{% else %} title="{% trans "click to add to the filter" %}"{% endif %}>

                     <a class="node-type-link" href="#{{ type }}">{{ name }}</a>
                 </li>
                 {% endfor %}
                     <a class="node-type-link" href="#{{ type }}">{{ name }}</a>
                 </li>
                 {% endfor %}


@@ -346,7 +340,7 @@
                     <a id="all-state-link" href="#any" title="{% trans "click to clear the state filter" %}">{% trans "any" %}</a>
                 </li>
                 {% for state_type in state_types %}
                     <a id="all-state-link" href="#any" title="{% trans "click to clear the state filter" %}">{% trans "any" %}</a>
                 </li>
                 {% for state_type in state_types %}

-                    <li{% if state_type in state_filter %} class="selected" title="{% trans "click to remove from the filter" %}"{% else %} title="{% trans "click to add to the filter" %}"{% endif %}>
+                    <li{% if state_type|contained_in:state_filter %} class="selected" title="{% trans "click to remove from the filter" %}"{% else %} title="{% trans "click to add to the filter" %}"{% endif %}>

                         <a class="state-type-link" href="#{{ state_type }}">{{ state_type }}</a>
                     </li>
                 {% endfor %}
                         <a class="state-type-link" href="#{{ state_type }}">{{ state_type }}</a>
                     </li>
                 {% endfor %}


@@ -418,7 +412,7 @@
                         <option selected="selected" value="">---------</option>
                         <option value="delete_selected">{% trans "Mark deleted" %}</option>
                         <option value="undelete_selected">{% trans "Undelete" %}</option>
                         <option selected="selected" value="">---------</option>
                         <option value="delete_selected">{% trans "Mark deleted" %}</option>
                         <option value="undelete_selected">{% trans "Undelete" %}</option>

-                        <option value="hard_delete_selected">{% trans "Delete completelly" %}</option>
+                        <option value="hard_delete_selected">{% trans "Delete completely" %}</option>

                         <option value="close_selected">{% trans "Close (questions only)" %}</option>
                     </select>
                 </label>
                         <option value="close_selected">{% trans "Close (questions only)" %}</option>
                     </select>
                 </label>


@@ -504,7 +498,7 @@
                         <td>{% diff_date node.last_activity_at %}</td>
                         <td>
                             {% for t in node.tags.all %}
                         <td>{% diff_date node.last_activity_at %}</td>
                         <td>
                             {% for t in node.tags.all %}

-                                {% if t in tags %}<b>{{ t.name }}</b>
+                                {% if t|contained_in:tags %}<b>{{ t.name }}</b>

                                 {% else %}{{ t.name }}{% endif %}
                             {% endfor %}
                         </td>
                                 {% else %}{{ t.name }}{% endif %}
                             {% endfor %}
                         </td>