[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

Revision: 5036
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5036&view=rev
Author:   einhverfr
Date:     2012-07-24 09:01:09 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
merging from branches/1.2

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Form.pm
    trunk/UI/journal/journal_entry.html
    trunk/UI/lib/elements.html
    trunk/old-handler.pl

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5032
   + /branches/1.3:3711-5035

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-07-24 08:48:39 UTC (rev 5035)
+++ trunk/Changelog	2012-07-24 09:01:09 UTC (rev 5036)
@@ -87,6 +87,7 @@
 * Fixed empty string working as empty source for cash recon (Chris T)
 * Saving a part now returns to editing the same part (Chris T, h/t Brian W)
 * If pos.conf.pl is not found, now returns an intelligible error (Chris T)
+* Adding action/id div to top of many screens (Chris T, h/t Erik H)
 
 Changelog for 1.3.20
 * Fixes for es_AR translation, duplicate keys removed (Andres B)

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2012-07-24 08:48:39 UTC (rev 5035)
+++ trunk/LedgerSMB/Form.pm	2012-07-24 09:01:09 UTC (rev 5036)
@@ -676,7 +676,11 @@
     } else {
         $class = "new";
     }
-    return "<div id='statusdiv' class='$class'>";
+    my $status = $LedgerSMB::App_State::Locale->text(
+            'Action: [_1], ID: [_2]', $self->{action}, $self->{id}
+    );
+    return "<div id='statusdiv' class='$class'>
+            <div id='history'>$status</div>";
 }
 
 =item $form->close_status_div

Modified: trunk/UI/journal/journal_entry.html
===================================================================
--- trunk/UI/journal/journal_entry.html	2012-07-24 08:48:39 UTC (rev 5035)
+++ trunk/UI/journal/journal_entry.html	2012-07-24 09:01:09 UTC (rev 5036)
@@ -8,7 +8,8 @@
 
 <body>
 
-<?lsmb INCLUDE OPEN_STATUS_DIV id=form.id approved = form.approved ?>
+<?lsmb INCLUDE OPEN_STATUS_DIV 
+             id=form.id approved = form.approved action=form.action ?>
 <form method="post" action="<?lsmb form.script ?>">
 <table width="100%">
 <tr>
@@ -377,4 +378,4 @@
    ?>&file_class=1&callback=<?lsmb tt_url(callback) ?>">[<?lsmb text('Attach') ?>]</a>
 <?lsmb END # IF for<?lsmb INCLUDE CLOSE_STATUS_DIV id=form.id approved = form.approved ?>
 </body>
-<?lsmb INCLUDE OPEN_STATUS_DIV ?>
+<?lsmb INCLUDE CLOSE_STATUS_DIV ?>

Modified: trunk/UI/lib/elements.html
===================================================================
--- trunk/UI/lib/elements.html	2012-07-24 08:48:39 UTC (rev 5035)
+++ trunk/UI/lib/elements.html	2012-07-24 09:01:09 UTC (rev 5036)
@@ -357,6 +357,7 @@
        CLASS = 'saved';
    END;
 ?><div id='statusdiv' class='<?lsmb CLASS ?>'>
+<div id="history"><?lsmb text('Action: [_1], ID: [_2]', action, id); ?></div>
 <?lsmb END ?>
 
 <?lsmb BLOCK CLOSE_STATUS_DIV ?></div><?lsmb END ?>

Modified: trunk/old-handler.pl
===================================================================
--- trunk/old-handler.pl	2012-07-24 08:48:39 UTC (rev 5035)
+++ trunk/old-handler.pl	2012-07-24 09:01:09 UTC (rev 5036)
@@ -61,6 +61,7 @@
 use LedgerSMB::Auth;
 use LedgerSMB::Session;
 use LedgerSMB::CancelFurtherProcessing;
+use LedgerSMB::App_State;
 use Data::Dumper;
 use LedgerSMB::App_State;
 
@@ -81,6 +82,8 @@
 $locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} )
   or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
 
+
+
 # we use $script for the language module
 $form->{script} = $script;
 
@@ -136,6 +139,8 @@
     $locale   = LedgerSMB::Locale->get_handle( $myconfig{language} )
       or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
 }
+
+$LedgerSMB::App_State::Locale = $locale;
 # pull in the main code
 $logger->trace("trying script=bin/$form->{script} action=$form->{action}");#trace flow
 try {

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