Author: bleny Date: 2013-07-04 15:50:46 +0200 (Thu, 04 Jul 2013) New Revision: 290 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: better presentation for prepare-article-reception Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -34,7 +34,7 @@ </head> <s:if test="suppliersToReceive.somethingToReceive"> - <ul id="receivedSuppliers"> + <ul class="oneItemPerLine"> <li> <script type="text/javascript"> $(document).ready(function () { Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -31,7 +31,7 @@ </script> </head> -<ul id="receivedArticles"> +<ul class="oneItemPerLine"> <s:iterator value="receivedArticles" status="stat" > <s:set var="receiveArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> <s:url namespace="/" action="receive-article!input" id="receiveArticleUrl"> 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-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -32,7 +32,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<ul id="receiveArticleHeader"> +<ul class="oneItemPerLine"> <li> Réf. : <s:property value="receptionTask.storedArticle.article.code" /> </li> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -58,41 +58,40 @@ <s:if test="storedArticle == null" > - <s:iterator value="storedArticles" status="stat"> - <li> - <s:set var="elementStoredArticleId">storedArticleId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="storage-transfer!input" id="storageTransferNextStepUrl"> - <s:param name="originId" value="%{origin.id}" /> - <s:param name="storedArticleId" value="%{id}" /> - </s:url> - <s:if test="#stat.index < shortcuts.size()"> - <script type="text/javascript"> - $(document).ready(function () { - var id = '<s:property value="elementStoredArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); - }); - </script> - <s:a href="%{storageTransferNextStepUrl}" id="%{elementStoredArticleId}"> - <s:property value="article.description" /> - (<s:property value="article.code" />) - (<s:property value="quantity" /> - <s:property value="article.unit" />) - (<s:property value="shortcuts.get(#stat.index)" />) - </s:a> - </s:if> - <s:else> - <s:a href="%{storageTransferNextStepUrl}" > - <s:property value="article.description" /> - (<s:property value="article.code" />) - (<s:property value="quantity" /> - <s:property value="article.unit" />) - </s:a> - </s:else> - </li> - </s:iterator> + <ul class="oneItemPerLine"> + <s:iterator value="storedArticles" status="stat"> + <li> + <s:set var="elementStoredArticleId">storedArticleId<s:property value="#stat.index" /></s:set> + <s:url namespace="/" action="storage-transfer!input" id="storageTransferNextStepUrl"> + <s:param name="originId" value="%{origin.id}" /> + <s:param name="storedArticleId" value="%{id}" /> + </s:url> + <s:if test="#stat.index < shortcuts.size()"> + <script type="text/javascript"> + $(document).ready(function () { + var id = '<s:property value="elementStoredArticleId" />'; + bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + }); + </script> + <s:a href="%{storageTransferNextStepUrl}" id="%{elementStoredArticleId}"> + (<s:property value="shortcuts.get(#stat.index)" />) + <s:property value="article.code" /> + Qté <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="article.description" /> + </s:a> + </s:if> + <s:else> + <s:a href="%{storageTransferNextStepUrl}" > + <s:property value="article.code" /> + Qté <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="article.description" /> + </s:a> + </s:else> + </li> + </s:iterator> + </ul> <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> - </s:if> <s:else> <s:form cssClass="form-horizontal"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-04 13:50:46 UTC (rev 290) @@ -72,7 +72,7 @@ right: auto; } -#receivedArticles, #receivedSuppliers, #receiveArticleHeader { +ul.oneItemPerLine { margin-left: 5px; list-style-type: none; overflow-x: hidden;