From 26f1d4b9e34d0648bb750e6daa62fc0b941476a9 Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian.short@gmail.com>
Date: Mon, 7 Jun 2010 01:14:11 +0100
Subject: [PATCH] Moved breadcrumb trail above page titles

---
 views/directorate.haml | 6 +++---
 views/service.haml     | 7 ++++---
 views/services.haml    | 4 ++--
 views/supplier.haml    | 6 +++---
 views/suppliers.haml   | 5 +++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/views/directorate.haml b/views/directorate.haml
index 11af3b4..2e92230 100644
--- a/views/directorate.haml
+++ b/views/directorate.haml
@@ -1,6 +1,4 @@
 .grid_12
-  %h2= @page_title = @directorate.name + " Directorate"
-  
   %ul#breadcrumb
     %li.home
       %a{ :href => '/'} Home
@@ -9,12 +7,14 @@
     %li
       = @directorate.name
       
+  %h2= @page_title = @directorate.name + " Directorate"
+  
   %table
     %tr
       %th Date
       %th Service
       %th Supplier
-      %th &pound;
+      %th.right &pound;
         
     - for payment in @directorate.payments
       %tr
diff --git a/views/service.haml b/views/service.haml
index 3c36a0c..110efce 100644
--- a/views/service.haml
+++ b/views/service.haml
@@ -1,6 +1,4 @@
 .grid_12
-  %h2= @page_title = @service.name + " (Service)"
-  
   %ul#breadcrumb
     %li.home
       %a{ :href => '/'} Home
@@ -8,6 +6,9 @@
       %a{ :href => '/services' } Services
     %li
       = @service.name
+
+  %h2= @page_title = @service.name + " (Service)"
+  
   %p.noprint.download
     %a{ :href => "/services/#{@service.slug}.csv" }
       Download data as CSV
@@ -17,7 +18,7 @@
       %th Date
       %th Directorate
       %th Supplier
-      %th &pound;
+      %th.right &pound;
         
     - for payment in @service.payments
       %tr
diff --git a/views/services.haml b/views/services.haml
index 6e08916..0815819 100644
--- a/views/services.haml
+++ b/views/services.haml
@@ -1,12 +1,12 @@
 .grid_12
-  %h2 Services
-  
   %ul#breadcrumb
     %li.home
       %a{ :href => '/'} Home
     %li
       Services
  
+  %h2= @page_title = "Services"
+  
   - for service in @services
     %p
       %a{ :href=> "/services/#{service.slug}" }
diff --git a/views/supplier.haml b/views/supplier.haml
index 56aa45a..f550ca8 100644
--- a/views/supplier.haml
+++ b/views/supplier.haml
@@ -1,6 +1,4 @@
 .grid_12
-  %h2= @page_title = @supplier.name + " (Supplier)"
-
   %ul#breadcrumb
     %li.home
       %a{ :href => '/'} Home
@@ -9,6 +7,8 @@
     %li
       = @supplier.name
 
+  %h2= @page_title = @supplier.name + " (Supplier)"
+
   %p.noprint.download
     %a{ :href => "/suppliers/#{@supplier.slug}.csv" }
       Download data as CSV
@@ -18,7 +18,7 @@
       %th Date
       %th Directorate
       %th Service
-      %th &pound;
+      %th.right &pound;
         
     - for payment in @supplier.payments
       %tr
diff --git a/views/suppliers.haml b/views/suppliers.haml
index 23ea4e3..964f346 100644
--- a/views/suppliers.haml
+++ b/views/suppliers.haml
@@ -1,12 +1,13 @@
 .grid_12
-  %h2 Suppliers
   
   %ul#breadcrumb
     %li.home
       %a{ :href => '/'} Home
     %li
       Suppliers
- 
+
+  %h2= @page_title = "Suppliers"
+
   - for supplier in @suppliers
     %p
       %a{ :href=> "/suppliers/#{supplier.slug}" }