knguyen 2004/10/20 11:45:33 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/engines/shared page_field.jsp
src/views/jsp/jahia/htmleditors/htmlarea htmlarea.js
src/views/jsp/jahia/htmleditors/htmlarea/lang fr.js
src/views/views/engines engines_default_layout.jsp
src/views/views/engines/versioning/pages sitemap.jsp
Log:
- some fix
Revision Changes Path
1.37.4.4 +9 -5 jahia/src/views/jsp/jahia/engines/shared/page_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/shared/page_field.jsp.diff?r1=1.37.4.3&r2=1.37.4.4&f=h
1.1.2.3 +21 -1 jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea.js.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
1.1.2.2 +19 -19 jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/fr.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/fr.js.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.2.4.2 +1 -0 jahia/src/views/views/engines/engines_default_layout.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/views/engines/engines_default_layout.jsp.diff?r1=1.2.4.1&r2=1.2.4.2&f=h
1.25.4.2 +9 -3 jahia/src/views/views/engines/versioning/pages/sitemap.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/views/engines/versioning/pages/sitemap.jsp.diff?r1=1.25.4.1&r2=1.25.4.2&f=h
Index: page_field.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/shared/Attic/page_field.jsp,v
retrieving revision 1.37.4.3
retrieving revision 1.37.4.4
diff -u -r1.37.4.3 -r1.37.4.4
--- page_field.jsp 14 Oct 2004 15:26:57 -0000 1.37.4.3
+++ page_field.jsp 20 Oct 2004 09:45:32 -0000 1.37.4.4
@@ -12,6 +12,7 @@
<%@ page import="org.jahia.utils.*" %>
<%@ page import="java.util.*" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
+<jahia:i18n />
<%
HashMap engineMap =
(HashMap)request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -36,6 +37,7 @@
if (title == null) {
title = "";
}
+ System.out.println("################## PAGGGGGGGGGGGGGGGGGGE TITLE
###################");
String remoteURL = pageBean.getRemoteURL();
// Get titles for the selected page engine.
@@ -78,19 +80,21 @@
<script language="javascript">
function callSelectPageMove() {
+ window.onunload = null; // Inhibate the engine pop up close
+ <%=jData.gui().html().drawSelectPageLauncher(SelectPage_Engine.MOVE_OPERATION,
pageBean.getParentID(), pageBean.getID())%>
+
document.mainForm.action += "&loadedFromSession=true" +
"&operation=<%=SelectPage_Engine.MOVE_OPERATION%>";
document.mainForm.submit();
- window.onunload = null; // Inhibate the engine pop up close
- <%=jData.gui().html().drawSelectPageLauncher(SelectPage_Engine.MOVE_OPERATION,
pageBean.getParentID(), pageBean.getID())%>
}
function callSelectPageLink() {
+ window.onunload = null; // Inhibate the engine pop up close
+ <%=jData.gui().html().drawSelectPageLauncher(SelectPage_Engine.LINK_OPERATION,
pageBean.getParentID(), pageBean.getID())%>
+
document.mainForm.action += "&loadedFromSession=true" +
"&operation=<%=SelectPage_Engine.LINK_OPERATION%>";
document.mainForm.submit();
- window.onunload = null; // Inhibate the engine pop up close
- <%=jData.gui().html().drawSelectPageLauncher(SelectPage_Engine.LINK_OPERATION,
pageBean.getParentID(), pageBean.getID())%>
}
function titleKeyPress() {
@@ -165,7 +169,7 @@
<jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.jahiaPageTitle.label"/> :<br><br>
<input class="input" type="text" size="65" name="page_title"
onkeypress="javascript:titleKeyPress()"
- value="<%=JahiaTools.text2html(title)%>"
maxlength="250"><br>
+ value="<%=title%>" maxlength="250"><br>
<input class="input" type="checkbox" name="shared_title"
<% if (pageBean.isSharedTitle()) { %>checked<% }
%>><jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.shareTitleWithOtherLanguages.label"/>.<br>
<% // Is it a new page field ?
Index: htmlarea.js
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/htmlarea/Attic/htmlarea.js,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- htmlarea.js 14 Oct 2004 10:52:40 -0000 1.1.2.2
+++ htmlarea.js 20 Oct 2004 09:45:32 -0000 1.1.2.3
@@ -9,7 +9,7 @@
// Version 3.0 developed by Mihai Bazon.
// http://dynarch.com/mishoo
//
-// $Id: htmlarea.js,v 1.1.2.2 2004/10/14 10:52:40 knguyen Exp $
+// $Id: htmlarea.js,v 1.1.2.3 2004/10/20 09:45:32 knguyen Exp $
if (typeof _editor_url == "string") {
// Leave exactly one backslash at the end of _editor_url
@@ -777,6 +777,8 @@
doc.write(html);
doc.close();
}
+ editor._doc.body.innerHTML = editor.getHTML();
+ editor._doc.body.innerHTML = editor.getHTML();
if (HTMLArea.is_ie) {
// enable editable mode for IE. For some reason this
@@ -1625,6 +1627,9 @@
if (this.config.killWordOnPaste)
this._wordClean();
this._doc.execCommand(cmdID, UI, param);
+ // Jahia cleaning a bit more
+ this._doc.body.innerHTML = this.getHTML();
+ this._doc.body.innerHTML = this.getHTML();
} catch (e) {
if (HTMLArea.is_gecko) {
if (confirm("Unprivileged scripts cannot access
Cut/Copy/Paste programatically " +
@@ -1633,6 +1638,7 @@
window.open("http://mozilla.org/editor/midasdemo/securityprefs.html";);
}
}
+
break;
case "lefttoright":
case "righttoleft":
@@ -1756,6 +1762,20 @@
return false;
};
+// retrieve the HTML
+HTMLArea.prototype.getCleanedHTML = function() {
+ switch (this._editMode) {
+ case "wysiwyg" :
+ if (!this.config.fullPage) {
+ return HTMLArea.getHTML(this._doc.body, false, this);
+ } else
+ return this.doctype + "\n" +
HTMLArea.getHTML(this._doc.documentElement, true, this);
+ case "textmode" : return this._textArea.value;
+ default : alert("Mode <" + mode + "> not defined!");
+ }
+ return false;
+};
+
// retrieve the HTML (fastest version, but uses innerHTML)
HTMLArea.prototype.getInnerHTML = function() {
switch (this._editMode) {
Index: fr.js
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/Attic/fr.js,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- fr.js 29 Sep 2004 16:47:41 -0000 1.1.2.1
+++ fr.js 20 Oct 2004 09:45:32 -0000 1.1.2.2
@@ -1,4 +1,4 @@
-// I18N constants
+// I18N constants
// Author: Jonathan Ernst, <[EMAIL PROTECTED]>
// FOR TRANSLATORS:
@@ -19,33 +19,33 @@
tooltips: {
bold: "Gras",
italic: "Italique",
- underline: "Soulign�",
- strikethrough: "Barr�",
+ underline: "Souligné",
+ strikethrough: "Barré",
subscript: "Subscript",
superscript: "Superscript",
- justifyleft: "Align� � gauche",
- justifycenter: "Centr�",
- justifyright: "Align� � droite",
- justifyfull: "Justifi�",
- orderedlist: "Num�rotation",
+ justifyleft: "Aligné à gauche",
+ justifycenter: "Centré",
+ justifyright: "Aligné à droite",
+ justifyfull: "Justifié",
+ orderedlist: "Numérotation",
unorderedlist: "Puces",
outdent: "Augmenter le retrait",
indent: "Diminuer le retrait",
forecolor: "Couleur du texte",
hilitecolor: "Couleur du fond",
horizontalrule: "Ligne horizontale",
- createlink: "Ins�rer un lien",
- insertimage: "Ins�rer une image",
- inserttable: "Ins�rer un tableau",
+ createlink: "Insérer un lien",
+ insertimage: "Insérer une image",
+ inserttable: "Insérer un tableau",
htmlmode: "Passer au code source HTML",
- popupeditor: "Agrandir l'�diteur",
- about: "A propos de cet �diteur",
- showhelp: "Aide sur l'�diteur",
+ popupeditor: "Agrandir l'éditeur",
+ about: "A propos de cet éditeur",
+ showhelp: "Aide sur l'éditeur",
textindicator: "Style courant",
- undo: "Annule la derni�re action",
- redo: "Refait la derni�re action",
- cut: "Coupe la s�lection",
- copy: "Copie la s�lection",
+ undo: "Annule la dernière action",
+ redo: "Refait la dernière action",
+ cut: "Coupe la sélection",
+ copy: "Copie la sélection",
paste: "Colle depuis le presse papiers"
},
@@ -56,6 +56,6 @@
msg: {
"Path": "Chemin",
- "TEXT_MODE": "Vous �tes en mode texte. Utilisez le bouton [<>]
pour revenir au mode WYSIWIG."
+ "TEXT_MODE": "Vous êtes en mode texte. Utilisez le bouton [<>]
pour revenir au mode WYSIWIG."
}
};
Index: engines_default_layout.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/views/engines/Attic/engines_default_layout.jsp,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- engines_default_layout.jsp 5 May 2004 14:37:18 -0000 1.2.4.1
+++ engines_default_layout.jsp 20 Oct 2004 09:45:33 -0000 1.2.4.2
@@ -22,6 +22,7 @@
<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" />
+<jsp:include page="/views/engines/common/calendar.jsp" flush="true" />
</head>
<body class="text" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
Index: sitemap.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/views/engines/versioning/pages/Attic/sitemap.jsp,v
retrieving revision 1.25.4.1
retrieving revision 1.25.4.2
diff -u -r1.25.4.1 -r1.25.4.2
--- sitemap.jsp 27 May 2004 09:53:09 -0000 1.25.4.1
+++ sitemap.jsp 20 Oct 2004 09:45:33 -0000 1.25.4.2
@@ -56,6 +56,9 @@
String engineURL = (String)engineMap.get("engineUrl");
String engineLang = (String)engineMap.get("languageCode");
String theScreen = (String)engineMap.get("screen");
+
+ int now = ServicesRegistry.getInstance()
+ .getJahiaVersionService().getCurrentVersionID();
%>
<script language="javascript">
@@ -299,6 +302,9 @@
String pageTitle =
treeJahiaSiteMap.getPageTitle(i, jParams.getLocale().toString());
boolean isPageMarkedForDeletion =
contentPage.isMarkedForDelete();
+
+
// check that we can undo the page that exist only in staging
+ boolean existOnlyInStaging =
!(contentPage.hasArchiveEntryState(now,false));
// check if the content object exists
before a given date
boolean
hasArchiveEntryBeforeRestoreDate =
@@ -399,12 +405,12 @@
new
RevisionEntry(entryState,contentPage.getObjectKey());
%>
<% if (
pagesVersViewHelper.getOperationType() == 1 ){ // Undo Staging %>
- <input name="<%=nodeName%>"
type="checkbox" <%if ( !allowPageSelection || !isStaging ){%>disabled<%}%> <% if (
isStaging && hasArchiveEntryBeforeRestoreDate &&
selectedPages.contains(contentPage.getObjectKey()) ){%>checked<%}%> >
+ <input name="<%=nodeName%>"
type="checkbox" <%if ( !allowPageSelection || existOnlyInStaging || !isStaging
){%>disabled<%}%> <% if ( isStaging && hasArchiveEntryBeforeRestoreDate &&
selectedPages.contains(contentPage.getObjectKey()) ){%>checked<%}%> >
<% } else if (
pagesVersViewHelper.getOperationType() == 2 ){ // Restore Archive %>
<input name="<%=nodeName%>"
type="checkbox" <%if ( !allowPageSelection || !hasArchiveEntryBeforeRestoreDate ||
wasDeleted ){%>disabled<%}%> <% if ( !( !hasArchiveEntryBeforeRestoreDate ||
wasDeleted ) && selectedPages.contains(contentPage.getObjectKey()) ){%>checked<%}%> >
- <% }
else { // page undelete %>
+
<% } else { // page undelete %>
<input name="<%=nodeName%>"
type="checkbox" <%if ( !allowPageSelection || !isDeleted ){%>disabled<%}%> <% if (
isDeleted && selectedPages.contains(contentPage.getObjectKey()) ){%>checked<%}%> >
- <% } %>
+
<% } %>
</td>
<td align="center">
<%
