[open-ils-commits] [GIT] Evergreen ILS branch master updated. a406ef3f41f61f53e7f74a04e71f4bb76306d7f7

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  a406ef3f41f61f53e7f74a04e71f4bb76306d7f7 (commit)
      from  c2e848c0bb731c3d3667d4fee037e52754db1d04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a406ef3f41f61f53e7f74a04e71f4bb76306d7f7
Author: Atom Edoceo <atom at helium.edoceo.lan>
Date:   Mon Aug 22 11:23:14 2011 -0700

    Add a new visible alert to the main client screen alerting about pending transactions
    
    Signed-off-by: Edoceo <code at edoceo.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index ba5ce63..4003508 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -650,6 +650,7 @@
 <!ENTITY staff.main.auth.hostname "Hostname">
 <!ENTITY staff.main.auth.hostname.accesskey "H">
 <!ENTITY staff.main.auth.offline.caption "Offline Use">
+<!ENTITY staff.main.auth.offline.message "Offline Transactions Pending">
 <!ENTITY staff.main.auth.offline.export "Export Transactions">
 <!ENTITY staff.main.auth.offline.import "Import Transactions">
 <!ENTITY staff.main.auth.offline.interface "Standalone Interface">
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js
index f13cbfe..77e72af 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js
@@ -664,6 +664,16 @@ function main_init() {
             false
         );
 
+        /**
+            @brief Stats for Offline Files / Transactions
+            @launchpad #797408
+        */
+        var px = new util.file('pending_xacts');
+        document.getElementById('offline_message').setAttribute('style','display:none;');
+        if (px._file.exists()) {
+            document.getElementById('offline_message').setAttribute('style','background-color:red;display:block;font-weight:bold;padding:2px;');
+            document.getElementById('offline_import_btn').disabled = true;
+        }
 
     } catch(E) {
         var error = offlineStrings.getFormattedString('common.exception', [E, '']);
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index 1c9d96f..c9ab790 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -176,12 +176,15 @@
             </grid>
         </groupbox>
 
+        <!-- Offline Information Section -->
         <groupbox flex="1">
             <caption label="&staff.main.auth.offline.caption;"/>
+            <hbox><label id="offline_message" value="&staff.main.auth.offline.message;" style="display:none;" /></hbox>
             <hbox><button label="&staff.main.auth.offline.interface;" accesskey="&staff.main.auth.offline.interface.accesskey;" command="cmd_standalone"/></hbox>
             <hbox><button label="&staff.main.auth.offline.export;" command="cmd_standalone_export"/></hbox>
             <hbox><button label="&staff.main.auth.offline.import;" command="cmd_standalone_import"/></hbox>
         </groupbox>
+
 </row>
 </rows>
 </grid>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/opac/locale/en-US/lang.dtd            |    1 +
 .../xul/staff_client/chrome/content/main/main.js   |   10 ++++++++++
 .../xul/staff_client/chrome/content/main/main.xul  |    3 +++
 3 files changed, 14 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS