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

[Dominique Pillot]

dpillot     2005/12/21 18:28:22 CET

  Modified files:
    src/view/jsp/include processing_inc.jsp 
  Log:
  specific window for monitoring display
  
  Revision  Changes    Path
  1.8       +20 -2     
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.7&r2=1.8&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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- processing_inc.jsp        20 Dec 2005 12:28:02 -0000      1.7
  +++ processing_inc.jsp        21 Dec 2005 17:28:22 -0000      1.8
  @@ -6,7 +6,7 @@
       /**
        * include jsp file to display inside a top admin bar in mode edit<br>
        *
  -     * @version $Id: processing_inc.jsp,v 1.7 2005/12/20 12:28:02 dpillot 
Exp $
  +     * @version $Id: processing_inc.jsp,v 1.8 2005/12/21 17:28:22 dpillot 
Exp $
        */
   
       String urlpdisp = "#";
  @@ -15,7 +15,7 @@
       String context = request.getContextPath();
       String ajaxpath = "http://"; + server + ":" + port + context + 
"/ajaxaction/PDisp";
   
  -    //urlpdisp = "javascript:OpenJahiaWindow('http://"; + server + ":" + port 
+ context + 
"/jsp/jahia/engines/importexport/processing.jsp','monitordisp',900,400)";
  +    //urlpdisp = "javascript:openDisp('http://"; + server + ":" + port + 
context + "/jsp/jahia/engines/importexport/processing.jsp',900,400)";
   
   %>
   
  @@ -23,6 +23,19 @@
   <script src="<jahia:serverHttpPath 
/>/jsp/jahia/javascript/prototype.js"></script>
   <script>
   
  +     monitordisp=null;//window
  +
  +    // open display
  +     function openDisp(url,width,height) {
  +
  +             if(monitordisp !=null && !monitordisp.closed) {
  +             monitordisp.close();
  +             return;
  +             }
  +             params = "width=" + width + ",height=" + height + 
",resizable=yes,scrollbars=yes,status=no";
  +             monitordisp=window.open(url,"monitordisp",params);
  +
  +     }
       // failure case
       function stopping(request) {
           //alert("authentication pbms");
  @@ -52,6 +65,11 @@
               // 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>';
               document.getElementById('plink').href = "#";
  +            //close the window since there is no process to display
  +            if(monitordisp !=null && !monitordisp.closed) {
  +             monitordisp.close();
  +
  +             }
   
           } else {
               document.getElementById('plink').href = "<%=urlpdisp%>";