Changeset ae881e5

Timestamp:

May 16, 2010, 11:01:29 PM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, fysm-4-1, space-access, stable, stage, test-hooks

Children:

101bf09

Parents:

aaa8e04

git-author:

Alex Dehnert <adehnert@…> (05/16/10 23:01:29)

git-committer:

Alex Dehnert <adehnert@…> (05/16/10 23:01:29)

Message:

Add navigation on the detail page

Location:

asadb

Files:

• forms/views.py (modified) (2 diffs)
• media/style/style.css (modified) (3 diffs)
• template/fysm/fysm_detail.html (modified) (3 diffs)

asadb/forms/views.py

@@ -76 +76 @@
 
 def fysm_view(request, year, submission, ):
+    submit_obj = get_object_or_404(forms.models.FYSM, pk=submission,)
+    all = forms.models.FYSM.objects.only("id", "display_name", )
+    try:
+        prev = all.filter(display_name__lt=submit_obj.display_name).order_by("-display_name")[0]
+    except IndexError:
+        prev = None
+    try:
+        next = all.filter(display_name__gt=submit_obj.display_name).order_by("display_name")[0]
+    except IndexError:
+        next = None
     return list_detail.object_detail(
         request,
@@ -85 +95 @@
             "year": year,
             "pagename": "fysm",
+            "prev": prev,
+            "next": next,
         },
     )

asadb/media/style/style.css

@@ -90 +90 @@
 }
 
-.single-fysm-entry h3 a
+.single-fysm-entry h3 a, .fysm-navstrip a
 {
     color:#fcfcfc;
@@ -96 +96 @@
 }
 
-.single-fysm-entry h3 a:hover
+.single-fysm-entry h3 a:hover, .fysm-navstrip a:hover
 {
     text-decoration: underline;
@@ -158 +158 @@
 }
 
-.fysm-detail
+.fysm-detail .back    { float: left;  }
+.fysm-detail .forward { float: right; }
+.fysm-detail .up      { text-align: center; }
+.fysm-detail h3
 {
-    height: 100%;
-    width: 100%;
+    text-align: center;
+    clear: both;
 }
 
-.fysm-detail .single-fysm-entry
+.fysm-navstrip
 {
-    margin: 0 auto;
+    clear: both;
+    margin: 0;
+    margin-top: 3em;
+    padding: 0.5em 1em;
+    background: #BE2933;
 }
 
-.fysm-detail td
+.fysm-navstrip p
 {
-    padding: 0;
+    margin: 0;
 }
-.fysm-join
-{
-    display: block;
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-}
+
 
 /* Reset some stuff */

asadb/template/fysm/fysm_detail.html

@@ -1 @@
-{% extends "base-plain.html" %}
+{% extends "base.html" %}
 {% load formcats %}
 
@@ -5 +5 @@
 {% block content %}
 <div class='fysm-detail'>
+
+<div class='fysm-navstrip'>
+{% if prev %}
+<p><a class='back'    href='{% url fysm-view year prev.pk %}'>&laquo; {{prev.display_name}}</a></p>
+{% endif %}
+{% if next %}
+<p><a class='forward' href='{% url fysm-view year next.pk %}'>{{next.display_name}} &raquo;</a></p>
+{% endif %}
+<p class='up'><a href='{% url fysm year %}'>Up to Index</a></p>
+<div style='clear: both;'></div>
+</div>
+
 <div class='single-fysm-entry'>
-    <h3><a href='{{fysm.website}}'>{{fysm.display_name}}</a></h3>
+    <h3>
+        <a href='{{fysm.website}}'>{{fysm.display_name}}</a>
+    </h3>
     <div class='fysm-body'>
     <div class='logo'>
@@ -25 +39 @@
     {% endif %}
 </div>
-<iframe src='{{fysm.join_url}}' class='fysm-join' height='100%'>
-    <p><a href='{{fysm.join_url}}'>Learn about joining {{fysm.display_name}}</a></p>
-</iframe>
+
 {% endblock %}