Changeset 539

Timestamp:

02/11/10 23:31:25 (6 months ago)

Author:

olivier

Message:

add support for rst based flat pages ; add descriptive text and image to home

Location:

trunk/telemeta

Files:

• htdocs/css/telemeta.css (modified) (3 diffs)
• models/location.py (modified) (1 diff)
• pages (added)
• pages/default (added)
• pages/default/help (added)
• pages/default/parts (added)
• pages/default/parts/home.rst (added)
• pages/default/parts/home_img.jpg (added)
• pages/fr (added)
• pages/fr/help (added)
• pages/fr/parts (added)
• pages/fr/parts/home.rst (added)
• templates/telemeta/flatpage.html (added)
• templates/telemeta_default/flatpage.html (added)
• templates/telemeta_default/index.html (modified) (2 diffs)
• templates/telemeta_default/search_criteria.html (modified) (1 diff)
• templatetags/telemeta_utils.py (modified) (3 diffs)
• urls.py (modified) (1 diff)
• web/base.py (modified) (4 diffs)
• web/pages.py (added)

trunk/telemeta/htdocs/css/telemeta.css

@@ -1 @@
-* {margin: 0; padding: 0;}
+body {margin: 0; padding: 0;}
 a {text-decoration: none; color: #969696;}
 a img {border: none;}
@@ -24 +24 @@
 a img { border: none; }
 
-h3 {
+.rst-content h1, h3 {
     font-size: 1.2em;
     font-weight: bold;
@@ -621 +621 @@
     margin-top: 0.8em;
 }
+
+img.home-image {
+    margin: 0 1.5em 1.5em 0;
+    float: left;
+}

trunk/telemeta/models/location.py

@@ -103 +103 @@
     class Meta(MetaCore):
         db_table = 'locations'
+        verbose_name = _('location')
 
     def __unicode__(self):

trunk/telemeta/templates/telemeta_default/index.html

@@ -1 +1 @@
 {% extends "telemeta/base.html" %}
+{% load telemeta_utils %}
 {% block content %}
+{{ page_content|rst }}
+
+<!--
 <div class="homelinks">
 <p><a href="{% url telemeta-collections %}">All collections</a><br />
@@ -11 +15 @@
   Configure Telemeta and manage users</p>
 </div>
+-->
 {% endblock %}

trunk/telemeta/templates/telemeta_default/search_criteria.html

@@ -30 +30 @@
 
     <p>
-    <label for="location">{% trans "Location" %}</label>
+    <label for="location">{% field_label "Location" %}</label>
     <input type="text" name="location" id="location" />
     </p>

trunk/telemeta/templatetags/telemeta_utils.py

@@ -9 +9 @@
 from telemeta import models
 from django.utils.translation import ungettext
+from docutils.core import publish_parts
+from django.utils.encoding import smart_str, force_unicode
+from django.utils.safestring import mark_safe
+import re
 
 register = template.Library()
@@ -166 +170 @@
 
 @register.simple_tag
-def field_label(model, field):
+def field_label(model, field=None):
     if isinstance(model, basestring):
         model = getattr(models, model)
             
+    if not field:
+        return capfirst(unicode(model._meta.verbose_name))
+
     return capfirst(unicode(model.field_label(field)))
 
@@ -210 +217 @@
 def equals(value1, value2):
     return value1 == value2
+
+@register.filter
+def rst(content):
+    parsed = ""
+    path = getattr(content, 'path', '')
+    if isinstance(content, basestring):
+        content = content.split("\n")
+
+    for line in content:
+        match = re.match('^(\.\. *(?:_[^:]*:|image::) *)([^ ]+) *$', line)
+        if match:
+            directive, urlname = match.groups()
+            line = directive
+            try:
+                i = urlname.index('telemeta-')
+            except ValueError:
+                i = -1
+            if i == 0:
+                line += reverse(urlname)
+            elif urlname[:1] != '/':
+                print '|%s|' % urlname
+                line += reverse('telemeta-flatpage', args=[path + '/../' + urlname])
+            else:
+                line += urlname
+
+        parsed += line + "\n"
+
+    parts = publish_parts(source=smart_str(parsed), writer_name="html4css1", settings_overrides={})
+    return mark_safe('<div class="rst-content">\n' + force_unicode(parts["html_body"]) + '</div>')
+rst.is_safe = True
+
+
+

trunk/telemeta/urls.py

@@ -166 +166 @@
         name="telemeta-timeside"),
 
+    # Flat pages
+    url(r'^page/(?P<path>.*)$', web_view.render_flatpage, name="telemeta-flatpage"),
+
     # OAI-PMH Data Provider
     url(r'^oai/.*$', web_view.handle_oai_request, name="telemeta-oai")

trunk/telemeta/web/base.py

@@ -41 +41 @@
 from django.http import HttpResponse
 from django.http import Http404
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, redirect
 from django.views.generic import list_detail
 from django.conf import settings
@@ -57 +57 @@
 from django.core.exceptions import ObjectDoesNotExist
 from telemeta.util.unaccent import unaccent
+from telemeta.web import pages
 
 class WebView(Component):
@@ -69 +70 @@
 
         template = loader.get_template('telemeta/index.html')
-        context = Context({})
+        context = Context({'page_content': pages.get_page_content(request, 'parts/home', True)})
         return HttpResponse(template.render(context))
 
@@ -391 +392 @@
         return HttpResponse(provider.handle(args), mimetype='text/xml')
         
-
+    def render_flatpage(self, request, path):
+        try:
+            content = pages.get_page_content(request, path)
+        except pages.MalformedPagePath:
+            return redirect(request.path + '/')
+
+        if isinstance(content, pages.PageAttachment):
+            return HttpResponse(content, content.mimetype())
+        else:
+            return render_to_response('telemeta/flatpage.html', {'page_content': content })
+