Author: Bavencoff Date: 2013-05-22 15:09:34 +0200 (Wed, 22 May 2013) New Revision: 179 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/fulfil-kanban-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css trunk/magalie-web/src/main/webapp/js/magalie.js trunk/magalie-web/src/main/webapp/js/receive-article-input.js trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-22 13:09:34 UTC (rev 179) @@ -50,8 +50,8 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{article.unit}" cssClass="input-mini" /> </s:if> - <div class="btn-group"> + <div> + <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a> - <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> </div> </s:form> \ No newline at end of file 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-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-22 13:09:34 UTC (rev 179) @@ -40,8 +40,7 @@ #storageMovements, #locations { - overflow-y: scroll; - height: 120px; + min-height: 120px; } #storageMovements div, Modified: trunk/magalie-web/src/main/webapp/js/magalie.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-22 13:09:34 UTC (rev 179) @@ -75,6 +75,7 @@ function bindKey(key, handler) { $(document).keydown(function(event) { if (event.which == KEYS[key]) { + event.preventDefault(); handler(); } }) Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-22 13:09:34 UTC (rev 179) @@ -124,12 +124,11 @@ } } else if (location.id === model.locations[model.locationsIndex].id && ! model.canTerminate()) { $(locationElement).addClass('pending'); - locationsElement.scrollTop(locationElement[0].offsetTop); } else { $(locationElement).hide(); } }); - + $("body").scrollTop($("#container").height()); }, refreshForm : function() { @@ -209,6 +208,7 @@ } } + view.refresh(); } catch (ex) { 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-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 13:09:34 UTC (rev 179) @@ -147,11 +147,11 @@ } } else if (storageMovement.originLocation.id === model.storageMovements[model.storageMovementsIndex].originLocation.id && ! model.canTerminate()) { $(storageMovementElement).addClass('pending'); - storageMovementsElement.scrollTop(storageMovementElement[0].offsetTop); } else { $(storageMovementElement).hide(); } }); + $("body").scrollTop($("#container").height()); },