r68 - in trunk/src/main: java/org/nuiton/scmwebeditor webapp - Scmwebeditor-commits

24 Dec 2009

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
===================================================================

--- trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java	2009-12-22 15:43:27 UTC (rev 67)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java	2009-12-24 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=UTF-8");
         PrintWriter ret = response.getWriter();
 
         ret.print(FileUtils.readFileToString(http_file));

Modified: trunk/src/main/webapp/ModificationViewer.jsp
===================================================================
--- 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 Author : glorieux --%> 
-<%@page contentType="text/html charset=UTF-8"%>
+ <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> 
+ <%@page contentType="text/html" pageEncoding="UTF-8"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
    "http://www.w3.org/TR/html4/loose.dtd">
@@ -11,7 +11,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body onload="cleanForm();geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);">
-    <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a>
+    <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a>
     <center><h2>Welcome on SCMWebEditor</h2>
         <%if (request.getAttribute("format").equals("rst") == true){
             %><h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4></center><%}%>
@@ -46,6 +46,9 @@
     <input type="hidden" value="<%=request.getAttribute("Project_url")%>" name="Project_url">
     <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message, this.form.Project_url, this.form.scmEditorUrl);"/>
         </form></center>
+    <%--Title and div for rst preview--%>
+    <h4 id="prevtitle" ></h4>
+    <div id="prev" title="Preview"></div>
     <p align="right">©2004-2009 CodeLutin</p>
 </body>
 </html>

Modified: trunk/src/main/webapp/Preview.js
===================================================================
--- 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 == 4 && http.status != 406)
     {
         var response = http.responseText;
-        var wind = window.open("", "Preview", "scrollbars=yes,resizable=yes,status=yes");
-        wind.document.body.innerHTML = response;
+        document.getElementById("prevtitle").innerHTML = "Preview : ";
+        document.getElementById("prev").innerHTML = response;
     }
     else if (http.readyState == 4 && http.status == 406)
     {

    

r68 - in trunk/src/main: java/org/nuiton/scmwebeditor webapp

glorieux＠users.nuiton.org

tags

participants (1)