Author: bleny Date: 2013-07-09 14:20:41 +0200 (Tue, 09 Jul 2013) New Revision: 296 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: remove namespace='/' in all s:url Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -49,30 +49,30 @@ </p> </header> -<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> +<s:url action="fulfil-kanban!input" id="fulfilKanbanUrl"/> <s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanLink">Kanbans (1)</s:a> -<s:url namespace="/" action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> +<s:url action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticleLink">Listes à servir (2)</s:a> -<s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> +<s:url action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> <s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionLink" >Réceptions fournisseurs (3)</s:a> -<s:url namespace="/" action="prepare-prepared-article-reception!input" id="preparePreparedArticleReceptionUrl"/> +<s:url action="prepare-prepared-article-reception!input" id="preparePreparedArticleReceptionUrl"/> <s:a href="%{preparePreparedArticleReceptionUrl}" cssClass="btn btn-block" id="preparePreparedArticleReceptionLink" >Rangement toiles (4)</s:a> -<s:url namespace="/" action="storage-transfer-location!input" id="storageTransferUrl"/> +<s:url action="storage-transfer-location!input" id="storageTransferUrl"/> <s:a href="%{storageTransferUrl}" cssClass="btn btn-block" id="storageTransferLink" >Transfert de stock (5)</s:a> -<s:url namespace="/" action="prepare-withdraw-item!input" id="prepareWithdrawItemUrl"/> +<s:url action="prepare-withdraw-item!input" id="prepareWithdrawItemUrl"/> <s:a href="%{prepareWithdrawItemUrl}" cssClass="btn btn-block" id="prepareWithdrawItemLink" >Sorties toiles (6)</s:a> <s:if test="movementOrderResume" > - <s:url namespace="/" action="withdraw-item!input" id="movementOrderResumeUrl"> + <s:url action="withdraw-item!input" id="movementOrderResumeUrl"> <s:param name="storageMovementOrderId" value="%{movementOrderResume.id}" /> </s:url> <s:a href="%{movementOrderResumeUrl}" cssClass="btn btn-block" id="movementOrderResumeLink" >Reprendre l'ordre de mouvement (7)</s:a> </s:if> -<s:url namespace="/" action="logout" id="logoutUrl"/> +<s:url action="logout" id="logoutUrl"/> <s:a href="%{logoutUrl}" cssClass="btn btn-block" id="logoutLink" >Déconnexion (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -33,7 +33,7 @@ <s:iterator value="companies" status="stat"> <li> <s:set var="elementCompanyId">companyId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="login!input" id="loginUrl"> + <s:url action="login!input" id="loginUrl"> <s:param name="companyId" value="%{id}" /> </s:url> <s:if test="#stat.index < shortcuts.size()"> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -34,7 +34,7 @@ <p> Vous êtes affecté à la liste <s:property value="requestedList.code" /> </p> - <s:url namespace="/" action="deliver-requested-article" id="deliverRequestedArticleUrl"> + <s:url action="deliver-requested-article" id="deliverRequestedArticleUrl"> <s:param name="listType" value="%{requestedList.listType}" /> </s:url> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir (0)</s:a> @@ -42,7 +42,7 @@ <s:else> <s:iterator value="listTypes" var="listType" status="stat"> <s:set var="deliverRequestedArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="deliver-requested-article" id="deliverRequestedArticleUrl"> + <s:url action="deliver-requested-article" id="deliverRequestedArticleUrl"> <s:param name="listType" value="#listType" /> </s:url> <s:if test="#stat.index < shortcuts.size()"> @@ -72,5 +72,5 @@ }); </script> -<s:url namespace="/" action="remove-user-affectation" id="removeUserAffectationUrl"/> +<s:url action="remove-user-affectation" id="removeUserAffectationUrl"/> <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -41,7 +41,7 @@ bindKey(<s:property value="shortcuts.get(0)" />, function(){ redirectTo($('#prepareArticleReceptionLink'));}); }); </script> - <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" /> + <s:url action="prepare-article-reception" id="prepareArticleReceptionUrl" /> <s:a href="%{prepareArticleReceptionUrl}" id="prepareArticleReceptionLink"> (<s:property value="shortcuts.get(0)" />) Tous les fournisseurs </s:a> @@ -50,7 +50,7 @@ <s:iterator value="suppliersToReceive.suppliers" status="stat"> <li> <s:set var="prepareArticleReceptionId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl"> + <s:url action="prepare-article-reception" id="prepareArticleReceptionUrl"> <s:param name="supplierId" value="%{id}" /> </s:url> <s:if test="#stat.index + 1 < shortcuts.size()"> @@ -75,5 +75,5 @@ </ul> </s:if> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink">Changer d'activité (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -34,7 +34,7 @@ <ul class="oneItemPerLine"> <s:iterator value="receivedArticles" status="stat" > <s:set var="receiveArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="receive-article!input" id="receiveArticleUrl"> + <s:url action="receive-article!input" id="receiveArticleUrl"> <s:param name="storedArticleId" value="%{id}" /> </s:url> <s:if test="#stat.index < shortcuts.size()"> @@ -65,5 +65,5 @@ </s:iterator> </ul> -<s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> +<s:url action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> <s:a href="%{prepareArticleReceptionUrl}" cssClass="btn" id="prepareArticleReceptionLink">Annuler (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -33,7 +33,7 @@ </script> </head> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:form> 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-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -33,7 +33,7 @@ </script> </head> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:form> <s:textfield key="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-medium" /> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -367,7 +367,7 @@ <s:if test="devMode"> <p> - <s:url namespace="/" action="restore-fixtures" id="restoreFixturesUrl"/> + <s:url action="restore-fixtures" id="restoreFixturesUrl"/> <s:a href="%{restoreFixturesUrl}">Restaurer le jeu de test de départ</s:a> </p> </s:if> 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-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -28,7 +28,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<s:url namespace="/" action="choose-activity" id="cancelUrl" /> +<s:url action="choose-activity" id="cancelUrl" /> <s:form> 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-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -40,7 +40,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<s:url namespace="/" action="choose-activity" id="cancelUrl" /> +<s:url action="choose-activity" id="cancelUrl" /> <header> <dl class="dl-horizontal"> @@ -63,7 +63,7 @@ <s:iterator value="storedArticles" status="stat"> <li> <s:set var="elementStoredArticleId">storedArticleId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="storage-transfer!input" id="storageTransferNextStepUrl"> + <s:url action="storage-transfer!input" id="storageTransferNextStepUrl"> <s:param name="originId" value="%{origin.id}" /> <s:param name="storedArticleId" value="%{id}" /> </s:url> @@ -107,7 +107,7 @@ <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink">Quitter (Esc)</s:a> - <s:url namespace="/" action="storage-transfer!reportError" id="reportErrorUrl"> + <s:url action="storage-transfer!reportError" id="reportErrorUrl"> <s:param name="storedArticleId" value="%{storedArticle.id}" /> </s:url> <s:a href="%{reportErrorUrl}" cssClass="btn btn-danger btn-small" id="reportErrorLink">Anomalie (F5)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -34,7 +34,7 @@ </script> </head> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:form> <s:textfield key="originBarcode" label="Emplacement de prélévement" inputAppendIcon="barcode" cssClass="input-medium" /> 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-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -50,7 +50,7 @@ <s:hidden name="confirmation" /> <div class="btn-group"> - <s:url namespace="/" action="withdraw-item!cancel" id="cancelUrl" > + <s:url action="withdraw-item!cancel" id="cancelUrl" > <s:param name="storageMovementOrderId" value="%{storageMovementOrderId}" /> </s:url> <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink" >Quitter (Esc)</s:a>