Permalink
Browse files

Merge branch 'master' of github.com:mollyproject/mollyproject

  • Loading branch information...
2 parents af81805 + fd32868 commit 778c0a378bf0c8bb9d7cdcdbdf4713ddfedda402 @cnorthwood cnorthwood committed Feb 15, 2011
@@ -2,30 +2,30 @@
{% load molly_utils %}
-<h3 class="contact-cn">{% if person.id %}
+{% if person.id %}
<a href="{% url contact:result_detail person.id %}">{{ person.cn }}</a>
{% else %}
{{ person.cn }}
-{% endif %}</h3>
+{% endif %}
<div class="contact-details">
{% for title in person.title %}
- <p class="contact-title">
+ <p>
{{ title }}
</p>
{% endfor %}
{% for ou in person.ou %}
- <p class="contact-ou">
+ <p>
{{ ou }}
</p>
{% endfor %}
{% for mail in person.mail %}
- <p class="contact-mail">
+ <p>
<a class="email" href="mailto:{{ mail }}">{{ mail }}</a>
</p>
{% endfor %}
{% for telephoneNumber in person.telephoneNumber %}
- <p class="contact-telephoneNumber">
+ <p>
<a class="phone" href="{{ telephoneNumber|telephone_uri }}">{{ telephoneNumber }}</a>
</p>
{% endfor %}
@@ -10,7 +10,7 @@
<div class="section">
{% block weatherloc %}
<div class="header">
- <h2>{{ weather.name }} <small>at {{ observation.observed_date|date:"H:i" }}</small></h2>
+ <h2>{{ observation.name }} <small>at {{ observation.observed_date|date:"H:i" }}</small></h2>
</div>
{% endblock %}
<div class="note">
@@ -2,41 +2,13 @@
<h2>About this site</h2>
<div class="note"><div class="bubble pad-10">
- {{ site_name }} was produced as part of the
- <a href="http://erewhon.oucs.ox.ac.uk/">Erewhon Project</a>, a
- <a href="http://www.jisc.ac.uk/">JISC</a>-funded project to explore the
- provision of location-aware applications and adaption of Weblearn (Oxford's implementation of the Sakai VLE) for use on
- mobile devices.
- </div></div>
-</div>
-
-<div class="section">
- <h2>Credits</h2>
- <div class="note"><div class="bubble pad-10">
- <p>
- The Erewhon team would like to thank the following organisations
- for providing the data used in the Portal:
- </p>
-
- <dl>
- <dt>Dailyinfo</dt>
- <dt>Association of Train Operating Companies</dt>
- <dt>Oxontime</dt>
- <dt>Oxfordshire County Council</dt>
- <dt>Stagecoach, Oxford Bus Company &amp; Thames Travel</dt>
- <dt>BBC</dt>
- <dt>Edina</dt>
- <dt>OpenStreetMap and Contributors</dt>
- <dt>Oxford University Estates Department</dt>
- <dt>Oxford University Library Services</dt>
- <dt>Cloudmade</dt>
- </dl>
+ This is a Molly Project Demo site.
</div></div>
</div>
<div class="section">
<h2>Be aware</h2>
<div class="note"><div class="bubble pad-10">
<p>
- Using {{ site_name }} may incur a cost of data transmission from your network provider. Many providers now offer "unlimited" day, week or month passes, please check with your provider for more information.</p>
+ Using this site may incur a cost of data transmission from your network provider. Many providers now offer "unlimited" day, week or month passes, please check with your provider for more information.</p>
</div></div></div>
View
@@ -56,6 +56,7 @@ apt_packages = {
'libxslt-dev',
'libldap2-dev',
'libsasl2-dev',
+ 'libjpeg-dev',
'imagemagick',
'git-core',
],
@@ -64,7 +65,7 @@ apt_packages = {
pip_packages = [
('PyZ3950', 'git+http://github.com/oucs/PyZ3950.git'), # Custom PyZ3950, contains some bug fixes
('django-compress', 'git+git://github.com/mikelim/django-compress.git#egg=django-compress'), # Fork of django-compress contains some extra features we need
- ('PIL', 'PIL==1.1.7'), # Because it doesn't install properly when called using setuptools...
+ ('PIL', 'PIL'), # Because it doesn't install properly when called using setuptools...
]
postgis_paths = {
@@ -694,7 +694,7 @@ def get_service_status_rss():
nearby_entity_types = (
('Transport', (
'bicycle-parking', 'bus-stop', 'car-park', 'park-and-ride',
- 'taxi-rank', 'train-station')),
+ 'taxi-rank', 'rail-station')),
('Amenities', (
'atm', 'bank', 'bench', 'medical', 'post-box', 'post-office',
'public-library', 'recycling', 'bar', 'food', 'pub')),

0 comments on commit 778c0a3

Please sign in to comment.