diff --git a/media/css/main2.css b/media/css/main2.css index e0023ea..d54baa1 100644 --- a/media/css/main2.css +++ b/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/parsers/logbooks.py b/parsers/logbooks.py index a9ac5dd..6976469 100644 --- a/parsers/logbooks.py +++ b/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/templates/base.html b/templates/base.html index 0e81b51..d189ae6 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,7 +3,8 @@ <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> + +<title>{% block title %}THE TITLE{% endblock %}</title> <script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script> {% block javascript %}{% endblock %} @@ -29,13 +30,18 @@ {% endblock %} </div> -<div id="currentLocation"> <br> - {% block currentLocation %} - Welcome to the website of the Cambridge University Caving Club's expeditions to Austria. - {% endblock %} </div> -<div class="content"> {% block content %} - {% endblock %} </div> + +<div id="content"> +{% block content %} + REPLACE : The content +{% endblock %} +</div> + +<div id="footer"> {% block footer %} -<p>{% endblock %}</p> + THE FOOTER +{% endblock %} +</div> </body> -</html> \ No newline at end of file +</html> + diff --git a/templates/index.html b/templates/index.html index 4b2d530..0a19187 100644 --- a/templates/index.html +++ b/templates/index.html @@ -5,8 +5,12 @@ {% 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 %} -{% block currentLocation %} -Welcome to the website of the Cambridge University Caving Club's expeditions to Austria. -{% endblock %} diff --git a/templates/survey.html b/templates/survey.html index ce62715..0cce748 100644 --- a/templates/survey.html +++ b/templates/survey.html @@ -51,14 +51,14 @@ {% endblock %} <body class="twoColHybLtHdr"> -{% block currentLocation %} +<div id="currentLocation"> CUCC Expo virtual survey binder: {% if current_survey %} {{current_survey}} {% else %} {{current_year }} {% endif %} -{% endblock %} +</div> {% block nav %} <div id="sidebar1"> @@ -185,4 +185,4 @@ </div> <br class="clearfloat" /> </div> -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/urls.py b/urls.py index eb9a825..fd00e46 100644 --- a/urls.py +++ b/urls.py @@ -19,13 +19,13 @@ urlpatterns = patterns('', (r'^survex/(?P<survex_file>.*)\.log$', log), (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'^logbookentry/(.*)/?$', logbookentry), - (r'^logbooksearch/(.*)/?$', logbookSearch), + url(r'^logbooksearch/(.*)/?$', logbookSearch), - (r'^statistics/?$', stats), + url(r'^statistics/?$', stats, name="stats"), (r'^survey/?$', surveyindex), (r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey),