diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-12-20 00:07:59 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-12-20 00:07:59 +0000 |
| commit | 0f9d68697da12477342cc41825737b282a215f32 (patch) | |
| tree | 4c2eea402e7e3a0800c5fc29a0ed1a65800ac14c /UI | |
| parent | de4c93c23b93218ec5feaec2ebb01189f73428a2 (diff) | |
More contact, payment, voucher fixes/enhancements
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1984 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'UI')
| -rw-r--r-- | UI/Contact/contact.html | 13 | ||||
| -rw-r--r-- | UI/batch/filter.html | 2 | ||||
| -rw-r--r-- | UI/lib/elements.html | 2 | ||||
| -rw-r--r-- | UI/payments/check_job.html | 2 | ||||
| -rw-r--r-- | UI/payments/payments_detail.html | 19 |
5 files changed, 32 insertions, 6 deletions
diff --git a/UI/Contact/contact.html b/UI/Contact/contact.html index 3a8d27b3..311660b8 100644 --- a/UI/Contact/contact.html +++ b/UI/Contact/contact.html @@ -152,6 +152,11 @@ problems with multi-word single-quoted constructs in PI tags. -CT --> value = entity_id } ?> <?lsmb PROCESS input element_data = { + type = "hidden" + name = "account_class" + value = account_class + } ?> + <?lsmb PROCESS input element_data = { label = text('Name:'), type= "text", name = "name", @@ -289,6 +294,14 @@ problems with multi-word single-quoted constructs in PI tags. -CT --> label = text('Business Type:') #' } ?> </td> + <td> <?lsmb INCLUDE input element_data = { + name = "threshold" + value = threshold + type = "text" + size = "20" + label = text('Threshold') + class = "numeric" + } ?> </tr> </table> diff --git a/UI/batch/filter.html b/UI/batch/filter.html index 3cb69089..87c1d847 100644 --- a/UI/batch/filter.html +++ b/UI/batch/filter.html @@ -30,7 +30,7 @@ options = batch_users value_attr = "entity_id" text_attr = "username" - name = "created_by" + name = "created_by_eid" default_values = [created_by] } ?></div> <div class="input" id="description_div"> diff --git a/UI/lib/elements.html b/UI/lib/elements.html index 4345e7ee..e22bd026 100644 --- a/UI/lib/elements.html +++ b/UI/lib/elements.html @@ -156,7 +156,7 @@ <?lsmb IF element_data.defined('text_attr'); option_data.text = option_data.$text_attr; END ?> - <?lsmb # Selected is a special case -- no attribute key, so it is handled here by looking for the option value in the default_values key. + <?lsmb # Selected is a special case -- no attribute key, so it is handled here by looking for the option value in the default_values list. IF element_data.defined('default_values') AND element_data.default_values.grep("^${option_data.value}$").size; option_data.selected = ' selected="selected"'; ELSE; diff --git a/UI/payments/check_job.html b/UI/payments/check_job.html index b59caeab..455a9934 100644 --- a/UI/payments/check_job.html +++ b/UI/payments/check_job.html @@ -25,10 +25,12 @@ ELSE; text('Job Failed'); END ?></div> + <?lsmb IF ! job.success ?> <div class="info"> <?lsmb text('Error:') ?><br /> <?lsmb job.error_condition ?> </div> + <?lsmb END # if ! job.success ?> <?lsmb END # if job.completed ?> </body> </html> diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html index bd41fcd2..1e75c603 100644 --- a/UI/payments/payments_detail.html +++ b/UI/payments/payments_detail.html @@ -13,6 +13,11 @@ <?lsmb payment_type = (account_class == 1) ? text('Payments') : text('Receipts') ?> <body id="payment_2_body"> +<!-- CT: This template produces invalid XHTML due to the use of nested tables. + Because nested tables are widely used (perhaps improperly) for layout, + most browsers should have no issues with them. Furthermore, I cannot find + any cleaner solution to embedding tabular data within tabular data than + this --> <div class="listtop"><?lsmb payment_type ?></div> <form name="pay_dues" method="post" action="payment.pl"> <!-- Moving all hidden variables to the top. -CT --> @@ -177,7 +182,11 @@ } ?> <?lsmb r.account_number ?> </td> - <td class="entity_name"><?lsmb r.contact_name ?></td> + <td class="entity_name"><span class="<?lsmb + IF r.has_vouchers; 'name_has_vouchers' ; + ELSE ; 'name_has_no_vouchers' ; + END + ?>"><?lsmb r.contact_name ?></span></td> <td class="invoice"><?lsmb r.total_due ?> <?lsmb currency ?></td> <td class="payment"> <?lsmb INCLUDE input element_data = { @@ -223,8 +232,10 @@ <tr> <td class="invoice_date_list"> <?lsmb i.2 ?></td> <td class="invoice_list"> <?lsmb i.1 ?></td> - <td class="total_due_list"> <?lsmb i.3 ?></td> - <td class="paid_list"> <?lsmb i.4 ?></td> + <td class="total_due_list"> + <?lsmb INCLUDE format_money number=i.3 ?></td> + <td class="paid_list"> + <?lsmb INCLUDE format_money number=i.4 ?></td> <td class="net_due_list"> <?lsmb INCLUDE format_money number= i.6 ?> <?lsmb currency ?></td> @@ -249,7 +260,7 @@ <?lsmb INCLUDE input element_data = { type = "hidden" name = "net_$i.0" - value = i.6 + value = ${"payment_$r.contact_id_$i.0"} } ?> </td> </tr> |