[open-ils-commits] SPAM: r9643 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb:
public/oils/media/css/skin public/oils/media/css/skin/default
public/oils/media/css/theme templates/oils/default
templates/oils/default/acq templates/oils/default/acq/financial
templates/oils/default/acq/picklist templates/oils/default/acq/po
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon May 19 17:09:37 EDT 2008
Author: erickson
Date: 2008-05-19 17:09:33 -0400 (Mon, 19 May 2008)
New Revision: 9643
Added:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
Removed:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js
Modified:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
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_list.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
Log:
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
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css 2008-05-19 21:09:33 UTC (rev 9643)
@@ -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;}
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css 2008-05-19 21:09:33 UTC (rev 9643)
@@ -26,12 +26,15 @@
/* 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%; }
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css 2008-05-19 21:09:33 UTC (rev 9643)
@@ -32,7 +32,9 @@
.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 @@
*/
.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;
+}
+
Added: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/base.html (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/base.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+<%inherit file='../base.html'/>
+<%def name='block_navigate()'>
+</%def>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
<!-- vim:set filetype=mako: -->
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%namespace file='../../common/widgets.html' name='widget'/>
<%def name="page_title()">${_('Create Fund')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
<!-- vim:set filetype=mako: -->
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%namespace file='../../common/widgets.html' name='widget'/>
<%def name="page_title()">${_('Create Funding Allocation')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
<!-- vim:set filetype=mako: -->
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%namespace file='../../common/widgets.html' name='widget'/>
<%def name="page_title()">${_('Create Funding Source')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -2,8 +2,8 @@
<!--
vim:ft=mako:
-->
-<%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>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
<!-- vim:set filetype=mako: -->
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%namespace file='../../common/widgets.html' name='widget'/>
<%def name="page_title()">${_('Create Provider')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_currency_types.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('Currency Types')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('Funding Sources')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('Funds')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('Providers')}</%def>
<%def name="block_content()">
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js 2008-05-19 21:09:33 UTC (rev 9643)
@@ -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'
-}
-
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('View Fund')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -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>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('View Provider')}</%def>
<%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},
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js 2008-05-19 21:09:33 UTC (rev 9643)
@@ -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'/>
- ]
- }
- ]
-}
Added: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+<%inherit file='../base.html'/>
+<%def name='block_navigate()'>
+ <div id='oils-acq-picklist-nav-div'>
+ <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/picklist/list'>${_('My Picklists')}</a></div>
+ <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/picklist/listall'>${_('All Picklists')}</a></div>
+ <div class='oils-acq-nav-link'><a href='javascript:alert("not yet...");'>${_('Picklist Search')}</a></div>
+ <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/picklist/bib_search'>${_('Title Search')}</a></div>
+ </div>
+ <script>setSelectedNavLink('oils-acq-picklist-nav-div');</script>
+</%def>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/bib_search.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('Title Search')}</%def>
<%def name="block_content()">
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js 2008-05-19 21:09:33 UTC (rev 9643)
@@ -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'
-}
-
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-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -2,7 +2,7 @@
<!--
vim:ts=4:sw=4:et:ft=mako:
-->
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="block_js()">
${parent.block_js()}
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,20 +1,24 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
-<%def name="page_title()">${_('Evergreen My Picklists')}</%def>
+<%inherit file='base.html'/>
+<%def name="page_title()">${_('My Picklists')}</%def>
<%def name="block_content()">
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-picklist-my-list-header'>
<div id='oils-acq-list-header-label'>${_('My Picklists')}</div>
+ <!--
<div id='oils-acq-list-header-actions'>
<a id='oils-acq-picklist-view-all' href="${c.oils.acq.prefix.value}/picklist/listall">${_('View All Picklists')}</a>
</div>
+ -->
</div>
<div id='oils-acq-picklist-all-list-header'>
<div id='oils-acq-list-header-label'>${_('All Picklists')}</div>
+ <!--
<div id='oils-acq-list-header-actions'>
<a id='oils-acq-picklist-view-mine' href="${c.oils.acq.prefix.value}/picklist/list">${_('View My Picklists')}</a>
</div>
+ -->
</div>
</div>
Added: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+<%inherit file='../base.html'/>
+<%def name='block_navigate()'>
+ <div id='oils-acq-picklist-nav-div'>
+ <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/search'>${_('PO Search')}</a></div>
+ <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/marc_upload'>${_('Load Order Record')}</a></div>
+ </div>
+ <script>setSelectedNavLink('oils-acq-picklist-nav-div');</script>
+</%def>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/marc_upload.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('MARC File Upload')}</%def>
<%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) {
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js 2008-05-19 21:09:33 UTC (rev 9643)
@@ -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'
-}
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html'/>
+<%inherit file='base.html'/>
<%def name="page_title()">${_('PO Search')}</%def>
<%def name="block_content()">
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-<%inherit file='../base.html' />
+<%inherit file='base.html' />
<%def name='page_title()'>${_('View PO')}</%def>
<%def name='block_content()'>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -6,34 +6,47 @@
${parent.block_js()}
<script type="text/javascript">
- dojo.require("dijit.layout.LayoutContainer")
- dojo.require("dijit.layout.ContentPane")
+ dojo.require("dijit.layout.LayoutContainer");
+ dojo.require("dijit.layout.ContentPane");
+
+ // sets the -active css class on the selected link
+ function setSelectedNavLink(divId) {
+ refs = dojo.query('a', divId);
+ for(var i = 0; i < refs.length; i++) {
+ var ref = refs[i];
+ if(ref.getAttribute('href') == location.href.replace(/http:\/\/.*?\//,'/'))
+ ref.parentNode.className += ' oils-acq-nav-link-active';
+ }
+ }
</script>
</%def>
<%def name='block_body_content()'>
- <div id="oils-base-body-block" class="tundra"
- dojoType="dijit.layout.LayoutContainer">
+ <div id="oils-base-body-block" class="tundra" dojoType="dijit.layout.LayoutContainer">
- <div id="oils-base-header-block"
- dojoType="dijit.layout.ContentPane" layoutAlign="top">
- ${self.block_header()}
+ <div id="oils-base-header-block" dojoType="dijit.layout.ContentPane" layoutAlign="top">
+ <div id='oils-base-header-menu-block'>
+ ${self.block_menu()}
+ </div>
+ <div id='oils-base-header-auto-login-block'>
+ ${self.block_header()}
+ </div>
</div>
<div id="oils-base-main-block"
dojoType="dijit.layout.LayoutContainer" layoutAlign="client">
- <div id="oils-base-navigate-block"
- dojoType="dijit.layout.ContentPane" layoutAlign="left">
+
+ <div id="oils-base-navigate-block" dojoType="dijit.layout.ContentPane" layoutAlign="left">
${self.block_navigate()}
</div>
- <div id="oils-base-content-block"
- dojoType="dijit.layout.ContentPane" layoutAlign="client">
+
+ <div id="oils-base-content-block" dojoType="dijit.layout.ContentPane" layoutAlign="client">
${self.block_global_content()}
</div>
</div>
<div id="oils-base-footer-block"
- dojoType="dijit.layout.ContentPane" layoutAlign="bottom">
+ dojoType="dijit.layout.ContentPane" layoutAlign="bottom">
${self.block_footer()}
</div>
</div>
@@ -44,17 +57,13 @@
</%def>
<%def name='block_sidebar()'/>
<%def name='block_global_content()'>
- <!--
- <div class='oils-base-sub-navigate-block'>
- ${self.block_sub_navigate()}
- </div>
- -->
${self.block_content()}
</%def>
<%def name='block_content()'/>
-<%def name='block_sub_navigate()'/>
+<%def name='block_menu()'>
+ <%include file='menu.html'/>
+</%def>
<%def name='block_navigate()'>
- <%include file='navigate.html'/>
</%def>
<%def name='block_footer()'>
<%include file='footer.html'/>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -8,7 +8,6 @@
auto_login = False
%>
% if auto_login:
- <span id='oils-base-header-auto-login'>${_('Auto-login is enabled')}</span>|
<script>
dojo.require('openils.User');
dojo.require('openils.Event');
Added: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -0,0 +1,44 @@
+<div>
+ <script>
+ dojo.require('dijit.Toolbar');
+ dojo.require('dijit.Menu');
+ </script>
+
+ <div dojoType="dijit.Toolbar" class='menuBar'>
+
+ <div dojoType="dijit.form.DropDownButton">
+ <span>${('Acquisitions')}</span>
+ <div dojoType="dijit.Menu">
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/picklist/list';">Picklists</div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/po/search';">Purchase Orders</div>
+ </div>
+ </div>
+
+ <div dojoType="dijit.form.DropDownButton">
+ <span>${('Serials')}</span>
+ <div dojoType="dijit.Menu">
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" onClick="alert('not yet...');">Test</div>
+ </div>
+ </div>
+
+
+ <div dojoType="dijit.form.DropDownButton">
+ <span>${('Admin')}</span>
+ <div dojoType="dijit.Menu">
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/fund/list';">Funds</div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/funding_source/list';">Funding Sources</div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/provider/list';">Providers</div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" onclick='alert("not yet...");'
+ onClick="return false;location.href = '${c.oils.core.prefix.value}/acq/fund/list';">Distribution Patterns</div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/currency_type/list';">Currency Types</div>
+ </div>
+ </div>
+ </div>
+</div>
+
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html 2008-05-19 18:17:07 UTC (rev 9642)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html 2008-05-19 21:09:33 UTC (rev 9643)
@@ -23,5 +23,3 @@
location.href = '${c.oils.core.prefix.value}/' + item.dest;
</script>
</div>
-
-
More information about the open-ils-commits
mailing list