[svn] QM parser now parses Hauchhoehle QMs.py

Photo model added.

Logbook parser now puts mugshots in as photo models, and descriptions from the old folk html pages in as "blurbs" on the person model.

Experimented with eye candy and a random logbook quote generator.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8094 by aaron @ 12/31/2008 2:59 AM
This commit is contained in:
substantialnoninfringinguser
2009-05-13 05:25:17 +01:00
parent 8c818906b5
commit 7aee3fb920
14 changed files with 261 additions and 93 deletions

View File

@@ -1,68 +1,60 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" />
<title>{% block title %}{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" />
<title>{% block title %}{% endblock %}</title>
<!-- script to toggle navbar -->
<script language="javascript">
<!--
function showFooter(){
document.getElementById('footerHidden').style.display = 'none';
document.getElementById('footerShowing').style.display = 'block';
}
function hideFooter(){
document.getElementById('footerHidden').style.display = 'block';
document.getElementById('footerShowing').style.display = 'none';
}
function makeTransparent(){
document.getElementById('footerShowing').style.backgroundColor = 'transparent';
}
-->
</script>
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
</head>
<body>
<div id="editLink" style="right:0px; top:0px; text-align: right; position: absolute; top:0; right:0; z-index:1">
{% block editLink %}not editable
{% endblock %}
</div>
<div id="bottomRight" style="position:absolute;right:0;bottom:0">
<img src="{{ settings.MEDIA_URL }}SilkRoadsilouetteAndrew.png" id="bridge" style="position:absolute; right:60px; bottom:0;z-index:-1;">
{% block lgbkQuote %}{% endblock %}
</div>
<div id="headerBackBar" style="background-color:#CCCC66; position:absolute; left:0; right:0; z-index:-2; top:60px; opacity:0.7; filter:alpha(opacity=70);height:75px; color:#000000; text-indent:100px">
<p>
<br>
{% block currentLocation %}
Welcome to the website of the Cambridge University Caving Club's expeditions to Austria.
{% endblock %}
</p>
</div>
<div class="contents">
<div class="main">
{% block content %}{% endblock %}
<div class="main"> {% block content %}{% endblock %} </div>
{% block footer %}
<div class="footer" id="footerHidden">
<h4><a href="javascript:;" onMouseDown="showDiv('footerHidden','footerShowing');">[Show Troggle Navigation / Search]</a></h4>
</div>
{% block footer %}
<div class="footer" id="footerHidden" style="display:none">
<h4><a href="javascript:;" onMouseDown="showFooter();">[Show Troggle Navigation / Search]</a></h4>
</div>
<div class="footer" id="footerShowing" style="background-color:#CCC">
<h4 class="navbar"> Troggle navigation <a href="javascript:;" onMouseDown="hideFooter();">[Hide]</a> or <a href="javascript:;" onMouseDown="makeTransparent();">[Make transparent]</a></align></h4>
<table class="normal">
<tr>
<td rowspan="2">
<a href="{{ settings.URL_ROOT }}cave">list caves</a> or
<form name="input" action="{{ settings.URL_ROOT }}cavesearch" method="get">
<input type="text" name="q" value="search caves">
<input type="submit" value="Submit">
</form>
</td>
<td rowspan="2">
<a href="{{ settings.URL_ROOT }}logbookentry">list logbook entries</a> or
<form name="input" action="{{ settings.URL_ROOT }}logbooksearch" method="get">
<input type="text" name="q" value="search logbooks">
<input type="submit" value="Submit">
</form>
</td>
<td><a href="{{ settings.URL_ROOT }}person">list cavers</a></td>
<td><a href="{{ settings.URL_ROOT }}statistics"> statistics</a></td>
<tr>
<div class="footer" id="footerShowing" style="background-color:#CCC; display:none">
<h4 class="navbar"> Troggle navigation <a href="javascript:;" onMouseDown="hideDiv('footerHidden','footerShowing');">[Hide]</a> or <a href="javascript:;" onMouseDown="makeDivTransparent('footerShowing');">[Make transparent]</a>
</align>
</h4>
<table class="normal">
<tr>
<td rowspan="2"><a href="{{ settings.URL_ROOT }}cave">list caves</a> or
<form name="input" action="{{ settings.URL_ROOT }}cavesearch" method="get">
<input type="text" name="q" value="search caves">
<input type="submit" value="Submit">
</form></td>
<td rowspan="2"><a href="{{ settings.URL_ROOT }}logbookentry">list logbook entries</a> or
<form name="input" action="{{ settings.URL_ROOT }}logbooksearch" method="get">
<input type="text" name="q" value="search logbooks">
<input type="submit" value="Submit">
</form></td>
<td><a href="{{ settings.URL_ROOT }}person">list cavers</a></td>
<td><a href="{{ settings.URL_ROOT }}statistics"> statistics</a></td>
<tr>
<td><a href="{{ settings.URL_ROOT }}photos">photos</a></td>
<td><a href="{{ settings.URL_ROOT }}admin"> admin</a></td>
</table>
</table>
</div>
<p>{% endblock %}</p>
</body>
<p>{% endblock %}</p>
</body>
</html>

View File

@@ -2,7 +2,7 @@
{% load wiki_markup %}
{% block title %}Logbook {{logbookentry.id}}{% endblock %}
{% block editLink %}<a href="{{settings.URL_ROOT}}admin/expo/logbookentry/{{logbookentry.id}}">edit </a>{% endblock %}
{% block content %}
<div class="logbookblock">
<h2>{{logbookentry.title}} - {{logbookentry.date}}</h2>
@@ -11,6 +11,7 @@
{% for persontrip in logbookentry.persontrip_set.all %}
<li>
<a href="/person/{{persontrip.personexpedition.person.id}}">{{persontrip.personexpedition}}</a>
<a href="{{settings.URL_ROOT}}admin/expo/logbookentry/{{logbookentry.id}}">edit </a>
{% ifequal persontrip.personexpedition logbookentry.author %}
(author)
{% endifequal %}