Made updates so django-categories works with django-grappelli

This commit is contained in:
Brent O'Connor 2012-08-24 13:57:48 -07:00
parent a92ab30f9c
commit 85fb2083bb
3 changed files with 57 additions and 50 deletions

View file

@ -14,6 +14,10 @@
zoom: 1; /* IE7 Hack */
}
.treeTable td.action-checkbox, .treeTable th.action-checkbox-column {
padding-left: 20px;
}
.treeTable tr.collapsed td .expander {
background-image: url(toggle-expand-dark.png);
}

View file

@ -1,39 +1,38 @@
{% extends "admin/change_list.html" %}
{% load adminmedia admin_list i18n admin_tree_list %}
{% block extrahead %}
{{block.super}}
<script type="text/javascript">
(function($) {
$(document).ready(function() {
var srchString = document.getElementById('searchbar').value;
{{block.super}}
<script type="text/javascript">
(function($) {
$(document).ready(function() {
var srchString = document.getElementById('grp-changelist-search').value;
if (srchString == '')
treeTable = $("#result_list").treeTable({initialState : "{{ EDITOR_TREE_INITIAL_STATE }}"});
else
treeTable = $("#result_list").treeTable({initialState : "expanded"});
function toggleChildren(index, value) {
var row = value.parentNode.parentNode;
if (row.className.match(/child-of-node-\d+/)) {
value.checked = /child-of-node-(\d+)/.exec(row.className);
}
if($(row).hasClass("parent")) {
$("table.treeTable tbody tr.child-of-" + row.id + " input").each(toggleChildren);
}
$("tr input.action-select").actions();
};
$('.action-select').each(
function(){
$(this).bind('click', function(event){
// Get the tr from checkbox -> td -> tr
var row = event.currentTarget.parentNode.parentNode;
$("table.treeTable tbody tr.child-of-" + row.id + " input").each(toggleChildren);
});
});
});
})(django.jQuery);
</script>
treeTable = $("#result_list").treeTable({initialState : "{{ EDITOR_TREE_INITIAL_STATE }}"});
else
treeTable = $("#result_list").treeTable({initialState : "expanded"});
function toggleChildren(index, value) {
var row = value.parentNode.parentNode;
if (row.className.match(/child-of-node-\d+/)) {
value.checked = /child-of-node-(\d+)/.exec(row.className);
}
if($(row).hasClass("parent")) {
$("table.treeTable tbody tr.child-of-" + row.id + " input").each(toggleChildren);
}
$("tr input.action-select").actions();
};
$('.action-select').each(
function(){
$(this).bind('click', function(event){
// Get the tr from checkbox -> td -> tr
var row = event.currentTarget.parentNode.parentNode;
$("table.treeTable tbody tr.child-of-" + row.id + " input").each(toggleChildren);
});
});
});
})(django.jQuery);
</script>
{% endblock %}
{% block result_list %}
{% if action_form and actions_on_top and cl.full_result_count %}{% admin_actions %}{% endif %}
{% result_tree_list cl %}
{% if action_form and actions_on_bottom and cl.full_result_count %}{% admin_actions %}{% endif %}
{% endblock %}

View file

@ -1,24 +1,28 @@
{% if result_hidden_fields %}
<div class="hiddenfields"> {# DIV for HTML validation #}
{% for item in result_hidden_fields %}{{ item }}{% endfor %}
</div>
<div class="hiddenfields"> {# DIV for HTML validation #}
{% for item in result_hidden_fields %}{{ item }}{% endfor %}
</div>
{% endif %}
{% if results %}
<div class="results">
<table cellspacing="0" id="result_list">
<thead>
<tr>
{% for header in result_headers %}<th{{ header.class_attrib }}>
{% if header.sortable %}<a href="{{ header.url }}">{% endif %}
{{ header.text|capfirst }}
{% if header.sortable %}</a>{% endif %}</th>{% endfor %}
</tr>
</thead>
<tbody>
{% for result in results %}
<tr id="node-{{ result.pk }}" class="{% cycle 'row1' 'row2' %}{% if result.parent_pk %} child-of-node-{{result.parent_pk}}{% endif %}">{% for item in result %}{{ item }}{% endfor %}</tr>
{% endfor %}
</tbody>
</table>
<div class="grp-module grp-changelist-results">
<table cellspacing="0" id="result_list">
<thead>
<tr>
{% for header in result_headers %}
<th scope="col" {{ header.class_attrib }}>
{% if header.sortable %}<a href="{{ header.url }}">{% endif %}
{{ header.text|capfirst }}
{% if header.sortable %}</a>{% endif %}
</th>
{% endfor %}
</tr>
</thead>
<tbody>
{% for result in results %}
<tr id="node-{{ result.pk }}" class="grp-row {% cycle 'grp-row-even' 'grp-row-odd' %}{% if result.parent_pk %} child-of-node-{{result.parent_pk}}{% endif %}">{% for item in result %}{{ item }}{% endfor %}</tr>
{% endfor %}
</tbody>
</table>
</div>
{% endif %}
{% endif %}