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

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@10146 dcc99617-32d9-48b4-a31d-7c20da2025e4

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
index 1204308..763500a 100644 (file)
--- 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
@@ -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>

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
index 1d47038..9bd815d 100644 (file)
--- 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
@@ -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>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
index 06a085e..cacb4ad 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
@@ -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>