SF.net SVN: ledger-smb:[5312] trunk

[..hidden..]

Revision: 5312
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5312&view=rev
Author:   einhverfr
Date:     2012-12-07 03:54:17 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/UI/users/preferences.html

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5307
   + /branches/1.3:3711-5311

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-12-07 03:50:57 UTC (rev 5311)
+++ trunk/Changelog	2012-12-07 03:54:17 UTC (rev 5312)
@@ -82,6 +82,7 @@
 Changelog for 1.3.26
 * Added db statistics post-upgrade and pre/post rebuild (Chris T, 3586113)
 * Merged in fcgi support from addons (Chris T)
+* Clarified UI for changing password vs settings (Chris T, 3588810) 
 
 Changelog for 1.3.25
 * Fixed internal server errors on LedgerSMB->error() during new() (Chris T)

Modified: trunk/UI/users/preferences.html
===================================================================
--- trunk/UI/users/preferences.html	2012-12-07 03:50:57 UTC (rev 5311)
+++ trunk/UI/users/preferences.html	2012-12-07 03:54:17 UTC (rev 5312)
@@ -21,6 +21,7 @@
         <tr valign="top">
 	  <td>
 	    <table>
+  <tr><th class="listtop" colspan="2"><?lsmb text('Change Password') ?></th></tr>
 	      <tr>
 		<th align="right"><?lsmb text('Old Password') ?></th>
 		<td><input type="password" name="old_password" size="10" value="" /></td>
@@ -33,6 +34,7 @@
 		<th align="right"><?lsmb text('Confirm') ?></th>
 		<td><input type="password" name="confirm_password" size="10" /></td>
 	      </tr>
+  <tr><th class="listtop" colspan="2"><?lsmb text('Settings') ?></th></tr>
 	      <tr>
 		<th align="right"><?lsmb text('Date Format') ?></th>
 		<td><?lsmb PROCESS select element_data={

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