r125 - in trunk/vradi-web/src/main: resources resources/i18n webapp/WEB-INF/jsp - Vradi-commits

18 Jul 2011

Author: sletellier
Date: 2011-07-18 17:52:57 +0200 (Mon, 18 Jul 2011)
New Revision: 125

Url: http://chorem.org/repositories/revision/vradi/125

Log:
Move ajax actions to namespace ajax



Modified:
   trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties
   trunk/vradi-web/src/main/resources/struts.xml
   trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp
   trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp
   trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp
   trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp
   trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp
   trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp

Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties
===================================================================

--- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties	2011-07-18 15:52:57 UTC (rev 125)
@@ -55,9 +55,9 @@
 vradi.invitation.reject.content=Text explicatif \:
 vradi.invitation.reject.content.title=Rejeter l'invitation
 vradi.invitation.reject.title=[Vradi web] Une demande de partenaria à été rejeté
-vradi.invitation.result.accept=L'utilisateur %1$s à accepté votre partenaria sur le projet %4$s avec le message \n\n %2$s \n\n vous aviez répondu : \n\n : %3$s \n\n parce que \: %4$s\n"\n\nCordialement.
+vradi.invitation.result.accept=L'utilisateur %1$s à accepté votre partenaria sur le projet %4$s avec le message \n\n %2$s \n\n vous aviez répondu \: \n\n \: %3$s \n\n parce que \: %4$s\n"\n\nCordialement.
 vradi.invitation.result.accept.title=[Vradi web] Une demande de partenaria à été accèpté
-vradi.invitation.result.reject=L'utilisateur %1$s à rejeté votre partenaria sur le projet %4$s avec le message \n\n %2$s \n\n vous aviez répondu : \n\n : %3$s \n\n parce que \: %4$s\n"\n\nCordialement.
+vradi.invitation.result.reject=L'utilisateur %1$s à rejeté votre partenaria sur le projet %4$s avec le message \n\n %2$s \n\n vous aviez répondu \: \n\n \: %3$s \n\n parce que \: %4$s\n"\n\nCordialement.
 vradi.invitation.result.reject.title=[Vradi web] Une demande de partenaria à été rejeté
 vradi.invitationResult.from=L'invitation provient de \:
 vradi.login.email=Email

Modified: trunk/vradi-web/src/main/resources/struts.xml
===================================================================
--- trunk/vradi-web/src/main/resources/struts.xml	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/resources/struts.xml	2011-07-18 15:52:57 UTC (rev 125)
@@ -132,55 +132,7 @@
       <result>/WEB-INF/jsp/options.jsp</result>
     </action>
 
-
     <!--
-     | Thesaurus
-     +-->
-    <action name="thesaurus" class="org.chorem.vradi.actions.ThesaurusAction">
-      <param name="thesaurusNameRequest"/>
-      <result name="success" type="json">
-        <param name="root">nodes</param>
-      </result>
-    </action>
-
-    <!--
-     | Form grid
-     +-->
-    <action name="formGrid" class="org.chorem.vradi.actions.FormGridAction">
-      <param name="query"/>
-      <result name="success" type="tableModel-json"/>
-    </action>
-
-    <!--
-     | Form note grid
-     +-->
-    <action name="formNoteGrid" class="org.chorem.vradi.actions.FormNoteGridAction">
-      <param name="opened"/>
-      <result name="success" type="tableModel-json"/>
-    </action>
-
-    <!--
-     | Saved queries panel
-     +-->
-    <action name="savedQueries" class="org.chorem.vradi.actions.SavedQueriesAction">
-      <result name="success" type="json"/>
-    </action>
-
-    <!--
-     | Saved queries panel
-     +-->
-    <action name="invitationResultButtons" class="org.chorem.vradi.actions.ShowInvitationAction">
-      <result name="success" type="json"/>
-    </action>
-
-    <!--
-     | Saved queries panel
-     +-->
-    <action name="invitationResultConfirmButtons" class="org.chorem.vradi.actions.ShowInvitationResultAction">
-      <result name="success" type="json"/>
-    </action>
-
-    <!--
      | Affiche le détail du formulaire
      +-->
     <action name="formView/*" class="org.chorem.vradi.actions.FormViewAction">
@@ -385,6 +337,55 @@
       <result>/WEB-INF/jsp/empty.jsp</result>
       <result name="error">/WEB-INF/jsp/empty.jsp</result>
     </action>
+
+
+    <!--
+     | Thesaurus
+     +-->
+    <action name="thesaurus" class="org.chorem.vradi.actions.ThesaurusAction">
+      <param name="thesaurusNameRequest"/>
+      <result name="success" type="json">
+        <param name="root">nodes</param>
+      </result>
+    </action>
+
+    <!--
+     | Form grid
+     +-->
+    <action name="formGrid" class="org.chorem.vradi.actions.FormGridAction">
+      <param name="query"/>
+      <result name="success" type="tableModel-json"/>
+    </action>
+
+    <!--
+     | Form note grid
+     +-->
+    <action name="formNoteGrid" class="org.chorem.vradi.actions.FormNoteGridAction">
+      <param name="opened"/>
+      <result name="success" type="tableModel-json"/>
+    </action>
+
+    <!--
+     | Saved queries panel
+     +-->
+    <action name="savedQueries" class="org.chorem.vradi.actions.SavedQueriesAction">
+      <result name="success" type="json"/>
+    </action>
+
+    <!--
+     | Saved queries panel
+     +-->
+    <action name="invitationResultButtons" class="org.chorem.vradi.actions.ShowInvitationAction">
+      <result name="success" type="json"/>
+    </action>
+
+    <!--
+     | Saved queries panel
+     +-->
+    <action name="invitationResultConfirmButtons" class="org.chorem.vradi.actions.ShowInvitationResultAction">
+      <result name="success" type="json"/>
+    </action>
+
   </package>
 
 </struts>

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp	2011-07-18 15:52:57 UTC (rev 125)
@@ -29,7 +29,7 @@
     <%=Infogene.FQ_FIELD_INFOGENE_OBJET%>
 </s:set>
 
-<s:url id="formResultUrl" action="formGrid">
+<s:url id="formResultUrl" namespace="/ajax" action="formGrid">
     <s:param name="query">
         <s:property value="query"/>
     </s:param>

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/savedQueries.jsp	2011-07-18 15:52:57 UTC (rev 125)
@@ -13,7 +13,7 @@
 
 <form id="queryForm" action="/fragment/searchPanel.action">
 
-    <s:url id="savedQueries" action="savedQueries"/>
+    <s:url id="savedQueries" namespace="/ajax" action="savedQueries"/>
 
     <sj:select id="lastQueriesSelect"
                href="%{savedQueries}"

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitation.jsp	2011-07-18 15:52:57 UTC (rev 125)
@@ -65,7 +65,7 @@
                 <s:hidden name="noteId" value="%{localNoteId}"/>
                 <s:hidden name="senderId" value="%{localSenderId}"/>
                 <s:hidden name="message" value="%{message}"/>
-				<s:url id="invitationResultUrl" action="invitationResultButtons"/>
+				<s:url id="invitationResultUrl" namespace="/ajax" action="invitationResultButtons"/>
                 <sj:radio
 					    href="%{invitationResultUrl}"
                         id="invitationResultSet"

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/showInvitationResult.jsp	2011-07-18 15:52:57 UTC (rev 125)
@@ -55,7 +55,7 @@
                 <s:hidden name="senderId" value="%{localSenderId}"/>
                 <s:hidden name="message" value="%{message}"/>
                 <s:hidden name="messageResult" value="%{messageResult}"/>
-				<s:url id="invitationResultConfirmUrl" action="invitationResultConfirmButtons"/>
+				<s:url id="invitationResultConfirmUrl" namespace="/ajax" action="invitationResultConfirmButtons"/>
                 <sj:radio
 					    href="%{invitationResultConfirmUrl}"
                         id="invitationResultSet"

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/thesaurusFilter.jsp	2011-07-18 15:52:57 UTC (rev 125)
@@ -3,7 +3,7 @@
 <%@taglib prefix="s" uri="/struts-tags"%>
 <%@ taglib prefix="sjt" uri="/struts-jquery-tree-tags" %>
 
-<s:url id="thesaurusDataUrl" action="thesaurus">
+<s:url id="thesaurusDataUrl" namespace="/ajax" action="thesaurus">
     <s:param name="thesaurusNameRequest">
         <s:property value="thesaurusNameRequest"/>
     </s:param>

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp	2011-07-18 08:48:04 UTC (rev 124)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp	2011-07-18 15:52:57 UTC (rev 125)
@@ -218,7 +218,7 @@
         <div>
             <h2><s:text name="vradi.userPreference.note.open" /></h2>
 
-            <s:url id="resultOpenedUrl" action="formNoteGrid">
+            <s:url id="resultOpenedUrl" namespace="/ajax" action="formNoteGrid">
                 <s:param name="opened" value="true"/>
             </s:url>
             <s:set id="creationDateText">
@@ -275,7 +275,7 @@
         <div>
             <h2><s:text name="vradi.userPreference.note.close" /></h2>
 
-            <s:url id="resultClosedUrl" action="formNoteGrid">
+            <s:url id="resultClosedUrl" namespace="/ajax" action="formNoteGrid">
                 <s:param name="opened" value="false"/>
             </s:url>
             <s:set id="creationDateText">

    

r125 - in trunk/vradi-web/src/main: resources resources/i18n webapp/WEB-INF/jsp

sletellier＠users.chorem.org

tags

participants (1)