Commits

Luke Plant committed 9de27e0 Merge

Merged from default

Comments (0)

Files changed (2)

templates/cciw/base.html

 <head>
 <title>{% block title %}CCIW: {{ title }}{% endblock %}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link href="http://fonts.googleapis.com/css?family=Amaranth" rel="stylesheet" type="text/css" />
+<link href="https://fonts.googleapis.com/css?family=Amaranth" rel="stylesheet" type="text/css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}css/style.css" type="text/css" />
 {% block extraheader %}{% endblock %}
 </head>

templates/cciw/camps/thisyear.html

 	{% if camps %}
 		{% htmlchunk camp_dates_intro_text %}
 		<h2>Dates</h2>
-		<p>Click on the number of the camp for more information</p>
 		<div>
 		<table class="topheaders" summary="Details of all camps running in {{ thisyear }}">
 			<thead>
 							title="{{ camp.nice_name }}">{{ camp.number }}</a></td>
 						<td>{{ camp.age	}}</td>
 						<td>{{ camp.start_date|date:"d M"}} - {{ camp.end_date|date:"d M" }}</td>
-						<td>{{ camp.leaders.all|join:", " }}</td>
+						<td><a href="{{ camp.get_absolute_url }}" title="{{ camp.nice_name }}">{{ camp.leaders.all|join:", " }}</a></td>
 						<td>{% if camp.chaplain %}{{ camp.chaplain }}{% else %}TBA{% endif %}</td>
 					</tr>
 					{% endfor %}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.