From: yomguy Date: Wed, 16 Mar 2011 12:30:57 +0000 (+0100) Subject: add help page X-Git-Tag: 1.1~363 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=96bee24e149fb01901b5fd850c847899fc505cd9;p=telemeta.git add help page --- diff --git a/telemeta/pages/default/parts/help.rst b/telemeta/pages/default/parts/help.rst new file mode 100644 index 00000000..7befd74a --- /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 b2e1a069..67d8c736 100644 --- 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" %} | +{% trans "Help" %} | {% trans "Sign out" %} {% else %} -{% trans "Help" %} | +{% trans "Help" %} | {% trans "Sign in" %} {% endif %} diff --git a/telemeta/urls.py b/telemeta/urls.py index 458760dc..180f3c86 100644 --- 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 4a9f1f17..90b3089a 100644 --- 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)) +