Adds div around pagetitle block

evildmp · Nov 27, 2014 · 727d582 · 727d582
1 parent 7456057
commit 727d582
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 21 deletions.
diff --git a/arkestra_utilities/templates/arkestra.html b/arkestra_utilities/templates/arkestra.html
@@ -60,9 +60,11 @@
         				{% block menu %}<ul class= "menu">{% show_menu 0 100 100 100 "cms/arkestra_menu.html" "" "" %}</ul>{% endblock menu %}
 
         				{% block pagetitle %}
-        					{% if not current_page.flags.no_page_title %}
-        			           	{% filter typogrify %}<h{{PAGE_TITLE_HEADING_LEVEL}}>{% page_attribute title %}</h{{PAGE_TITLE_HEADING_LEVEL}}>{% endfilter %}
-        					{% endif %}
+                            <div id="pagetitle">
+            					{% if not current_page.flags.no_page_title %}
+            			           	{% filter typogrify %}<h{{PAGE_TITLE_HEADING_LEVEL}}>{% page_attribute title %}</h{{PAGE_TITLE_HEADING_LEVEL}}>{% endfilter %}
+            					{% endif %}
+                            </div>
         				{% endblock pagetitle %}
 
                         {% block summary %}{% endblock summary %}

diff --git a/arkestra_utilities/templates/arkestra/generic_item.html b/arkestra_utilities/templates/arkestra/generic_item.html
@@ -8,7 +8,9 @@
 {% block nav_local %}{% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}}>{{ item.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    <div id="pagetitle">
+    	<h{{PAGE_TITLE_HEADING_LEVEL}}>{{ item.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    </div>
 {% endblock pagetitle %}
 
 {% block summary %}

diff --git a/arkestra_utilities/templates/arkestra_utilities/entity_auto_page.html b/arkestra_utilities/templates/arkestra_utilities/entity_auto_page.html
@@ -9,7 +9,7 @@
 {% block title %}
 	<title>{{ title }}</title>
 {% endblock %}
-  
+
 {% block col_class %}
 	{% with is_menu_node="True" %}
 		{{ block.super }}
@@ -21,7 +21,9 @@
 
 {% if pagetitle %}
 	{% block pagetitle %}
-	    <h{{PAGE_TITLE_HEADING_LEVEL}}>{{ pagetitle|typogrify }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+	    <div id="pagetitle">
+            <h{{PAGE_TITLE_HEADING_LEVEL}}>{{ pagetitle|typogrify }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+        </div>
 	{% endblock pagetitle %}
 {% endif %}
 

diff --git a/contacts_and_people/templates/contacts_and_people/contacts_and_people.html b/contacts_and_people/templates/contacts_and_people/contacts_and_people.html
@@ -21,7 +21,9 @@
 
 {% if pagetitle %}
 	{% block pagetitle %}
-	    <h{{PAGE_TITLE_HEADING_LEVEL}}>{{ pagetitle|typogrify }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+        <div id="pagetitle">
+    	    <h{{PAGE_TITLE_HEADING_LEVEL}}>{{ pagetitle|typogrify }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+        </div>
 	{% endblock pagetitle %}
 {% endif %}
 
@@ -35,7 +37,7 @@
             {% render_placeholder intro_page_placeholder %}
 
             <div class="column firstcolumn">
-                <div class = "">
+                <div>
                     <h{{ IN_BODY_HEADING_LEVEL }}>Contact information</h{{ IN_BODY_HEADING_LEVEL }}>
                     <dl class="not-indented">
                         {% include "includes/key_contacts.html" %}

diff --git a/contacts_and_people/templates/contacts_and_people/person.html b/contacts_and_people/templates/contacts_and_people/person.html
@@ -19,13 +19,15 @@
 {% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}} class="name">
-        {{ person}}
-    </h{{PAGE_TITLE_HEADING_LEVEL}}>
-	{% if home_role %}
-		<p><span class="home-role">{{ home_role.role }}</span>
-            {% if MULTIPLE_ENTITY_MODE %}, {{ entity }}{% endif %}</p>
-	{% endif %}
+    <div id="pagetitle">
+    	<h{{PAGE_TITLE_HEADING_LEVEL}} class="name">
+            {{ person}}
+        </h{{PAGE_TITLE_HEADING_LEVEL}}>
+    	{% if home_role %}
+    		<p><span class="home-role">{{ home_role.role }}</span>
+                {% if MULTIPLE_ENTITY_MODE %}, {{ entity }}{% endif %}</p>
+    	{% endif %}
+    </div>
 {% endblock pagetitle %}
 
 {% block main_page_body %}

diff --git a/contacts_and_people/templates/contacts_and_people/place.html b/contacts_and_people/templates/contacts_and_people/place.html
@@ -13,7 +13,9 @@
 {% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}} class="name">{{ place.identifier }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    <div id="pagetitle">
+    	<h{{PAGE_TITLE_HEADING_LEVEL}} class="name">{{ place.identifier }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    </div>
 {% endblock pagetitle %}
 
 {% block main_page_body %}

diff --git a/contacts_and_people/templates/contacts_and_people/place_map.html b/contacts_and_people/templates/contacts_and_people/place_map.html
@@ -102,7 +102,9 @@
 {% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}} class="name">{{ place }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+	<div id="pagetitle">
+        <h{{PAGE_TITLE_HEADING_LEVEL}} class="name">{{ place }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    </div>
 {% endblock pagetitle %}
 
 {% block place_information %}

diff --git a/news_and_events/templates/news_and_events/event.html b/news_and_events/templates/news_and_events/event.html
@@ -13,7 +13,9 @@
 {% block nav_local %}{% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}}>{{ event.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+	<div id="pagetitle">
+        <h{{PAGE_TITLE_HEADING_LEVEL}}>{{ event.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    </div>
 {% endblock pagetitle %}
 
 {% block summary %}

diff --git a/news_and_events/templates/news_and_events/newsarticle.html b/news_and_events/templates/news_and_events/newsarticle.html
@@ -9,7 +9,9 @@
 {% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}}>{{ newsarticle.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+	<div id="pagetitle">
+        <h{{PAGE_TITLE_HEADING_LEVEL}}>{{ newsarticle.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    </div>
 {% endblock pagetitle %}
 
 {% block summary %}

diff --git a/vacancies_and_studentships/templates/vacancies_and_studentships/studentship_base.html b/vacancies_and_studentships/templates/vacancies_and_studentships/studentship_base.html
@@ -9,7 +9,9 @@
 {% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}}>Studentship ({{ studentship.hosted_by.short_name }}): {{ studentship.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+	<div id="pagetitle">
+        <h{{PAGE_TITLE_HEADING_LEVEL}}>Studentship ({{ studentship.hosted_by.short_name }}): {{ studentship.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    </div>
 {% endblock pagetitle %}
 
 {% block summary %}

diff --git a/vacancies_and_studentships/templates/vacancies_and_studentships/vacancy_base.html b/vacancies_and_studentships/templates/vacancies_and_studentships/vacancy_base.html
@@ -9,7 +9,9 @@
 {% endblock nav_local %}
 
 {% block pagetitle %}
-	<h{{PAGE_TITLE_HEADING_LEVEL}}>Vacancy: {{ vacancy.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    <div id="pagetitle">
+    	<h{{PAGE_TITLE_HEADING_LEVEL}}>Vacancy: {{ vacancy.title }}</h{{PAGE_TITLE_HEADING_LEVEL}}>
+    </div>
 {% endblock pagetitle %}
 
 {% block summary %}