[open-ils-commits] r9202 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default:
. acq acq/financial acq/picklist acq/po admin
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Apr 2 21:00:14 EDT 2008
Author: erickson
Date: 2008-04-02 20:23:53 -0400 (Wed, 02 Apr 2008)
New Revision: 9202
Added:
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
Removed:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
Modified:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
Log:
navigation tree is now a dojo tree
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html 2008-04-02 20:29:59 UTC (rev 9201)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html 2008-04-03 00:23:53 UTC (rev 9202)
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/fund/list'>${_('Funds')}</a>
-</div>
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/funding_source/list'>${_('Funding Sources')}</a>
-</div>
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/provider/list'>${_('Providers')}</a>
-</div>
-
Added: 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 (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.js 2008-04-03 00:23:53 UTC (rev 9202)
@@ -0,0 +1,16 @@
+{
+ 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'
+}
+
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html 2008-04-02 20:29:59 UTC (rev 9201)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html 2008-04-03 00:23:53 UTC (rev 9202)
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/base/index'>${_('Home')}</a>
-</div>
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/picklist/list'>${_('Picklists')}</a>
-</div>
-% if c.oils.core.page.value.startswith('acq/picklist'):
- <div class='oils-base-navigate-sub-list'>
- <%include file='picklist/navigate.html'/>
- </div>
-% endif
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/fund/list'>${_('Funds')}</a>
-</div>
-% if c.oils.core.page.value.startswith('acq/financial'):
- <div class='oils-base-navigate-sub-list'>
- <%include file='financial/navigate.html'/>
- </div>
-% endif
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/po/list'>${_('POs')}</a>
-</div>
-% if c.oils.core.page.value.startswith('acq/po'):
- <div class='oils-base-navigate-sub-list'>
- <%include file='po/navigate.html' />
- </div>
-% endif
-
Added: 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 (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.js 2008-04-03 00:23:53 UTC (rev 9202)
@@ -0,0 +1,26 @@
+{ 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'/>
+ ]
+ }
+ ]
+}
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html 2008-04-02 20:29:59 UTC (rev 9201)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html 2008-04-03 00:23:53 UTC (rev 9202)
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/picklist/list'>${_('Manage')}</a>
-</div>
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/picklist/search'>${_('Title Search')}</a>
-</div>
-
Added: 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 (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.js 2008-04-03 00:23:53 UTC (rev 9202)
@@ -0,0 +1,11 @@
+{
+ label : "${_('Manage')}",
+ dest : 'acq/picklist/list',
+ id : 'acq-picklist-list'
+},
+{
+ label : "${_('Search Titles')}",
+ dest : 'acq/picklist/search',
+ id : 'acq-picklist-search'
+}
+
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.html 2008-04-02 20:29:59 UTC (rev 9201)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.html 2008-04-03 00:23:53 UTC (rev 9202)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/po/list'>${_('Manage')}</a>
-</div>
Added: 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 (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/navigate.js 2008-04-03 00:23:53 UTC (rev 9202)
@@ -0,0 +1,5 @@
+{
+ label : '${_("Manage")}',
+ id : 'acq-po-list',
+ dest : 'acq/po/list'
+}
Deleted: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html 2008-04-02 20:29:59 UTC (rev 9201)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html 2008-04-03 00:23:53 UTC (rev 9202)
@@ -1,17 +0,0 @@
-<span>
- <a href='${c.oils.adm.prefix.value}/search/${c.oils.adm.object_class.value}'>${_('Search')}</a>
-</span>
-% if c.oils.adm.mode.value != 'create' and c.oils.core.page.value != 'admin/index.html':
- <span>
- <a href='${c.oils.adm.prefix.value}/create/${c.oils.adm.object_class.value}'>${_('Create')}</a>
- </span>
- % if c.oils.adm.mode.value != 'update':
- <span>
- <a href='${c.oils.adm.prefix.value}/update/${c.oils.adm.object_class.value}/${c.oils.adm.object.value.id()}'>${_('Update')}</a>
- </span>
- % endif
- <span>
- <a href='${c.oils.adm.prefix.value}/delete/${c.oils.adm.object_class.value}/${c.oils.adm.object.value.id()}'>${_('Delete')}</a>
- </span>
-% endif
-
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-04-02 20:29:59 UTC (rev 9201)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html 2008-04-03 00:23:53 UTC (rev 9202)
@@ -1,23 +1,25 @@
-# -*- coding: utf-8 -*-
-<div id='oils-base-navigate-list'>
- <div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/base/dashboard'>${_('Dashboard')}</a>
- </div>
- <div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/acq/base/index'>${_('Acquisitions')}</a>
- </div>
- % if c.oils.core.page.value.startswith('acq'):
- <div class='oils-base-navigate-sub-list'>
- <%include file='acq/navigate.html'/>
- </div>
- % endif
- <!--
- <div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/ser/index'>${_('Serials')}</a>
- </div>
- -->
- <div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix.value}/admin/index'>${_('Admin')}</a>
- </div>
+<script>
+ /* Create a simple data store to organize the menu options */
+ dojo.require("dijit.Tree");
+ var menuData = {
+ data : {
+ label: 'label',
+ identifier: 'id',
+ items: [
+ <%include file='acq/navigate.js'/>,
+ /** add navigation files as needed */
+ ]
+ }
+ };
+ var menuStore = new dojo.data.ItemFileReadStore(menuData);
+ //dojo.addOnLoad(function(){oilsMenuTree.expand()});
+</script>
+
+<div dojoType="dijit.Tree" jsId='oilsMenuTree' store="menuStore" label="${_('Menu')}">
+ <script type="dojo/method" event="onClick" args="item">
+ if(item.dest)
+ location.href = '${c.oils.core.prefix.value}/' + item.dest;
+ </script>
</div>
+
More information about the open-ils-commits
mailing list