[open-ils-commits] r8712 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: controllers controllers/acq lib templates/oils/default/acq/financial templates/oils/default/acq/picklist

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-02-11 12:53:10 -0500 (Mon, 11 Feb 2008)
New Revision: 8712

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
Log:
changed some method names to be more Pythonic.  change Fund Source labels to Funding Source

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py	2008-02-11 17:53:10 UTC (rev 8712)
@@ -65,7 +65,7 @@
         self.picklist_entry_marc_html = ContextItem()
 
     def postinit(self):
-        self.prefix = "%s/acq" % Context.getContext().core.prefix
+        self.prefix = "%s/acq" % Context.get_context().core.prefix
 
-Context.applySubContext('acq', AcqContext)
+Context.apply_sub_context('acq', AcqContext)
 

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py	2008-02-11 17:53:10 UTC (rev 8712)
@@ -15,9 +15,9 @@
         self.mode = ContextItem(default_value='view')
         self.prefix = ContextItem()
     def postinit(self):
-        self.prefix = "%s/admin" % Context.getContext().core.prefix
+        self.prefix = "%s/admin" % Context.get_context().core.prefix
 
-Context.applySubContext('adm', AdminContext)
+Context.apply_sub_context('adm', AdminContext)
 
 class AdminController(BaseController):
 

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py	2008-02-11 17:53:10 UTC (rev 8712)
@@ -9,8 +9,8 @@
 
 class BaseContext(SubContext):
     def postinit(self):
-        self.prefix = "%s/base" % Context.getContext().core.prefix
-Context.applySubContext('base', BaseContext)
+        self.prefix = "%s/base" % Context.get_context().core.prefix
+Context.apply_sub_context('base', BaseContext)
 
 
 class BaseController(BaseController):

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py	2008-02-11 17:53:10 UTC (rev 8712)
@@ -37,7 +37,7 @@
         usermgr.fetch_user()
         #self.work_orgs = usermgr.fetch_work_orgs()
 
-Context.applySubContext('core', CoreContext)
+Context.apply_sub_context('core', CoreContext)
 
 
 class UtilContext(SubContext):
@@ -48,6 +48,6 @@
         self.get_org_type = ContextItem(default_value=oils.org.OrgUtil.get_org_type)
         self.get_min_org_depth = ContextItem(default_value=oils.org.OrgUtil.get_min_depth)
 
-Context.applySubContext('util', UtilContext)
+Context.apply_sub_context('util', UtilContext)
 
 

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py	2008-02-11 17:53:10 UTC (rev 8712)
@@ -63,14 +63,13 @@
                 if val is not None and val != f.default_value:
                     session[f.cgi_name] =  val
 
-
     @staticmethod
-    def applySubContext(app, ctx):
+    def apply_sub_context(app, ctx):
         global _subContexts
         _subContexts[app] = ctx
 
     @staticmethod
-    def getContext():
+    def get_context():
         global _context
         return _context
 

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html	2008-02-11 17:53:10 UTC (rev 8712)
@@ -4,6 +4,14 @@
 <%def name="page_title()">${_('Funding Sources')}</%def>
 <%def name="block_content()">
 
+<div id='oils-acq-picklist-list-header' class='container'>
+    <div id='oils-acq-picklist-list-header-label'>${_('Funding Sources')}</div>
+    <div id='oils-acq-picklist-list-header-create'>
+        <a href='${c.oils.acq.prefix}/fund/create'>${_('New Funding Source')}</a>
+    </div>
+</div>
+
+
 <table class='oils-admin-table'>
     <thead>
         <tr>

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html	2008-02-11 17:53:10 UTC (rev 8712)
@@ -8,7 +8,3 @@
 <div class='oils-base-navigate-item'>
     <a href='${c.oils.core.prefix}/acq/fund_source/list'>${_('Funding Sources')}</a>
 </div>
-<div class='oils-base-navigate-item'>
-    <a href='${c.oils.core.prefix}/acq/fund_source/create'>${_('New Funding Source')}</a>
-</div>
-   

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html	2008-02-11 15:44:34 UTC (rev 8711)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html	2008-02-11 17:53:10 UTC (rev 8712)
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+<!-- 
+ vim:ft=mako: 
+-->
 <%inherit file='../base.html'/>
 <%def name="page_title()">${_('Picklist')}</%def>
 <%def name="block_content()">