dpillot 2005/12/19 17:41:35 CET
Modified files:
src/view/jsp/include processing_inc.jsp
Log:
url of display,new running icon
Revision Changes Path
1.6 +14 -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.5&r2=1.6&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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- processing_inc.jsp 15 Dec 2005 17:11:44 -0000 1.5
+++ processing_inc.jsp 19 Dec 2005 16:41:35 -0000 1.6
@@ -6,18 +6,19 @@
/**
* include jsp file to display inside a top admin bar in mode edit<br>
*
- * @version $Id: processing_inc.jsp,v 1.5 2005/12/15 17:11:44 dpillot
Exp $
+ * @version $Id: processing_inc.jsp,v 1.6 2005/12/19 16:41:35 dpillot
Exp $
*/
boolean isRoot = false;
JahiaUser theUser = (JahiaUser)
session.getAttribute(ParamBean.SESSION_USER);
isRoot = theUser.isRoot();
- String urlpdisp = "";
+ String urlpdisp = "#";
String server = request.getServerName();
int port = request.getServerPort();
String context = request.getContextPath();
- String ajaxpath= "http://"+server+":"+port+context+"/ajaxaction/PDisp";;
- //if (isRoot || isAdmin) urlpdisp =
"javascript:OpenJahiaWindow('http://"; + server + ":" + port + context +
"/jsp/jahia/engines/importexport/processing.jsp','monitordisp',600,300)";
+ String ajaxpath = "http://"; + server + ":" + port + context +
"/ajaxaction/PDisp";
+
+ //urlpdisp = "javascript:OpenJahiaWindow('http://"; + server + ":" + port
+ context +
"/jsp/jahia/engines/importexport/processing.jsp','monitordisp',900,400)";
%>
@@ -53,12 +54,19 @@
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>';
+ document.getElementById('plink').href = "#";
+
} else {
+ document.getElementById('plink').href = "<%=urlpdisp%>";
stringh = '<table border="0" cellspacing="0"
cellpadding="0"><tr>';
// no more 5 bars
for (n = 0; n < 5; n++) {
if (n < value1) {
- stringh = stringh + '<td bgcolor="#AAAAAA"><img
src="<jahia:serverHttpPath />/jsp/jahia/engines/images/p1.gif" width="5"
height="12" /></td>';
+ if (n < value2) {
+ stringh = stringh + '<td bgcolor="#AAAAAA"><img
src="<jahia:serverHttpPath />/jsp/jahia/engines/images/p0.gif" width="5"
height="12" /></td>';
+ } else {
+ stringh = stringh + '<td bgcolor="#AAAAAA"><img
src="<jahia:serverHttpPath />/jsp/jahia/engines/images/p1.gif" width="5"
height="12" /></td>';
+ }
} else {
stringh = stringh + '<td bgcolor="#AAAAAA"><img
src="<jahia:serverHttpPath />/jsp/jahia/engines/images/pix.gif" width="5"
height="12" /></td>';
}
@@ -79,7 +87,7 @@
<table border="0" cellspacing="0" cellpadding="0"><tr><td><img
src="<jahia:contextURL/>/images/pix.gif" width="5"
height="12"/></td><td><img
src="<jahia:serverHttpPath
/>/jsp/jahia/engines/images/fondp1.gif" width="6" height="12"/></td>
- <td bgcolor="#EEEEEE"><a
href="<%=urlpdisp%>">Processus</a> </td>
+ <td bgcolor="#EEEEEE"><a href="#" id="plink">Processus</a> </td>
<td bgcolor="#AAAAAA"><div id="bar"></div></td>
<td bgcolor="#AAAAAA"><div id="running"
style="color: white; font-size: 9px;
font-family: Arial, Helvetica, sans-serif;"></div>
