[2375] Wrap the header/footer in container divs

ckan · May 15, 2012 · b473229 · b473229
1 parent 2f3b1fb
commit b473229
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 35 deletions.
diff --git a/ckan/templates/footer.html b/ckan/templates/footer.html
@@ -5,21 +5,23 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   py:strip="">
   <footer class="site-footer">
-    <nav class="footer-links row-fluid">
-      <ul class="unstyled row-fluid">
-        <li><a href="#">Terms and Conditions</a></li>
-        <li><a href="#">Accessibility</a></li>
-        <li><a href="#">Code of conduct</a></li>
-        <li><a href="#">Moderation policy</a></li>
-        <li><a href="#">FAQ</a></li>
-        <li><a href="#">Privacy</a></li>
-        <li><a href="#">Contact us</a></li>
-        <li><a href="#">Consultation</a></li>
-      </ul>
-    </nav>
-    <div class="attribution">
-      <p><strong>Powered by</strong> <a href="">CityData</a> from <a href="">CKAN</a></p>
-      <p><small>Maps powered by Leaflet, map data &copy; OpenStreetMap contributors, CC-BY-SA, map imagery &copy; CloudMade</small></p>
+    <div class="container">
+      <nav class="footer-links row-fluid">
+        <ul class="unstyled row-fluid">
+          <li><a href="#">Terms and Conditions</a></li>
+          <li><a href="#">Accessibility</a></li>
+          <li><a href="#">Code of conduct</a></li>
+          <li><a href="#">Moderation policy</a></li>
+          <li><a href="#">FAQ</a></li>
+          <li><a href="#">Privacy</a></li>
+          <li><a href="#">Contact us</a></li>
+          <li><a href="#">Consultation</a></li>
+        </ul>
+      </nav>
+      <div class="attribution">
+        <p><strong>Powered by</strong> <a href="">CityData</a> from <a href="">CKAN</a></p>
+        <p><small>Maps powered by Leaflet, map data &copy; OpenStreetMap contributors, CC-BY-SA, map imagery &copy; CloudMade</small></p>
+      </div>
     </div>
   </footer>
 </html>
diff --git a/ckan/templates/header.html b/ckan/templates/header.html
@@ -5,26 +5,28 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   py:strip="">
   <header class="masthead">
-    <hgroup>
-      <h1><a href="">My Site Title</a></h1>
-      <p>My Site Tagline</p>
-    </hgroup>
-    <div class="account">
-      <a href="#home" class="image">
-        <img src="" width="25" height="25" />
-      </a>
-      <span class="links">
-        <a href="#home">username</a>
-        <a class="logout" href="#logout">Log out</a>
-      </span>
+    <div class="container">
+      <hgroup>
+        <h1><a href="">My Site Title</a></h1>
+        <p>My Site Tagline</p>
+      </hgroup>
+      <div class="account">
+        <a href="#home" class="image">
+          <img src="" width="25" height="25" />
+        </a>
+        <span class="links">
+          <a href="#home">username</a>
+          <a class="logout" href="#logout">Log out</a>
+        </span>
+      </div>
+      <nav>
+        <ul class="unstyled">
+          <li><a href="#">Find</a></li>
+          <li><a class="active" href="#">Groups</a></li>
+          <li><a href="#">Share</a></li>
+          <li><a href="#">About</a></li>
+        </ul>
+      </nav>
     </div>
-    <nav>
-      <ul class="unstyled">
-        <li><a href="#">Find</a></li>
-        <li><a class="active" href="#">Groups</a></li>
-        <li><a href="#">Share</a></li>
-        <li><a href="#">About</a></li>
-      </ul>
-    </nav>
   </header>
 </html>