From: erickson Date: Mon, 19 May 2008 21:09:33 +0000 (+0000) Subject: Moved to a dojo tooltip + dropdown-button menu for the top-level navigation X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2ab8c539b3dcbbffbc16c42f5c00666da5ee6f00;p=Evergreen.git Moved to a dojo tooltip + dropdown-button menu for the top-level navigation Added a base.html at the lowest level where local navigation can be defined (or imported) Removed the navigate.js files git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9643 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- 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 f6ceed90dd..b96b18c020 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 @@ -26,12 +26,15 @@ html, body, #oils-base-body-block { /* main layout blocks */ #oils-base-main-block { width: 100%; margin-top: 0px; padding-top: 0px;} -#oils-base-navigate-block { width: 15%; vertical-align: top; float:left;} -#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-navigate-block { width: 12%; vertical-align: top; float:left;} +#oils-base-content-block { width: 87%; vertical-align: top; float:right; padding-top: 0px;} +#oils-base-sidebar-block { width: 12%; 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-header-block { width: 100%; text-align: right; margin-top: 0px; padding-bottom: 0px;} +#oils-base-header-menu-block { float:left; text-align: left; width: 50%; } +#oils-base-header-auto-login-block { float:right; text-align: right; width: 47%;} + #oils-base-footer-block { width: 100%; text-align: center; vertical-align: bottom;} #oils-base-navigate-list { width: 100%; } 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 3814371605..ae8d520f6d 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 @@ -25,7 +25,7 @@ #oils-acq-search-sources-label { margin-bottom: 10px; } #oils-acq-search-fields-label { margin-bottom: 10px; } #oils-acq-search-fields-submit-block { margin: 5px; text-align: center;} -#oils-acq-search-progress {width: 100%, text-align: center;} +#oils-acq-search-progress {width: 100%; text-align: center;} #oils-acq-search-source-select option {padding: 5px;} #oils-acq-search-fields-tbody td {padding: 3px;} 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 c24f17b7a8..83043ea459 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 @@ -32,6 +32,8 @@ body { font-size: 80%; } .oils-base-sub-navigate-block a { color: #000000; } */ +#oils-base-header-user-info { font-weight: bold; margin-right: 8px;} + .label { font-weight: bold; } @@ -40,3 +42,17 @@ body { font-size: 80%; } */ .oils-admin-table td { border-bottom: 1px solid #d9e8f9; } .oils-admin-label { font-weight: bold; } + +.oils-acq-nav-link { + padding:0px 3px 3px 3px; + border-top:1px solid #F8F7F1; + border-bottom:1px solid #F8F7F1; + font-size: 105%; +} +.oils-acq-nav-link a { text-decoration:none; } +.oils-acq-nav-link-active { + background:#FFFDF3; + border-top:1px solid #ACA899; + border-bottom:1px solid #ACA899; +} + diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/base.html new file mode 100644 index 0000000000..46a0233fb8 --- /dev/null +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/base.html @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +<%inherit file='../base.html'/> +<%def name='block_navigate()'> + diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html index c90ebce37b..0c84bd3935 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%namespace file='../../common/widgets.html' name='widget'/> <%def name="page_title()">${_('Create Fund')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html index be15a79058..60bd544917 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%namespace file='../../common/widgets.html' name='widget'/> <%def name="page_title()">${_('Create Funding Allocation')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html index bb70ae0ce7..d50897ce33 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%namespace file='../../common/widgets.html' name='widget'/> <%def name="page_title()">${_('Create Funding Source')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html index 366cba799c..910890361b 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html @@ -2,8 +2,8 @@ -<%inherit file='../base.html'/> -<%namespace file='../../common/widgets.html' name='widget'/> +<%inherit file='base.html'/> +<%namespace file='../common/widgets.html' name='widget'/> <%def name="page_title()">${_('Create Funding Source Credit')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html index e46efa6875..ccdd07c3c0 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%namespace file='../../common/widgets.html' name='widget'/> <%def name="page_title()">${_('Create Provider')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html index 538c909449..2cbc929805 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('Currency Types')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html index 31132598f5..95973ab938 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('Funding Sources')} <%def name="block_content()"> 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 index c46e999565..c83c7da81e 100644 --- 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 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('Funds')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html index 6f2e666f1f..8f4a2c5768 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('Providers')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js deleted file mode 100644 index f3d773a197..0000000000 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js +++ /dev/null @@ -1,16 +0,0 @@ -{ - label : "${_('Funding Sources')}", - dest : 'acq/funding_source/list', - id : 'acq-funding-source-list' -}, -{ - label : "${_('Funds')}", - dest : 'acq/fund/list', - id : 'acq-fund-list' -}, -{ - label : "${_('Providers')}", - dest : 'acq/provider/list', - id : 'acq-provider-list' -} - 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 37a47acb8b..a2fa556800 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 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('View Fund')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html index b638ae117d..e19b452193 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%namespace file='../../common/widgets.html' name='widget'/> <%def name="page_title()">${_('View Funding Source')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html index bd667b25c2..abf7f65a04 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('View Provider')} <%def name="block_content()"> @@ -100,7 +100,7 @@ var padGridLayout = [{ cells : [[ {name: '${_("ID")}', field: 'id'}, - {name: '${_("Code")}', field:'code'}, + {name: '${_("Code")}', field:'code', width:'auto'}, {name: '${_("Description")}', field: "description", width:'auto'}, {name: '${_("Tag")}', get:getTag}, {name: '${_("Subfield")}', get:getSubfield}, diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js deleted file mode 100644 index 7efb58c356..0000000000 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js +++ /dev/null @@ -1,26 +0,0 @@ -{ label : "${_('Acquisitions')}", - id : 'acq', - children : [ - { label : "${_('Picklist')}", - dest : 'acq/picklist/list', - id : 'acq-picklist', - children : [ - <%include file='picklist/navigate.js'/> - ] - }, - { label:"${_('Manage Funds')}", - id : 'acq-fund', - dest : 'acq/fund/list', - children : [ - <%include file='financial/navigate.js'/> - ] - }, - { label : "${_('PO')}", - id : 'acq-po', - dest : 'acq/po/list', - children : [ - <%include file='po/navigate.js'/> - ] - } - ] -} diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html new file mode 100644 index 0000000000..12043088d3 --- /dev/null +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +<%inherit file='../base.html'/> +<%def name='block_navigate()'> +
+
${_('My Picklists')}
+
${_('All Picklists')}
+
${_('Picklist Search')}
+
${_('Title Search')}
+
+ + diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html index efa95a9f70..6a6c4d139d 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('Title Search')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js deleted file mode 100644 index 4fce98d906..0000000000 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js +++ /dev/null @@ -1,11 +0,0 @@ -{ - label : "${_('Manage')}", - dest : 'acq/picklist/list', - id : 'acq-picklist-list' -}, -{ - label : "${_('Search Titles')}", - dest : 'acq/picklist/bib_search', - id : 'acq-picklist-search' -} - 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 5af3536d81..a90745f9fa 100644 --- 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 @@ -2,7 +2,7 @@ -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="block_js()"> ${parent.block_js()} diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html index d81598da14..18110f136c 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html @@ -1,20 +1,24 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> -<%def name="page_title()">${_('Evergreen My Picklists')} +<%inherit file='base.html'/> +<%def name="page_title()">${_('My Picklists')} <%def name="block_content()">
${_('My Picklists')}
+
${_('All Picklists')}
+
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html new file mode 100644 index 0000000000..6dbbd54db4 --- /dev/null +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +<%inherit file='../base.html'/> +<%def name='block_navigate()'> +
+
${_('PO Search')}
+
${_('Load Order Record')}
+
+ + diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html index abc6d609d5..2af0aa6d9b 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('MARC File Upload')} <%def name="block_content()"> @@ -13,6 +13,7 @@ dojo.require('dijit.form.FilteringSelect'); dojo.require('openils.acq.Provider'); dojo.require('dojox.widget.FileInput'); + dojo.require('dojo.data.ItemFileReadStore'); function load() { openils.acq.Provider.createStore( function(store) { diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js deleted file mode 100644 index 19f97ee5ae..0000000000 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js +++ /dev/null @@ -1,15 +0,0 @@ -{ - label : '${_("Manage")}', - id : 'acq-po-list', - dest : 'acq/po/list' -}, -{ - label : '${_("Search")}', - id : 'acq-po-search', - dest: 'acq/po/search' -}, -{ - label : '${_("MARC File Upload")}', - id : 'acq-po-upload-marc', - dest: 'acq/po/marc_upload' -} diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html index 9ae325d8e9..17852d7545 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html'/> +<%inherit file='base.html'/> <%def name="page_title()">${_('PO Search')} <%def name="block_content()"> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html index 0485528ff7..3d0e2f6927 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -<%inherit file='../base.html' /> +<%inherit file='base.html' /> <%def name='page_title()'>${_('View PO')} <%def name='block_content()'> 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 9d98b0e7ee..9806c02850 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html @@ -6,34 +6,47 @@ ${parent.block_js()} <%def name='block_body_content()'> -
+
-
- ${self.block_header()} +
+
+ ${self.block_menu()} +
+
+ ${self.block_header()} +
-
+ +
${self.block_navigate()}
-
+ +
${self.block_global_content()}
@@ -44,17 +57,13 @@ <%def name='block_sidebar()'/> <%def name='block_global_content()'> - ${self.block_content()} <%def name='block_content()'/> -<%def name='block_sub_navigate()'/> +<%def name='block_menu()'> + <%include file='menu.html'/> + <%def name='block_navigate()'> - <%include file='navigate.html'/> <%def name='block_footer()'> <%include file='footer.html'/> diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html index e3432ab508..6937c40110 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html @@ -8,7 +8,6 @@ auto_login = False %> % if auto_login: - ${_('Auto-login is enabled')}| + +
+ +
+ ${('Acquisitions')} +
+
Picklists
+
Purchase Orders
+
+
+ +
+ ${('Serials')} +
+
Test
+
+
+ + +
+ ${('Admin')} +
+
Funds
+
Funding Sources
+
Providers
+
Distribution Patterns
+
Currency Types
+
+
+
+
+ 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 64177fa24e..27459cb30c 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html @@ -23,5 +23,3 @@ location.href = '${c.oils.core.prefix.value}/' + item.dest;
- -