From kcardineaud@users.nuiton.org Thu Jul 7 12:31:09 2011
From: kcardineaud@users.nuiton.org
To: scmwebeditor-commits@list.nuiton.org
Subject: [Scmwebeditor-commits] r164 - in trunk/src/main:
java/org/nuiton/scmwebeditor/actions webapp
Date: Thu, 07 Jul 2011 12:31:09 +0200
Message-ID: <20110707103109.BF9F415921@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0298538279693308772=="
--===============0298538279693308772==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Author: kcardineaud
Date: 2011-07-07 12:31:09 +0200 (Thu, 07 Jul 2011)
New Revision: 164
Url: http://nuiton.org/repositories/revision/scmwebeditor/164
Log:
The default language in editor is now select only with javascript instead of =
java/javascript
Added:
trunk/src/main/webapp/selectLanguage.js
Modified:
trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java
trunk/src/main/webapp/ModificationViewer.jsp
Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.ja=
va
=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/actions/SearchAction.java 201=
1-07-07 09:25:04 UTC (rev 163)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 201=
1-07-07 10:31:09 UTC (rev 164)
@@ -127,7 +127,6 @@
=20
if(log.isInfoEnabled()) {
log.info("Enter in search action");
- log.info("username : "+username+" pw : "+pw);
}
=20
=20
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 2011-07-07 09:25:04 UTC (rev=
163)
+++ trunk/src/main/webapp/ModificationViewer.jsp 2011-07-07 10:31:09 UTC (rev=
164)
@@ -11,6 +11,8 @@
SCMWebEditor
=20
+
+
=20
@@ -75,8 +77,18 @@
File in editor : " >=
<%=3Drequest.getAttribute("address")%>
=20
+ =20
+ =20
+
+ =20
+ =20
=20
- <%
- if(typeEditor.equals("null") && request.getAttribute("minetype")!=3Dnull=
) {
=20
- if(( (String) request.getAttribute("minetype")).contains("rst") ) {
- typeEditor=3D"rst";
- %>
-
- <%
- }
- else if(( (String) request.getAttribute("minetype")).contains("javas=
cript")) {
- typeEditor=3D"javascript";
- %>
- =20
- <%
- }
- else if(( (String) request.getAttribute("minetype")).contains("html"=
) ) {
- typeEditor=3D"text/html";
- %>
-
- <%
- }
- else if(( (String) request.getAttribute("minetype")).contains("xml")=
) {
- typeEditor=3D"xml";
- %>
-
- <%
- }
- }
=20
- if (typeEditor.equals("null") && request.getAttribute("format")!=3Dnull){
- =20
- =20
- if (request.getAttribute("format").equals("rst")) { =20
- typeEditor=3D"rst";
- %>
-
- <% } else if(request.getAttribute("format").equals("javascript")) {
- typeEditor=3D"javascript";
- %>
- =20
- <% } else if(request.getAttribute("format").equals("html")) {
- typeEditor=3D"text/html";
- %>
-
- <%
- } else if(request.getAttribute("format").equals("xml")) {
- typeEditor=3D"xml";
- %>
-
- <%
- } else if(request.getAttribute("format").equals("java")) {
- typeEditor=3D"text/x-java";
- %>
-
- <%
- }
- =20
- }
-%>
+ =20
+
=20
=20
-
- =20
- =20
-
-