cvs commit: corporate_portal_templates/src/view/jsp/include processing_inc.jsp

[Dominique Pillot]

dpillot     2005/12/22 17:43:33 CET

  Modified files:
    src/view/jsp/include processing_inc.jsp 
  Log:
  some cleaning in js
  
  Revision  Changes    Path
  1.11      +13 -6     
corporate_portal_templates/src/view/jsp/include/processing_inc.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/processing_inc.jsp.diff?r1=1.10&r2=1.11&f=h
  
  
  
  Index: processing_inc.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/processing_inc.jsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- processing_inc.jsp        22 Dec 2005 15:11:39 -0000      1.10
  +++ processing_inc.jsp        22 Dec 2005 16:43:33 -0000      1.11
  @@ -1,9 +1,10 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
  +
   <%
       /**
        * include jsp file to display inside a top admin bar in mode edit<br>
        *
  -     * @version $Id: processing_inc.jsp,v 1.10 2005/12/22 15:11:39 dpillot 
Exp $
  +     * @version $Id: processing_inc.jsp,v 1.11 2005/12/22 16:43:33 dpillot 
Exp $
        */
   
       String urlpdisp = "#";//the url of detailed process window
  @@ -20,7 +21,7 @@
       //default values
       monitordisp = null;//window
       oldvalue1 = 0;
  -    freqCall = 10;//frequency of call ajax
  +    freqCall = 10;
   
   
       //functions
  @@ -38,11 +39,13 @@
       function closeDisplay() {
           if (monitordisp != null && !monitordisp.closed) {
               monitordisp.close();
  +
           }
       }
       //refresh
       function refreshDisplay() {
           if (monitordisp != null && !monitordisp.closed) {
  +
               monitordisp.location.reload();
           }
       }
  @@ -72,15 +75,16 @@
           if (value1 != oldvalue1) {
               if (value1 > 0) {
                   refreshDisplay();
  -            } else {
  +            }
  +            else {
                   closeDisplay();
  -                }
  +            }
               oldvalue = value1;
           }
   
           if (value1 == 0) {
               // empty table
  -            stringh = '<table border="0" cellspacing="0" 
cellpadding="0"><tr><td bgcolor="#AAAAAA"><img src="<jahia:serverHttpPath 
/>/jsp/jahia/engines/images/pix.gif" width="25" height="12" 
/></td></tr></table>';
  +            stringh = '<table border="0" cellspacing="0" 
cellpadding="0"><tr><td bgcolor="#AAAAAA"><img src="<jahia:serverHttpPath 
/>/jsp/jahia/engines/images/pix.gif" width="45" height="12" 
/></td></tr></table>';
               document.getElementById('plink').href = "#";
   
               //close the window since there is no process to display
  @@ -90,7 +94,7 @@
               document.getElementById('plink').href = "<%=urlpdisp%>";
               stringh = '<table border="0" cellspacing="0" 
cellpadding="0"><tr>';
               // no more 5 bars
  -            for (n = 0; n < 5; n++) {
  +            for (n = 0; n < 9; n++) {
                   if (n < value1) {
                       if (n < value2) {
                           stringh = stringh + '<td bgcolor="#AAAAAA"><img 
src="<jahia:serverHttpPath />/jsp/jahia/engines/images/p0.gif" width="5" 
height="12" /></td>';
  @@ -105,8 +109,11 @@
           }
   
           //alert(stringh);
  +
           document.getElementById('bar').innerHTML = stringh;
  +        /*
           document.getElementById('running').innerHTML = "&nbsp;(" + value2 + 
")&nbsp;";
  +        */
       }