From 395271f0b1f97f79de1b27489665ac021d3bac77 Mon Sep 17 00:00:00 2001 From: Paul van Tilburg Date: Wed, 25 Jan 2012 15:53:43 +0100 Subject: [PATCH] More Mab compability: different doctype and text escaping --- stoptime.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/stoptime.rb b/stoptime.rb index 709f870..2b9a233 100644 --- a/stoptime.rb +++ b/stoptime.rb @@ -1352,7 +1352,8 @@ module StopTime::Views # The main layout used by all views. def layout - xhtml_strict do + doctype! + html do head do title "Stop… Camping Time!" # FIXME: improve static serving so that the hack below is not needed. @@ -1386,8 +1387,8 @@ module StopTime::Views h3 { a customer.name, :href => R(CustomersN, customer.id) } if @tasks[customer].empty? p do - text "No projects/tasks found! Create one " + - "#{a "here", :href => R(CustomersNTasksNew, customer.id)}." + text! "No projects/tasks found! Create one " + + "#{a "here", :href => R(CustomersNTasksNew, customer.id)}." end else table.overview do @@ -1546,7 +1547,7 @@ module StopTime::Views h2 "Customers" if @customers.empty? p do - text "None found! You can create one " + + text! "None found! You can create one " + "#{a "here", :href => R(CustomersNew)}." end else @@ -1707,8 +1708,8 @@ module StopTime::Views if @invoices.values.flatten.empty? p do - text "Found none! You can create one by " - "#{a "selecting a customer", :href => R(Customers)}." + text! "Found none! You can create one by " + "#{a "selecting a customer", :href => R(Customers)}." end else @invoices.keys.sort.each do |key| @@ -1996,7 +1997,7 @@ module StopTime::Views # menu item. def _menu_link(label, ctrl) # FIXME: dirty hack? - if self.helpers.class.to_s.match(/^#{ctrl.to_s}/) + if self.class.to_s.match(/^#{ctrl.to_s}/) li.selected { a label, :href => R(ctrl) } else li { a label, :href => R(ctrl) }