Author: Bavencoff Date: 2013-05-28 16:28:53 +0200 (Tue, 28 May 2013) New Revision: 202 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2164 : user experience and debug Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css trunk/magalie-web/src/main/webapp/js/magalie.js 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-05-28 12:32:42 UTC (rev 201) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-05-28 14:28:53 UTC (rev 202) @@ -21,14 +21,14 @@ </header> -<s:form> +<s:form cssClass="form-horizontal"> <s:hidden name="originId" value="%{origin.id}" /> - <s:radio name="storedArticleId" list="storedArticles" listKey="id" listValue="article.description + ' (' + article.code + ')'" /> + <s:radio name="storedArticleId" list="storedArticles" listKey="id" listValue="article.description + ' (' + article.code + ')'" cssClass="radio" /> <s:textfield name="quantity" label="Qté" inputAppend="" type="number" step="any" min="0" cssClass="input-mini" /> - <s:textfield key="destinationBarCode" label="Emplacement de destination" inputAppendIcon="barcode" cssClass="input-medium" /> + <s:textfield key="destinationBarCode" label="Destination" inputAppendIcon="barcode" cssClass="input-small" /> <div class="btn-group"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-28 12:32:42 UTC (rev 201) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-28 14:28:53 UTC (rev 202) @@ -45,6 +45,14 @@ margin-left: 110px; } +.control-group.radio > .controls { + margin-left: 0px; +} + +/*.controls { + margin-left: 30px; +} +*/ .btn-group { margin-top: 3px; position: absolute; Modified: trunk/magalie-web/src/main/webapp/js/magalie.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-28 12:32:42 UTC (rev 201) +++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-28 14:28:53 UTC (rev 202) @@ -74,7 +74,7 @@ function bindKey(key, handler) { $(document).keydown(function(event) { - if (event.which == KEYS[key] && !($(document.activeElement).is(":input") && SHORTCUTS.indexOf(KEYS[key]) >= O)) { + if (event.which == KEYS[key] && !($(document.activeElement).is(":input") && SHORTCUTS.indexOf(KEYS[key]) >= 0)) { event.preventDefault(); handler(); }