[svn] again some changes on the webpage

--HG--
branch : trunk

diff --git a/jinja/parser.py b/jinja/parser.py
index 5ef47c42f700312276a5e7217ab73b3296b1cff7..5994fb8bdc61bd023c8bd07a6e1848303258917b 100644 (file)
--- a/jinja/parser.py
+++ b/jinja/parser.py
@@ -583,8 +583,9 @@ class Parser(object):
                 if data in self.directives:
                     node = self.directives[data](lineno, gen)
                 else:
-                    raise TemplateSyntaxError('unknown directive %r' % data,
-                                              lineno, self.filename)
+                    raise TemplateSyntaxError('unknown directive %r' %
+                                              str(data), lineno,
+                                              self.filename)
                 # some tags like the extends tag do not output nodes.
                 # so just skip that.
                 if node is not None:

diff --git a/www/documentation.tmpl b/www/documentation.tmpl
deleted file mode 100644 (file)
index 49ae145..0000000
--- a/www/documentation.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<% extends 'layout/base.tmpl' %>
-<% set title = 'Documentation' %>
-<% set active_page = 'documentation' %>
-<% block content %>
-  <h1>Documentation</h1>
-  <p>
-    Currently Jinja 1 in still under heavy development and we have neither
-    released a final version nor do we provide a documentation you can download.
-    However you can browse the documentation of the current SVN version online:
-  </p>
-  <p><a href="./documentation/index.html">browse online documentation</a></p>
-<% endblock %>

diff --git a/www/faq.tmpl b/www/faq.tmpl
index ac4ebea2fdf7c81f02e3787e8e8a366d307f649d..69bb4c71cc549341527f0600f035b02bab8c3091 100644 (file)
--- a/www/faq.tmpl
+++ b/www/faq.tmpl
@@ -52,7 +52,7 @@
   <ul>
     <li>filter functions</li>
     <li>block based template inheritance</li>
-    <li>the <tt>{% cycle %}</tt> and <tt>{% filter %}</li> tag</li>
+    <li>the <tt>{% cycle %}</tt> and <tt>{% filter %}</tt> tag</li>
     <li>being sandboxed</li>
     <li>similar default syntax</li>
   </ul>
@@ -66,7 +66,7 @@
     <li>uncoupled internationalization support</li>
     <li>expression support in any tag</li>
     <li>abbility of modifying the context from the template
-        by using the <tt>{% set %}</li> tag.</li>
+        by using the <tt>{% set %}</tt> tag.</li>
     <li>support for function calling with arguments</li>
     <li>filters can be called with a variable argument count</li>
     <li>full unicode support</li>
@@ -81,5 +81,24 @@
     <li>test functions like <tt>is even</tt> etc.</li>
     <li>block delimiters are exchangeable.</il>
     <li>no implicit function calling</li>
+    <li><tt>{% endblock %}</tt> doesn't support the optional name argument</li>
+    <li><tt>{% ifchanged %}</tt> is not implemented because of performance
+        reasons. If there's enough interest an implementation might be added</li>
+    <li><tt>{% templatetag %}</tt> is not implemented because Jinja supports
+        escaping via <tt>{% raw %}</tt> or the variable syntax</li>
+    <li><tt>{% comment %}</tt> is not implemented, rather use
+        <tt>{# ... #}</tt> for commenting out stuff.</li>
+    <li><tt>{% now %}</tt> is not implemented because Jinja doesn't handle
+        l10n. Datetime specific stuff should be provided by the application.</li>
+    <li><tt>{% load %}</tt>, loading components for Jinja works from the
+        application side. Template designers don't have to import stuff on
+        their own.</li>
+    <li><tt>{% debug %}</tt> is not implemented. You can use the global
+        function <tt>debug()</tt>.</li>
+    <li>custom tags are not supported. Most of the stuff that is
+        possible with django template tags is possible with either functions,
+        filters, tests or a combination of them.</li>
+    <li>using keywords like <tt>endfor</tt> as identifer raises an
+        exception.</li>
   </ul>
 <% endblock %>

diff --git a/www/generate.py b/www/generate.py
index 6edd973ba38add65e3fab85991f580e6025e8150..55d659b4e6c4394245b7af228e0d19ef43818401 100755 (executable)
--- a/www/generate.py
+++ b/www/generate.py
@@ -13,6 +13,7 @@ from pygments import highlight
 from pygments.lexers import get_lexer_by_name
 from pygments.formatters import HtmlFormatter
 
+
 _data_re = re.compile(
     r'<!-- TITLE -->(?P<page_title>.*?)<!-- ENDTITLE -->.*?'
     r'<!-- TOC -->(?P<page_toc>.*?)<!-- ENDTOC -->.*?'

diff --git a/www/layout/base.html b/www/layout/base.html
deleted file mode 100644 (file)
index bcfd39d..0000000
--- a/www/layout/base.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Frameset//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Untitled | Jinja Template Engine</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" href="./../static/style.css" type="text/css" />
-    <link rel="stylesheet" href="./../static/print.css" type="text/css" media="print" />
-    <link rel="stylesheet" href="./../static/pygments.css" type="text/css" />
-  </head>
-  <body>
-    <div id="header">
-      <h1>Jinja</h1>
-    </div>
-    <ul id="navigation">
-          <li><a href="./../index.html">Index</a></li>
-          <li><a href="./../faq.html">FAQ</a></li>
-          <li><a href="./../documentation.html">Documentation</a></li>
-          <li><a href="./../download.html">Download</a></li>
-        </ul>
-        <div id="content">
-      <div id="contentwrapper">
-              </div>
-    </div>
-    <div id="footer">
-      &copy; Copyright 2007 by the Pocoo Team.
-    </div>
-  </body>
-</html>
\ No newline at end of file

diff --git a/www/layout/base.tmpl b/www/layout/base.tmpl
index b6317ff0ccfeaac5f2546abbb9c12a5303b86821..e881373d6fed50fc2b357d1540bde15f94021730 100644 (file)
--- a/www/layout/base.tmpl
+++ b/www/layout/base.tmpl
@@ -1,8 +1,8 @@
 <% set navigation = [
-  ('index', 'Index'),
-  ('faq', 'FAQ'),
-  ('documentation', 'Documentation'),
-  ('download', 'Download')
+  ('index.html', 'index', 'Index'),
+  ('faq.html', 'faq', 'FAQ'),
+  ('documentation/index.html', 'documentation', 'Documentation'),
+  ('download.html', 'download', 'Download')
 ] %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Frameset//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -19,23 +19,11 @@
       <h1>Jinja</h1>
     </div>
     <ul id="navigation">
-    <% for id, caption in navigation %>
+    <% for href, id, caption in navigation %>
       <li<% if id == active_page %> class="active"<% endif
-        %>><a href="<%= root %><%= id|escape %>.html"><%= caption|escape
-        %></a></li>
+        %>><a href="<%= (root + href)|escape %>"><%= caption|escape %></a></li>
     <% endfor %>
     </ul>
-    <% if trace %>
-    <div id="trace">
-    <% for href, caption in trace %>
-      <% if loop.last %>
-        <%= caption %>
-      <% else %>
-        <a href="<%= href|escape %>"><%= caption %></a> &raquo;
-      <% endif %>
-    <% endfor %>
-    </div>
-    <% endif %>
     <div id="content">
       <div id="contentwrapper">
         <% block content %><% endblock %>

diff --git a/www/static/style.css b/www/static/style.css
index ff33585464c9ab4bc38777d9ddfd14878781cf77..644e6717442d11343a718e7e7ebb81349b51b7cc 100644 (file)
--- a/www/static/style.css
+++ b/www/static/style.css
@@ -40,7 +40,8 @@ a:hover {
 }
 
 pre {
-    background-color: #f9f9f9;
+    background-color: #f8f8f8;
+    color: #000;
     border-top: 1px solid #ccc;
     border-bottom: 1px solid #ccc;
     padding: 5px;
@@ -144,7 +145,7 @@ div.admonition p {
 }
 
 #header h1 {
-    display: none
+    display: none;
 }
 
 #navigation {