OpenLayers OpenLayers

Changeset 7891

Show
Ignore:
Timestamp:
08/29/08 02:53:08 (3 months ago)
Author:
crschmidt
Message:

More improvements, including wiki-like formatting.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • project/gallery.openlayers.org/openlayers/faq/models.py

    r7890 r7891  
    11from django.db import models 
    22from django.template.defaultfilters import slugify 
     3from openlayers.faq.render import render_text 
    34 
    45# Create your models here. 
    …… 
    4445        return ('openlayers.faq.views.question', 
    4546            [self.cat.slug, self.slug]) 
    46          
     47     
     48    def rendered_answer(self): 
     49        return render_text(self.answer).replace("<script", "&lt;script")  
     50 
    4751    q = models.CharField(max_length=255) 
    4852    slug = models.CharField(max_length=255, editable=False) 

  • project/gallery.openlayers.org/openlayers/faq/templates/cat.html

    r7890 r7891  
    11{% extends "base.html" %} 
     2{% block title %}{{cat}}{% endblock %}  
    23{% block content %} 
    34{% include "breadcrumb.html" %} 
    …… 
    56<ul> 
    67{% for q in cat.question_set.all %} 
    7   <li><a href="{{q.get_absolute_url}}">{{ q }}</a></li> 
     8  <li><a href="{{q.get_absolute_url}}">{{ q }}</a> 
     9      {% if expanded %} 
     10       <br />  
     11        {{ q.rendered_answer|safe }} 
     12      {% endif %}   
     13  </li> 
    814{% endfor %} 
    915</ul> 
    10 <a href="/add/question/">Add a question/answer</a> 
     16<a href="/add/question/">Add a question/answer</a><br /> 
     17<a href="all/">Expand All</a> 
    1118{% endblock %} 
    1219 

  • project/gallery.openlayers.org/openlayers/faq/templates/cat_list.html

    r7890 r7891  
    77    <ul> 
    88    {% for q in cat.question_set.all %} 
    9       <li><a href="{{q.get_absolute_url}}">{{ q }}</a></li> 
     9      <li><a href="{{q.get_absolute_url}}">{{ q }}</a> 
     10      {% if expanded %} 
     11       <br />  
     12        {{ q.rendered_answer|safe }} 
     13      {% endif %}   
     14      </li> 
    1015    {% endfor %} 
    1116    </ul> 
    …… 
    1318{% endfor %} 
    1419</ul> 
    15 <a href="/add/category/">Add Category</a> 
     20<a href="/add/category/">Add Category</a><br /> 
     21<a href="/all/">Expand All</a> 
    1622{% endblock %} 

  • project/gallery.openlayers.org/openlayers/faq/templates/question.html

    r7890 r7891  
    11{% extends "base.html" %} 
     2{% block title %}{{question}}{% endblock %}  
    23{% block content %} 
    34{% include "breadcrumb.html" %} 
    45<h1>{{ question }}</h1> 
    56<small>(<a href="/add/question/{{question.id}}">Edit</a>)</small> 
    6 <p>{{ question.answer }}</p> 
     7{{ question.rendered_answer|safe }} 
    78 
    89<hr /> 

  • project/gallery.openlayers.org/openlayers/faq/urls.py

    r7890 r7891  
    44    # Example: 
    55     (r'^$', 'list'), 
     6     (r'^(?P<all>all)/$', 'list'), 
    67     (r'^add/qlink/', 'qlink_upload'), 
    78     (r'^add/(?P<type>category|question)/$', 'add_item'), 
    89     (r'^add/(?P<type>category|question)/(?P<id>[0-9]+)/$', 'add_item'), 
    910     (r'^(?P<cat>[a-z0-9-_]+)/$', 'cat'), 
     11     (r'^(?P<cat>[a-z0-9-_]+)/(?P<all>all)/$', 'cat'), 
    1012     (r'^(?P<cat>[a-z0-9-_]+)/(?P<q>[a-z0-9-_]+)/$', 'question'), 
    1113)     

  • project/gallery.openlayers.org/openlayers/faq/views.py

    r7890 r7891  
    55from django.http import HttpResponseRedirect 
    66from django.shortcuts import render_to_response, get_object_or_404 
     7 
     8import openlayers.faq.render  
    79 
    810class Page(object): 
    …… 
    3133        model = QLink 
    3234 
    33 def list(request): 
     35def list(request, all=None): 
    3436    crumb = [Page("/", "FAQ Home")] 
    3537    cats = Category.objects.all() 
    36     return render_to_response("cat_list.html", {'cats': cats, 'breadcrumb': crumb})  
     38    template = "cat_list.html" 
     39    return render_to_response(template, {'cats': cats, 'breadcrumb': crumb, 'expanded': bool(all)})  
    3740 
    38 def cat(request, cat): 
     41def cat(request, cat, all=None): 
    3942    crumb = [Page("/", "FAQ Home")] 
    4043    cat = get_object_or_404(Category, slug=cat) 
    4144    crumb.append(cat) 
    42     return render_to_response("cat.html", {'cat': cat, 'breadcrumb': crumb}) 
     45    return render_to_response("cat.html", {'cat': cat, 'breadcrumb': crumb, 'expanded': bool(all)}) 
    4346 
    4447def qlink_upload(request): 
    …… 
    6770        return render_to_response("form.html", {'form': form}) 
    6871         
    69 def add_cat(request, id=None): 
    70     if id: 
    71         cat = get_object_or_404(Question, pk=id) 
    72         form = QuestionForm(request.POST, instance=cat, auto_id=False) 
    73     else: 
    74         if request.method == "POST":  
    75             form = QuestionForm(request.POST) 
    76         else: 
    77             form = QuestionForm() 
    78     if request.method == "POST" and form.is_valid(): 
    79         obj = form.save() 
    80         return HttpResponseRedirect(obj.get_absolute_url()) 
    81     else: 
    82         return render_to_response("form.html", {'form': form}) 
    83          
    8472 
    8573def question(request, cat, q): 
    …… 
    8977        question = forms.IntegerField(initial=q.id, widget=forms.HiddenInput) 
    9078    f = QQLinkForm() 
    91     return render_to_response("question.html", {'question': q, 'breadcrumb':crumb, 'form': f})  
     79    return render_to_response("question.html", {'question': q, 'breadcrumb':crumb, 'form': f})  
    9280