Author: bleny Date: 2013-07-25 14:43:22 +0200 (Thu, 25 Jul 2013) New Revision: 339 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #2939 add missing focus rules, use btn-mini class to fit buttons to the screen, add missing shortcut declaration Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp 2013-07-25 12:13:51 UTC (rev 338) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp 2013-07-25 12:43:22 UTC (rev 339) @@ -28,10 +28,10 @@ <head> <title>Traitement des kanbans</title> <script type="text/javascript"> - $(document).ready(function () { - $("#fulfil-kanban_articleBarcode").focus(); - bindKey('Esc', function(){ redirectTo($('#chooseActivityLink'));}); - }); + $(document).ready(function () { + bindKey('Esc', function(){ redirectTo($('#chooseActivityLink'));}); + $('input[name="articleBarcode"]').focus(); + }); </script> </head> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-25 12:13:51 UTC (rev 338) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-25 12:43:22 UTC (rev 339) @@ -26,6 +26,12 @@ <head> <title>Prélèvement immédiat</title> <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> + <script type="text/javascript"> + $(document).ready(function () { + bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); + $('input[name="originLocationBarcode"]').focus(); + }); + </script> </head> <s:url action="prepare-withdraw-item!input" id="cancelUrl" /> @@ -72,9 +78,9 @@ <s:hidden name="articleBarcode" value="%{articleBarcode}" /> <div class="btn-group"> - <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> - <s:submit action="simple-withdraw-item!reportError" value="Anomalie (F5)" cssClass="btn btn-danger" /> - <s:submit action="simple-withdraw-item" value="Valider" cssClass="btn btn-primary" /> + <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink" >Quitter (Esc)</s:a> + <s:submit action="simple-withdraw-item" value="Valider" cssClass="btn btn-mini btn-primary" /> + <s:submit action="simple-withdraw-item!reportError" value="Anomalie (F5)" cssClass="btn btn-mini btn-danger" /> </div> </s:form>
participants (1)
-
bleny＠users.forge.codelutin.com