diff --git a/troggle/media/css/main2.css b/troggle/media/css/main2.css index e0023eadc..d54baa1e3 100644 --- a/troggle/media/css/main2.css +++ b/troggle/media/css/main2.css @@ -2,19 +2,39 @@ .centre { text-align: center; } .plus2pt { font-size: 160%; } -body, td, center, ul, p, input { +body, td, center, ul, p, input +{ color: rgb(0, 0, 0); font-family: sans-serif; } -body { + +body +{ background-color: #FFFFFF; font: 100% Verdana, Arial, Helvetica, sans-serif; - background: #666666; - margin: 0; /* it's good practice to zero the margin and padding of the body element to account for differing browser defaults */ + Zbackground: #666666; + margin: 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; } + +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 { width:100%; position:relative; @@ -123,11 +143,8 @@ position: absolute; top: 0; right: 0; } -div.footer { -position: fixed; -bottom: 2px; -left: 2px; -} + + div.main { margin-bottom: 3em; } diff --git a/troggle/parsers/logbooks.py b/troggle/parsers/logbooks.py index a9ac5dd90..697646922 100644 --- a/troggle/parsers/logbooks.py +++ b/troggle/parsers/logbooks.py @@ -92,7 +92,7 @@ def LoadPersons(): def parseMugShotAndBlurb(firstname, lastname, person, header, pObject): #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 mugShotObj = models.Photo( caption="Mugshot for "+firstname+" "+lastname, diff --git a/troggle/templates/base.html b/troggle/templates/base.html index 0e81b5127..d189ae6d0 100644 --- a/troggle/templates/base.html +++ b/troggle/templates/base.html @@ -3,7 +3,8 @@ -{% block title %}{% endblock %} + +{% block title %}THE TITLE{% endblock %} {% block javascript %}{% endblock %} @@ -29,13 +30,18 @@ {% endblock %} -

- {% block currentLocation %} - Welcome to the website of the Cambridge University Caving Club's expeditions to Austria. - {% endblock %}
-
{% block content %} - {% endblock %}
+ +
+{% block content %} + REPLACE : The content +{% endblock %} +
+ + - \ No newline at end of file + + diff --git a/troggle/templates/index.html b/troggle/templates/index.html index 4b2d53033..0a19187ae 100644 --- a/troggle/templates/index.html +++ b/troggle/templates/index.html @@ -5,8 +5,12 @@ {% block content %} +

The unfinished front page

+

Some handy links into the less incomplete parts of this webpage

+ + {% endblock %} -{% block currentLocation %} -Welcome to the website of the Cambridge University Caving Club's expeditions to Austria. -{% endblock %} diff --git a/troggle/templates/survey.html b/troggle/templates/survey.html index ce6271597..0cce74823 100644 --- a/troggle/templates/survey.html +++ b/troggle/templates/survey.html @@ -51,14 +51,14 @@ {% endblock %} -{% block currentLocation %} +
CUCC Expo virtual survey binder: {% if current_survey %} {{current_survey}} {% else %} {{current_year }} {% endif %} -{% endblock %} +
{% block nav %}
@@ -185,4 +185,4 @@

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/troggle/urls.py b/troggle/urls.py index eb9a82565..fd00e4695 100644 --- a/troggle/urls.py +++ b/troggle/urls.py @@ -19,13 +19,13 @@ urlpatterns = patterns('', (r'^survex/(?P.*)\.log$', log), (r'^survex/(?P.*)\.err$', err), - (r'^person/?$', personindex), + url(r'^personindex$', personindex, name="personindex"), (r'^person/(?P\d*)(?P[a-zA-Z]*)[-_/\.\s(\%20)]*(?P[a-zA-Z]*)/?$', person), (r'^logbookentry/(.*)/?$', logbookentry), - (r'^logbooksearch/(.*)/?$', logbookSearch), + url(r'^logbooksearch/(.*)/?$', logbookSearch), - (r'^statistics/?$', stats), + url(r'^statistics/?$', stats, name="stats"), (r'^survey/?$', surveyindex), (r'^survey/(?P\d\d\d\d)\#(?P\d*)$', survey),