dpillot 2005/12/14 14:49:50 CET
Modified files:
src/view/jsp/include admin_menu.inc
Log:
monitor process display
Revision Changes Path
1.11 +6 -31
corporate_portal_templates/src/view/jsp/include/admin_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/admin_menu.inc.diff?r1=1.10&r2=1.11&f=h
Index: admin_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/admin_menu.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- admin_menu.inc 22 Nov 2005 15:06:25 -0000 1.10
+++ admin_menu.inc 14 Dec 2005 13:49:50 -0000 1.11
@@ -214,44 +214,19 @@
}
%><% if (jData.gui().isEditMode() &&
request.getSession().getAttribute("clipboard_key")!=null) {%>
| <img id="clipboard" name="<%=
request.getSession().getAttribute("clipboard_key")%>"
src="<jahia:serverHttpPath />/jsp/jahia/engines/images/clipboard_next.png"
width="16" height="16" alt="Clipboard :<%=
request.getSession().getAttribute("clipboard_key")%>" />
-
-
-
- <% } else { %>
+<% } else { %>
<img id="clipboard" name="" src="<jahia:contextURL/>/images/pix.gif"
width="16" height="16" alt="Clipboard :vide" />
<% } %>
- </td>
-</tr>
-
-
- <%
- List exec =
ServicesRegistry.getInstance().getSchedulerService().getCurrentlyExecutingJobs();
- if (!exec.isEmpty()) {
- %>
-<tr>
- <td><img src="<jahia:serverHttpPath />/jsp/jahia/engines/images/hr.gif"
width="100%" height="2"/></td>
-</tr>
-<tr>
- <td class="adminmenu" nobreak>
- <jahia:displayIcon src="org.jahia.pix.image" height="20" width="15"/>
<%
- for (Iterator it = exec.iterator(); it.hasNext();) {
- org.quartz.JobExecutionContext jec =
(org.quartz.JobExecutionContext) it.next();
- org.quartz.JobDetail jd = jec.getJobDetail();
- org.quartz.JobDataMap data = jd.getJobDataMap();
- SimpleDateFormat mysdf = new SimpleDateFormat(
"dd/MM/yy kk:mm" );
- %> <%= jd.getDescription() %> started by <%=
data.get("userkey") %> at <%= mysdf.format(jec.getFireTime()) %><br>
- <%
- }
-
+if(jData.gui().isEditMode()){
%>
- </td>
-</tr>
-
+<br>
+<%@ include file="processing_inc.jsp" %>
<% } %>
-
+ </td>
+</tr>
<tr>
<td><img src="<jahia:serverHttpPath />/jsp/jahia/engines/images/hr.gif"
width="100%" height="2"/></td>
