Author: Bavencoff Date: 2013-05-22 10:53:50 +0200 (Wed, 22 May 2013) New Revision: 176 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-05-22 08:53:50 UTC (rev 176) @@ -42,4 +42,9 @@ public List<String> getShortcuts () { return SHORTCUTS; } + + public boolean isWithMessages() { + return super.hasActionErrors() || super.hasActionMessages(); + } + } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-22 08:53:50 UTC (rev 176) @@ -55,10 +55,9 @@ </div> </s:form> <div id="locationTemplate" class="template"> - <dl class="dl-horizontal"> - <dt>Empl.</dt> - <dd><span data="warehouse.code"></span> <span data="code"></span></dd> - <dt>Prélev.</dt> - <dd><span data="stored">0</span> <s:property value="receptionTask.storedArticle.article.unit" /></dd> - </dl> + <div> + <span data="warehouse.code"></span> + <span data="code"></span> + <span data="stored">0</span> <s:property value="receptionTask.storedArticle.article.unit" /> + </div> </div> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-05-22 08:53:50 UTC (rev 176) @@ -41,11 +41,18 @@ </head> <body> <div id="container"> - - <s:actionerror theme="bootstrap"/> - <s:actionmessage theme="bootstrap"/> - <s:fielderror theme="bootstrap"/> - + <s:if test="withMessages" > + <script type="text/javascript"> + $(document).ready(function () { + <s:iterator value="actionMessages" var="actionMessage" > + alert('<s:property value="#actionMessage" escapeJavaScript="true" escapeHtml="false" />'); + </s:iterator> + <s:iterator value="actionErrors" var="actionError" > + alert('<s:property value="#actionError" escapeJavaScript="true" escapeHtml="false"/>'); + </s:iterator> + }); + </script> + </s:if> <decorator:body /> </div> </body> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 08:53:50 UTC (rev 176) @@ -27,8 +27,6 @@ #container { position: absolute; - #left: 5px; - #top: 5px; width: 230px; height: 320px; overflow: auto;