r1075 - in xwiki/trunk/src/main: java/com/xpn/xwiki/web web/skins/default web/templates web/wiki_editor/plugins
Phung Hai Nam
namphunghai at users.forge.objectweb.org
Mon May 29 12:07:37 CEST 2006
Author: namphunghai
Date: 2006-05-29 12:07:36 +0200 (Mon, 29 May 2006)
New Revision: 1075
Added:
xwiki/trunk/src/main/web/skins/default/browserdetect.js
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java
xwiki/trunk/src/main/web/templates/edit.vm
xwiki/trunk/src/main/web/templates/editactions.vm
xwiki/trunk/src/main/web/templates/previewfooter.vm
xwiki/trunk/src/main/web/templates/previewheader.vm
xwiki/trunk/src/main/web/templates/wysiwyg.vm
xwiki/trunk/src/main/web/wiki_editor/plugins/core.js
Log:
Commited wysiwyg editor add some code lost when Ludovic commit before and some things
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java 2006-05-29 10:07:36 UTC (rev 1075)
@@ -38,6 +38,7 @@
public String render(XWikiContext context) throws XWikiException {
XWikiRequest request = context.getRequest();
+ String content = request.getParameter("content");
XWikiDocument doc = context.getDoc();
XWikiForm form = context.getForm();
VelocityContext vcontext = (VelocityContext) context.get("vcontext");
@@ -94,6 +95,8 @@
}
XWikiDocument tdoc2 = (XWikiDocument) tdoc.clone();
+ if (content != null && !content.equals(""))
+ tdoc2.setContent(content);
context.put("tdoc", tdoc2);
vcontext.put("tdoc", new Document(tdoc2, context));
tdoc2.readFromTemplate(peform, context);
Added: xwiki/trunk/src/main/web/skins/default/browserdetect.js
===================================================================
--- xwiki/trunk/src/main/web/skins/default/browserdetect.js 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/web/skins/default/browserdetect.js 2006-05-29 10:07:36 UTC (rev 1075)
@@ -0,0 +1,97 @@
+// Browser Detect Lite v2.1.4
+// http://www.dithered.com/javascript/browser_detect/index.html
+// modified by Chris Nott (chris at NOSPAMdithered.com - remove NOSPAM)
+
+
+function BrowserDetectLite() {
+ var ua = navigator.userAgent.toLowerCase();
+
+ // browser name
+ this.isGecko = (ua.indexOf('gecko') != -1 && ua.indexOf('safari') == -1);
+ this.isMozilla = (this.isGecko && ua.indexOf('gecko/') + 14 == ua.length);
+ this.isNS = ( (this.isGecko) ? (ua.indexOf('netscape') != -1) : ( (ua.indexOf('mozilla') != -1) && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1) ) );
+ this.isIE = ( (ua.indexOf('msie') != -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) );
+ this.isSafari = (ua.indexOf('safari') != - 1);
+ this.isOpera = (ua.indexOf('opera') != -1);
+ this.isKonqueror = (ua.indexOf('konqueror') != -1 && !this.isSafari);
+ this.isIcab = (ua.indexOf('icab') != -1);
+ this.isAol = (ua.indexOf('aol') != -1);
+
+ // spoofing and compatible browsers
+ this.isIECompatible = ( (ua.indexOf('msie') != -1) && !this.isIE);
+ this.isNSCompatible = ( (ua.indexOf('mozilla') != -1) && !this.isNS && !this.isMozilla);
+
+ // browser version
+ this.versionMinor = parseFloat(navigator.appVersion);
+
+ // correct version number
+ if (this.isNS && this.isGecko) {
+ this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) );
+ }
+ else if (this.isIE && this.versionMinor >= 4) {
+ this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) );
+ }
+ else if (this.isMozilla) {
+ this.versionMinor = parseFloat( ua.substring( ua.indexOf('rv:') + 3 ) );
+ }
+ else if (this.isSafari) {
+ this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) );
+ }
+ else if (this.isOpera) {
+ if (ua.indexOf('opera/') != -1) {
+ this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera/') + 6 ) );
+ }
+ else {
+ this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera ') + 6 ) );
+ }
+ }
+ else if (this.isKonqueror) {
+ this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) );
+ }
+ else if (this.isIcab) {
+ if (ua.indexOf('icab/') != -1) {
+ this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab/') + 6 ) );
+ }
+ else {
+ this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab ') + 6 ) );
+ }
+ }
+
+ this.versionMajor = parseInt(this.versionMinor);
+ this.geckoVersion = ( (this.isGecko) ? ua.substring( (ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14) ) : -1 );
+
+ // dom support
+ this.isDOM1 = (document.getElementById);
+ this.isDOM2Event = (document.addEventListener && document.removeEventListener);
+
+ // css compatibility mode
+ this.mode = document.compatMode ? document.compatMode : 'BackCompat';
+
+ // platform
+ this.isWin = (ua.indexOf('win') != -1);
+ this.isWin32 = (this.isWin && ( ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1 || ua.indexOf('xp') != -1) );
+ this.isMac = (ua.indexOf('mac') != -1);
+ this.isUnix = (ua.indexOf('unix') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1)
+ this.isLinux = (ua.indexOf('linux') != -1);
+
+ // specific browser shortcuts
+ this.isNS4x = (this.isNS && this.versionMajor == 4);
+ this.isNS40x = (this.isNS4x && this.versionMinor < 4.5);
+ this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7);
+ this.isNS4up = (this.isNS && this.versionMinor >= 4);
+ this.isNS6x = (this.isNS && this.versionMajor == 6);
+ this.isNS6up = (this.isNS && this.versionMajor >= 6);
+ this.isNS7x = (this.isNS && this.versionMajor == 7);
+ this.isNS7up = (this.isNS && this.versionMajor >= 7);
+
+ this.isIE4x = (this.isIE && this.versionMajor == 4);
+ this.isIE4up = (this.isIE && this.versionMajor >= 4);
+ this.isIE5x = (this.isIE && this.versionMajor == 5);
+ this.isIE55 = (this.isIE && this.versionMinor == 5.5);
+ this.isIE5up = (this.isIE && this.versionMajor >= 5);
+ this.isIE6x = (this.isIE && this.versionMajor == 6);
+ this.isIE6up = (this.isIE && this.versionMajor >= 6);
+
+ this.isIE4xMac = (this.isIE4x && this.isMac);
+}
+var browser = new BrowserDetectLite();
Modified: xwiki/trunk/src/main/web/templates/edit.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/edit.vm 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/web/templates/edit.vm 2006-05-29 10:07:36 UTC (rev 1075)
@@ -18,6 +18,9 @@
#else
#set($colsclass = "hide-both")
#end
+<script language="javascript" type="text/javascript" src="${request.contextPath}/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript" src="${request.contextPath}/wiki_editor/wiki_editor.js"></script>
+
<div id="xwikieditcontent" class="large">
<div id="columns">
<div class="cols-wrapper">
@@ -55,7 +58,7 @@
#end
$msg.get("titlefield"): <input type="text" name="title" value="$!tdoc.title" size="60" />
<br /><br />
-Switch to <span style="color: blue; cursor:pointer;" onclick="document.forms.edit.action='$doc.getURL("edit","xpage=wysiwyg")'; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;"><u>$msg.get("wysiwygeditor")</u></span>
+Switch to <span style="color: blue; cursor:pointer;" onclick="document.forms.edit.action='$doc.getURL("edit","xpage=wysiwyg")'; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;"><u>$msg.get("wysiwygeditor")</u></span>
<br />
#includeHelp("EditWikiToolbar")
$xwiki.getTextArea($tdoc.content)
Modified: xwiki/trunk/src/main/web/templates/editactions.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/editactions.vm 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/web/templates/editactions.vm 2006-05-29 10:07:36 UTC (rev 1075)
@@ -11,9 +11,9 @@
}
</script>
#if ($showactions == 1)
-<a href="$doc.getURL("cancel")" onclick="document.forms.edit.action=this.href; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;" >$msg.get("cancel")</a>
-<span> | </span>
-<a href="$doc.getURL("preview")" onclick="document.forms.edit.action=this.href; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;">$msg.get("preview")</a>
-<span> | </span>
-<a href="$doc.getURL("save")" onclick="document.forms.edit.action=this.href; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;" >$msg.get("save")</a>
+ <a href="$doc.getURL("cancel")" onclick="document.forms.edit.action=this.href; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;" >$msg.get("cancel")</a>
+ <span> | </span>
+ <a style="cursor:pointer;" onclick="document.forms.edit.action='$doc.getURL("preview")'; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;" >$msg.get("preview")</a>
+ <span> | </span>
+ <a href="$doc.getURL("save")" onclick="document.forms.edit.action=this.href; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;" >$msg.get("save")</a>
#end
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/templates/previewfooter.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/previewfooter.vm 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/web/templates/previewfooter.vm 2006-05-29 10:07:36 UTC (rev 1075)
@@ -1,5 +1,20 @@
<div class="xwiki${xwikimode}b" id="xwikinav_footer">
-<div class="xwikiactions">
+ <div class="xwikiactions">
+ <a href="$doc.getURL("cancel")" onclick="document.forms.edit.action=this.href; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;" >$msg.get("cancel")</a>
+ <span> | </span>
+ #if($doc.content.indexOf("includeForm(")!=-1)
+ #set($editaction = "inline")
+ #else
+ #set($editaction = "edit")
+ ## Check WYSISYG editing option
+ #if($xwiki.getUserPreference("editor")=="Wysiwyg")
+ #set($editparams="xpage=wysiwyg")
+ #else
+ #set($editparams="")
+ #end
+ #end
+<a href="$doc.getURL($editaction,$editparams)" onclick="document.forms.edit.action=this.href; document.forms.edit.submit(); return false;"> $msg.get("backtoedit")</a>
+<span> | </span>
<a href="$doc.getURL("save")" onclick="document.forms.edit.action=this.href; document.forms.edit.submit(); return false;" >$msg.get("save")</a>
</div>
-</div>
+</div>
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/templates/previewheader.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/previewheader.vm 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/web/templates/previewheader.vm 2006-05-29 10:07:36 UTC (rev 1075)
@@ -1,5 +1,21 @@
<div class="xwiki${xwikimode}b" id="xwikinav_footer">
-<div class="xwikiactions">
-<a href="$doc.getURL("save")" onclick="document.forms.edit.action=this.href; document.forms.edit.submit(); return false;" >$msg.get("save")</a>
-</div>
-</div>
+ <div class="xwikiactions">
+ <a href="$doc.getURL("cancel")" onclick="document.forms.edit.action=this.href; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;" >$msg.get("cancel")</a>
+ <span> | </span>
+ #if($doc.content.indexOf("includeForm(")!=-1)
+ #set($editaction = "inline")
+ #set($editparams="")
+ #else
+ #set($editaction = "edit")
+ ## Check WYSISYG editing option
+ #if($xwiki.getUserPreference("editor")=="Wysiwyg")
+ #set($editparams="xpage=wysiwyg")
+ #else
+ #set($editparams="")
+ #end
+ #end
+ <a href="$doc.getURL($editaction,$editparams)" onclick="document.forms.edit.action=this.href; document.forms.edit.submit(); return false;"> $msg.get("backtoedit")</a>
+ <span> | </span>
+ <a href="$doc.getURL("save")" onclick="document.forms.edit.action=this.href; document.forms.edit.submit(); return false;" >$msg.get("save")</a>
+ </div>
+</div>
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/templates/wysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/wysiwyg.vm 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/web/templates/wysiwyg.vm 2006-05-29 10:07:36 UTC (rev 1075)
@@ -65,7 +65,7 @@
#end
$msg.get("titlefield"): <input type="text" name="title" value="$!tdoc.title" size="60" />
<br /><br />
- Switch to <span style="color: blue; cursor:pointer;" onclick="document.forms.edit.action='$doc.getURL("edit")'; if (document.forms.edit.onsubmit) document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;"><u>$msg.get("wikieditor")</u></span>
+ Switch to <span style="color: blue; cursor:pointer;" onclick="document.forms.edit.action='$doc.getURL("edit")'; document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;"><u>$msg.get("wikieditor")</u></span>
<br />
$xwiki.getTextArea($tdoc.content)
<br/>
Modified: xwiki/trunk/src/main/web/wiki_editor/plugins/core.js
===================================================================
--- xwiki/trunk/src/main/web/wiki_editor/plugins/core.js 2006-05-28 21:20:04 UTC (rev 1074)
+++ xwiki/trunk/src/main/web/wiki_editor/plugins/core.js 2006-05-29 10:07:36 UTC (rev 1075)
@@ -59,7 +59,9 @@
"û|ü|ÿ|" +
// Commercial symbols:
"?|©|®|¢|?|¥|" +
- "£|¤";
+ "£|¤|" +
+ //Other characters
+ ">|<";
var characterEntityStr = "À|Á|Â|Ã|Ä|Å|" +
"Æ|Ç|È|É|Ê|Ë|" +
"Ì|Í|Î|Ï|Ñ|Ò|" +
@@ -72,7 +74,9 @@
"û|ü|ÿ|" +
// Commercial symbols:
"™|©|®|¢|€|¥|" +
- "£|¤";
+ "£|¤|" +
+ //Other characters
+ ">|<"
var characterEntitys = characterEntityStr.split("|");
var chars = charStr.split("|");
More information about the Xwiki-notifications
mailing list