From vbriand@users.chorem.org Thu Jan 27 16:51:12 2011 From: vbriand@users.chorem.org To: bow-commits@list.chorem.org Subject: [Bow-commits] r178 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action webapp webapp/WEB-INF/decorators webapp/css webapp/jsp webapp/jsp/inc webapp/template webapp/template/xhtml Date: Thu, 27 Jan 2011 16:51:12 +0100 Message-ID: <20110127155112.86849158BB@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8562490783771671497==" --===============8562490783771671497== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: vbriand Date: 2011-01-27 16:51:12 +0100 (Thu, 27 Jan 2011) New Revision: 178 Url: http://chorem.org/repositories/revision/bow/178 Log: Overloaded the default template of Struts2 ("xhtml") in order to remove the g= enerated ""s Added: trunk/src/main/webapp/template/ trunk/src/main/webapp/template/xhtml/ trunk/src/main/webapp/template/xhtml/controlheader-core.ftl trunk/src/main/webapp/template/xhtml/form-close.ftl trunk/src/main/webapp/template/xhtml/form.ftl trunk/src/main/webapp/template/xhtml/password.ftl trunk/src/main/webapp/template/xhtml/submit-close.ftl trunk/src/main/webapp/template/xhtml/submit.ftl trunk/src/main/webapp/template/xhtml/text.ftl Modified: trunk/src/main/java/org/chorem/bow/ trunk/src/main/java/org/chorem/bow/action/LoginAction.java trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/css/global.css trunk/src/main/webapp/jsp/inc/rightMenu.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/preferences.jsp Property changes on: trunk/src/main/java/org/chorem/bow ___________________________________________________________________ Added: svn:ignore + .ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/action/LoginAction.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/chorem/bow/action/LoginAction.java 2011-01-27 09:= 31:16 UTC (rev 177) +++ trunk/src/main/java/org/chorem/bow/action/LoginAction.java 2011-01-27 15:= 51:12 UTC (rev 178) @@ -90,15 +90,15 @@ } return null; } - =20 + =20 public String execute() { if (email !=3D null) { email =3D email.trim(); - + =20 if (password !=3D null) { String md5 =3D StringUtil.encodeMD5(password); User user; - + =09 try { user =3D checkLogin(email, md5); } catch (NoSuchAlgorithmException e) { Modified: trunk/src/main/webapp/WEB-INF/decorators/main.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/decorators/main.jsp 2011-01-27 09:31:16 UTC= (rev 177) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-27 15:51:12 UTC= (rev 178) @@ -8,6 +8,7 @@ Bow : <decorator:title default=3D"Bow" /> + @@ -20,7 +21,6 @@ -
Modified: trunk/src/main/webapp/css/bookmark.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/css/bookmark.css 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/css/bookmark.css 2011-01-27 15:51:12 UTC (rev 178) @@ -488,10 +488,4 @@ #bookmarkForm label{ margin-top:12px; font-style:normal; -} - -#bookmarkForm input[type=3D"text"]{ - width:100%; - margin-top:10px; - margin-left:10px; } \ No newline at end of file Modified: trunk/src/main/webapp/css/connexion.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/css/connexion.css 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/css/connexion.css 2011-01-27 15:51:12 UTC (rev 178) @@ -52,7 +52,7 @@ margin-top: 25px; } =20 -#page { +#page{ width:100%; margin:0 auto; clear:both; @@ -78,12 +78,12 @@ color:#804561; width:225px; position:relative; - margin:15px 15px -20px 0px; + margin:15px 15px 10px 0px; } =20 -#formFrame form table td label{ +#formFrame form p{ color:#804561; - font-size:16px; + font-size:14px; font-weight:bold; padding:10px 0; } @@ -137,9 +137,9 @@ } =20 #forgotPassword{ - margin-top:50px; + margin-top:30px; } =20 #register{ - margin-top:35px; + margin-top:20px; } \ No newline at end of file Modified: trunk/src/main/webapp/css/global.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/css/global.css 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/css/global.css 2011-01-27 15:51:12 UTC (rev 178) @@ -108,3 +108,9 @@ text-align:center; line-height:50px; } + +.errorMessage{ + font-weight:normal; + font-size:12px; + color:red;=09 +} \ No newline at end of file Modified: trunk/src/main/webapp/jsp/inc/rightMenu.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/jsp/inc/rightMenu.jsp 2011-01-27 09:31:16 UTC (rev = 177) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-27 15:51:12 UTC (rev = 178) @@ -87,10 +87,10 @@

- - - - +
+
+
+

@@ -106,8 +106,7 @@
- - +
@@ -115,8 +114,7 @@
- - +
Modified: trunk/src/main/webapp/jsp/login.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/jsp/login.jsp 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/jsp/login.jsp 2011-01-27 15:51:12 UTC (rev 178) @@ -17,9 +17,11 @@

+





+


Modified: trunk/src/main/webapp/jsp/preferences.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/jsp/preferences.jsp 2011-01-27 09:31:16 UTC (rev 17= 7) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-01-27 15:51:12 UTC (rev 17= 8) @@ -51,22 +51,22 @@

-

- - - - - +
+
+
+
+ +

-
-
-
-
- +
+
+
+
+


Added: trunk/src/main/webapp/template/xhtml/controlheader-core.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template/xhtml/controlheader-core.ftl = (rev 0) +++ trunk/src/main/webapp/template/xhtml/controlheader-core.ftl 2011-01-27 15= :51:12 UTC (rev 178) @@ -0,0 +1,66 @@ +<#-- +/* + * $Id: controlheader-core.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#-- + Only show message if errors are available. + This will be done if ActionSupport is used. +--> +<#assign hasFieldErrors =3D parameters.name?? && fieldErrors?? && fieldError= s[parameters.name]??/> +<#if hasFieldErrors> +<#list fieldErrors[parameters.name] as error> + + ${error?html}<#t/> + <#if parameters.labelposition?default("") =3D=3D 'top'> +
+ + + + +<#-- + if the label position is top, + then give the label it's own row in the table +--> +<#if parameters.label??> + <#t/> + +<#if parameters.labelposition?default("") =3D=3D 'top'> +
+ \ No newline at end of file Added: trunk/src/main/webapp/template/xhtml/form-close.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template/xhtml/form-close.ftl = (rev 0) +++ trunk/src/main/webapp/template/xhtml/form-close.ftl 2011-01-27 15:51:12 U= TC (rev 178) @@ -0,0 +1,34 @@ +<#-- +/* + * $Id: form-close.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/simple/form-close.ftl" /> +<#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" /> +<#if parameters.focusElement?if_exists !=3D ""> + + Added: trunk/src/main/webapp/template/xhtml/form.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template/xhtml/form.ftl (re= v 0) +++ trunk/src/main/webapp/template/xhtml/form.ftl 2011-01-27 15:51:12 UTC (re= v 178) @@ -0,0 +1,32 @@ +<#-- +/* + * $Id: form.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/form-validate.ftl" /> +<#include "/${parameters.templateDir}/simple/form-common.ftl" /> +<#if (parameters.validate?default(false))> + onreset=3D"${parameters.onreset?default('clearErrorMessages(this);clearErr= orLabels(this);')}" +<#else> + <#if parameters.onreset??> + onreset=3D"${parameters.onreset?html}" + + +> Added: trunk/src/main/webapp/template/xhtml/password.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template/xhtml/password.ftl = (rev 0) +++ trunk/src/main/webapp/template/xhtml/password.ftl 2011-01-27 15:51:12 UTC= (rev 178) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: password.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/password.ftl" /> Added: trunk/src/main/webapp/template/xhtml/submit-close.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template/xhtml/submit-close.ftl = (rev 0) +++ trunk/src/main/webapp/template/xhtml/submit-close.ftl 2011-01-27 15:51:12= UTC (rev 178) @@ -0,0 +1 @@ +<#include "/${parameters.templateDir}/simple/submit-close.ftl" /> Added: trunk/src/main/webapp/template/xhtml/submit.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template/xhtml/submit.ftl (= rev 0) +++ trunk/src/main/webapp/template/xhtml/submit.ftl 2011-01-27 15:51:12 UTC (= rev 178) @@ -0,0 +1,23 @@ +<#-- +/* + * $Id: submit.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/simple/submit.ftl" /> Added: trunk/src/main/webapp/template/xhtml/text.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/template/xhtml/text.ftl (re= v 0) +++ trunk/src/main/webapp/template/xhtml/text.ftl 2011-01-27 15:51:12 UTC (re= v 178) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: text.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/text.ftl" /> --===============8562490783771671497==--