Permalink
Browse files

remove static page contents

  • Loading branch information...
1 parent b9f86a0 commit 1d8b94c92be38466a34eec97f4fb8a43c528e816 @backface backface committed Jan 28, 2012
Showing with 14 additions and 31 deletions.
  1. +7 −1 riverview/views.py
  2. +6 −29 templates/riverviews/riverviews.html
  3. +1 −1 urls.py
View
@@ -3,6 +3,7 @@
from django.core import serializers
from django.http import HttpResponse
from riverview.models import Track, TrackPoint, Label
+from page.models import Page
import simplejson as json
import datetime
@@ -26,6 +27,9 @@ def index(request,id=0):
track = get_object_or_404(Track, pk=id)
offset = 0
+ about = get_object_or_404(Page, name="about")
+ credits = get_object_or_404(Page, name="credits")
+
return render_to_response('riverviews/riverviews.html', locals())
@@ -74,14 +78,16 @@ def view(request,id=0,offset=0):
# load track
track = Track.objects.get(id=id)
+ about = get_object_or_404(Page, name="about")
+ credits = get_object_or_404(Page, name="credits")
if offset == 0:
offset = track.offset
return render_to_response('riverviews/riverviews.html', locals())
def view_by_name(request,name,offset=0):
- track = get_object_or_404(Track, name=name)
+ track = get_object_or_404(Track, name=name)
return view(request,track.id,offset)
@@ -103,12 +103,9 @@
<div id="about_close" class="button window_close">x</div>
</div>
<div id="about_content">
- <p>River Studies is an ongoing long-term artistic research project about exploring the relationship of rivers and its people, rivers and its transforming cultural landscape, rivers and their function as carrier of cultural landscapes and identities. It utilizes custom, combined and unique methods in digital photography, data visualization, cartography and cultural mapping.</p>
-
- <p>Rivers are natural waterways and lifelines of cultures with complex, diverse and ambivalent historical and contemporary roles. Rivers are connecting as well as bordering, they are deployed as routes for trade, as routes of military actions, as a place of religious worships or as a purely economical resource. However rivers play an important role in every culture and nation around them: Their basins give water and therefor life to the people..</p>
-
- <p>It has a long tradition to understand rivers as veins and lifelines of the 'system' Earth and as a consequence: humanity. It might have an even longer history to understand rivers as a timeless metaphor for life or the flow of history. That is one thing that makes rivers outstanding and quite fascinating. My other primary interest is to understand rivers as intersection and connection lines through continents, peoples and cultures - cross lines that form a landscape of natural features and accumulated history, a landscape that is as much a cultural as a geographic landscape.</p>
- <p><a class="link" href="/page/making_of" target="_self">A Brief Making Of</a></p>
+ {% autoescape off %}
+ {{ about.content }}
+ {% endautoescape%}
</div>
</div>
@@ -118,29 +115,9 @@
<div id="credits_close" class="button window_close">x</div>
</div>
<div id="credits_content">
- <p>a project by
- <ul>
- <li><a href="http://m.ash.to">Michael Aschauer</a></li>
- </ul>
- </p>
-
- <p>
- it would not have been possible without support by:<br />
- <ul>
- <li><a href="http://www.bmukk.gv.at/kunst/index.xml">BMUKK</a> </li>
- <li><a href="http://www.wien.gv.at/amtshelfer/kultur/kulturabteilung/foerderungen/neuemedien.html">Stadt Wien, MA 7</a></li>
- <li><a href="http://www.austrianculture.in/">Austrian Cultural Forum New Delhi</a></li>
- <li><a href="http://www.elphel.com">Elphel Inc.</a> - Imaging solutions with Free software
- and open hardware </li>
- </ul>
- </p>
-
- <p>sources:
- <ul>
- <li><a href="https://github.com/backface/malisca">malisca</a></li>
- <li><a href="https://github.com/backface/riverstudies-django-app">riverstudies-django-app</a></li>
- </ul>
- </p>
+ {% autoescape off %}
+ {{ credits.content }}
+ {% endautoescape%}
</div>
</div>
View
@@ -17,7 +17,7 @@
# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
- # (r'^media/(?P<path>.*)$', 'django.views.static.serve',{'document_root': '/data/projects/river-studies/django/apps/riverstudies/media'}),
+ # (r'^media/(?P<path>.*)$', 'django.views.static.serve',{'document_root': '/data/projects/river-studies/django/apps/riverstudies/media'}),
)

0 comments on commit 1d8b94c

Please sign in to comment.