Author: bleny Date: 2013-08-27 18:47:15 +0200 (Tue, 27 Aug 2013) New Revision: 380 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #2997 show button to report error 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 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-08-27 16:41:08 UTC (rev 379) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-08-27 16:47:15 UTC (rev 380) @@ -66,14 +66,12 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{article.unit}" cssClass="input-mini" /> <s:hidden name="confirmation" /> - <div class="btn-group"> - <s:url action="withdraw-item!cancel" id="cancelUrl" /> - <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink" >Abandon (Esc)</s:a> - <div style="display: none"> - <input type="button" id="reportError" value="Ano. (F5)" class="btn btn-danger btn-mini" /> - </div> + <div style="width: 180px"> <s:submit name="next" value="Suivant (⏎)" cssClass="btn btn-primary btn-mini" /> <input type="button" id="confirm" value="Terminer (F4)" class="btn btn-success btn-mini" /> + <input type="button" id="reportError" value="Ano. (F5)" class="btn btn-danger btn-mini" /> + <s:url action="withdraw-item!cancel" id="cancelUrl" /> + <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink" >Abandon (Esc)</s:a> </div> </s:form> <div id="storageMovementTemplate" class="template"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-27 16:41:08 UTC (rev 379) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-27 16:47:15 UTC (rev 380) @@ -64,11 +64,14 @@ margin-bottom: 0px; } -#locations, -#storageMovements { +#locations { min-height: 80px; /* 4 * 20px for each element */ } +#storageMovements { + min-height: 60px; /* 3 * 20px for each element */ +} + #storageMovements div, #locations dl { margin: 0;