SF.net SVN: ledger-smb:[5596] branches/1.3

[..hidden..]

Revision: 5596
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5596&view=rev
Author:   einhverfr
Date:     2013-01-16 09:45:01 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
Fixed lines 2-3 not showing up on address list for customer or vendor, fix semi-independent of trunk

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/Contact/contact.html

Property Changed:
----------------
    branches/1.3/Changelog

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-16 09:38:30 UTC (rev 5595)
+++ branches/1.3/Changelog	2013-01-16 09:45:01 UTC (rev 5596)
@@ -20,6 +20,7 @@
 Robert C)
 * Fixed contact info addition workflow.  Now entering multiple contact records 
 is not a total pain(Chris T)
+* Fixed lines 2 and 3 not showing on address div for contacts (Chris T)
 
 Changelog for 1.3.28
 * Added db list to setup.pl when no db is entered and credentials allow login


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595

Modified: branches/1.3/UI/Contact/contact.html
===================================================================
--- branches/1.3/UI/Contact/contact.html	2013-01-16 09:38:30 UTC (rev 5595)
+++ branches/1.3/UI/Contact/contact.html	2013-01-16 09:45:01 UTC (rev 5596)
@@ -758,23 +758,30 @@
     <table width="100%">
     <tr class="listheading">
         <th class="type"><?lsmb text('Type') ?></th>
-        <th class="line_one"><?lsmb text('Address1') ?></th>
+        <th class="address"><?lsmb text('Address') ?></th>
         <th class="city"><?lsmb text('City') ?></th>
         <th class="state"><?lsmb text('State/Province') ?></th>
         <th class="mail_code"><?lsmb text('ZIP/Post Code') ?></th>
         <th class="country"><?lsmb text('Country') ?></th>
 	<th class="actions"><?lsmb text('Actions') ?></th>
     </tr>
-	<?lsmb FOREACH loc = locations ?>
-    <?lsmb IF location_id == loc.id;
+	<?lsmb FOREACH loc = locations;
+           IF location_id == loc.id;
                  FOREACH key = loc.keys();
                       $key = loc.$key;
                  END;
            END;
+         loc.address = loc.line_one;
+         IF loc.line_two;
+            loc.address = loc.address _ '<br />' _ loc.line_two;
+         END;
+         IF loc.line_three;
+            loc.address = loc.address _ '<br />' _ loc.line_three;
+         END;
     ?>
     <tr <?lsmb IF location_id == loc.id ?> class="active" <?lsmb END ?>>
 	<td class="type"><?lsmb loc.class ?></td>
-	<td class="line_one"><?lsmb loc.line_one ?></td>
+	<td class="line_one"><?lsmb loc.address ?></td>
 	<td class="city"><?lsmb loc.city ?></td>
 	<td class="state"><?lsmb loc.state ?></td>
 	<td class="mail_code"><?lsmb loc.mail_code ?></td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.