Changeset 4857

Timestamp:

03/29/07 20:50:06 (2 years ago)

Author:

adrian

Message:

Fixed #3799 -- Added django.contrib.webdesign and moved 'lorem' template tag into there

Files:

• django/trunk/django/contrib/webdesign (added)
• django/trunk/django/contrib/webdesign/__init__.py (added)
• django/trunk/django/contrib/webdesign/lorem_ipsum.py (added)
• django/trunk/django/contrib/webdesign/templatetags (added)
• django/trunk/django/contrib/webdesign/templatetags/__init__.py (added)
• django/trunk/django/contrib/webdesign/templatetags/webdesign.py (added)
• django/trunk/django/template/defaulttags.py (modified) (6 diffs)
• django/trunk/docs/templates.txt (modified) (1 diff)
• django/trunk/docs/webdesign.txt (added)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (2 diffs)

django/trunk/django/template/defaulttags.py

@@ -141 +141 @@
-                compare_to = self.nodelist.render(context)
-        except VariableDoesNotExist:
-        
+
-
-        if  compare_to != self._last_seen:
@@ -281 +281 @@
-        return ''
-
-class LoremNode(Node):
-    def __init__(self, count, method, common):
-        self.count, self.method, self.common = count, method, common
-
-    def render(self, context):
-        from django.utils.lorem_ipsum import words, paragraphs
-        try:
-            count = int(self.count.resolve(context))
-        except (ValueError, TypeError):
-            count = 1
-        if self.method == 'w':
-            return words(count, common=self.common)
-        else:
-            paras = paragraphs(count, common=self.common)
-        if self.method == 'p':
-            paras = ['<p>%s</p>' % p for p in paras]
-        return '\n\n'.join(paras)
-
-class NowNode(Node):
-    def __init__(self, format_string):
@@ -339 +321 @@
-        self.args = args
-        self.kwargs = kwargs
-
+
-    def render(self, context):
-        from django.core.urlresolvers import reverse, NoReverseMatch
@@ -788 +770 @@
-
-#@register.tag
-def lorem(parser, token):
-    """
-    Creates random latin text useful for providing test data in templates.
-
-    Usage format::
-
-        {% lorem [count] [method] [random] %}
-
-    ``count`` is a number (or variable) containing the number of paragraphs or
-    words to generate (default is 1).
-
-    ``method`` is either ``w`` for words, ``p`` for HTML paragraphs, ``b`` for
-    plain-text paragraph blocks (default is ``b``).
-
-    ``random`` is the word ``random``, which if given, does not use the common
-    paragraph (starting "Lorem ipsum dolor sit amet, consectetuer...").
-
-    Examples:
-        * ``{% lorem %}`` will output the common "lorem ipsum" paragraph
-        * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph
-          and two random paragraphs each wrapped in HTML ``<p>`` tags
-        * ``{% lorem 2 w random %}`` will output two random latin words
-    """
-    bits = list(token.split_contents())
-    tagname = bits[0]
-    # Random bit
-    common = bits[-1] != 'random'
-    if not common:
-        bits.pop()
-    # Method bit
-    if bits[-1] in ('w', 'p', 'b'):
-        method = bits.pop()
-    else:
-        method = 'b'
-    # Count bit
-    if len(bits) > 1:
-        count = bits.pop()
-    else:
-        count = '1'
-    count = parser.compile_filter(count)
-    if len(bits) != 1:
-        raise TemplateSyntaxError, "Incorrect format for %r tag" % tagname
-    return LoremNode(count, method, common)
-lorem = register.tag(lorem)    
-
-#@register.tag
-def now(parser, token):
-    """
@@ -981 +917 @@
-def url(parser, token):
-    """
- 
-
+
+
-    This is a way to define links that aren't tied to a particular URL configuration::
-
+
-        {% url path.to.some_view arg1,arg2,name1=value1 %}
-
+
-    The first argument is a path to a view. It can be an absolute python path
-    or just ``app_name.view_name`` without the project name if the view is
@@ -995 +931 @@
-    For example if you have a view ``app_name.client`` taking client's id and
-    the corresponding line in a URLconf looks like this::
-
+
-        ('^client/(\d+)/$', 'app_name.client')
-
+
-    and this app's URLconf is included into the project's URLconf under some
-    path::
-
+
-        ('^clients/', include('project_name.app_name.urls'))
-
+
-    then in a template you can create a link for a certain client like this::
-
+
-        {% url app_name.client client.id %}
-
+
-    The URL will look like ``/clients/client/123/``.
-    """

django/trunk/docs/templates.txt

@@ -625 +625 @@
-
-See `Custom tag and filter libraries`_ for more information.
-
-lorem
-~~~~~
-
-Display random latin text useful for providing sample data in templates.
-
-Usage format: ``{% lorem [count] [method] [random] %}``
-
-    ===========  =============================================================
-    Argument     Description
-    ===========  =============================================================
-    ``count``    A number (or variable) containing the number of paragraphs or
-                 words to generate (default is 1).
-    ``method``   Either ``w`` for words, ``p`` for HTML paragraphs or ``b``
-                 for plain-text paragraph blocks (default is ``b``).
-    ``random``   The word ``random``, which if given, does not use the common
-                 paragraph ("Lorem ipsum dolor sit amet...") when generating
-                 text.
-
-Examples:
-
-    * ``{% lorem %}`` will output the common "lorem ipsum" paragraph.
-    * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph
-      and two random paragraphs each wrapped in HTML ``<p>`` tags.
-    * ``{% lorem 2 w random %}`` will output two random latin words.
-
-now

django/trunk/tests/regressiontests/templates/tests.py

@@ -150 +150 @@
-            # Dictionary lookup wins out when there is a string and int version of the key.
-            'list-index07': ("{{ var.1 }}", {"var": {'1': "hello", 1: "world"}}, "hello"),
-
+
-            # Basic filter usage
-            'basic-syntax21': ("{{ var|upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"),
@@ -655 +655 @@
-            'with02': ('{{ key }}{% with dict.key as key %}{{ key }}-{{ dict.key }}-{{ key }}{% endwith %}{{ key }}', {'dict': {'key':50}}, ('50-50-50', 'INVALID50-50-50INVALID')),
-
-            ### LOREM TAG ######################################################
-            'lorem01': ('{% lorem %}', {}, 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'),
-            'lorem02': ('{% lorem p %}', {}, '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>'),
-            'lorem03': ('{% lorem 6 w %}', {}, 'lorem ipsum dolor sit amet consectetur'),
-
-            ### NOW TAG ########################################################
-            # Simple case