From 2a6bd9b1c29365b58a11e98f8506d2aa9a910657 Mon Sep 17 00:00:00 2001 From: erickson Date: Sun, 11 May 2008 14:39:35 +0000 Subject: [PATCH] dojo-ized the provider detail display moved some inline style to the .css files git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9553 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../oilsweb/oilsweb/controllers/acq/provider.py | 5 +- .../public/oils/media/css/skin/default/acq.css | 2 + .../oils/default/acq/financial/view_fund.html | 4 -- .../oils/default/acq/financial/view_provider.html | 77 +++++++++++++++++----- 4 files changed, 64 insertions(+), 24 deletions(-) diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py index ac1670258d..fb043ab984 100644 --- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py +++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py @@ -13,12 +13,9 @@ class ProviderController(BaseController): def view(self, **kwargs): r = RequestMgr() - provider = provider_mgr.retrieve(r, kwargs['id']) - provider.owner(OrgUtil.get_org_unit(provider.owner())) - r.ctx.acq.provider.value = provider + r.ctx.acq.provider_id = kwargs['id'] return r.render('acq/financial/view_provider.html') - def create(self): r = RequestMgr() ses = ClientSession(oils.const.OILS_APP_ACQ) diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css index ec7d6bcfc5..3814371605 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css @@ -6,6 +6,8 @@ .oils-sub-navigate-block span { padding: 3px; } */ +.oils-acq-detail-content-pane {height:600px;width:100%} + /* bib search */ #oils-acq-search-container { width:100%; } #oils-acq-search-sources-block { width:32%; vertical-align: top; float: left; margin-right: 10px;} diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html index ecc148fee0..d9fec41106 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html @@ -95,10 +95,6 @@
${_('Fund Details')}
- -
-<%namespace file='../../common/widgets.html' name='widget'/> <%def name="page_title()">${_('View Provider')} <%def name="block_content()"> -<% provider = c.oils.acq.provider.value %> + + + +
+
+
+ +
+
+
- - - - - - - - - - - -
${_('Owner')}${provider.owner().name()}
${_('Currency')}${provider.currency_type()}
+ -- 2.11.0