Skip to content
This repository
Browse code

reskinning several sections mox-18 mox-20 mox-45 mox-43

  • Loading branch information...
commit 197dcb01edcd0eed1a2739bfed82b9ea747e5060 1 parent 4c9d0c0
Csteph authored December 10, 2010 cnorthwood committed December 13, 2010
6  demos/molly_oxford/site_media/site/css/groups/smart.css
@@ -466,13 +466,13 @@ button, input[type="submit"], input[type="reset"] {
466 466
 .invisible {display:none;}
467 467
 .center {text-align:center;}
468 468
 
469  
-
  469
+/*
470 470
 h2 {
471 471
     text-align:center;
472 472
     color:white;
473 473
     padding: 5px 0; margin: 0;
474 474
 }
475  
-
  475
+*/
476 476
 h3 {
477 477
     color:white;
478 478
     padding: 5px 5px; margin: 0;
@@ -672,7 +672,7 @@ div.header {
672 672
 div.header h2 {
673 673
     color: rgb(34, 34, 34);
674 674
     text-shadow: 2px 2px 2px rgb(204, 204, 204);
675  
-    text-align: left;
  675
+    text-align: center;
676 676
     font-size: 11pt;
677 677
     padding-top: 3px;
678 678
 }
BIN  demos/molly_oxford/site_media/site/png/apple-touch-startup-image.jpg
3  molly/apps/places/templates/places/busstop.html
@@ -38,6 +38,7 @@
38 38
 
39 39
 
40 40
 <div class="section">
  41
+<div class="header">
41 42
 	<h2><small>{{ entity.title }}<br /><span id="time_now">{% now "G:i:s "%}</span></small></h2>
42 43
 
43 44
 
@@ -93,7 +94,7 @@
93 94
     <a href="{% url maps:entity_nearby_list entity.entity_type.slug,entity.display_id %}" rel="nofollow">Find things near here</a>
94 95
     </li>
95 96
 </ul>
96  
-
  97
+</div>
97 98
 </div>
98 99
 
99 100
 {% endblock %}
4  molly/apps/places/templates/places/busstop_search.html
@@ -5,7 +5,9 @@
5 5
 {% block content %}
6 6
 {% if search_form.is_valid %}
7 7
 	<div class="section">
  8
+<div class="header">
8 9
 	  <h2>Results</h2>
  10
+</div>
9 11
 	{% if entities %}
10 12
 	  <ul>
11 13
 	{% for entity in entities %}
@@ -44,4 +46,4 @@
44 46
 
45 47
 
46 48
 
47  
-{% endblock %}
  49
+{% endblock %}
3  molly/apps/places/templates/places/category_detail.html
@@ -7,6 +7,7 @@
7 7
 {% block content %}
8 8
 
9 9
 <div class="section">
  10
+<div class="header">
10 11
   <h2>
11 12
     Found {{ count }}
12 13
     {% ifequal count 1 %}
@@ -21,7 +22,7 @@
21 22
       {% endifnotequal %} 
22 23
     {% endifequal %}
23 24
   </h2>
24  
-
  25
+</div>
25 26
 {% if not found_entity_types|length_is:0 and not found_entity_types|length_is:1 %}
26 27
   <div class="note">
27 28
     <div class="bubble pad-10">
2  molly/apps/places/templates/places/category_list.html
@@ -3,7 +3,9 @@
3 3
 {% block content %}
4 4
 
5 5
 <div class="section">
  6
+<div class="header">
6 7
   <h2>Places</h2>
  8
+</div>
7 9
 	<ul class="link-list">
8 10
 	{% for entity_type in entity_types %}
9 11
 	    <li{% if forloop.last %} class="round-bottom"{% endif %}><a href="{% url places:category-detail entity_type.slug %}">{{ entity_type.verbose_name_plural|capfirst }}</a></li>
6  molly/apps/places/templates/places/entity_detail.html
@@ -7,6 +7,7 @@
7 7
 
8 8
 
9 9
 <div class="section">
  10
+<div class="header">
10 11
   {% include "places/metadata/real_time_information.html" %}
11 12
 	{% if entity.location %}
12 13
 	
@@ -18,7 +19,7 @@
18 19
         <img src="{% map_url entity.location %}" alt="Map"><br />
19 20
         {% include "places/map_elements.html" %}
20 21
     {% endifnotequal %}
21  
-    
  22
+ </div>  
22 23
 	<ul class="link-list">
23 24
 	    <li class="round-bottom"><a href="{% url places:entity-nearby-list entity.identifier_scheme entity.identifier_value %}" rel="nofollow">Find things near here</a></li>
24 25
 	</ul>
@@ -27,6 +28,9 @@
27 28
 	        We do not yet have a location for this {{ entity.entity_type.verbose_name }}.
28 29
 	    </div></div>
29 30
 	{% endif %}
  31
+
  32
+
  33
+
30 34
 </div>
31 35
 
32 36
 {% include "places/metadata/oxpoints.html" %}
4  molly/apps/places/templates/places/entity_without_location.html
@@ -6,10 +6,12 @@
6 6
 {% block content %}
7 7
 
8 8
 <div class="section">
  9
+<div class="header">
9 10
   <h2>{{ entity_type.verbose_name_plural }} near {{ entity.title }}</h2>
10 11
   <div class="note"><div class="bubble pad-10">
11 12
     Unfortunately, we do not have a location for this object, and so cannot tell you what is near it.
12 13
   </div>
13 14
 </div>
  15
+</div>
14 16
 
15  
-{% endblock %}
  17
+{% endblock %}
2  molly/apps/places/templates/places/index.html
@@ -48,8 +48,10 @@ <h2 class="invisible">Search Places</h2>
48 48
 
49 49
 {# Points of Interest #}
50 50
 <div class="section">
  51
+<div class="header">
51 52
   <h2>Points of Interest</h2>
52 53
   {% include "geolocation/update_location_embed.html" %}
  54
+</div>
53 55
   <ul class="link-list">
54 56
     <li><a href="{% url places:nearby-list %}">Near Me</a></li>
55 57
     <li class="round-bottom"><a href="{% url places:category-list %}">By Category</a></li>
3  molly/apps/places/templates/places/metadata/osm.html
@@ -3,6 +3,7 @@
3 3
 {% if entity|osm_tags or entity.metadata.osm.tags.phone or entity.metadata.osm.tags.wikipedia or entity.metadata.osm.tags.url %}
4 4
 
5 5
 <div class="section">
  6
+<div class="header">
6 7
   <h2>Information from OpenStreetMap</h2>
7 8
 {% if entity|osm_tags %}
8 9
   <div class="article"><div class="bubble pad-5">
@@ -14,7 +15,7 @@
14 15
     </dl>
15 16
   </div></div>
16 17
 {% endif %}
17  
-
  18
+</div>
18 19
 <ul class="link-list">
19 20
 {% if entity.metadata.osm.tags.phone %}
20 21
     <li>
4  molly/apps/places/templates/places/metadata/oxpoints.html
@@ -2,7 +2,9 @@
2 2
 
3 3
 {% with entity.metadata.oxpoints as oxp %}
4 4
 <div class="section">
  5
+<div class="header">
5 6
 	<h2>{{ oxp.dc_title }}</h2>
  7
+</div>
6 8
 <div class="article"><div class="bubble pad-5">
7 9
 	<dl>
8 10
 	{% if oxp.foaf_homepage or oxp.oxp_hasITHomepage or oxp.oxp_hasWeblearn or oxp.oxp_hasLibraryHomepage %}
@@ -77,7 +79,9 @@
77 79
 
78 80
 {% if oxp.foaf_depiction %}
79 81
 <div class="section">
  82
+<div class="header">
80 83
 	<h2>Images</h2>
  84
+</div>
81 85
 	{% for image in oxp.foaf_depiction %}
82 86
 		{% external_image image.uri asdiv %}
83 87
 	{% endfor %}
3  molly/apps/places/templates/places/nearby_detail.html
@@ -6,6 +6,7 @@
6 6
 {% block content %}
7 7
 
8 8
 <div class="section">
  9
+<div class="header">
9 10
   <h2>
10 11
 {% if entity_types|length_is:0 %}
11 12
     Found {{ count }} thing{{ count|pluralize }} near {{ entity.title }}
@@ -57,7 +58,7 @@
57 58
     {% include "places/map_elements.html" %}
58 59
 {% endifnotequal %}
59 60
 
60  
-
  61
+</div>
61 62
 
62 63
 <ul class="link-list">
63 64
 {% if entities %}
2  molly/apps/places/templates/places/nearby_list.html
@@ -7,7 +7,9 @@
7 7
 
8 8
 {% for name, types in entity_types %}
9 9
 <div class="section">
  10
+<div class="header">
10 11
   <h2>{{ name }}</h2>
  12
+</div>
11 13
 	<ul class="link-list">
12 14
 	{% for entity_type in types %}{% if entity %}
13 15
 	    <li{% if forloop.last %} class="round-bottom"{% endif %}><a href="{% url places:entity-nearby-detail entity.identifier_scheme,entity.identifier_value,entity_type.slug %}">
3  molly/apps/places/templates/places/postcode.html
@@ -3,11 +3,12 @@
3 3
 {% block content %}
4 4
 
5 5
 <div class="section">
  6
+<div class="header">
6 7
   <h2>Places with this post code</h2>
7 8
 {% if entities|length_is:"1" %}
8 9
   <div class="note"><div class="bubble pad-10">
9 10
     We don't know of anywhere with this post code.
10  
-  </div></div>
  11
+  </div></div></div>
11 12
 <ul>
12 13
 {% else %}
13 14
   <ul>
2  molly/apps/webcams/templates/webcams/index.html
@@ -8,7 +8,9 @@
8 8
 
9 9
 
10 10
 <div class="section">
  11
+<div class="header">
11 12
 	<h2>Webcams</h2>
  13
+</div>
12 14
 		<ul class="link-list">
13 15
 {% for webcam in webcams %}
14 16
 		<li {% if forloop.last %}class="round-bottom"{% endif %}>
7  molly/apps/webcams/templates/webcams/webcam_detail.html
@@ -14,7 +14,8 @@
14 14
 {% block content %}
15 15
 
16 16
 <div class="section">
17  
-<h2>{{ webcam.title }}<br /><small>{% now "G:i "%}</small></h2>
  17
+	<div class="header">
  18
+		<h2>{{ webcam.title }}<br /><small>{% now "G:i "%}</small></h2>
18 19
 
19 20
 {% if eis %}
20 21
     {% ifnotequal style_group "dumb" %}
@@ -37,5 +38,7 @@
37 38
 <p><small>{{ webcam.credit|safe }}</small></p>
38 39
 {% endif %}
39 40
 
40  
-</div></div></div>
  41
+</div></div>
  42
+</div>
  43
+</div>
41 44
 {% endblock %}

0 notes on commit 197dcb0

Please sign in to comment.
Something went wrong with that request. Please try again.