xlawrence 2005/10/07 20:39:11 CEST
Modified files:
core/src/webapp/views/engines engines_default_layout.jsp
core/src/webapp/views/engines/versioning/pages
operation_choices.jsp
Log:
Started refactoring of versionning engine
Revision Changes Path
1.3 +205 -35
jahia/core/src/webapp/views/engines/engines_default_layout.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/engines_default_layout.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +57 -83
jahia/core/src/webapp/views/engines/versioning/pages/operation_choices.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/operation_choices.jsp.diff?r1=1.2&r2=1.3&f=h
Index: engines_default_layout.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/engines_default_layout.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- engines_default_layout.jsp 5 May 2004 14:43:56 -0000 1.2
+++ engines_default_layout.jsp 7 Oct 2005 18:39:11 -0000 1.3
@@ -1,48 +1,218 @@
-<[EMAIL PROTECTED] language = "java"%>
-<[EMAIL PROTECTED] import = "java.util.*"%>
-<[EMAIL PROTECTED] import = "org.jahia.params.*"%>
-<[EMAIL PROTECTED] import = "org.jahia.views.engines.*"%>
+<%@ page language="java" %>
+<%@ page import="org.jahia.views.engines.JahiaEngineCommonData" %>
+<%@ page import="org.jahia.views.engines.JahiaEngineCommonDataInterface" %>
+<%@ page import="org.jahia.bin.Jahia"%>
+<%@ page import="org.jahia.services.usermanager.JahiaUser"%>
+<%@ page import="org.jahia.params.ProcessingContext"%>
+<%@ page import="java.util.HashMap"%>
+<%@ page import="org.jahia.services.pages.JahiaPage"%>
+
+<%@ include file="/views/engines/common/taglibs.jsp" %>
+
+<jsp:useBean id="jspSource" class="java.lang.String" scope="request"/>
+<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
+<jsp:useBean id="javaScriptPath" class="java.lang.String" scope="request"/>
-<[EMAIL PROTECTED] file="/views/engines/common/taglibs.jsp" %>
-<jahia:i18n />
+<jahia:i18n/>
<%
- JahiaEngineCommonDataInterface jahiaEngineCommonData =
-
(JahiaEngineCommonDataInterface)request.getAttribute(JahiaEngineCommonData.JAHIA_ENGINE_COMMON_DATA);
- if ( jahiaEngineCommonData == null ){
- // Minimal engine common data, engineURL and engine title are
not set
- // to avoid null pointer exception
- jahiaEngineCommonData = new JahiaEngineCommonData(request);
-
request.setAttribute(JahiaEngineCommonData.JAHIA_ENGINE_COMMON_DATA,jahiaEngineCommonData);
- }
+ JahiaEngineCommonDataInterface jahiaEngineCommonData =
+ (JahiaEngineCommonDataInterface)
request.getAttribute(JahiaEngineCommonData.JAHIA_ENGINE_COMMON_DATA);
+ if (jahiaEngineCommonData == null) {
+ // Minimal engine common data, engineURL and engine title are not set
+ // to avoid null pointer exception
+ jahiaEngineCommonData = new JahiaEngineCommonData(request);
+ request.setAttribute(JahiaEngineCommonData.JAHIA_ENGINE_COMMON_DATA,
jahiaEngineCommonData);
+ }
+
+ final ProcessingContext jParams = jahiaEngineCommonData.getParamBean();
+ final String engineTitle = jahiaEngineCommonData.getEngineTitle();
+ final HashMap engineMap = (HashMap)
request.getAttribute("jahia_session_engineMap");
+ final String engineUrl = (String) engineMap.get("engineUrl");
+ final String theScreen = (String) engineMap.get("screen");
+ final JahiaPage thePage = (JahiaPage) engineMap.get("thePage");
+ final boolean showEditMenu = false;
+ final String engineView = (String)request.getAttribute("engineView");
%>
-<html:html>
+
+<html xmlns="http://www.w3.org/1999/xhtml";
xml:lang="<%=jParams.getLocale()%>" lang="<%=jParams.getLocale()%>">
<head>
-<title>Jahia - <bean:write filter="false" name="jahiaEngineCommonData"
property="engineTitle" /></title>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+<title>Jahia Engine - <%=engineTitle%></title>
+<link rel="stylesheet"
+ href="<jahia:serverHttpPath/>/jsp/jahia/css/colorsAndStyles.css"
type="text/css"/>
+<link rel="stylesheet"
+ href="<jahia:serverHttpPath/>/jsp/jahia/engines/css/menu.css"
type="text/css"/>
+<link rel="stylesheet"
href="<jahia:serverHttpPath/>/jsp/jahia/css/actions.css" type="text/css"/>
+<link rel="stylesheet"
+ href="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.stylesheet.css"/>"
+ type="text/css"/>
+
+<script type="text/javascript" src="<%=javaScriptPath%>"></script>
+<script type="text/javascript"
src="<%=URL%>../javascript/serverdatetime.js"></script>
+<% if (request.getAttribute("org.jahia.engines.html.headers") != null) { %>
+<%= (String) request.getAttribute("org.jahia.engines.html.headers") %>
+<% } %>
+<script type="text/javascript">
+
+ function check() {
+ // override this function if needed in subengine to perform form
data check
+ // before submit !!!
+ return true;
+ }
+
+ function saveContent() {
+ // used by Html editors
+ // override this for preprocessing before for submission
+ }
+
+ var submittedCount = 0;
+
+ function teleportCaptainFlam(what) {
+ if (submittedCount == 0) {
+ submittedCount++;
+ document.mainForm.submit();
+ }
+ }
+
+ function handleLanguageChange(lang) {
+ document.mainForm.screen.value = "<%=theScreen%>";
+ document.mainForm.engine_lang.value = lang;
+ if (check()) {
+ saveContent();
+ teleportCaptainFlam(document.mainForm);
+ }
+ }
+
+ function handleActionChange(what) {
+ saveContent();
+ document.mainForm.screen.value = what;
+ document.mainForm.submit();
+ }
+
+ function sendFormSave() {
+ if (check()) {
+ document.mainForm.screen.value = "save";
+ saveContent();
+ teleportCaptainFlam(document.mainForm);
+ }
+ }
+
+ function sendFormSaveAndAddNew() {
+ document.mainForm.screen.value = "save";
+ document.mainForm.addnew.value = "true";
+ if (check()) {
+ saveContent();
+ teleportCaptainFlam(document.mainForm);
+ }
+ }
+
+ function sendFormApply() {
+ if (check()) {
+ document.mainForm.screen.value = "apply";
+ saveContent();
+ teleportCaptainFlam(document.mainForm);
+ }
+ }
+
+ function sendFormCancel() {
+ document.mainForm.screen.value = "cancel";
+ teleportCaptainFlam(document.mainForm);
+ }
+
+ function changeField(fieldID) {
+ document.mainForm.screen.value = "<%=theScreen%>";
+ document.mainForm.editfid.value = fieldID;
+ if (check()) {
+ saveContent();
+ document.mainForm.submit();
+ }
+ }
+
+ function setWaitingCursor (showWaitingImage) {
+ document.body.style.cursor = "wait";
+ if (showWaitingImage == 1)
+ openWorkInProgressWindow('<%=request.getContextPath()%>');
+ }
+
+ window.onload = function() {
+ scroll(0, 0);
+ }
+
+ window.onunload = closeEngineWin;
+
+ function sendForm (value) {
+ document.mainForm.method.value = value;
+ document.mainForm.screen.value = "<%=theScreen%>";
+ document.mainForm.submit();
+ }
+
+//-->
+</script>
-<link rel="stylesheet"
href="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.stylesheet.css"/>" type="text/css">
-<script language="javascript" src="<bean:write filter="false"
name="jahiaEngineCommonData" property="javaScriptPath" />"></script>
-<script language="javascript" src="<bean:write filter="false"
name="jahiaEngineCommonData" property="httpJsContextPath"
/>formWrapper.js"></script>
-<jsp:include page="/views/engines/common/javascripts.jsp" flush="true" />
</head>
-<body class="text" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0">
-<!-- Import all tiles attribute in request scope -->
-<tiles:importAttribute scope="request"/>
+<body>
+<div id="wrapper"><!-- wrapper -->
+ <div id="header"><!-- header -->
+ <h1>Jahia Engine</h1>
+ <span class="textHeader">
+ <jahia:adminResourceBundle
resourceName="org.jahia.admin.userMessage.user.label"/>:
+ <%=((JahiaUser) request.getSession().
+
getAttribute(ProcessingContext.SESSION_USER)).getUsername()%>
+ </span>
+ </div><!-- end header -->
+ <div id="pagebody"><!-- pagebody -->
+ <form name="mainForm" method="post" action="<%=engineUrl%>">
+ <input type="hidden" name="screen" value=""/>
+ <input type="hidden" name="lastscreen" value="<%=theScreen%>"/>
+ <input type="hidden" name="engineview" value="<%=engineView%>"/>
+ <input type="hidden" name="method" value=""/>
+ <!-- include page starts -->
+
+ <!-- Import all tiles attribute in request scope -->
+ <tiles:importAttribute scope="request"/>
+
+ <h3 class="page">
+ <jahia:engineResourceBundle
+
resourceName="org.jahia.engines.pages.PageProperties_Engine.pageSettings.label"/>
+ <span>[pid = <%=thePage.getID()%>]</span>
+ </h3>
+
+ <!-- Langs -->
+ <%@ include file="/jsp/jahia/engines/multilanguage_links.inc" %>
+ <!-- End Langs -->
+
+ <!-- Buttons -->
+ <%@ include file="/jsp/jahia/engines/buttons.inc" %>
+ <!-- End Buttons -->
+
+ <!-- Menubar -->
+ <%@ include file="/jsp/jahia/engines/menuBar.inc" %>
+ <!-- End Menubar -->
+
+ <!-- Body main content -->
+ <tiles:insert attribute="body-content" ignore="true"/>
+
+ <!-- include page ends -->
+ </form>
+ </div><!-- end pagebody -->
+ <div id="footer"><!-- footer -->
+ <div id="copyright"><%=Jahia.COPYRIGHT%></div>
+ <span class="version">Jahia v. <%=Jahia.VERSION%></span>
+ </div><!-- end footer -->
+ <div id="poweredby">
+ <span>Powered by Jahia</span>
+ </div>
+</div> <!-- end wrapper -->
+</body>
+</html>
+
+
+
+
-<!-- Header page -->
-<tiles:insert attribute="header" ignore="true" />
-<!-- Engine Top Information Section -->
-<tiles:insert attribute="top-information" ignore="true"/>
-<!-- Engine Top Action Menu -->
-<tiles:insert attribute="top-action-menu" ignore="true"/>
-<!-- Engine Language Switch buttons -->
-<tiles:insert attribute="language-switch-buttons" ignore="true"/>
-<!-- Body main content -->
-<tiles:insert attribute="body-content" ignore="true"/>
-</body>
-</html:html>
\ No newline at end of file
Index: operation_choices.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/engines/versioning/pages/operation_choices.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- operation_choices.jsp 2 Nov 2004 17:49:38 -0000 1.2
+++ operation_choices.jsp 7 Oct 2005 18:39:11 -0000 1.3
@@ -3,90 +3,64 @@
<%@ page import="org.jahia.views.engines.*" %>
<%@ page
import="org.jahia.views.engines.versioning.pages.PagesVersioningViewHelper" %>
-<[EMAIL PROTECTED] file="/views/engines/common/taglibs.jsp" %>
+<%@ taglib uri="JahiaLib" prefix="jahia" %>
+<jsp:useBean id="jspSource" class="java.lang.String" scope="request"/>
<%
- String actionURL =
(String)request.getAttribute("PagesVersioning.ActionURL");
- String engineView = (String)request.getAttribute("engineView");
- PagesVersioningViewHelper pagesVersViewHelper =
-
(PagesVersioningViewHelper)request.getAttribute(JahiaEngineViewHelper.ENGINE_VIEW_HELPER);
-
- HashMap engineMap =
(HashMap)request.getAttribute("jahia_session_engineMap");
- String theScreen = (String)engineMap.get("screen");
+ final PagesVersioningViewHelper pagesVersViewHelper =
+ (PagesVersioningViewHelper)
request.getAttribute(JahiaEngineViewHelper.ENGINE_VIEW_HELPER);
+ final HashMap engineMap = (HashMap)
request.getAttribute("jahia_session_engineMap");
+ final String theScreen = (String) engineMap.get("screen");
%>
-<[EMAIL PROTECTED] file="common-javascript.inc" %>
-<script language="javascript">
-<!--
-if (screen.availHeight <= 600) {
- window.moveTo(0,0);
- window.resizeTo(660, screen.availHeight);
-} else {
- window.resizeTo(660, 740);
-}
-//-->
-</script>
-<br><br>
-<table border="0" width="100%">
-<form name="mainForm" method="POST" action="<bean:write filter="false"
name="jahiaEngineCommonData" property="engineURL" />&screen=versioning" >
-<tr>
- <td align="left"> </td>
- <td align="left" class="text">
- <table border="0" width="90%">
- <tr>
- <td colspan="4" class="text" align="left">
- <b><jahia:engineResourceBundle
resourceName="org.jahia.engines.version.stepOneOfThree" /> :
<jahia:engineResourceBundle
resourceName="org.jahia.engines.version.typeOfOperation" /> :</b>
- </td>
- </tr>
- <tr>
- <td colspan="4" height="10"> </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan=3" class="text" align="left" valign="top"
bowrap>
- <table>
- <tr>
- <td class="text" align="left"
colspan="2">
- <b><jahia:engineResourceBundle
resourceName="org.jahia.engines.version.selectTheTaskToPerform" />.</b>
- <br><br><br>
- <b><jahia:engineResourceBundle
resourceName="org.jahia.engines.version.availableTasks" /> : </b>
- <br><br>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td class="text" align="left" nowrap>
- <input type="radio"
class="input" name="operationType" value="1"
<%if(pagesVersViewHelper.getOperationType()==1){%>checked<%}%>>A)
<jahia:engineResourceBundle
resourceName="org.jahia.engines.version.undoStagingModification" />.<br><br>
- <input type="radio"
class="input" name="operationType" value="2"
<%if(pagesVersViewHelper.getOperationType()==2){%>checked<%}%>>B)
<jahia:engineResourceBundle
resourceName="org.jahia.engines.version.restoreArchivedContent" />.<br><br>
- <input type="radio"
class="input" name="operationType" value="3"
<%if(pagesVersViewHelper.getOperationType()==3){%>checked<%}%>>C)
<jahia:engineResourceBundle
resourceName="org.jahia.engines.version.restoreDeletedPages" />.<br><br>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3" height="30"><img
src="<jahia:serverHttpPath /><jahia:engineResourceBundle
resourceName="org.jahia.hr.image" />" height="2" width="100%"></td>
- </tr>
- <tr>
- <td> </td>
- <td colspan="3" class="text" align="right" nowrap valign="top">
- <table border="0" cellpadding="0"
cellspacing="0" >
- <tr>
- <td> </td>
- <td class="text">
- <a
href="javascript:sendForm('showSiteMap','')"><b><jahia:engineResourceBundle
resourceName="org.jahia.engines.version.proceedToStep" /> 2 >></b></a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
- </table>
- </td>
-</tr>
-<input type="hidden" name="lastscreen" value="<%=theScreen%>">
-</form>
-</table>
+
+<div class="menuwrapper">
+ <%@ include file="../../../../jsp/jahia/engines/tools.inc" %>
+ <div class="content">
+ <div id="editor">
+ <h4>
+ <jahia:engineResourceBundle
+
resourceName="org.jahia.engines.include.actionSelector.Versioning.label"/>
+ </h4>
+
+ <h5><jahia:engineResourceBundle
resourceName="org.jahia.engines.version.stepOneOfThree"/></h5>
+
+ <p>
+ <strong><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.version.selectTheTaskToPerform"/></strong>. </p>
+ <p>
+ <jahia:engineResourceBundle
+
resourceName="org.jahia.engines.version.availableTasks"/>:</p>
+ <ul class="noStyle">
+ <li>
+ <input type="radio" name="operationType"
+ value="1"
<%if(pagesVersViewHelper.getOperationType()==1){%>
+ checked="checked"<%}%>> A)
+ <jahia:engineResourceBundle
+
resourceName="org.jahia.engines.version.undoStagingModification"/>
+ </li>
+ <li>
+ <input type="radio" name="operationType"
+ value="2"
<%if(pagesVersViewHelper.getOperationType()==2){%>
+ checked=checked<%}%>> B)
+ <jahia:engineResourceBundle
+
resourceName="org.jahia.engines.version.restoreArchivedContent"/>
+ </li>
+ <li>
+ <input type="radio" name="operationType"
+ value="3"
<%if(pagesVersViewHelper.getOperationType()==3){%>
+ checked=checked<%}%>> C)
+ <jahia:engineResourceBundle
+
resourceName="org.jahia.engines.version.restoreDeletedPages"/>
+ </li>
+ </ul>
+
+ <a
href="javascript:sendForm('showSiteMap');"><jahia:engineResourceBundle
+ resourceName="org.jahia.engines.version.proceedToStep"/>
2 >></a>
+
+ </div>
+ </div>
+
+ <div class="clearing"> </div>
+</div>
+
