Author: xlawrence
Date: Mon Jul 2 17:14:37 2007
New Revision: 17864
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17864&repname=
=3Djahia
Log:
resolve http://www.jahia.net/jira/browse/JAHIA-2093: Update Engine - Tools =
- Logs - clicking on Flush closes the popup
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/fl=
ushconfirm.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/vi=
ewlogs.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/au=
dit/flushconfirm.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/audit/flushconfirm.jsp&rev=3D1786=
4&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/fl=
ushconfirm.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/fl=
ushconfirm.jsp Mon Jul 2 17:14:37 2007
@@ -14,43 +14,53 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><%@ page language=3D"java" %>
-<%@ page import=3D"org.jahia.params.*" %>
-<%@ page import=3D"java.util.*" %>
+--%>
+<%@ page language=3D"java" %>
+<%@ page import=3D"java.util.HashMap" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%
- HashMap engineMap =3D (HashMap) request.getAttribute( "org.ja=
hia.engines.EngineHashMap" );
- ParamBean jParams =3D (ParamBean) request.getAttribute( "org.ja=
hia.params.ParamBean" );
- Integer flushLogs =3D (Integer) engineMap.get( "flushLogs" =
);
- String engineURL =3D (String) engineMap.get( "engineUrl" =
);
- String objectTypeName =3D (String) engineMap.get( "objectTypeNam=
e" );
- String objectIDStr =3D ((Integer) engineMap.get( "objectIDObj" =
)).toString();
- String objectName =3D (String) engineMap.get( "objectName" =
);
- String theURL =3D (String) jParams.settings().getJahiaEn=
ginesHttpPath();
- String URLSep =3D (engineURL.indexOf("?") =3D=3D -1) ? "?" =
: "&" ;
+ final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
+ final String engineURL =3D (String) engineMap.get("engineUrl");
+ final String objectTypeName =3D (String) engineMap.get("objectTypeName=
");
+ final String objectIDStr =3D engineMap.get("objectIDObj").toString();
+ final String objectName =3D (String) engineMap.get("objectName");
+ final String URLSep =3D (engineURL.indexOf("?") =3D=3D -1) ? "?" : "&";
+ final String theScreen =3D (String) engineMap.get("screen");
%>
+<div class=3D"menuwrapper">
+ <%@ include file=3D"../tools.inc" %>
+ <div class=3D"content">
+ <div id=3D"editor">
+ <h4 class=3D"logsIcon">
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.engi=
nes.EngineToolBox.flushLogEntries.label"/>
+ </h4>
=
-<br>
-<p class=3D"text">
- <b><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.Engin=
eToolBox.flushLogEntries.label"/></b>
-</p>
-<form name=3D"logForm" method=3D"POST" action=3D"<%=3DengineURL%>&flush=3D=
2">
-<table border=3D"0" width=3D"90%">
-<tr>
- <td width=3D"10%"> </td>
- <td width=3D"80%" align=3D"center">
- <p class=3D"text" align=3D"left">
- <jahia:engineResourceBundle resourceName=3D"org.jahia.engines=
.EngineToolBox.areYouSureDelete.label"/> <%=3DobjectTypeName%>:
- <b class=3D"text2"><%=3DobjectName%></b> ?
- <br><br>
- </p>
- <div align=3D"center">
- <a href=3D"<%=3DengineURL%><%=3DURLSep%>screen=3Dlogs" onMouseOut=
=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('No','','<jahia:server=
HttpPath/><jahia:engineResourceBundle resourceName=3D"org.jahia.noOn.button=
"/>',1)"><img name=3D"No" src=3D"<jahia:serverHttpPath/><jahia:engineResour=
ceBundle resourceName=3D"org.jahia.noOff.button"/>" width=3D"69" height=3D"=
17" border=3D"0" alt=3D"<jahia:engineResourceBundle resourceName=3D"org.jah=
ia.engines.no.label"/>"></a>
- <a href=3D"<%=3DengineURL%><%=3DURLSep%>screen=3Dlogs&flush=3D2" o=
nMouseOut=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('Yes','','<ja=
hia:serverHttpPath/><jahia:engineResourceBundle resourceName=3D"org.jahia.y=
esOn.button"/>',1)"><img name=3D"Yes" src=3D"<jahia:serverHttpPath/><jahia:=
engineResourceBundle resourceName=3D"org.jahia.yesOff.button"/>" width=3D"6=
9" height=3D"17" border=3D"0" alt=3D"<jahia:engineResourceBundle resourceNa=
me=3D"org.jahia.engines.yes.label"/>"></a>
+ <form name=3D"logForm" method=3D"post" action=3D"<%=3DengineUR=
L%>&flush=3D2">
+ <p align=3D"left">
+ <jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.EngineToolBo=
x.areYouSureDelete.label"/> <%=3DobjectTypeName%>:
+ <b><%=3DobjectName%></b> ?
+ </p>
+
+ <div id=3D"buttons">
+ <div class=3D"button">
+ <a href=3D"javascript:submittedCount++;window.loca=
tion.href=3D'<%=3DengineURL%><%=3DURLSep%>screen=3Dlogs&flush=3D2'">
+ <jahia:engineResourceBundle resourceName=3D"or=
g.jahia.engines.yes.label"/>
+ </a>
+ </div>
+
+ <div class=3D"button">
+ <a href=3D"javascript:submittedCount++;window.loca=
tion.href=3D'<%=3DengineURL%><%=3DURLSep%>screen=3Dlogs'">
+ <jahia:engineResourceBundle resourceName=3D"or=
g.jahia.engines.no.label"/>
+ </a>
+ </div>
+ </div>
+
+ <input type=3D"hidden" name=3D"oid" value=3D"<%=3DobjectID=
Str%>">
+ </form>
</div>
- </td>
-</tr>
-</table>
-<input type=3D"hidden" name=3D"oid" value=3D"<%=3DobjectIDStr%>">
-</form>
\ No newline at end of file
+ </div>
+
+ <div class=3D"clearing"> </div>
+</div>
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/au=
dit/viewlogs.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/audit/viewlogs.jsp&rev=3D17864&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/vi=
ewlogs.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/vi=
ewlogs.jsp Mon Jul 2 17:14:37 2007
@@ -52,13 +52,13 @@
</h4>
=
<form name=3D"logForm" method=3D"post" action=3D"<%=3DengineUR=
L%>">
- <textarea class=3D"logs" name=3D"objectLogs" cols=3D"<%=3D=
areaSize%>" rows=3D"18" wrap=3D"off">
+ <textarea class=3D"logs" name=3D"objectLogs" cols=3D"<%=3D=
areaSize%>" rows=3D"18">
<%
Long start =3D new Long(0);
for(int i=3D0; i < logData.size(); i++) {
- HashMap logRecord =3D (HashMap) logData.get(i);
- Long tempStart =3D (Long) logRecord.get("starttime");
- if(tempStart!=3D null && !start.equals(tempStart)) {
+ final HashMap logRecord =3D (HashMap) logData.get(i);
+ final Long tempStart =3D (Long) logRecord.get("starttime");
+ if (tempStart !=3D null && !start.equals(tempStart)) {
out.println("");
start =3D tempStart;
}
@@ -68,7 +68,7 @@
logRecord.get("objectname")%> (<%=3D
logRecord.get("objectid") %>) to <%=3D logRecord.get("parenttype")%=
> <%=3D logRecord.get("parentname") %> (<%=3D logRecord.get("parentid")%>)
<% } %>
- </textarea>
+ </textarea>
=
<p class=3D"error">
<% if (deletedRows.intValue() > 0) { %>
@@ -83,14 +83,18 @@
<% } else { %>
<% if (! (readOnlyMode && (results.getReadOnlyTabs().c=
ontains(LockPrerequisites.LOGS) ||
results.getReadOnlyTabs().contains(LockPrerequ=
isites.ALL_LEFT)))) { %>
- <a href=3D"<%=3DengineURL%><%=3DURLSep%>screen=3Dlogs&=
flush=3D1"><jahia:engineResourceBundle
- resourceName=3D"org.jahia.engines.EngineToolBo=
x.flush.label"/></a>
+
+ <div id=3D"buttons">
+ <div class=3D"button">
+ <a href=3D"javascript:submittedCount++;window.=
location.href=3D'<%=3DengineURL%><%=3DURLSep%>screen=3Dlogs&flush=3D1'">
+ <jahia:engineResourceBundle resourceName=
=3D"org.jahia.engines.EngineToolBox.flush.label"/>
+ </a>
+ </div>
+ </div>
<% } %>
<% } %>
</p>
-
</form>
-
</div>
</div>
<div class=3D"clearing"> </div>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
