More polished PAI for module html injection and added a couple more places to inject...

[osqa.git] / forum / views / meta.py

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 97c852f0a7e5d6194eb07367ab254391bb085f1b..8195e44f896b1478c4d8a5585c3048c9b93448a2 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -1,36 +1,46 @@
+import os

 from itertools import groupby
 from django.shortcuts import render_to_response, get_object_or_404
 from django.core.urlresolvers import reverse
 from django.template import RequestContext, loader
 from itertools import groupby
 from django.shortcuts import render_to_response, get_object_or_404
 from django.core.urlresolvers import reverse
 from django.template import RequestContext, loader

-from django.http import HttpResponseRedirect, HttpResponse
+from django.http import HttpResponseRedirect, HttpResponse, Http404
+from django.views.static import serve

 from forum import settings
 from forum.forms import FeedbackForm
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.db.models import Count
 from forum import settings
 from forum.forms import FeedbackForm
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.db.models import Count

-from forum.utils.forms import get_next_url
-from forum.models import Badge, Award, User
+from forum.forms import get_next_url
+from forum.models import Badge, Award, User, Page

 from forum.badges.base import BadgesMeta
 from forum import settings
 from forum.badges.base import BadgesMeta
 from forum import settings

-from forum.utils.mail import send_email
+from forum.utils.mail import send_template_email
+from django.utils.safestring import mark_safe
+from forum.templatetags.extra_filters import or_preview
+import decorators

 import re
 
 def favicon(request):
     return HttpResponseRedirect(str(settings.APP_FAVICON))
 
 import re
 
 def favicon(request):
     return HttpResponseRedirect(str(settings.APP_FAVICON))
 

+def custom_css(request):
+    return HttpResponse(or_preview(settings.CUSTOM_CSS, request), mimetype="text/css")
+

 def static(request, title, content):
 def static(request, title, content):

-    return render_to_response('static.html', {'content' : content, 'title': title}, context_instance=RequestContext(request))
+    return render_to_response('static.html', {'content' : content, 'title': title},
+                              context_instance=RequestContext(request))

 
 

-def markdown_help(request):
-    # md = markdown.Markdown([SettingsExtension({})])
-    # text = md.convert(settings.FAQ_PAGE_TEXT.value)
+def media(request, skin, path):
+    return serve(request, "%s/media/%s" % (skin, path),
+                 document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)), 'skins').replace('\\', '/'))

 
 

+def markdown_help(request):

     return render_to_response('markdown_help.html', context_instance=RequestContext(request))
 
 
     return render_to_response('markdown_help.html', context_instance=RequestContext(request))
 
 

-def opensearch(request):   
+def opensearch(request):

     return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request))
     return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request))

-    
+

 
 def feedback(request):
     if request.method == "POST":
 
 def feedback(request):
     if request.method == "POST":


@@ -39,16 +49,14 @@ def feedback(request):
             context = {'user': request.user}
 
             if not request.user.is_authenticated:
             context = {'user': request.user}
 
             if not request.user.is_authenticated:

-                context['email'] = form.cleaned_data.get('email',None)
+                context['email'] = form.cleaned_data.get('email', None)

             context['message'] = form.cleaned_data['message']
             context['message'] = form.cleaned_data['message']

-            context['name'] = form.cleaned_data.get('name',None)
+            context['name'] = form.cleaned_data.get('name', None)

             context['ip'] = request.META['REMOTE_ADDR']
 
             context['ip'] = request.META['REMOTE_ADDR']
 

-            recipients = [(adm.username, adm.email) for adm in User.objects.filter(is_superuser=True)]
+            recipients = User.objects.filter(is_superuser=True)
+            send_template_email(recipients, "notifications/feedback.html", context)

 
 

-            send_email(settings.EMAIL_SUBJECT_PREFIX + _("Feedback message from %(site_name)s") % {'site_name': settings.APP_SHORT_NAME},
-                       recipients, "notifications/feedback.html", context)
-            

             msg = _('Thanks for the feedback!')
             request.user.message_set.create(message=msg)
             return HttpResponseRedirect(get_next_url(request))
             msg = _('Thanks for the feedback!')
             request.user.message_set.create(message=msg)
             return HttpResponseRedirect(get_next_url(request))


@@ -56,6 +64,7 @@ def feedback(request):
         form = FeedbackForm(initial={'next':get_next_url(request)})
 
     return render_to_response('feedback.html', {'form': form}, context_instance=RequestContext(request))
         form = FeedbackForm(initial={'next':get_next_url(request)})
 
     return render_to_response('feedback.html', {'form': form}, context_instance=RequestContext(request))

+

 feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, give it next time :)')
 
 def privacy(request):
 feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, give it next time :)')
 
 def privacy(request):


@@ -63,33 +72,81 @@ def privacy(request):
 
 def logout(request):
     return render_to_response('logout.html', {
 
 def logout(request):
     return render_to_response('logout.html', {

-        'next' : get_next_url(request),
+    'next' : get_next_url(request),

     }, context_instance=RequestContext(request))
 
     }, context_instance=RequestContext(request))
 

+@decorators.render('badges.html', 'badges', _('badges'), weight=300)

 def badges(request):
     badges = [b.ondb for b in sorted(BadgesMeta.by_id.values(), lambda b1, b2: cmp(b1.name, b2.name))]
 def badges(request):
     badges = [b.ondb for b in sorted(BadgesMeta.by_id.values(), lambda b1, b2: cmp(b1.name, b2.name))]

-    
+

     if request.user.is_authenticated():
         my_badges = Award.objects.filter(user=request.user).values('badge_id').distinct()
     else:
         my_badges = []
 
     if request.user.is_authenticated():
         my_badges = Award.objects.filter(user=request.user).values('badge_id').distinct()
     else:
         my_badges = []
 

-    return render_to_response('badges.html', {
+    return {

         'badges' : badges,
         'mybadges' : my_badges,
         'badges' : badges,
         'mybadges' : my_badges,

-    }, context_instance=RequestContext(request))
+    }

 
 def badge(request, id, slug):
     badge = Badge.objects.get(id=id)
     awards = list(Award.objects.filter(badge=badge).order_by('user', 'awarded_at'))
     award_count = len(awards)
 
 def badge(request, id, slug):
     badge = Badge.objects.get(id=id)
     awards = list(Award.objects.filter(badge=badge).order_by('user', 'awarded_at'))
     award_count = len(awards)

-    
+

     awards = sorted([dict(count=len(list(g)), user=k) for k, g in groupby(awards, lambda a: a.user)],
                     lambda c1, c2: c2['count'] - c1['count'])
 
     return render_to_response('badge.html', {
     awards = sorted([dict(count=len(list(g)), user=k) for k, g in groupby(awards, lambda a: a.user)],
                     lambda c1, c2: c2['count'] - c1['count'])
 
     return render_to_response('badge.html', {

-        'award_count': award_count,
-        'awards' : awards,
-        'badge' : badge,
+    'award_count': award_count,
+    'awards' : awards,
+    'badge' : badge,

     }, context_instance=RequestContext(request))
 
     }, context_instance=RequestContext(request))
 

+def page(request, path):
+    if path in settings.STATIC_PAGE_REGISTRY:
+        try:
+            page = Page.objects.get(id=settings.STATIC_PAGE_REGISTRY[path])
+
+            if (not page.published) and (not request.user.is_superuser):
+                raise Http404
+        except:
+            raise Http404
+    else:
+        raise Http404
+
+    template = page.extra.get('template', 'default')
+    sidebar = page.extra.get('sidebar', '')
+
+    if template == 'default':
+        base = 'base_content.html'
+    elif template == 'sidebar':
+        base = 'base.html'
+
+        sidebar_render = page.extra.get('render', 'markdown')
+
+        if sidebar_render == 'markdown':
+            sidebar = page._as_markdown(sidebar)
+        elif sidebar_render == 'html':
+            sidebar = mark_safe(sidebar)
+
+    else:
+        return HttpResponse(page.body, mimetype=page.extra.get('mimetype', 'text/html'))
+
+    render = page.extra.get('render', 'markdown')
+
+    if render == 'markdown':
+        body = page.as_markdown()
+    elif render == 'html':
+        body = mark_safe(page.body)
+    else:
+        body = page.body
+
+    return render_to_response('page.html', {
+    'page' : page,
+    'body' : body,
+    'sidebar': sidebar,
+    'base': base,
+    }, context_instance=RequestContext(request))
+
+