From glorieux@users.nuiton.org Thu Dec 24 11:17:02 2009 From: glorieux@users.nuiton.org To: scmwebeditor-commits@list.nuiton.org Subject: [Scmwebeditor-commits] r68 - in trunk/src/main: java/org/nuiton/scmwebeditor webapp Date: Thu, 24 Dec 2009 11:17:02 +0100 Message-ID: <20091224101702.5D5BB15D56@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5260468584308589184==" --===============5260468584308589184== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: glorieux Date: 2009-12-24 11:17:02 +0100 (Thu, 24 Dec 2009) New Revision: 68 Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/Preview.js Log: Preview is now directly on the edition page. Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java =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 --- trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2009-12-2= 2 15:43:27 UTC (rev 67) +++ trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2009-12-2= 4 10:17:02 UTC (rev 68) @@ -79,8 +79,8 @@ } copy.delete(); // Sending html content to pop-up preview page + response.setCharacterEncoding("UTF-8"); response.setContentType("text/html"); - response.setContentType("text/html;charset=3DUTF-8"); PrintWriter ret =3D response.getWriter(); =20 ret.print(FileUtils.readFileToString(http_file)); Modified: trunk/src/main/webapp/ModificationViewer.jsp =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 --- trunk/src/main/webapp/ModificationViewer.jsp 2009-12-22 15:43:27 UTC (rev= 67) +++ trunk/src/main/webapp/ModificationViewer.jsp 2009-12-24 10:17:02 UTC (rev= 68) @@ -1,5 +1,5 @@ -<%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Auth= or : glorieux --%>=20 -<%@page contentType=3D"text/html charset=3DUTF-8"%> + <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Aut= hor : glorieux --%>=20 + <%@page contentType=3D"text/html" pageEncoding=3D"UTF-8"%> =20 @@ -11,7 +11,7 @@ , 5);"> - 3D"$alt"/ + 3D"ScmWebEditor

Welcome on SCMWebEditor

<%if (request.getAttribute("format").equals("rst") =3D=3D true){ %>

For any Problem with RestruturedText visit RST documentation website.

<%}%> @@ -46,6 +46,9 @@ " name=3D"Project_url">
+ <%--Title and div for rst preview--%> +

+

©2004-2009 CodeLutin

Modified: trunk/src/main/webapp/Preview.js =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 --- trunk/src/main/webapp/Preview.js 2009-12-22 15:43:27 UTC (rev 67) +++ trunk/src/main/webapp/Preview.js 2009-12-24 10:17:02 UTC (rev 68) @@ -40,8 +40,8 @@ if(http.readyState =3D=3D 4 && http.status !=3D 406) { var response =3D http.responseText; - var wind =3D window.open("", "Preview", "scrollbars=3Dyes,resizable= =3Dyes,status=3Dyes"); - wind.document.body.innerHTML =3D response; + document.getElementById("prevtitle").innerHTML =3D "Preview : "; + document.getElementById("prev").innerHTML =3D response; } else if (http.readyState =3D=3D 4 && http.status =3D=3D 406) { --===============5260468584308589184==--