From kcardineaud@users.nuiton.org Fri Aug 19 17:43:34 2011 From: kcardineaud@users.nuiton.org To: scmwebeditor-commits@list.nuiton.org Subject: [Scmwebeditor-commits] r236 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp/WEB-INF/content webapp/css webapp/img/editor Date: Fri, 19 Aug 2011 17:43:34 +0200 Message-ID: <20110819154334.45CAA157E0@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3155296325901594743==" --===============3155296325901594743== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: kcardineaud Date: 2011-08-19 17:43:34 +0200 (Fri, 19 Aug 2011) New Revision: 236 Url: http://nuiton.org/repositories/revision/scmwebeditor/236 Log: #261 Improve user interface - Add a new theme Added: trunk/src/main/webapp/css/uploadForm.css trunk/src/main/webapp/img/editor/head.png trunk/src/main/webapp/img/editor/save-quit-hover.png trunk/src/main/webapp/img/editor/save-quit-hover2.png trunk/src/main/webapp/img/editor/save-quit.png Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java trunk/src/main/resources/log4j.properties trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/save.jsp trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.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/actions/ResetAction.java 2011= -08-19 13:23:31 UTC (rev 235) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011= -08-19 15:43:34 UTC (rev 236) @@ -73,8 +73,8 @@ this.pw =3D pw; } =20 - public void getErreur(String error) { - this.error =3D error; + public String getError() { + return error; } =20 =20 Modified: trunk/src/main/resources/log4j.properties =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/resources/log4j.properties 2011-08-19 13:23:31 UTC (rev 23= 5) +++ trunk/src/main/resources/log4j.properties 2011-08-19 15:43:34 UTC (rev 23= 6) @@ -49,7 +49,7 @@ #log4j.appender.rolling.layout.ConversionPattern=3D%d{yyyy/MM/dd hh:mm:ss} %= 5p (%F:%L) %m%n =20 # package level -#log4j.logger.org.nuiton.scmwebeditor.actions=3DDEBUG +#log4j.logger.org.nuiton.scmwebeditor.actions.SaveAction=3DDEBUG =20 #log4j.logger.org.chorem.jtimer=3DDEBUG #log4j.logger.org.chorem.jtimer.ws=3DDEBUG Modified: trunk/src/main/webapp/WEB-INF/content/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/WEB-INF/content/modificationViewer.jsp 2011-08-19 1= 3:23:31 UTC (rev 235) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-19 1= 5:43:34 UTC (rev 236) @@ -66,9 +66,12 @@ + =20 + =20 + + =20 =20 - =20 =20 @@ -76,21 +79,183 @@ =20 - 3D"ScmWebEditor +
+ +
+ +
+ =20 -
-

+

SCMWebEditor

+ =20 + =20 + +
+ =20 +
+

Connexion

+ =20 + + + + + + + + + + + + + + =20 + + + =20 + + + =
+ + =20 +
+ <%if (request.getAttribute("badLogin")!=3Dnull && request.getAttribu= te("badLogin").equals(true)) { %> +

+ + + +

+ <%} %> +
=20 + =20 + =20 +
+ =20 + =20 + + =20 +
+ + + + =20 + + + =20 + +
+ + + =20 + + <%if (request.getAttribute("format")!=3Dnull && request.getAttribute(= "format")!=3Dnull && request.getAttribute("format").equals("rst") =3D=3D true= ){ + %> + + =20 + + + =20 + +
+ + =20 + <%}%> + + =20 + + =20 + + + =20 + +
+ + =20 + +=09 + + + + =20 + =20 + +
+ + =20 + + =20 + + =20 + + + + + + + + +
+ + =20 + + =20 +
=20 +
+ =20 + =20 + =20 + =20 +
=20 + =20 + <% String typeEditor=3D"null"; if (request.getAttribute("format")!=3Dnull && request.getAttribute("= format").equals("rst")) { =20 %>

.

<% } %> - =20 + =20 =20 - =20 + =20 <% if (request.getAttribute("format")!=3Dnull){ =20 %> @@ -153,22 +318,13 @@ =20 =20 =20 - - +
=20

©2004-2009 CodeLutin

Modified: trunk/src/main/webapp/WEB-INF/content/save.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/WEB-INF/content/save.jsp 2011-08-19 13:23:31 UTC (r= ev 235) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-19 15:43:34 UTC (r= ev 236) @@ -28,14 +28,14 @@ =20 =09 -

+

=

-

+

=20 -

+

=20 @@ -58,7 +58,7 @@ =20 -

+

=20 @@ -91,15 +91,15 @@ =20 -

,

+

,

=20 -

+

=20 -

+