[open-ils-commits] r8714 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: public/oils/media/css/skin/default public/oils/media/css/theme/default templates/oils/default/acq/financial templates/oils/default/acq/picklist

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-02-11 14:04:31 -0500 (Mon, 11 Feb 2008)
New Revision: 8714

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
   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/view_list.html
Log:
moved new-fund action into fund list page.  generic-ified some of the css

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css	2008-02-11 18:47:54 UTC (rev 8713)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css	2008-02-11 19:04:31 UTC (rev 8714)
@@ -36,10 +36,11 @@
 .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; }
 #oils-acq-picklist-entry-summary {}

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css	2008-02-11 18:47:54 UTC (rev 8713)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css	2008-02-11 19:04:31 UTC (rev 8714)
@@ -26,10 +26,11 @@
 .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 */
 #oils-acq-picklist-entry-marc-block { border: 1px solid #6BA160; }

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html	2008-02-11 18:47:54 UTC (rev 8713)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html	2008-02-11 19:04:31 UTC (rev 8714)
@@ -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>

Modified: 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	2008-02-11 18:47:54 UTC (rev 8713)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html	2008-02-11 19:04:31 UTC (rev 8714)
@@ -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>

Modified: 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-02-11 18:47:54 UTC (rev 8713)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html	2008-02-11 19:04:31 UTC (rev 8714)
@@ -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>

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html	2008-02-11 18:47:54 UTC (rev 8713)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html	2008-02-11 19:04:31 UTC (rev 8714)
@@ -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>