svn commit: r1728029 - in /ofbiz/trunk/framework: common/webcommon/includes/messages.ftl images/webapp/images/selectall.js

[pgil]

Author: pgil
Date: Tue Feb  2 00:38:51 2016
New Revision: 1728029

URL: http://svn.apache.org/viewvc?rev=1728029&view=rev
Log:

OFBIZ-6869 : Jgrowl enhancement for internationalization, center and speed up display, with some format/typo fixes

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
    ofbiz/trunk/framework/images/webapp/images/selectall.js

Modified: ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/messages.ftl?rev=1728029&r1=1728028&r2=1728029&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/messages.ftl Tue Feb  2 00:38:51 2016
@@ -49,7 +49,7 @@ under the License.
       </#if>
     </div>
   </#if>
-    <script>showjGrowl();</script>
+  <script>showjGrowl("${uiLabelMap.CommonShowAll}","${uiLabelMap.CommonCollapse}");</script>
   <#-- display the event messages -->
   <#if (eventMessage?has_content || eventMessageList?has_content)>
     <div id="content-messages" class="content-messages eventMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)">
@@ -63,6 +63,6 @@ under the License.
         </#list>
       </#if>
     </div>
-    <script>showjGrowl();</script>
+  <script>showjGrowl("${uiLabelMap.CommonShowAll}","${uiLabelMap.CommonCollapse}");</script>
   </#if>
 </#escape>

Modified: ofbiz/trunk/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/selectall.js?rev=1728029&r1=1728028&r2=1728029&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/selectall.js Tue Feb  2 00:38:51 2016
@@ -733,41 +733,45 @@ function submitFormDisableSubmits(form)
 }
 
 
-function showjGrowl() {
+function showjGrowl(showAllLabel, collapseLabel) {
     var contentMessages = jQuery("#content-messages");
-    if (contentMessages.length) {
-       jQuery("#content-messages").hide();
-       var errMessage = jQuery("#content-messages").html();
-       var classeEvent = "";
-       var classList = jQuery("#content-messages").attr('class').split(/\s+/);
-       var stickyValue = false;
-       jQuery(classList).each(function(index){
+    if (contentMessages.length) {
+        jQuery("#content-messages").hide();
+        var errMessage = jQuery("#content-messages").html();
+        var classEvent = "";
+        var classList = jQuery("#content-messages").attr('class').split(/\s+/);
+        var stickyValue = false;
+        jQuery(classList).each(function(index) {
             var localClass = classList[index];
             if(localClass == "eventMessage" || localClass == "errorMessage" ){
-            classEvent = localClass + "JGrowl";
+                classEvent = localClass + "JGrowl";
             }
-       });
-       if(classEvent == "errorMessageJGrowl"){
-           stickyValue = true;
-       }
-      
+        });
+        if (classEvent == "errorMessageJGrowl") {
+            stickyValue = true;
+        }
+
         if (errMessage == null || errMessage == "" || errMessage == undefined ) {
             // No Error Message Information is set, Error Msg Box can't be created
             return;
         }
         $.jGrowl.defaults.closerTemplate = '<div class="closeAllJGrowl">Hide All Notifications</div>';
+        $.jGrowl.defaults.position = 'center';
         $.jGrowl(errMessage, { theme: classEvent, sticky: stickyValue,
-           afterOpen: function(e,m) {
-               jQuery(".jGrowl-message").readmore({
-                   moreLink: '<a href="#" style="display: block; width: auto; padding: 0px;text-align: right; margin-top: 10px; color: #ffffff; font-size: 0.8em">Show All</a>',
-                   lessLink: '<a href="#" style="display: block; width: auto; padding: 0px;text-align: right; margin-top: 10px; color: #ffffff; font-size: 0.8em">Show Less</a>',
-                   maxHeight: 75
-                   });
+            beforeOpen: function(e,m,o){
+                $(e).width( "600px" );
+            },
+            afterOpen: function(e,m) {
+                jQuery(".jGrowl-message").readmore({
+                    moreLink: '<a href="#" style="display: block; width: auto; padding: 0px;text-align: right; margin-top: 10px; color: #ffffff; font-size: 0.8em">'+showAllLabel+'</a>',
+                    lessLink: '<a href="#" style="display: block; width: auto; padding: 0px;text-align: right; margin-top: 10px; color: #ffffff; font-size: 0.8em">'+collapseLabel+'</a>',
+
+                    maxHeight: 75
+                });
             },
-            speed:1000
+            speed:100
         });
-
- contentMessages.remove();
+        contentMessages.remove();
     }
 }