Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

some issues with removing views/faq.py file

  • Loading branch information...
commit 69b3de60892eefd1980dba53cfc71bb478a79068 1 parent 161da19
Jennifer Bell authored
7  mainapp/views/main.py
@@ -86,6 +86,13 @@ def search_address(request):
86 86
 def about(request):
87 87
    return render_to_response("about.html",{'faq_entries' : FaqEntry.objects.all().order_by('order')},
88 88
                 context_instance=RequestContext(request)) 
  89
+
  90
+
  91
+def show_faq( request, slug ):
  92
+    faq = get_object_or_404(FaqEntry, slug=slug)
  93
+    return render_to_response("faq/show.html",
  94
+                {"faq_entry":faq },
  95
+                 context_instance=RequestContext(request))
89 96
    
90 97
 def posters(request): 
91 98
    return render_to_response("posters.html",
5  media/css/typography.css
@@ -140,3 +140,8 @@ margin-bottom:0.8em;
140 140
 #content_middle label {text-transform:uppercase;}
141 141
 #instructable {color:#b4b4b4;}
142 142
 #report-body p { margin-bottom: .5em;}
  143
+#faq p {margin-bottom:1em;}
  144
+#faq p, #faq ul {
  145
+margin-left:2em;
  146
+text-align:left !important;
  147
+}
5  urls.py
@@ -41,15 +41,12 @@
41 41
     (r'^$', 'home', {}, 'home_url_name'),
42 42
     (r'^search', 'search_address'),
43 43
     (r'about/$', 'about',{}, 'about_url_name'),
  44
+    (r'^about/(\S+)$', 'show_faq'),
44 45
     (r'posters/$', 'posters',{}, 'posters'),
45 46
     (r'privacy/$', 'privacy',{}, 'privacy'),
46 47
 
47 48
 )
48 49
 
49  
-urlpatterns += patterns('mainapp.views.faq',
50  
-    (r'^about/(\S+)$', 'show'),
51  
-)
52  
-
53 50
 
54 51
 urlpatterns += patterns('mainapp.views.promotion',
55 52
     (r'^promotions/(\w+)$', 'show'),

0 notes on commit 69b3de6

Please sign in to comment.
Something went wrong with that request. Please try again.