changed some method names to be more Pythonic. change Fund Source labels to Funding...

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8712 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
index 13f52db..52027fe 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
@@ -65,7 +65,7 @@ class AcqContext(SubContext):
         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)
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py b/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py
index 466b098..578806e 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py
@@ -15,9 +15,9 @@ class AdminContext(SubContext):
         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):
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/base.py b/Open-ILS/web/oilsweb/oilsweb/controllers/base.py
index a0f296b..26b4bfb 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/base.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/base.py
@@ -9,8 +9,8 @@ log = logging.getLogger(__name__)
 
 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):

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
index 85046ba..1cb3362 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
@@ -37,7 +37,7 @@ class CoreContext(SubContext):
         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 @@ class UtilContext(SubContext):
         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)
 
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/context.py b/Open-ILS/web/oilsweb/oilsweb/lib/context.py
index 80262f0..5a4afd8 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/lib/context.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/context.py
@@ -63,14 +63,13 @@ class Context(object):
                 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
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
index d63ce64..350cb97 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
@@ -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>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
index e06ad8f..bcbf1e9 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
@@ -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>
-   

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
index 8f07cc1..6225f5a 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+<!-- 
+ vim:ft=mako: 
+-->
 <%inherit file='../base.html'/>
 <%def name="page_title()">${_('Picklist')}</%def>
 <%def name="block_content()">