[open-ils-commits] r10146 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default:
. acq/picklist acq/po
svn at svn.open-ils.org
svn at svn.open-ils.org
Sun Jul 27 10:21:17 EDT 2008
Author: erickson
Date: 2008-07-27 10:21:10 -0400 (Sun, 27 Jul 2008)
New Revision: 10146
Modified:
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
Log:
moved the primary menu items into the top-level menu as sub-menus to reduce
the amount of extra page loads to get to an option
Modified: 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 2008-07-26 05:14:58 UTC (rev 10145)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/base.html 2008-07-27 14:21:10 UTC (rev 10146)
@@ -1,6 +1,7 @@
# -*- 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>
@@ -8,4 +9,5 @@
<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/po/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html 2008-07-26 05:14:58 UTC (rev 10145)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html 2008-07-27 14:21:10 UTC (rev 10146)
@@ -1,10 +1,12 @@
# -*- 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/li_search'>${_('Lineitem 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/menu.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html 2008-07-26 05:14:58 UTC (rev 10145)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html 2008-07-27 14:21:10 UTC (rev 10146)
@@ -9,10 +9,44 @@
<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>
+
+ <!-- ==========================================================================
+ Picklist SubMenu
+ ========================================================================== -->
+ <div dojoType="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
+ <span>Selection Lists</span>
+ <div dojoType="dijit.Menu">
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/picklist/list';">
+ My Selection Lists
+ </div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/picklist/bib_search';">
+ Title Search
+ </div>
+ </div>
+ </div>
+
+ <!-- ==========================================================================
+ Purchase Order SubMenu
+ ========================================================================== -->
+ <div dojoType="dijit.PopupMenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy">
+ <span>Purchase Orders</span>
+ <div dojoType="dijit.Menu">
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/po/search';">
+ PO Search
+ </div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/po/li_search';">
+ Lineitem Search
+ </div>
+ <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+ onClick="location.href = '${c.oils.core.prefix.value}/acq/po/marc_upload';">
+ Load Vendor Order Records
+ </div>
+ </div>
+ </div>
</div>
</div>
@@ -35,8 +69,10 @@
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>
More information about the open-ils-commits
mailing list