[open-ils-commits] r8487 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: lib
public/oils/media/css/skin public/oils/media/css/theme
templates/oils/default templates/oils/default/acq
templates/oils/default/acq/financial
templates/oils/default/acq/picklist
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Jan 23 16:51:21 EST 2008
Author: erickson
Date: 2008-01-23 16:24:48 -0500 (Wed, 23 Jan 2008)
New Revision: 8487
Added:
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/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html
Modified:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
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/theme/default.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.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/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
Log:
moved the navigation links into divs for easier modification
moved app-specific nav links into main nav chunk -- tree-like display
added some more direct action links
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py 2008-01-23 19:37:00 UTC (rev 8486)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py 2008-01-23 21:24:48 UTC (rev 8487)
@@ -24,9 +24,9 @@
self.authtoken = ContextItem(cgi_name='ses', session=True) # authtoken string
self.user = ContextItem() # logged in user object
self.workstation = ContextItem() # workstation object
- self.page = ContextItem() # the current page
self.use_demo = ContextItem(cgi_name='demo') # use the demo login
self.org_tree = ContextItem() # full org tree
+ self.page = ContextItem() # the current page
def postinit(self):
self.prefix = pylons.config['oils_prefix']
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-01-23 19:37:00 UTC (rev 8486)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css 2008-01-23 21:24:48 UTC (rev 8487)
@@ -10,25 +10,25 @@
table { border-collapse: collapse; }
body { margin-top: 0px; padding-top: 0px;}
+/* main layout blocks */
#oils-base-body-block { width: 100%; margin-top: 0px; padding-top: 0px;}
#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-navigate-block { width: 15%; vertical-align: top; float:left;}
-#oils-base-navigate-table { width: 100%; }
-#oils-base-navigate-table td { width: 100%; }
#oils-base-sidebar-block { width: 15%; 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-footer-block { width: 100%; text-align: center; vertical-align: bottom;}
+#oils-base-navigate-list { width: 100%; }
+.oils-base-navigate-sub-list { padding-left: 4px; }
+.oils-base-navigate-item {}
-.oils-base-sub-navigate-block { text-align: center; padding: 3px; margin-bottom: 10px;}
-.oils-base-sub-navigate-block span { padding: 3px; }
-
/* general purpose form table */
.oils-admin-table { width: 100%; }
.oils-admin-table td { padding: 4px; }
.oils-admin-label { width: 20%; }
.label { margin: 1px; }
+
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-01-23 19:37:00 UTC (rev 8486)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css 2008-01-23 21:24:48 UTC (rev 8487)
@@ -7,17 +7,27 @@
#oils-base-body-block {}
#oils-base-navigate-block {border: 2px solid #85C777; background: #6BA160;}
#oils-base-navigate-block a { color: #000000; }
-#oils-base-navigate-table td:hover { background: #85C777; }
#oils-base-content-block {}
#oils-base-sidebar-block {}
#oils-base-footer-block {padding: 3px; margin-top: 20px; border-top: 1px solid #5E5E5E;}
-#oils-base-header-block {border-bottom: 1px solid #5E5E5E; }
+/*
+#oils-base-header-block {border-bottom: 1px solid #5E5E5E; border: 2px solid #85C777; background: #6BA160;}
+*/
+#oils-base-header-block {border-bottom: 1px solid #6BA160;}
+#oils-base-navigate-list { width: 100%; }
+.oils-base-navigate-sub-list { margin-left: 14px; }
+/*.oils-base-navigate-item {border: 2px solid #85C777; background: #6BA160;}*/
+.oils-base-navigate-item:hover { background: #85C777; }
+
+/*
+#oils-base-navigate-table td:hover { background: #85C777; }
.oils-base-sub-navigate-block { border: 2px solid #6BA160; background: #85C777;}
.oils-base-sub-navigate-block a { color: #000000; }
-.oils-base-sub-navigate-block span:hover { background: #6BA160; }
+*/
+
.label { font-weight: bold; }
.oils-admin-table td { border-bottom: 1px solid #5E5E5E; }
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.html 2008-01-23 19:37:00 UTC (rev 8486)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/base.html 2008-01-23 21:24:48 UTC (rev 8487)
@@ -1,6 +1,2 @@
# -*- coding: utf-8 -*-
<%inherit file='../base.html'/>
-<%def name="block_sub_navigate()">
- <%include file='navigate.html'/>
-</%def>
-
Added: 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 (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-01-23 21:24:48 UTC (rev 8487)
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+<%inherit file='../base.html'/>
+<%namespace file='../../common/widgets.html' name='widget'/>
+<%def name="page_title()">${_('Evergreen Create Fund')}</%def>
+<%def name="block_content()">
+
+<table class='oils-admin-table'>
+ <thead>
+ <tr>
+ <td>${_('Fund Name')}</td>
+ <td>${_('Fund Owner')}</td>
+ <td>${_('Fund Currency Type')}</td>
+ </tr>
+ </thead>
+ <tbody>
+ % for fund in c.oils.acq.fund_list:
+ <tr>
+ <td><a href='${c.oils.acq.prefix}/fund/view/${fund.id()}'>${fund.name()}</a></td>
+ <td>${fund.owner().name()}</td>
+ <td>${fund.currency_type()}</td>
+ </tr>
+ %endfor
+ </tbody>
+</table>
+</%def>
Added: 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 (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html 2008-01-23 21:24:48 UTC (rev 8487)
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+<div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/acq/fund/list'>${_('My Funds')}</a>
+</div>
+<div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/acq/fund/create'>${_('Create Fund')}</a>
+</div>
+
Modified: 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-01-23 19:37:00 UTC (rev 8486)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html 2008-01-23 21:24:48 UTC (rev 8487)
@@ -1,5 +1,21 @@
# -*- coding: utf-8 -*-
-<span><a href='${c.oils.core.prefix}/acq/base/index'>${_('Acquisitions Home')}</a></span>
-<span><a href='${c.oils.core.prefix}/acq/picklist/search'>${_('Bib Search')}</a></span>
-<span><a href='${c.oils.core.prefix}/acq/picklist/list'>${_('My Picklists')}</a></span>
+<div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/acq/base/index'>${_('Home')}</a>
+</div>
+<div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/acq/picklist/list'>${_('Picklists')}</a>
+</div>
+% if c.oils.core.page.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}/acq/fund/list'>${_('Funds')}</a>
+</div>
+% if c.oils.core.page.startswith('acq/financial'):
+ <div class='oils-base-navigate-sub-list'>
+ <%include file='financial/navigate.html'/>
+ </div>
+% endif
Added: 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 (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html 2008-01-23 21:24:48 UTC (rev 8487)
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+<div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/acq/picklist/list'>${_('My Picklists')}</a>
+</div>
+<div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/acq/picklist/search'>${_('Bib Search')}</a>
+</div>
+
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-01-23 19:37:00 UTC (rev 8486)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html 2008-01-23 21:24:48 UTC (rev 8487)
@@ -28,9 +28,11 @@
</%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()'/>
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-01-23 19:37:00 UTC (rev 8486)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html 2008-01-23 21:24:48 UTC (rev 8487)
@@ -1,10 +1,21 @@
# -*- coding: utf-8 -*-
-<table id='oils-base-navigate-table'>
- <tbody>
- <tr><td><a href='${c.oils.core.prefix}/base/dashboard'>${_('Dashboard')}</a></td></tr>
- <tr><td><a href='${c.oils.core.prefix}/acq/base/index'>${_('Acquisitions')}</a></td></tr>
- <tr><td><a href='${c.oils.core.prefix}/ser/index'>${_('Serials')}</a></td></tr>
- <tr><td><a href='${c.oils.core.prefix}/admin/index'>${_('Admin')}</a></td></tr>
- </tbody>
-</table>
+<div id='oils-base-navigate-list'>
+ <div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/base/dashboard'>${_('Dashboard')}</a>
+ </div>
+ <div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/acq/base/index'>${_('Acquisitions')}</a>
+ </div>
+ % if c.oils.core.page.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}/ser/index'>${_('Serials')}</a>
+ </div>
+ <div class='oils-base-navigate-item'>
+ <a href='${c.oils.core.prefix}/admin/index'>${_('Admin')}</a>
+ </div>
+</div>
More information about the open-ils-commits
mailing list