expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-29 14:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r8169] julian's quick makework and index page

Browse Source
This commit is contained in:
julian 2009-01-17 20:46:05 +01:00
parent c538cc7e95
commit 309d706bd7
6 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
troggle/media/css/main2.css
View File

@ -2,19 +2,39 @@
.centre { text-align: center; } .centre { text-align: center; }
.plus2pt { font-size: 160%; } .plus2pt { font-size: 160%; }
body, td, center, ul, p, input { body, td, center, ul, p, input
{
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
font-family: sans-serif; font-family: sans-serif;
} }
body {
body
{
background-color: #FFFFFF; background-color: #FFFFFF;
font: 100% Verdana, Arial, Helvetica, sans-serif; font: 100% Verdana, Arial, Helvetica, sans-serif;
background: #666666; Zbackground: #666666;
margin: 0; /* it's good practice to zero the margin and padding of the body element to account for differing browser defaults */ margin: 0;
padding: 0; padding: 0;
text-align: center; /* this centers the container in IE 5* browsers. The text is then set to the left aligned default in the #container selector */ text-align: center;
color: #000000; color: #000000;
} }
div#content
{
border: thin black dotted;
margin: 50px;
}
div#footer
{
background-color:black;
color:white;
text-align:center;
margin-left:auto;
margin-right:auto;
}
#expoHeader { #expoHeader {
width:100%; width:100%;
position:relative; position:relative;
@ -123,11 +143,8 @@ position: absolute;
top: 0; top: 0;
right: 0; right: 0;
} }
div.footer {
position: fixed;
bottom: 2px;
left: 2px;
}
div.main { div.main {
margin-bottom: 3em; margin-bottom: 3em;
} }

2
troggle/parsers/logbooks.py
View File

@ -92,7 +92,7 @@ def LoadPersons():
def parseMugShotAndBlurb(firstname, lastname, person, header, pObject): def parseMugShotAndBlurb(firstname, lastname, person, header, pObject):
#create mugshot Photo instance #create mugshot Photo instance
mugShotPath = settings.EXPOWEB+"folk/"+person[header["Mugshot"]] mugShotPath = os.path.join(settings.EXPOWEB, "folk", person[header["Mugshot"]])
if mugShotPath[-3:]=='jpg': #if person just has an image, add it if mugShotPath[-3:]=='jpg': #if person just has an image, add it
mugShotObj = models.Photo( mugShotObj = models.Photo(
caption="Mugshot for "+firstname+" "+lastname, caption="Mugshot for "+firstname+" "+lastname,

24
troggle/templates/base.html
View File

@ -3,7 +3,8 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" /> <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" />
<title>{% block title %}{% endblock %}</title>
<title>{% block title %}THE TITLE{% endblock %}</title>
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
{% block javascript %}{% endblock %} {% block javascript %}{% endblock %}
@ -29,13 +30,18 @@
{% endblock %} </div> {% endblock %} </div>
<div id="currentLocation"> <br>
{% block currentLocation %} <div id="content">
Welcome to the website of the Cambridge University Caving Club's expeditions to Austria. {% block content %}
{% endblock %} </div> REPLACE : The content
<div class="content"> {% block content %} {% endblock %}
{% endblock %} </div> </div>
<div id="footer">
{% block footer %} {% block footer %}
<p>{% endblock %}</p> THE FOOTER
{% endblock %}
</div>
</body> </body>
</html> </html>

10
troggle/templates/index.html
View File

@ -5,8 +5,12 @@
{% block content %} {% block content %}
<h2>The unfinished front page</h2>
<p>Some handy links into the less incomplete parts of this webpage</p>
<ul>
<li><a href="{% url personindex %}">List osf people</a></li>
<li><a href="/statistics">Statistics of what's loaded in the database</a></li>
</ul>
{% endblock %} {% endblock %}
{% block currentLocation %}
Welcome to the website of the Cambridge University Caving Club's expeditions to Austria.
{% endblock %}

6
troggle/templates/survey.html
View File

@ -51,14 +51,14 @@
{% endblock %} {% endblock %}
<body class="twoColHybLtHdr"> <body class="twoColHybLtHdr">
{% block currentLocation %} <div id="currentLocation">
CUCC Expo virtual survey binder: CUCC Expo virtual survey binder:
{% if current_survey %} {% if current_survey %}
{{current_survey}} {{current_survey}}
{% else %} {% else %}
{{current_year }} {{current_year }}
{% endif %} {% endif %}
{% endblock %} </div>
{% block nav %} {% block nav %}
<div id="sidebar1"> <div id="sidebar1">
@ -185,4 +185,4 @@
</div> </div>
<br class="clearfloat" /> <br class="clearfloat" />
</div> </div>
{% endblock %} {% endblock %}

6
troggle/urls.py
View File

@ -19,13 +19,13 @@ urlpatterns = patterns('',
(r'^survex/(?P<survex_file>.*)\.log$', log), (r'^survex/(?P<survex_file>.*)\.log$', log),
(r'^survex/(?P<survex_file>.*)\.err$', err), (r'^survex/(?P<survex_file>.*)\.err$', err),
(r'^person/?$', personindex), url(r'^personindex$', personindex, name="personindex"),
(r'^person/(?P<person_id>\d*)(?P<first_name>[a-zA-Z]*)[-_/\.\s(\%20)]*(?P<last_name>[a-zA-Z]*)/?$', person), (r'^person/(?P<person_id>\d*)(?P<first_name>[a-zA-Z]*)[-_/\.\s(\%20)]*(?P<last_name>[a-zA-Z]*)/?$', person),
(r'^logbookentry/(.*)/?$', logbookentry), (r'^logbookentry/(.*)/?$', logbookentry),
(r'^logbooksearch/(.*)/?$', logbookSearch), url(r'^logbooksearch/(.*)/?$', logbookSearch),
(r'^statistics/?$', stats), url(r'^statistics/?$', stats, name="stats"),
(r'^survey/?$', surveyindex), (r'^survey/?$', surveyindex),
(r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey), (r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey),