[open-ils-commits] r13112 - in trunk/Open-ILS/web: css/skin css/skin/default templates templates/default templates/default/acq/financial templates/default/acq/picklist templates/default/vandelay/inc (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri May 8 19:39:44 EDT 2009
Author: erickson
Date: 2009-05-08 19:39:43 -0400 (Fri, 08 May 2009)
New Revision: 13112
Modified:
trunk/Open-ILS/web/css/skin/default.css
trunk/Open-ILS/web/css/skin/default/acq.css
trunk/Open-ILS/web/css/skin/default/vandelay.css
trunk/Open-ILS/web/templates/base.tt2
trunk/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2
trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2
trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2
trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2
trunk/Open-ILS/web/templates/default/base.tt2
trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
Log:
on the hunt for grids that don't need an explicit height. think i've found a way, started moving some files in that direction. hiding the left bar for now since it's just taking up space. some other general cleanup
Modified: trunk/Open-ILS/web/css/skin/default/acq.css
===================================================================
--- trunk/Open-ILS/web/css/skin/default/acq.css 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/css/skin/default/acq.css 2009-05-08 23:39:43 UTC (rev 13112)
@@ -6,7 +6,7 @@
.oils-sub-navigate-block span { padding: 3px; }
*/
-.oils-acq-detail-content-pane {height:600px;width:100%}
+/*.oils-acq-detail-content-pane {height:600px;width:100%}*/
.oils-acq-basic-form-div {padding:4px; width:95%;}
/* bib search */
Modified: trunk/Open-ILS/web/css/skin/default/vandelay.css
===================================================================
--- trunk/Open-ILS/web/css/skin/default/vandelay.css 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/css/skin/default/vandelay.css 2009-05-08 23:39:43 UTC (rev 13112)
@@ -3,10 +3,8 @@
@import "/js/dojo/dojox/grid/_grid/Grid.css";
@import "/js/dojo/dojox/grid/resources/tundraGrid.css";
-.container:after {content: ""; display: block; height: 0; clear: both; }
-html,body { width:100%; height:100%; border:0; margin:0; padding:0; background-color:white; }
-table { border-collapse: collapse; }
table.dijitTooltipTable { border-collapse: separate; }
+
.content { padding: 5px; }
.form_table td { padding: 6px; }
.small_form_table td { padding: 1px; }
@@ -22,9 +20,6 @@
color: red;
font-weight:bold;
}
-.tall { height:600px; }
-.wide { width:100%; }
-.hidden { display: none; }
#toolbar { margin-top: 0px; }
.progress {margin: 20px;}
.overlay_selected {
Modified: trunk/Open-ILS/web/css/skin/default.css
===================================================================
--- trunk/Open-ILS/web/css/skin/default.css 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/css/skin/default.css 2009-05-08 23:39:43 UTC (rev 13112)
@@ -4,7 +4,7 @@
/* import the dojo CSS */
@import "/js/dojo/dojo/resources/dojo.css";
@import "/js/dojo/dijit/themes/tundra/tundra.css";
- at import "/js/dojo/dojox/grid/_grid/Grid.css";
+ at import "/js/dojo/dojox/grid/resources/Grid.css";
@import "/js/dojo/dojox/grid/resources/tundraGrid.css";
@@ -14,9 +14,15 @@
border:0;
margin:0;
padding:0;
+ background:white;
}
+body { width: 99%; }
+#oils-base-body-block { height: 98%; }
table { border-collapse: collapse; }
+.tall { height:98%; }
+.wide { width:98%; }
+
/* use this for divs whose contents should be entirely contained within the div */
.container:after {content: ""; display: block; height: 0; clear: both; }
@@ -27,16 +33,19 @@
/* main layout blocks */
#oils-base-main-block { width: 100%; margin-top: 0px; padding-top: 0px;}
-#oils-base-navigate-block { width: 12%; vertical-align: top; float:left;}
-#oils-base-content-block { width: 87%; vertical-align: top; float:right; padding-top: 0px;}
-#oils-base-sidebar-block { width: 12%; vertical-align: top; float:left;}
+/*
+#oils-base-navigate-block { width: 0%; vertical-align: top; float:left;}
+#oils-base-sidebar-block { width: 0%; vertical-align: top; float:left;}
+*/
+#oils-base-content-block { width: 100%; vertical-align: top; padding: 0px 5px 0px 5px;}
-#oils-base-header-auto-login { padding-right: 20px; }
+/*#oils-base-header-auto-login { padding-right: 20px; }*/
#oils-base-header-block { width: 100%; text-align: right; margin-top: 0px; padding-bottom: 0px;}
#oils-base-header-menu-block { float:left; text-align: left; width: 50%; }
#oils-base-header-auto-login-block { float:right; text-align: right; width: 47%;}
-#oils-base-footer-block { width: 100%; text-align: center; vertical-align: bottom;}
+/*#oils-base-footer-block { width: 100%; text-align: center; vertical-align: bottom;}*/
+#oils-base-footer-block { position:fixed; bottom:0px; left:0px; right:0px; border-top:1px solid #aaa; text-align:center;}
#oils-base-navigate-list { width: 100%; }
.oils-base-navigate-sub-list { padding-left: 4px; }
@@ -70,7 +79,7 @@
.oils-fm-edit-pane td { padding: 5px; }
.oils-fm-edit-dialog td { border:1px solid #999;}
.oils-header-panel {
- width:100%;
+ width:98%;
margin-top:20px;
}
.oils-header-panel div:first-child {
Modified: trunk/Open-ILS/web/templates/base.tt2
===================================================================
--- trunk/Open-ILS/web/templates/base.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/base.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -10,7 +10,7 @@
<link rel='stylesheet' type='text/css'
href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %].css'></link>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/dojo.js"
- djConfig="parseOnLoad: true, isDebug:true"></script>
+ djConfig="parseOnLoad: true, isDebug:false"></script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/opensrf/md5.js"></script>
<script>
var oilsBasePath = '[% ctx.base_path %]';
Modified: trunk/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/default/acq/financial/list_currency_types.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -11,15 +11,16 @@
);
</script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
<div>Currency Type</div>
<div>
<button dojoType='dijit.form.Button' onClick='ctGrid.showCreateDialog()'>New Currency Type</button>
<button dojoType='dijit.form.Button' onClick='ctGrid.deleteSelected()'>Delete Selected</button>
</div>
</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px;'>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
<table jsId="ctGrid"
+ autoHeight='true'
dojoType="openils.widget.AutoGrid"
fieldOrder="['code', 'label']"
defaultCellWidth='25'
@@ -27,6 +28,7 @@
fmClass='acqct'
editOnEnter='true'>
</table>
+ <div/>
</div>
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -13,31 +13,31 @@
}
</script>
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
- <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
- <div>Funding Sources</div>
- <div>
- <button dojoType='dijit.form.Button' onClick='fsGrid.showCreateDialog()'>New Funding Source</button>
- <button dojoType='dijit.form.Button' onClick='fsGrid.deleteSelected()'>Delete Selected</button>
- </div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+ <div>Funding Sources</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='fsGrid.showCreateDialog()'>New Funding Source</button>
+ <button dojoType='dijit.form.Button' onClick='fsGrid.deleteSelected()'>Delete Selected</button>
</div>
+ </div>
- <table jsId="fsGrid"
- dojoType="openils.widget.AutoGrid"
- fieldOrder="['id', 'name', 'owner', 'code', 'currency_type', 'balance']"
- query="{name: '*'}"
- defaultCellWidth='20'
- fmClass='acqfs'
- editOnEnter='true'>
- <thead>
- <tr>
- <th field="name" get='getName'/>
- <th field="owner" get='getOrgInfo'/>
- <th field="balance" get='getBalanceInfo'/>
- </tr>
- </thead>
- </table>
- </div>
+ <table jsId="fsGrid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['id', 'name', 'owner', 'code', 'currency_type', 'balance']"
+ query="{name: '*'}"
+ defaultCellWidth='"auto"'
+ fmClass='acqfs'
+ editOnEnter='true'>
+ <thead>
+ <tr>
+ <th field="name" get='getName'/>
+ <th field="owner" get='getOrgInfo'/>
+ <th field="balance" get='getBalanceInfo'/>
+ </tr>
+ </thead>
+ </table>
</div>
Modified: trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -20,10 +20,7 @@
}
);
}
-</script>
- <!-- The main grid lives here -->
-<script>
function getName(rowIndex, item) {
if(!item) return;
var name = this.grid.store.getValue(item, 'name');
@@ -32,34 +29,36 @@
}
</script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
- <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
- <div>Funds</div>
- <div>
- <button dojoType='dijit.form.Button' onClick='lfGrid.showCreateDialog()'>New Fund</button>
- <button dojoType='dijit.form.Button' onClick='lfGrid.deleteSelected()'>Delete Selected</button>
- </div>
- </div>
- <label>Year</label>
- <select dojoType='dijit.form.FilteringSelect' onchange='filterGrid();' style='width:100px;'
- jsId='fundFilterYearSelect' labelAttr='year' searchAttr='year'> </select>
-
- <table jsId="lfGrid"
- dojoType="openils.widget.AutoGrid"
- fieldOrder="['id', 'name', 'code', 'year', 'org', 'currency_type', 'combined_balance']"
- query="{id: '*'}"
- defaultCellWidth='20'
- fmClass='acqf'
- editOnEnter='true'>
- <thead>
- <tr><th field='owner' get='getOrgInfo'/>
- </tr>
- </thead>
- </table>
+<div class='oils-header-panel' dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div>Funds</div>
+ <div>
+ <button dojoType='dijit.form.Button' onClick='lfGrid.showCreateDialog()'>New Fund</button>
+ <button dojoType='dijit.form.Button' onClick='lfGrid.deleteSelected()'>Delete Selected</button>
</div>
</div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ Year <select dojoType='dijit.form.FilteringSelect' onchange='filterGrid();'
+ jsId='fundFilterYearSelect' labelAttr='year' searchAttr='year'> </select>
+</div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <table jsId="lfGrid"
+ autoHeight='true'
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['id', 'name', 'code', 'year', 'org', 'currency_type', 'combined_balance']"
+ query="{id: '*'}"
+ defaultCellWidth='"auto"'
+ fmClass='acqf'
+ editOnEnter='true'>
+ <thead>
+ <tr><th field='owner' get='getOrgInfo'></th></tr>
+ </thead>
+ </table>
+ <div/>
+</div>
+
+
[% END %]
Modified: trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/default/acq/picklist/list.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -1,26 +1,8 @@
[% WRAPPER 'default/base.tt2' %]
-<div id='oils-acq-list-header' class='container'>
- <div id='oils-acq-picklist-my-list-header'>
- <div id='oils-acq-list-header-label'>My Selection Lists</div>
- </div>
- <div id='oils-acq-picklist-all-list-header'>
- <div id='oils-acq-list-header-label'>All Selection Lists</div>
- </div>
-</div>
-
+[% ctx.page_title = 'Selection Lists' %]
<script src='[% ctx.media_prefix %]/js/ui/default/acq/picklist/view_list.js'> </script>
<script>
- if(location.href.match(/listall$/)) {
- listAll = true;
- dojo.style('oils-acq-picklist-my-list-header', 'visibility', 'hidden');
- dojo.style('oils-acq-picklist-my-list-header', 'display', 'none');
- } else {
- dojo.style('oils-acq-picklist-all-list-header', 'visibility', 'hidden');
- dojo.style('oils-acq-picklist-all-list-header', 'display', 'none');
- }
-</script>
-<script>
function formatName(inDatum) {
for(var i in plCache){
var pl = plCache[i];
@@ -32,8 +14,16 @@
}
</script>
-<div class='oils-acq-actions-div'>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div id='oils-acq-list-header' class='container'>
+ <div id='oils-acq-picklist-my-list-header'>
+ <div id='oils-acq-list-header-label'>My Selection Lists</div>
+ </div>
+ </div>
+</div>
+<div class='oils-acq-actions-div' dojoType="dijit.layout.ContentPane" layoutAlign="client">
+
<div dojoType="dijit.form.DropDownButton">
<span>New Selection List</span>
<div dojoType="dijit.TooltipDialog" execute="createPL(arguments[0]);">
@@ -84,35 +74,32 @@
</table>
</div>
</div>
-
<button dojoType="dijit.form.Button" onclick="deleteFromGrid();">Delete Selected</button>
</div>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top">
- <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:600px;'>
- <table
- jsId="plListGrid"
- dojoType="openils.widget.AutoGrid"
- query="{id: '*'}"
- fieldOrder="['name', 'owner', 'entry_count', 'create_time', 'edit_time']"
- suppressFields="['editor', 'creator']"
- query="{id: '*'}"
- defaultCellWidth='"auto"'
- fmClass='acqpl'
- editOnEnter='true'>
- <thead>
- <tr>
- <th field="name" formatter='formatName'/>
- <th field="owner" get='getOwnerName'/>
- <th field="entry_count">Entry Count</th>
- </tr>
- </thead>
- </table>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <table
+ autoHeight='true'
+ jsId="plListGrid"
+ dojoType="openils.widget.AutoGrid"
+ query="{id: '*'}"
+ fieldOrder="['name', 'owner', 'entry_count', 'create_time', 'edit_time']"
+ suppressFields="['editor', 'creator']"
+ query="{id: '*'}"
+ defaultCellWidth='"auto"'
+ fmClass='acqpl'
+ editOnEnter='true'>
+ <thead>
+ <tr>
+ <th field="name" formatter='formatName'/>
+ <th field="owner" get='getOwnerName'/>
+ <th field="entry_count">Entry Count</th>
+ </tr>
+ </thead>
+ </table>
+ <div class='hidden'>
+ <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'/>
</div>
</div>
-<div class='hidden'>
- <div jsId='progressDialog' dojoType='openils.widget.ProgressDialog'/>
-</div>
-
[% END %]
Modified: trunk/Open-ILS/web/templates/default/base.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/base.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/default/base.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -15,13 +15,15 @@
</div>
</div>
<div id="oils-base-main-block" dojoType="dijit.layout.LayoutContainer" layoutAlign="client">
+ <!--
<div id="oils-base-navigate-block" dojoType="dijit.layout.ContentPane" layoutAlign="left">
</div>
+ -->
<div id="oils-base-content-block" dojoType="dijit.layout.ContentPane" layoutAlign="client">
[% content %]
</div>
</div>
- <div id="oils-base-footer-block" dojoType="dijit.layout.ContentPane" layoutAlign="bottom">
+ <div id="oils-base-footer-block">
[% INCLUDE default/footer.tt2 %]
</div>
</div>
Modified: trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -81,8 +81,8 @@
</table>
</div>
</div>
-<div style='height:600px;'>
- <table dojoType='dojox.grid.DataGrid' jsId='attrEditorGrid' query="{id: '*'}">
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <table dojoType='dojox.grid.DataGrid' jsId='attrEditorGrid' query="{id: '*'}" autoHeight='true'>
<thead>
<tr>
<th field='id'>&vandelay.id;</th>
Modified: trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2 2009-05-08 23:03:18 UTC (rev 13111)
+++ trunk/Open-ILS/web/templates/default/vandelay/inc/queue.tt2 2009-05-08 23:39:43 UTC (rev 13112)
@@ -110,11 +110,11 @@
</div>
<!-- Queue Grid -->
- <div class='hidden' id='vl-bib-queue-grid-wrapper'>
+ <div class='hidden tall' id='vl-bib-queue-grid-wrapper'>
<div dojoType="openils.widget.GridColumnPicker" jsid="vlBibQueueGridMenu" style="display: none;" grid='vlBibQueueGrid'>
<div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
</div>
- <div style='height:600px' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+ <div class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
<table dojoType='dojox.grid.DataGrid' jsId='vlBibQueueGrid' query="{id:'*'}" headerMenu='vlBibQueueGridMenu'>
</table>
</div>
@@ -123,7 +123,7 @@
<div dojoType="openils.widget.GridColumnPicker" jsid="vlAuthQueueGridMenu" style="display: none;" grid='vlAuthQueueGrid'>
<div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
</div>
- <div style='height:600px' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+ <div class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
<table dojoType='dojox.grid.DataGrid' jsId='vlAuthQueueGrid' query="{id:'*'}" headerMenu='vlAuthQueueGridMenu'>
</table>
</div>
More information about the open-ils-commits
mailing list