[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4496] trunk
- Subject: SF.net SVN: ledger-smb:[4496] trunk
- From: ..hidden..
- Date: Sat, 17 Mar 2012 02:18:46 +0000
Revision: 4496
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4496&view=rev
Author: einhverfr
Date: 2012-03-17 02:18:45 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Merging in new dynatable, copying old one to dynatable-old.html and changing form-dyantable to hit old one
Modified Paths:
--------------
trunk/UI/form-dynatable.html
trunk/UI/lib/dynatable.html
Added Paths:
-----------
trunk/UI/lib/dynatable-old.html
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/customer.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/journal.pm
trunk/LedgerSMB/Scripts/login.pm
trunk/LedgerSMB/Scripts/menu.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Scripts/taxform.pm
trunk/LedgerSMB/Scripts/vendor.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4490
+ /branches/1.3:3711-4494
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4490
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4494
/branches/1.3/scripts/account.pl:3711-4368
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4490
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4494
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4490
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4494
/branches/1.3/scripts/customer.pl:4273-4287
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4490
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4494
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4490
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4494
/branches/1.3/scripts/file.pl:3711-4138
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4490
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4494
/branches/1.3/scripts/journal.pl:3711-4328
Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4490
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4494
/branches/1.3/scripts/login.pl:3711-4192
Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4490
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4494
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4490
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4494
/branches/1.3/scripts/payment.pl:3711-4310
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4490
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4494
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4490
/branches/1.3/scripts/setup.pl:3711-4474
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4494
/branches/1.3/scripts/setup.pl:3711-4474
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4490
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4494
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4490
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4494
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/UI/form-dynatable.html
===================================================================
--- trunk/UI/form-dynatable.html 2012-03-17 02:17:46 UTC (rev 4495)
+++ trunk/UI/form-dynatable.html 2012-03-17 02:18:45 UTC (rev 4496)
@@ -1,6 +1,6 @@
<?lsmb PROCESS 'ui-header.html' ?>
<?lsmb PROCESS elements.html ?>
-<?lsmb PROCESS 'dynatable.html' ?>
+<?lsmb PROCESS 'dynatable-old.html' ?>
<body>
<form method="post" action="<?lsmb form.script ?>">
Copied: trunk/UI/lib/dynatable-old.html (from rev 4490, trunk/UI/lib/dynatable.html)
===================================================================
--- trunk/UI/lib/dynatable-old.html (rev 0)
+++ trunk/UI/lib/dynatable-old.html 2012-03-17 02:18:45 UTC (rev 4496)
@@ -0,0 +1,68 @@
+<?lsmb BLOCK dynatable ?>
+<table width="100%">
+ <tr>
+ <th class="listtop" colspan="<?lsmb columns.size ?>"><?lsmb form.title ?></th>
+ </tr>
+ <tr>
+ <?lsmb IF options.defined ?>
+ <td><?lsmb FOREACH option IN options; option ?><br /><?lsmb END ?></td>
+ <?lsmb ELSE ?>
+ <td colspan="<?lsmb columns.size ?>"></td></tr>
+ <?lsmb END ?>
+ </tr>
+ <tr class="listheading">
+<?lsmb FOREACH column IN columns ?>
+ <th class="listtop">
+ <?lsmb IF heading.$column.href.defined ?><a class="listtop" href="<?lsmb heading.$column.href ?>"><?lsmb heading.$column.text ?></a>
+ <?lsmb ELSE; heading.$column; END ?>
+ </th>
+<?lsmb END ?>
+ </tr>
+ <?lsmb USE dumper(indent=2, pad="<br>") ?>
+<?lsmb FOREACH row IN rows ?>
+<?lsmb IF row.class == 'heading'; s = 'th'; c = 'listheading';
+ ELSIF row.class == 'subtotal'; s = 'th'; c = 'listsubtotal';
+ ELSIF row.class == 'divider'; s = 'th'; c = 'listheading';
+ ELSE; s = 'td'; c = "listrow${row.i}"; END ?>
+<tr class="<?lsmb c ?>">
+ <?lsmb IF row.class == 'divider' ?>
+ <th colspan="<?lsmb columns.size ?>">
+ <?lsmb IF row.href.defined ?>
+ <a href="<?lsmb row.href?>"><?lsmb row.text ?></a>
+ <?lsmb ELSIF row.delimiter;
+ FOREACH l IN row.text.split(row.delimiter); l ?><br /><?lsmb END ?>
+ <?lsmb ELSIF row.input.defined;
+ PROCESS input element_data=row.input ?>
+ <?lsmb ELSIF row.select.defined;
+ PROCESS select element_data=row.select ?>
+ <?lsmb ELSE; row.text; END ?>
+ </th>
+</tr>
+ <?lsmb NEXT; END ?>
+ <?lsmb FOREACH column IN columns ?>
+ <<?lsmb s ?> class="<?lsmb c ?>" <?lsmb IF (!row.class.defined || row.class != 'heading') && row_alignment.$column ?>align="<?lsmb row_alignment.$column ?>"<?lsmb END ?>>
+ <?lsmb IF row.$column.href.defined ?>
+ <a href="<?lsmb row.$column.href?>"><?lsmb row.$column.text ?></a>
+ <?lsmb ELSIF row.$column.delimiter;
+ FOREACH l IN row.$column.text.split(row.$column.delimiter); l ?><br /><?lsmb END ?>
+ <?lsmb ELSIF row.$column.input.defined;
+ PROCESS input element_data=row.$column.input ?>
+ <?lsmb ELSIF row.$column.select.defined;
+ PROCESS select element_data=row.$column.select ?>
+ <?lsmb ELSIF row.$column.text.defined;row.$column.text ?>
+ <?lsmb ELSE; row.$column; END ?>
+ </<?lsmb s ?>>
+ <?lsmb END ?>
+</tr>
+<?lsmb END ?>
+<?lsmb IF totals ?>
+<tr class="listtotal">
+ <?lsmb FOREACH column IN columns ?>
+ <th class="listtotal" align="right"><?lsmb totals.$column ?></th>
+ <?lsmb END ?>
+</tr>
+<?lsmb END ?>
+ <tr><td colspan="<?lsmb columns.size ?>"><hr size="3" /></td></tr>
+</table>
+
+<?lsmb END # BLOCK ?>
Modified: trunk/UI/lib/dynatable.html
===================================================================
--- trunk/UI/lib/dynatable.html 2012-03-17 02:17:46 UTC (rev 4495)
+++ trunk/UI/lib/dynatable.html 2012-03-17 02:18:45 UTC (rev 4496)
@@ -1,68 +1,124 @@
<?lsmb BLOCK dynatable ?>
-<table width="100%">
- <tr>
- <th class="listtop" colspan="<?lsmb columns.size ?>"><?lsmb form.title ?></th>
- </tr>
- <tr>
- <?lsmb IF options.defined ?>
- <td><?lsmb FOREACH option IN options; option ?><br /><?lsmb END ?></td>
- <?lsmb ELSE ?>
- <td colspan="<?lsmb columns.size ?>"></td></tr>
- <?lsmb END ?>
- </tr>
- <tr class="listheading">
-<?lsmb FOREACH column IN columns ?>
- <th class="listtop">
- <?lsmb IF heading.$column.href.defined ?><a class="listtop" href="<?lsmb heading.$column.href ?>"><?lsmb heading.$column.text ?></a>
- <?lsmb ELSE; heading.$column; END ?>
- </th>
-<?lsmb END ?>
- </tr>
- <?lsmb USE dumper(indent=2, pad="<br>") ?>
-<?lsmb FOREACH row IN rows ?>
-<?lsmb IF row.class == 'heading'; s = 'th'; c = 'listheading';
- ELSIF row.class == 'subtotal'; s = 'th'; c = 'listsubtotal';
- ELSIF row.class == 'divider'; s = 'th'; c = 'listheading';
- ELSE; s = 'td'; c = "listrow${row.i}"; END ?>
-<tr class="<?lsmb c ?>">
- <?lsmb IF row.class == 'divider' ?>
- <th colspan="<?lsmb columns.size ?>">
- <?lsmb IF row.href.defined ?>
- <a href="<?lsmb row.href?>"><?lsmb row.text ?></a>
- <?lsmb ELSIF row.delimiter;
- FOREACH l IN row.text.split(row.delimiter); l ?><br /><?lsmb END ?>
- <?lsmb ELSIF row.input.defined;
- PROCESS input element_data=row.input ?>
- <?lsmb ELSIF row.select.defined;
- PROCESS select element_data=row.select ?>
- <?lsmb ELSE; row.text; END ?>
- </th>
-</tr>
- <?lsmb NEXT; END ?>
- <?lsmb FOREACH column IN columns ?>
- <<?lsmb s ?> class="<?lsmb c ?>" <?lsmb IF (!row.class.defined || row.class != 'heading') && row_alignment.$column ?>align="<?lsmb row_alignment.$column ?>"<?lsmb END ?>>
- <?lsmb IF row.$column.href.defined ?>
- <a href="<?lsmb row.$column.href?>"><?lsmb row.$column.text ?></a>
- <?lsmb ELSIF row.$column.delimiter;
- FOREACH l IN row.$column.text.split(row.$column.delimiter); l ?><br /><?lsmb END ?>
- <?lsmb ELSIF row.$column.input.defined;
- PROCESS input element_data=row.$column.input ?>
- <?lsmb ELSIF row.$column.select.defined;
- PROCESS select element_data=row.$column.select ?>
- <?lsmb ELSIF row.$column.text.defined;row.$column.text ?>
- <?lsmb ELSE; row.$column; END ?>
- </<?lsmb s ?>>
- <?lsmb END ?>
-</tr>
-<?lsmb END ?>
-<?lsmb IF totals ?>
-<tr class="listtotal">
- <?lsmb FOREACH column IN columns ?>
- <th class="listtotal" align="right"><?lsmb totals.$column ?></th>
- <?lsmb END ?>
-</tr>
-<?lsmb END ?>
- <tr><td colspan="<?lsmb columns.size ?>"><hr size="3" /></td></tr>
+<table id="<?lsmb attributes.id ?>" class="<?lsmb attributes.class">
+<?lsmb- IF !hide_header -?>
+<thead>
+ <tr>
+ <?lsmb- FOREACH COL IN columns -?>
+ <th class="<?lsmb COL.col_id _ ' ' _ COL.class _ ' ' _ COL.type ?>">
+ <?lsmb COL.name ?>
+ </th>
+ <?lsmb- END -?>
+ </tr>
+</thead>
+<?lsmb- END -?>
+<tbody>
+ <?lsmb- FOREACH ROW IN tbody.rows -?>
+ <tr class="<?lsmb ROW.html_class ?>">
+ <?lsmb- FOREACH COL IN columns -?>
+ <td class="<?lsmb COL.col_id _ ' ' _ COL.class _ ' ' _ COL.type ?>">
+ <?lsmb- IF COL.type == 'input_text' -?>
+ <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+ type="text"
+ class="<?lsmb COL.class ?>"
+ name="<?lsmb COL.col_id ?>_<?lsmb loop.count ?>"
+ value="<?lsmb ROW.${COL.col_id} ?>"
+ />
+ <?lsmb- ELSIF COL.type == 'checkbox';
+ IF ROW.${COL.name};
+ CHECKED = "checked='CHECKED'";
+ ELSE;
+ CHECKED = '';
+ END;
+ ?>
+ <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+ type="checkbox"
+ name="<?lsmb COL.col_id ?>_<?lsmb loop.count ?>"
+ class="<?lsmb COL.class ?>"
+ value="<?lsmb ROW.row_id ?>"
+ <?lsmb CHECKED ?> />
+ <?lsmb- ELSIF COL.type == 'radio' ?>
+ <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+ type="radio"
+ name="<?lsmb COL.col_id ?>"
+ class="<?lsmb COL.class ?>"
+ value="<?lsmb ROW.row_id ?>"
+ <?lsmb CHECKED ?> />
+ <?lsmb- ELSIF COL.type == 'href';
+ IF row.${COL.col_id}_href_suffix;
+ HREF = COL.href_base _ ROW.${COL.col_id}_href_suffix;
+ ELSE;
+ HREF = COL.href_base _ ROW.row_id;
+ END
+ ?><a href="<?lsmb HREF ?>"><?lsmb ROW.${COL.col_id} ?></a>
+ <?lsmb- ELSE -?>
+ <?lsmb ROW.${COL.col_id} ?>
+ <?lsmb- END -?>
+ </td>
+ <?lsmb- COUNT = loop.count -?>
+ <?lsmb- END -?>
+ </tr>
+ <?lsmb- END ?>
+</tbody>
+<?lsmb- IF tfoot -?>
+<tfoot>
+ <?lsmb- FOREACH ROW IN tfoot.rows -?>
+ <tr>
+ <?lsmb- FOREACH COL IN columns;
+ IF tfoot.coltypes.${COL.col_id} == 'spacer';
+ SPACECOUNT = SPACECOUNT + 1;
+ ELSE;
+ IF SPACECOUNT gt 0 ?>
+ <td colspan="<?lsmb SPACECOUNT ?>"> </td>
+ <?lsmb END ?>
+ <td class="<?lsmb COL.col_id ?>">
+ <?lsmb IF tfoot.coltypes.${COL.col_id};
+ TYPE = tfoot.coltypes.${COL.col_id};
+ ELSE;
+ TYPE = COL.type;
+ END;
+ <?lsmb- IF TYPE == 'input_text' -?>
+ <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+ type="text"
+ class="<?lsmb COL.class ?>"
+ name="<?lsmb COL.col_id ?>_<?lsmb loop.count ?>"
+ value="<?lsmb ROW.${COL.col_id} ?>"
+ />
+ <?lsmb- ELSIF TYPE == 'checkbox';
+ IF ROW.${COL.name};
+ CHECKED = "checked='CHECKED'";
+ ELSE;
+ CHECKED = '';
+ END;
+ ?>
+ <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+ type="checkbox"
+ name="<?lsmb COL.col_id ?>_<?lsmb loop.count ?>"
+ class="<?lsmb COL.class ?>"
+ value="<?lsmb ROW.row_id ?>"
+ <?lsmb CHECKED ?> />
+ <?lsmb- ELSIF TYPE == 'radio' ?>
+ <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+ type="radio"
+ name="<?lsmb COL.col_id ?>"
+ class="<?lsmb COL.class ?>"
+ value="<?lsmb ROW.row_id ?>"
+ <?lsmb CHECKED ?> />
+ <?lsmb- ELSIF TYPE == 'href';
+ IF row.${COL.col_id}_href_suffix;
+ HREF = COL.href_base _ ROW.${COL.col_id}_href_suffix;
+ ELSE;
+ HREF = COL.href_base _ ROW.row_id;
+ END
+ ?><a href="<?lsmb HREF ?>"><?lsmb ROW.${COL.col_id} ?></a>
+ <?lsmb- ELSE -?>
+ <?lsmb ROW.${COL.col_id} ?>
+ <?lsmb- END -?>
+ </td>
+ <?lsmb- END #if -?>
+ <?lsmb- END -?>
+ </tr>
+ <?lsmb- END -?>
+</tfoot>
+<?lsmb- END -?>
</table>
-
-<?lsmb END # BLOCK ?>
+<?lsmb END #block ?>
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4490
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4494
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.