Ticket #105: show-hide-toggle.diff

django/tests/template_tests.py

@@ -259 +259 @@
         expected = '<h1>Default \\ slash</h1>'
         self.assertEqual(expected, t.render(c))
 
-    def testDefaultFilter4(self):
-        "Use the default argument when a variable passed through the 'default' filter doesn't exist (single backslash)"
-        t = '<h1>{{ nonvar|default:"Default \\ slash" }}</h1>'
-        self.assertRaises(template.TemplateSyntaxError, template.Template, t)
-
     def testIllegalCharacterInFilterName(self):
         "Raise TemplateSyntaxError when trying to access a filter containing an illegal character"
         t = '<h1>{{ blah|(lower) }}</h1>'
@@ -516 +511 @@
     def testNormalUsage(self):
         "A cycle tag should work as expected"
         c = template.Context({'set':range(10)})
-        t = template.Template('{% for i in set %}{% cycle red, green %}-{{ i }} {% endfor %}')
+        t = template.Template('{% for i in set %}{% cycle red,green %}-{{ i }} {% endfor %}')
         expected = 'red-0 green-1 red-2 green-3 red-4 green-5 red-6 green-7 red-8 green-9 '
         self.assertEqual(expected, t.render(c))
 
@@ -525 +520 @@
         t = '{% cycle %}'
         self.assertRaises(template.TemplateSyntaxError, template.Template, t)
 
-    def testOneArgument(self):
-        "Raise TemplateSyntaxError in cycle tags with only one argument"
-        t = '{% cycle hello %}'
-        self.assertRaises(template.TemplateSyntaxError, template.Template, t)
+    def testNamedGroup(self):
+        "cycle tags with named groups should work as expected"
+        t = template.Template('{% cycle red,blue as colours %}{% cycle colours %}{% cycle colours %}')
+        c = template.Context()
+        self.assertEqual('redbluered', t.render(c))
 
-    def testExtraInitialSpaces(self):
-        "Extra spaces around cycle tags and their arguments should be ignored"
-        c = template.Context({'set':range(5)})
-        t = template.Template('{% for i in set %}{% cycle  red, green %}{% endfor %}')
-        expected = 'redgreenredgreenred'
-        self.assertEqual(expected, t.render(c))
-
 class TemplateTagNodeCheck(unittest.TestCase):
 
     def testNormalUsage(self):

django/conf/admin_media/css/global.css

@@ -228 +228 @@
 /*  COLLAPSED FIELDSETS  */
 
 fieldset.collapsed * { display:none; }
-fieldset.collapsed h2, fieldset.collapsed .collapse-toggle  { display:block !important; }
+fieldset.collapsed h2, fieldset.collapsed { display:block !important; }
+fieldset.collapsed .collapse-toggle { display: inline !important; }
 fieldset.collapsed h2 { background-image:url(../img/admin/nav-bg.gif); background-position:bottom left; color:#999; }
-fieldset.collapsed .collapse-toggle { padding:3px 5px !important; background:#efefef; }
-fieldset.collapsed .collapse-toggle a { display:inline !important; }
 
 /* MESSAGES & ERRORS  */
 

django/conf/admin_media/js/admin/CollapsedFieldsets.js

@@ -1 +1 @@
 // Finds all fieldsets with class="collapse", collapses them, and gives each
-// one a "Show foo" link that uncollapses it.
+// one a "Show" link that uncollapses it. The "Show" link becomes a "Hide"
+// link when the fieldset is visible.
 
 function findForm(node) {
         // returns the node of the form containing the given node
@@ -16 +17 @@
         init: function() {
                 var fieldsets = document.getElementsByTagName('fieldset');
                 var collapsed_seen = false;
-                for (var i=0; i<fieldsets.length; i++) {
-                        var fs = fieldsets[i];
+                for (var i = 0, fs; fs = fieldsets[i]; i++) {
                         // Collapse this fieldset if it has the correct class, and if it
                         // doesn't have any errors. (Collapsing shouldn't apply in the case
                         // of error messages.)
                         if (fs.className.match(CollapsedFieldsets.collapse_re) && !CollapsedFieldsets.fieldset_has_errors(fs)) {
-
                                 collapsed_seen = true;
-
                                 // Give it an additional class, used by CSS to hide it.
                                 fs.className += ' ' + CollapsedFieldsets.collapsed_class;
-
-                                // Get plural verbose name of object.
-                                var verbose_name = fs.getElementsByTagName('h2')[0].innerHTML;
-
-                                // <div class="form-row collapse-toggle" id="fieldsetcollapser1">
-                                // <a href="javascript:toggleDisplay;">Show section priorities&hellip;</a>
-                                // </div>
-                                var div = document.createElement('div');
-
-                                // Give it a hook so we can remove it later.
-                                div.id = 'fieldsetcollapser' + i;
-
-                                div.className = 'form-row collapse-toggle'; // CSS hook
+                                // (<a id="fieldsetcollapser3" class="collapse-toggle" href="#">Show</a>)
                                 var collapse_link = document.createElement('a');
-                                collapse_link.setAttribute('href', 'javascript:CollapsedFieldsets.display(' + i + ');');
-                                collapse_link.appendChild(document.createTextNode('Show ' + verbose_name));
-                                div.appendChild(collapse_link);
-                                fs.appendChild(div);
+                                collapse_link.className = 'collapse-toggle';
+                                collapse_link.id = 'fieldsetcollapser' + i;
+                                collapse_link.onclick = new Function('CollapsedFieldsets.show('+i+'); return false;');
+                                collapse_link.href = '#';
+                                collapse_link.innerHTML = 'Show';
+                                var h2 = fs.getElementsByTagName('h2')[0];
+                                h2.appendChild(document.createTextNode(' ('));
+                                h2.appendChild(collapse_link);
+                                h2.appendChild(document.createTextNode(')'));
                         }
                 }
                 if (collapsed_seen) {
@@ -62 +53 @@
                 }
                 return false;
         },
-        display: function(fieldset_index) {
+        show: function(fieldset_index) {
                 var fs = document.getElementsByTagName('fieldset')[fieldset_index];
                 // Remove the class name that causes the "display: none".
                 fs.className = fs.className.replace(CollapsedFieldsets.collapsed_re, '');
-                // Remove the "Show foo" link.
-                fs.removeChild(document.getElementById('fieldsetcollapser' + fieldset_index));
+                // Toggle the "Show" link to a "Hide" link
+                var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index);
+                collapse_link.onclick = new Function('CollapsedFieldsets.hide('+fieldset_index+'); return false;');
+                collapse_link.innerHTML = 'Hide';
         },
+        hide: function(fieldset_index) {
+                var fs = document.getElementsByTagName('fieldset')[fieldset_index];
+                // Add the class name that causes the "display: none".
+                fs.className += ' ' + CollapsedFieldsets.collapsed_class;
+                // Toggle the "Hide" link to a "Show" link
+                var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index);
+        collapse_link.onclick = new Function('CollapsedFieldsets.show('+fieldset_index+'); return false;');
+                collapse_link.innerHTML = 'Show';
+        },
+        
         uncollapse_all: function() {
                 var fieldsets = document.getElementsByTagName('fieldset');
                 for (var i=0; i<fieldsets.length; i++) {
                         if (fieldsets[i].className.match(CollapsedFieldsets.collapsed_re)) {
-                                CollapsedFieldsets.display(i);
+                                CollapsedFieldsets.show(i);
                         }
                 }
         }

django/core/template.py

@@ -459 +459 @@
 class VariableNode(Node):
     def __init__(self, var_string):
         self.var_string = var_string
+        # Compile time check of validity of var_string
+        get_filters_from_token(var_string)
 
     def __repr__(self):
         return "<Variable Node: %s>" % self.var_string