add help page

diff --git a/telemeta/pages/default/parts/help.rst b/telemeta/pages/default/parts/help.rst
new file mode 100644 (file)
index 0000000..7befd74
--- /dev/null
+++ b/telemeta/pages/default/parts/help.rst
@@ -0,0 +1,5 @@
+===============================
+Telemeta help page
+===============================
+
+Soon

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index b2e1a06956276315613ecd84dd78c10e32466f99..67d8c736b02ef2a4a66e98c7cbff1406c9c87b0c 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -39,11 +39,12 @@
 {% else %}
 {{ user.username }}.
 {% endif %}
-{% trans "Account" %} | {% trans "Help" %} | 
+{% trans "Account" %} |
+<a href="{% url telemeta-help %}">{% trans "Help" %}</a> | 
 <a href="{% url telemeta-logout %}">{% trans "Sign out" %}
 <img src="images/logout.png" style="vertical-align:middle" /></a>
 {% else %}
-{% trans "Help" %} |
+<a href="{% url telemeta-help %}">{% trans "Help" %}</a> |
 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
 {% endif %}
 </div>

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 458760dc82159790a23aee5c27f5b10c412cc168..180f3c86d1f21baac306c1dbf861e73a1805679d 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -57,6 +57,7 @@ htdocs = os.path.dirname(__file__) + '/htdocs'
 
 urlpatterns = patterns('',
     url(r'^$', web_view.index, name="telemeta-home"),
+    url(r'^help$', web_view.help, name="telemeta-help"),
 
     # items
     url(r'^items/$', 'django.views.generic.list_detail.object_list', 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 4a9f1f17c9ed48b1e786482439c93277d6b59e7d..90b3089a9d2b7981983ce202ca4707f1dc764bc9 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -709,8 +709,6 @@ class WebView(object):
         return HttpResponse(provider.handle(args), mimetype='text/xml')
         
     def render_flatpage(self, request, path):
-        print "REQUEST:"+request
-        print"PATH"+path
         try:
             content = pages.get_page_content(request, path)
         except pages.MalformedPagePath:
@@ -887,3 +885,16 @@ class WebView(object):
                 writer.writerow(data)
         
         return response
+
+    def help(self, request):
+        """Render the help page"""
+    
+        template = loader.get_template('telemeta/index.html')
+        ids = [id for id in MediaItem.objects.all().values_list('id', flat=True).order_by('?')[0:3]]
+        items = MediaItem.objects.enriched().filter(pk__in=ids)
+
+        context = RequestContext(request, {
+                    'page_content': pages.get_page_content(request, 'parts/help', ignore_slash_issue=True),
+                    'items': items})
+        return HttpResponse(template.render(context))
+