Author: Bavencoff Date: 2013-05-17 17:42:52 +0200 (Fri, 17 May 2013) New Revision: 166 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-17 13:07:37 UTC (rev 165) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-17 15:42:52 UTC (rev 166) @@ -51,15 +51,14 @@ <s:hidden name="confirmation" /> <div class="btn-group"> - <s:submit name="reportError" value="Anomalie" cssClass="btn btn-danger btn-small" /> + <input type="button" id="reportError" value="Anomalie" class="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> </s:form> <div id="storageMovementTemplate" class="template"> - <dl class="dl-horizontal"> - <dt>Empl.</dt> - <dd><span data="originLocation.warehouse.code"></span> <span data="originLocation.code"></span></dd> - <dt>Prélev.</dt> - <dd><span data="withdrawn">0</span> / <span data="expectedQuantity"></span> <s:property value="storageMovementTask.article.unit" /></dd> - </dl> + <div> + <span data="originLocation.warehouse.code"></span> + <span data="originLocation.code"></span> + <span data="withdrawn">0</span> / <span data="expectedQuantity"></span> <s:property value="storageMovementTask.article.unit" /> + </div> </div> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-17 13:07:37 UTC (rev 165) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-17 15:42:52 UTC (rev 166) @@ -41,13 +41,13 @@ #storageMovements, #locations { overflow-y: scroll; - height: 150px; + height: 120px; } -#storageMovements dl, +#storageMovements div, #locations dl { margin: 0; - height: 50px; + height: 20px; box-sizing: border-box; color: inherit; } Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-17 13:07:37 UTC (rev 165) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-17 15:42:52 UTC (rev 166) @@ -234,6 +234,8 @@ model.nextLocation(); } + view.refresh(); + } } catch (ex) { @@ -266,7 +268,7 @@ // bindings $(document).ready(function() { $('#withdraw-item').submit(controller.onSubmit); - $('#withdraw-item_reportError').click(controller.onReportError); + $('#reportError').click(controller.onReportError); $('#withdraw-item_next').click(controller.onNext); view.refresh();