Changed the app controller jqGrid virtual functions for getting the tables for both count and the full query. The ExtraTables bit was too confusing, and was only intended to allow the user to specify a subset for count and augment it for full query. This is easily accomplished by having DataTables just call DataCountTables first... one line solution ends the confusion.
Modified linkable behavior to support a %{MODEL_ALIAS} tag, which is replaced in the relationship conditions at runtime with the actual model alias. This is experimental at best, and certainly will create a problem for any model that ends up using the conditions in 'contain' instead of 'link'.
Broke the LedgerEntry->findInLedgerContext function out into multiple pieces, so those same pieces could be used in the LedgerEntries controller to populate jqGrid.
Changed the ledger_entries element, as a special case, to also allow listing control from ledger_id and account_type, instead of idlist as a mechanism for populating the grid.
Changed the infobox summary css, which will break several pages until I rework them.
Some next steps include fixing the broken infoboxes, and changing the transactions view to use the ledger_entries element. This also means the ledger_entries element will need to add support for idlist, or if we have any credit/debit issues, perhaps another custom transaction_id instead.
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@134 97e9348a-65ac-dc4b-aefc-98561f571b83
271 lines
6.4 KiB
CSS
271 lines
6.4 KiB
CSS
/************************************************************
|
|
************************************************************
|
|
* Debug table margin/padding helper
|
|
*/
|
|
|
|
/* table th, td { border: dashed 1px; } */
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* Overall page layout
|
|
*/
|
|
|
|
table#layout { width: 100% }
|
|
td#sidecolumn ,
|
|
td#pagecolumn { vertical-align: top; }
|
|
td#pagecolumn { padding-left: 4mm; }
|
|
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* Panel captions
|
|
*/
|
|
|
|
table caption { text-align: left;
|
|
font-size: 120%;
|
|
font-weight: bold;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
|
|
div.item.list { margin-bottom: 1.5em; }
|
|
/* table.item caption { margin-top: 1em; } */
|
|
/* table.detail caption { margin-top: 0; } */
|
|
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* Cell configuration
|
|
*/
|
|
|
|
table.item th ,
|
|
table.item td { padding: 0.1em 0.4em 0.1em 0.4em; }
|
|
table.item td { white-space: nowrap; }
|
|
/* table.item { border-spacing: 0 0; /\*IE*\/border-collapse: collapse; empty-cells: show } */
|
|
table.item { border-spacing: 0 0; empty-cells: show }
|
|
table.item { border:1px solid #ccc;
|
|
border-bottom:2px solid #ccc;
|
|
}
|
|
|
|
table.list th { background: #dcdcdc;
|
|
border-top: 1px solid #fff;
|
|
border-left: 1px solid #fff;
|
|
border-bottom: 2px solid #aaa;
|
|
border-right: 1px solid #ccc;
|
|
text-align: center;
|
|
}
|
|
table.item td { border-right: 1px solid #ccc; }
|
|
|
|
tr.evnrow { background: #f4f4f4; }
|
|
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* Item detail formats
|
|
* (such as Tenant Info, Unit Info, etc)
|
|
*/
|
|
|
|
table.detail { width : 60%;
|
|
float: left; }
|
|
table.detail td.field { width: 10em; }
|
|
|
|
div.detail.supporting { clear : both;
|
|
padding-top: 1.5em; }
|
|
|
|
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* Pertinent Information Box
|
|
* These floating boxes appear on the detail pages,
|
|
* providing the most pertinent / important information
|
|
* for the given view.
|
|
*/
|
|
|
|
div.infobox { float: right;
|
|
width: 39%;
|
|
margin-top: 1.5em;
|
|
margin-right: 0.5em;
|
|
}
|
|
|
|
table.summary {
|
|
margin-left:auto;
|
|
margin-right:0.5em;
|
|
color: #993;
|
|
font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
|
|
font-size: 125%;
|
|
text-align: right;
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0.2em;
|
|
}
|
|
|
|
table.summary td {
|
|
padding-left:0.5em;
|
|
}
|
|
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* Item table formats
|
|
* (listing multiple items of one type)
|
|
*/
|
|
|
|
/* Item listing width and borders */
|
|
table.list { width : 100%; }
|
|
|
|
/* Text alignment exceptions */
|
|
table.list td.id { text-align: center; }
|
|
table.list td.currency { text-align: right; }
|
|
|
|
/* White spacing exceptions */
|
|
td.comment { white-space: normal; }
|
|
|
|
/* Generic column to assign excess space */
|
|
table.list td.slack { width : 99%; }
|
|
|
|
/* Customers */
|
|
table.list.customer td.comment { width : 66%; }
|
|
|
|
/* Contacts */
|
|
table.list.contact td.comment { width : 66%; }
|
|
|
|
/* Contact methods */
|
|
table.list.phone td.preference ,
|
|
table.list.email td.preference ,
|
|
table.list.address td.preference { width: 18em; }
|
|
table.list.phone td.phone ,
|
|
table.list.email td.email ,
|
|
table.list.address td.address { width: 15em; }
|
|
table.list.phone td.comment ,
|
|
table.list.email td.comment ,
|
|
table.list.address td.comment { width: auto; }
|
|
|
|
/* Ledger Entries */
|
|
table.list.ledger td { border-top : 1px dashed #ccc; }
|
|
table.list.ledger td.date.receipt { padding-left: 1em; }
|
|
table.list.ledger td.evnrow { background: #f4f4f4; }
|
|
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* jqGrid
|
|
*/
|
|
table.Header th h2 {
|
|
color: #dd5;
|
|
font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
|
|
font-size: 190%;
|
|
margin-bottom: 0.0em;
|
|
}
|
|
|
|
div.loading {
|
|
margin-top: 1.5em;
|
|
margin-left: 1.0em;
|
|
}
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* Forms
|
|
*/
|
|
|
|
form {
|
|
margin-right: 20px;
|
|
padding: 0;
|
|
width: 80%;
|
|
}
|
|
fieldset {
|
|
border: 1px solid #ccc;
|
|
margin-top: 4px;
|
|
/* padding: 4px 4px; */
|
|
}
|
|
fieldset legend {
|
|
/* background:#fff; */
|
|
/* color: #e32; */
|
|
/* font-size: 120%; */
|
|
font-weight: bold;
|
|
}
|
|
fieldset fieldset {
|
|
margin: 4px 4px;
|
|
/* margin-bottom: 20px; */
|
|
padding: 4px 4px;
|
|
}
|
|
fieldset fieldset legend {
|
|
font-size: 100%;
|
|
font-weight: normal;
|
|
}
|
|
fieldset fieldset div {
|
|
clear: left;
|
|
/* margin: 0 20px; */
|
|
}
|
|
form div {
|
|
clear: both;
|
|
/* margin-bottom: 1em; */
|
|
/* padding: .5em; */
|
|
vertical-align: text-top;
|
|
}
|
|
form div.input {
|
|
color: #444;
|
|
}
|
|
form div.required {
|
|
color: #333;
|
|
font-weight: bold;
|
|
}
|
|
form div.submit {
|
|
border: 0;
|
|
clear: both;
|
|
margin-top: 10px;
|
|
margin-left: 140px;
|
|
}
|
|
|
|
/************************************************************
|
|
************************************************************
|
|
* General Style Info
|
|
*/
|
|
|
|
body {
|
|
/* background: #003d4c; */
|
|
/* color: #fff; */
|
|
font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
|
|
font-size:90%;
|
|
margin: 0;
|
|
}
|
|
a {
|
|
color: #003d4c;
|
|
text-decoration: underline;
|
|
font-weight: bold;
|
|
}
|
|
a:hover {
|
|
color: #00f;
|
|
text-decoration:none;
|
|
}
|
|
a img {
|
|
border:none;
|
|
}
|
|
|
|
h1, h2, h3, h4 {
|
|
font-weight: normal;
|
|
}
|
|
|
|
h1 {
|
|
color: #003d4c;
|
|
font-size: 100%;
|
|
margin: 0.1em 0;
|
|
}
|
|
h2 {
|
|
/* color: #e32; */
|
|
color: #993;
|
|
font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
|
|
font-size: 190%;
|
|
margin-bottom: 0.3em;
|
|
}
|
|
h3 {
|
|
color: #993;
|
|
font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
|
|
/* font-size: 165%; */
|
|
}
|
|
h4 {
|
|
color: #993;
|
|
font-weight: normal;
|
|
padding-top: 0.5em;
|
|
}
|
|
|
|
|