From 08345d8fb01ba1e06db55313bcc0133405f7e530 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 11 Feb 2008 19:04:31 +0000
Subject: [PATCH] moved new-fund action into fund list page.  generic-ified
 some of the css

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8714 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css    | 7 ++++---
 .../oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css   | 7 ++++---
 .../templates/oils/default/acq/financial/list_fund_sources.html   | 6 +++---
 .../oilsweb/templates/oils/default/acq/financial/list_funds.html  | 8 ++++++++
 .../oilsweb/templates/oils/default/acq/financial/navigate.html    | 3 ---
 .../oilsweb/templates/oils/default/acq/picklist/view_list.html    | 6 +++---
 6 files changed, 22 insertions(+), 15 deletions(-)

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 8b7ed88f2d..8f7a31dd6a 100644
--- 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
@@ -36,9 +36,10 @@
 .oils-acq-picklist-records-author-row td { padding-left: 30px; }
 .oils-acq-picklist-records-phys_desc-row td { padding-left: 30px; }
 .oils-acq-picklist-records-phys_desc-row {}
-#oils-acq-picklist-list-header { margin: 10px; width: 98%;}
-#oils-acq-picklist-list-header-label { float: left; }
-#oils-acq-picklist-list-header-create { float: right; }
+
+#oils-acq-list-header { margin: 10px; width: 98%;}
+#oils-acq-list-header-label { float: left; }
+#oils-acq-list-header-create { float: right; }
 
 /* picklist entry page */
 #oils-acq-picklist-entry-header { padding: 4px; margin-bottom: 20px; }
diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
index 0175f7b2f2..3fce8b1272 100644
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
@@ -26,9 +26,10 @@
 .oils-acq-picklist-picklist-td { border-style: solid; border-color: #A1A1A1; border-width: 0px 1px 0px 1px; } 
 .oils-acq-picklist-records-service-td { font-size: 85%; }
 .oils-acq-picklist-entry-delete-link { font-size: 85%; }
-#oils-acq-picklist-list-header {border-bottom: 1px solid #6BA160;}
-#oils-acq-picklist-list-header-label { font-weight: bold; font-size: 110%; }
-#oils-acq-picklist-list-header-create { font-weight: bold; }
+
+#oils-acq-list-header {border-bottom: 1px solid #6BA160;}
+#oils-acq-list-header-label { font-weight: bold; font-size: 110%; }
+#oils-acq-list-header-create { font-weight: bold; }
 
 
 /* entry display */
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
index 350cb97a90..7bd1494aa4 100644
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
@@ -4,9 +4,9 @@
 <%def name="page_title()">${_('Funding Sources')}</%def>
 <%def name="block_content()">
 
-<div id='oils-acq-picklist-list-header' class='container'>
-    <div id='oils-acq-picklist-list-header-label'>${_('Funding Sources')}</div>
-    <div id='oils-acq-picklist-list-header-create'>
+<div id='oils-acq-list-header' class='container'>
+    <div id='oils-acq-list-header-label'>${_('Funding Sources')}</div>
+    <div id='oils-acq-list-header-create'>
         <a href='${c.oils.acq.prefix}/fund/create'>${_('New Funding Source')}</a>
     </div>
 </div>
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 69c195b74a..5dd22eee57 100644
--- 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
@@ -4,6 +4,14 @@
 <%def name="page_title()">${_('Funds')}</%def>
 <%def name="block_content()">
 
+<div id='oils-acq-list-header' class='container'>
+    <div id='oils-acq-list-header-label'>${_('Funds')}</div>
+    <div id='oils-acq-list-header-create'>
+        <a href='${c.oils.acq.prefix}/fund/create'>${_('New Fund')}</a>
+    </div>
+</div>
+
+
 <table class='oils-admin-table'>
     <thead>
         <tr>
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
index bcbf1e9c7b..84c6ab3f85 100644
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
@@ -3,8 +3,5 @@
     <a href='${c.oils.core.prefix}/acq/fund/list'>${_('Funds')}</a>
 </div>
 <div class='oils-base-navigate-item'>
-    <a href='${c.oils.core.prefix}/acq/fund/create'>${_('New Fund')}</a>
-</div>
-<div class='oils-base-navigate-item'>
     <a href='${c.oils.core.prefix}/acq/fund_source/list'>${_('Funding Sources')}</a>
 </div>
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 d5f1e67d70..3e6966e6d6 100644
--- 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
@@ -3,9 +3,9 @@
 <%def name="page_title()">${_('Evergreen My Picklists')}</%def>
 <%def name="block_content()">
 
-<div id='oils-acq-picklist-list-header' class='container'>
-    <div id='oils-acq-picklist-list-header-label'>${_('My Picklists')}</div>
-    <div id='oils-acq-picklist-list-header-create'>
+<div id='oils-acq-list-header' class='container'>
+    <div id='oils-acq-list-header-label'>${_('My Picklists')}</div>
+    <div id='oils-acq-list-header-create'>
         <a href='${c.oils.acq.prefix}/picklist/create'>${_('New Picklist')}</a>
     </div>
 </div>
-- 
2.11.0