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 f6ceed9..b96b18c 100644 (file)
--- 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 3814371..ae8d520 100644 (file)
--- 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 c24f17b..83043ea 100644 (file)
--- 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 (file)
index 0000000..46a0233
--- /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()'>
+</%def>

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 c90ebce..0c84bd3 100644 (file)
--- 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 -*-
 <!-- 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()">

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 be15a79..60bd544 100644 (file)
--- 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 -*-
 <!-- 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()">

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 bb70ae0..d50897c 100644 (file)
--- 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 -*-
 <!-- 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()">

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 366cba7..9108903 100644 (file)
--- 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 @@
 <!-- 
  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()">
 

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 e46efa6..ccdd07c 100644 (file)
--- 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 -*-
 <!-- 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()">

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 538c909..2cbc929 100644 (file)
--- 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>
 <%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 3113259..95973ab 100644 (file)
--- 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>
 <%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 c46e999..c83c7da 100644 (file)
--- 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>
 <%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 6f2e666..8f4a2c5 100644 (file)
--- 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>
 <%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 (file)
index f3d773a..0000000
--- 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 37a47ac..a2fa556 100644 (file)
--- 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>
 <%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 b638ae1..e19b452 100644 (file)
--- 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>
 <%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 bd667b2..abf7f65 100644 (file)
--- 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>
 <%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 (file)
index 7efb58c..0000000
--- 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 (file)
index 0000000..1204308
--- /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()'>
+    <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>

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 efa95a9..6a6c4d1 100644 (file)
--- 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>
 
 <%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 (file)
index 4fce98d..0000000
--- 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 5af3536..a90745f 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
@@ -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()}

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 d81598d..18110f1 100644 (file)
--- 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')}</%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>
 

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 (file)
index 0000000..6dbbd54
--- /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()'>
+    <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>

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 abc6d60..2af0aa6 100644 (file)
--- 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>
 <%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 (file)
index 19f97ee..0000000
--- 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 9ae325d..17852d7 100644 (file)
--- 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>
 <%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 0485528..3d0e2f6 100644 (file)
--- 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>
 <%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 9d98b0e..9806c02 100644 (file)
--- 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()}
 
     <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'/>

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 e3432ab..6937c40 100644 (file)
--- 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:
-        <span id='oils-base-header-auto-login'>${_('Auto-login is enabled')}</span>|
         <script>
             dojo.require('openils.User');
             dojo.require('openils.Event');

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
new file mode 100644 (file)
index 0000000..96399cd
--- /dev/null
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
@@ -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>
+

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 64177fa..27459cb 100644 (file)
--- 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;
     </script>
 </div>
-
-