Author: bleny Date: 2013-07-03 12:55:35 +0200 (Wed, 03 Jul 2013) New Revision: 277 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: keep on line per item in received suppliers and articles 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/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-03 10:40:40 UTC (rev 276) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-03 10:55:35 UTC (rev 277) @@ -34,7 +34,7 @@ </head> <s:if test="suppliersToReceive.somethingToReceive"> - <ul> + <ul id="receivedSuppliers"> <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-03 10:40:40 UTC (rev 276) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-03 10:55:35 UTC (rev 277) @@ -23,7 +23,7 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<ul> +<ul id="receivedArticles"> <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"> @@ -38,21 +38,19 @@ </script> <li> <s:a href="%{receiveArticleUrl}" id="%{receiveArticleId}"> - <s:property value="quantity" /> - <s:property value="article.unit" /> - <s:property value="article.description" /> - (Réf <s:property value="article.code" />) (<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> </li> </s:if> <s:else> <li> <s:a href="%{receiveArticleUrl}"> - <s:property value="quantity" /> - <s:property value="article.unit" /> + <s:property value="article.code" /> + Qté : <s:property value="quantity" /> <s:property value="article.unit" /> <s:property value="article.description" /> - (Réf <s:property value="article.code" />) </s:a> </li> </s:else> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-03 10:40:40 UTC (rev 276) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-03 10:55:35 UTC (rev 277) @@ -72,4 +72,11 @@ right: auto; } +#receivedArticles, #receivedSuppliers { + margin-left: 5px; + list-style-type: none; + overflow-x: hidden; + white-space: nowrap; } + +}