Author: jkoster
Date: 2010-02-18 10:46:49 +0100 (Thu, 18 Feb 2010)
New Revision: 41122
Modified:
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/menu.jsp
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/showdbprocesslist.jsp
Log:
CMSC-1583 - Improve script and order in menu.
Modified:
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/menu.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/menu.jsp
2010-02-17 20:53:23 UTC (rev 41121)
+++
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/menu.jsp
2010-02-18 09:46:49 UTC (rev 41122)
@@ -88,6 +88,15 @@
</li>
<% } %>
</mm:haspage>
+ <li class="advancedpublish">
+ <c:url var="checkIntegrityUrl"
value="/editors/maintenance/checkintegrity.jsp"/>
+ <a href="${checkIntegrityUrl}" target="rightpane"><fmt:message
key="maintenance.checkintegrity" /></a>
+ </li>
+ <li class="advancedpublish">
+ <c:url var="showprocesslistUrl"
value="/editors/maintenance/showdbprocesslist.jsp"/>
+ <a href="${showprocesslistUrl}" target="rightpane"><fmt:message
key="maintenance.showdbprocesslist" /></a>
+ </li>
+
<cmsc:hasfeature name="workflowitem">
<li class="workflow">
<a href="staging/workflow-remove.jsp"
target="rightpane"><fmt:message key="maintenance.workflow" /></a>
@@ -112,14 +121,6 @@
<c:url var="logoutUrl" value="../logout.jsp"/>
<a href="${logoutUrl}" target="rightpane"><fmt:message
key="maintenance.logout" /></a>
</li>
- <li class="advancedpublish">
- <c:url var="checkIntegrityUrl"
value="/editors/maintenance/checkintegrity.jsp"/>
- <a href="${checkIntegrityUrl}" target="rightpane"><fmt:message
key="maintenance.checkintegrity" /></a>
- </li>
- <li class="advancedpublish">
- <c:url var="showprocesslistUrl"
value="/editors/maintenance/showdbprocesslist.jsp"/>
- <a href="${showprocesslistUrl}" target="rightpane"><fmt:message
key="maintenance.showdbprocesslist" /></a>
- </li>
</ul>
</mm:cloud>
</div>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/showdbprocesslist.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/showdbprocesslist.jsp
2010-02-17 20:53:23 UTC (rev 41121)
+++
CMSContainer/trunk/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/showdbprocesslist.jsp
2010-02-18 09:46:49 UTC (rev 41122)
@@ -1,50 +1,48 @@
<%...@page language="java" contentType="text/html;charset=UTF-8"
%><%...@include file="globals.jsp"
-%><%@ page import="com.finalist.cmsc.maintenance.sql.*"
-%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml/DTD/transitional.dtd";>
+%><mm:content type="text/html" encoding="UTF-8" expires="0">
+<%@ page import="com.finalist.cmsc.maintenance.sql.*"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml/DTD/transitional.dtd";>
<html xmlns="http://www.w3.org/TR/xhtml";>
<head>
-<title>Show process list of MMBase database.</title>
-<meta http-equiv="pragma" value="no-cache" />
-<meta http-equiv="expires" value="0" />
-<link href="../style.css" type="text/css" rel="stylesheet"/>
+ <title>Show process list of MMBase database.</title>
+ <link href="<cmsc:staticurl page='/editors/css/main.css'/>" type="text/css"
rel="stylesheet" />
</head>
- <body>
+<body>
+ <div class="editor">
+ <div class="body">
<h2>Show process list of MMBase database.</h2>
<mm:cloud jspvar="cloud" loginpage="../editors/login.jsp"
rank="administrator">
<mm:log jspvar="log">
- <form method="post">
+ <form method="post" action="#">
<input type="hidden" name="action" value="check"/>
- <input type="submit" name="action" value="Check"/>
+ <input type="submit" name="action" value="Refresh"/>
</form>
-
- <mm:import externid="action"/>
- <mm:present referid="action">
- <%
- Map<Integer,List> results = new HashMap<Integer,List>();
- new SqlExecutor().execute(new
ShowDatabaseProcessList(results));
- pageContext.setAttribute("results", results);
- %>
+ <%
+ Map<Integer,List> results = new HashMap<Integer,List>();
+ new SqlExecutor().execute(new ShowDatabaseProcessList(results));
+ pageContext.setAttribute("results", results);
+ %>
<c:if test="${fn:length(results) > 0}">
- <p>Processes List :</p>
+ <p><b>Processes List</b></p>
<table border="1px">
<tr><th>Id</th><th>User</th><th>Host</th><th>db</th><th>Command</th><th>Time</th><th>State</th><th>Info</th></tr>
<c:forEach var="entry" items="${results}">
- <tr >
+ <tr>
<c:forEach var="value" items='${entry.value}'>
- <td>
- ${value}
- </td>
+ <td>${value}</td>
</c:forEach>
</tr>
</c:forEach>
</table>
</c:if>
<c:if test="${fn:length(results) == 0}">
- No process.
+ No processes.
</c:if>
- </mm:present>
-</mm:log>
-</mm:cloud>
+ </mm:log>
+ </mm:cloud>
+ </div>
+ </div>
</body>
+</mm:content>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
