From: erickson Date: Wed, 23 Jan 2008 21:24:48 +0000 (+0000) Subject: moved the navigation links into divs for easier modification X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d8219eae80ff7d76b5c1c494496f5871722882ca;p=Evergreen.git moved the navigation links into divs for easier modification moved app-specific nav links into main nav chunk -- tree-like display added some more direct action links git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8487 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py index aa9d612949..b4e2c9cc82 100644 --- a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py +++ b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py @@ -24,9 +24,9 @@ class CoreContext(SubContext): self.authtoken = ContextItem(cgi_name='ses', session=True) # authtoken string self.user = ContextItem() # logged in user object self.workstation = ContextItem() # workstation object - self.page = ContextItem() # the current page self.use_demo = ContextItem(cgi_name='demo') # use the demo login self.org_tree = ContextItem() # full org tree + self.page = ContextItem() # the current page def postinit(self): self.prefix = pylons.config['oils_prefix'] diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css index e62655a65f..6002bf839b 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css @@ -10,21 +10,20 @@ table { border-collapse: collapse; } body { margin-top: 0px; padding-top: 0px;} +/* main layout blocks */ #oils-base-body-block { width: 100%; margin-top: 0px; padding-top: 0px;} #oils-base-main-block { width: 100%; margin-top: 0px; padding-top: 0px;} -#oils-base-content-block { width: 84%; vertical-align: top; float:right; padding-top: 0px;} #oils-base-navigate-block { width: 15%; vertical-align: top; float:left;} -#oils-base-navigate-table { width: 100%; } -#oils-base-navigate-table td { width: 100%; } +#oils-base-content-block { width: 84%; vertical-align: top; float:right; padding-top: 0px;} #oils-base-sidebar-block { width: 15%; vertical-align: top; float:left;} #oils-base-header-auto-login { padding-right: 20px; } #oils-base-header-block { width: 100%; text-align: right; margin-top: 0px; padding-bottom: 4px;} #oils-base-footer-block { width: 100%; text-align: center; vertical-align: bottom;} - -.oils-base-sub-navigate-block { text-align: center; padding: 3px; margin-bottom: 10px;} -.oils-base-sub-navigate-block span { padding: 3px; } +#oils-base-navigate-list { width: 100%; } +.oils-base-navigate-sub-list { padding-left: 4px; } +.oils-base-navigate-item {} /* general purpose form table */ .oils-admin-table { width: 100%; } @@ -32,3 +31,4 @@ body { margin-top: 0px; padding-top: 0px;} .oils-admin-label { width: 20%; } .label { margin: 1px; } + diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css index decdf08db4..cbc3286d52 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css @@ -7,16 +7,26 @@ body { font-size: 80%; } #oils-base-body-block {} #oils-base-navigate-block {border: 2px solid #85C777; background: #6BA160;} #oils-base-navigate-block a { color: #000000; } -#oils-base-navigate-table td:hover { background: #85C777; } #oils-base-content-block {} #oils-base-sidebar-block {} #oils-base-footer-block {padding: 3px; margin-top: 20px; border-top: 1px solid #5E5E5E;} -#oils-base-header-block {border-bottom: 1px solid #5E5E5E; } +/* +#oils-base-header-block {border-bottom: 1px solid #5E5E5E; border: 2px solid #85C777; background: #6BA160;} +*/ +#oils-base-header-block {border-bottom: 1px solid #6BA160;} + +#oils-base-navigate-list { width: 100%; } +.oils-base-navigate-sub-list { margin-left: 14px; } +/*.oils-base-navigate-item {border: 2px solid #85C777; background: #6BA160;}*/ +.oils-base-navigate-item:hover { background: #85C777; } +/* +#oils-base-navigate-table td:hover { background: #85C777; } .oils-base-sub-navigate-block { border: 2px solid #6BA160; background: #85C777;} .oils-base-sub-navigate-block a { color: #000000; } -.oils-base-sub-navigate-block span:hover { background: #6BA160; } +*/ + .label { font-weight: bold; } diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.html index 66dbf68e82..b285202232 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.html @@ -1,6 +1,2 @@ # -*- coding: utf-8 -*- <%inherit file='../base.html'/> -<%def name="block_sub_navigate()"> - <%include file='navigate.html'/> - - diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html new file mode 100644 index 0000000000..b29e75c71b --- /dev/null +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +<%inherit file='../base.html'/> +<%namespace file='../../common/widgets.html' name='widget'/> +<%def name="page_title()">${_('Evergreen Create Fund')} +<%def name="block_content()"> + + + + + + + + + + + % for fund in c.oils.acq.fund_list: + + + + + + %endfor + +
${_('Fund Name')}${_('Fund Owner')}${_('Fund Currency Type')}
${fund.name()}${fund.owner().name()}${fund.currency_type()}
+ 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 new file mode 100644 index 0000000000..cf932a86b4 --- /dev/null +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +
+ ${_('My Funds')} +
+
+ ${_('Create Fund')} +
+ diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html index fabfd12f23..76068dad23 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html @@ -1,5 +1,21 @@ # -*- coding: utf-8 -*- -${_('Acquisitions Home')} -${_('Bib Search')} -${_('My Picklists')} +
+ ${_('Home')} +
+
+ ${_('Picklists')} +
+% if c.oils.core.page.startswith('acq/picklist'): +
+ <%include file='picklist/navigate.html'/> +
+% endif +
+ ${_('Funds')} +
+% if c.oils.core.page.startswith('acq/financial'): +
+ <%include file='financial/navigate.html'/> +
+% endif diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html new file mode 100644 index 0000000000..1fb1437fad --- /dev/null +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +
+ ${_('My Picklists')} +
+
+ ${_('Bib Search')} +
+ diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html index a028bb901a..9e7c736eb3 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html @@ -28,9 +28,11 @@ <%def name='block_sidebar()'/> <%def name='block_global_content()'> + ${self.block_content()} <%def name='block_content()'/> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html index 8c5d7551c3..5243d08fac 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html @@ -1,10 +1,21 @@ # -*- coding: utf-8 -*- - - - - - - - -
${_('Dashboard')}
${_('Acquisitions')}
${_('Serials')}
${_('Admin')}
+
+
+ ${_('Dashboard')} +
+
+ ${_('Acquisitions')} +
+ % if c.oils.core.page.startswith('acq'): +
+ <%include file='acq/navigate.html'/> +
+ % endif +
+ ${_('Serials')} +
+
+ ${_('Admin')} +
+