Move common title generating code into base template

diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index ee8ad78f3cd579b9a3887761f7906c9b8ed003e5..66a7cb9c130bebc1f22aa07e0e455af4c0995d6b 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -38,7 +38,11 @@
   </body>
 </html>
 
-<%def name="title()">BlueChips</%def>
+<%def name="title()">BlueChips
+% if c.title != '':
+  :: ${c.title}
+% endif
+</%def>
 
 <%def name="listExpenditures(es)">
 <table>

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

diff --git a/bluechips/templates/spend/index.mako b/bluechips/templates/spend/index.mako
index e8283308257a6175379a162a3e35a2ba84cd0012..7cff4a8975962b6efaa18c74c45993bdf0724edc 100644 (file)
--- a/bluechips/templates/spend/index.mako
+++ b/bluechips/templates/spend/index.mako
@@ -1,6 +1,5 @@
 <%inherit file="/base.mako"/>
 
-<%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 73a7042c6e2e033f8b3e975680a42e81f7b4daf3..ec23631c8c189b51466c9a8ec5a551859789808c 100644 (file)
--- a/bluechips/templates/transfer/index.mako
+++ b/bluechips/templates/transfer/index.mako
@@ -1,6 +1,5 @@
 <%inherit file="/base.mako"/>
 
-<%def name="title()">${parent.title()} :: ${c.title}</%def>
 <%!
 import bluechips.widgets.transfer as forms
 %>