Move title into controller to encourage template reuse

diff --git a/bluechips/controllers/history.py b/bluechips/controllers/history.py
index 986d06362e99c3007a2f87197c24fd39e8ac3cca..e0a501b8f38edd5139afe90321979ff3a2d99dcc 100644 (file)
--- a/bluechips/controllers/history.py
+++ b/bluechips/controllers/history.py
@@ -13,6 +13,8 @@ log = logging.getLogger(__name__)
 
 class HistoryController(BaseController):
     def index(self):
+        c.title = 'History'
+        
         c.expenditures = meta.Session.query(model.Expenditure).all()
         c.transfers = meta.Session.query(model.Transfer).all()
         

diff --git a/bluechips/controllers/spend.py b/bluechips/controllers/spend.py
index a72f65f5b369465e1dfa4179da255a2dd128f4d8..27ded4b584e314be0f5e3d5753131809cdd26082 100644 (file)
--- a/bluechips/controllers/spend.py
+++ b/bluechips/controllers/spend.py
@@ -13,6 +13,8 @@ log = logging.getLogger(__name__)
 
 class SpendController(BaseController):
     def index(self):
+        c.title = 'Add a New Expenditure'
+        
         c.expenditure = dict()
         c.expenditure['spender'] = request.environ['user']
         

diff --git a/bluechips/controllers/transfer.py b/bluechips/controllers/transfer.py
index 7a47d970749f8f5375afafac2616a8668a33d2e9..5a3767d238a541170a4f4ab9d88fce5ef6ee6855 100644 (file)
--- a/bluechips/controllers/transfer.py
+++ b/bluechips/controllers/transfer.py
@@ -13,6 +13,8 @@ log = logging.getLogger(__name__)
 
 class TransferController(BaseController):
     def index(self):
+        c.title = 'Add a New Transfer'
+        
         c.transfer = dict()
         c.transfer['debtor'] = request.environ['user']
         

diff --git a/bluechips/templates/history/index.mako b/bluechips/templates/history/index.mako
index 41547ca3ec75e0a2b0c44e4564a840075f44f5ee..6cb5fb1829050f94615005a1750b1fe9d5f68c9d 100644 (file)
--- a/bluechips/templates/history/index.mako
+++ b/bluechips/templates/history/index.mako
@@ -1,6 +1,6 @@
 <%inherit file="/base.mako"/>
 
-<%def name="title()">${parent.title()} :: History</%def>
+<%def name="title()">${parent.title()} :: ${c.title}</%def>
 
 <h2>Group Expenditures</h2>
 

diff --git a/bluechips/templates/spend/index.mako b/bluechips/templates/spend/index.mako
index 61047ad445ab1e243278c40840c42e5f4ad365b9..09f5e2b0c59ab6d914cb286aae05b1d7b3a40cc9 100644 (file)
--- a/bluechips/templates/spend/index.mako
+++ b/bluechips/templates/spend/index.mako
@@ -1,6 +1,6 @@
 <%inherit file="/base.mako"/>
 
-<%def name="title()">${parent.title()} :: Add a New Expenditure</%def>
+<%def name="title()">${parent.title()} :: ${c.title}</%def>
 <%!
 import bluechips.widgets.spend as forms
 %>

diff --git a/bluechips/templates/transfer/index.mako b/bluechips/templates/transfer/index.mako
index 18ef666a2f17a683d6a96eb6b310e501124d0a7f..a6684241c6f298c79ae9a091b2ab545207f5e6f2 100644 (file)
--- a/bluechips/templates/transfer/index.mako
+++ b/bluechips/templates/transfer/index.mako
@@ -1,6 +1,6 @@
 <%inherit file="/base.mako"/>
 
-<%def name="title()">${parent.title()} :: Add a New Transfer</%def>
+<%def name="title()">${parent.title()} :: ${c.title}</%def>
 <%!
 import bluechips.widgets.transfer as forms
 %>