r207 - in trunk/src/main/webapp: WEB-INF/decorators jsp jsp/inc - Bow-commits

18 Feb 2011

Author: vbriand
Date: 2011-02-18 09:35:57 +0100 (Fri, 18 Feb 2011)
New Revision: 207

Url: http://chorem.org/repositories/revision/bow/207

Log:
Replaced deprecated "id" attribute by "var" attribute on all <s:url> tags

Modified:
   trunk/src/main/webapp/WEB-INF/decorators/main.jsp
   trunk/src/main/webapp/jsp/admin.jsp
   trunk/src/main/webapp/jsp/error.jsp
   trunk/src/main/webapp/jsp/forgotPassword.jsp
   trunk/src/main/webapp/jsp/home.jsp
   trunk/src/main/webapp/jsp/inc/bookmark.jsp
   trunk/src/main/webapp/jsp/inc/footer.jsp
   trunk/src/main/webapp/jsp/inc/rightMenu.jsp
   trunk/src/main/webapp/jsp/inc/tagsCloud.jsp
   trunk/src/main/webapp/jsp/login.jsp
   trunk/src/main/webapp/jsp/preferences.jsp
   trunk/src/main/webapp/jsp/register.jsp
   trunk/src/main/webapp/jsp/search.jsp

Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp
===================================================================

--- trunk/src/main/webapp/WEB-INF/decorators/main.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -39,17 +39,17 @@
     <decorator:head />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta name="description" content="Bookmarks on the web" />
-    <s:url id="temporaryXml" action="temporaryXml" />
-    <s:url id="permanentXml" action="permanentXml" />
-    <s:url id="favicon" value="/img/favicon.png" />
+    <s:url var="temporaryXml" action="temporaryXml" />
+    <s:url var="permanentXml" action="permanentXml" />
+    <s:url var="favicon" value="/img/favicon.png" />
     <link rel="icon" type="image/png" href="${favicon}" />
     <s:if test="%{#session.BowSession.user != null}">
     	<link rel="search" type="application/opensearchdescription+xml" title="Bow (temporary)" href="${temporaryXml}" />
     	<link rel="search" type="application/opensearchdescription+xml" title="Bow (permanent)" href="${permanentXml}" />
     </s:if>
-    <s:url id="globalCSS" value="/css/global.css" />
+    <s:url var="globalCSS" value="/css/global.css" />
     <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" />
-    <s:url id="bookmarkJS" value="/js/bookmark.js" />
+    <s:url var="bookmarkJS" value="/js/bookmark.js" />
     <script type="text/javascript" src="${bookmarkJS}"></script>
   </head>
   <body id="page-home">

Modified: trunk/src/main/webapp/jsp/admin.jsp
===================================================================
--- trunk/src/main/webapp/jsp/admin.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/admin.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -30,7 +30,7 @@
       xmlns:jsp="http://java.sun.com/JSP/Page"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <head>
-        <s:url id="css" value="/css/bookmark.css" />
+        <s:url var="css" value="/css/bookmark.css" />
         <link href="${css}" rel="stylesheet" type="text/css" />
         <s:head />
     </head>

Modified: trunk/src/main/webapp/jsp/error.jsp
===================================================================
--- trunk/src/main/webapp/jsp/error.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/error.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -32,7 +32,7 @@
       xmlns:jsp="http://java.sun.com/JSP/Page"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <head>
-  	<s:url id="css" value="/css/connexion.css" />
+  	<s:url var="css" value="/css/connexion.css" />
     <link href="${css}" rel="stylesheet" type="text/css" />
     <s:head />
   </head>

Modified: trunk/src/main/webapp/jsp/forgotPassword.jsp
===================================================================
--- trunk/src/main/webapp/jsp/forgotPassword.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/forgotPassword.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -29,7 +29,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <head>
   	<title><s:text name="bow.forgotpwd.title" /></title>
-  	<s:url id="css" value="/css/connexion.css" />
+  	<s:url var="css" value="/css/connexion.css" />
     <link href="${css}" rel="stylesheet" type="text/css" />
     <s:head />
   </head>

Modified: trunk/src/main/webapp/jsp/home.jsp
===================================================================
--- trunk/src/main/webapp/jsp/home.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/home.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -40,7 +40,7 @@
       	xmlns:jsp="http://java.sun.com/JSP/Page">
 		<head>
 			<title><s:text name="bow.home.title" /></title>
-			<s:url id="css" value="/css/bookmark.css" />
+			<s:url var="css" value="/css/bookmark.css" />
 			<link href="${css}" rel="stylesheet" type="text/css" />
 			<s:head />
 		</head>

Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/bookmark.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/inc/bookmark.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -44,18 +44,18 @@
             <s:property value="%{#bookmarkAlias}" />
         </s:a>
         <p class="date">(<s:property value="%{date}" />)</p>
-        <s:url id="editBookmarkModify" action="modifyBookmark" escapeAmp="false">
+        <s:url var="editBookmarkModify" action="modifyBookmark" escapeAmp="false">
         	<s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>
         	<s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param>
         	<s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param>
         </s:url>
-        <s:url id="editBookmark" action="modifyBookmark" escapeAmp="true">
+        <s:url var="editBookmark" action="modifyBookmark" escapeAmp="true">
         	<s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>
         	<s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param>
         	<s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param>
         </s:url>        
         <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmarkModify}', '%{#wikittyId}');"></s:a>
-        <s:url id="removeBookmark" action="removeBookmark" escapeAmp="true">
+        <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true">
         	<s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>
         	<s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param>
         	<s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param>
@@ -68,7 +68,7 @@
         <div class="description">
             <h3><s:text name="bow.bookmark.description" /> :</h3>
             <p>
-            	<s:url id="addClick" action="addClick">
+            	<s:url var="addClick" action="addClick">
             		<s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>
             	</s:url>
                 <s:a title="%{#bookmarkLink}" href="%{addClick}" onclick="window.open(this.href); return false;"><s:property value="%{#bookmarkDescription}" /></s:a>
@@ -76,7 +76,7 @@
             <p class="tags">
                 <strong><s:text name="bow.bookmark.tags" /> :</strong>
                 <s:iterator value="#request.bookmark.labels">
-                	<s:url id="deleteTag" action="deleteTag" escapeAmp="false">
+                	<s:url var="deleteTag" action="deleteTag" escapeAmp="false">
                			<s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>
                			<s:param name="deleteTag"><s:property /></s:param>
                			<s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param>
@@ -92,7 +92,7 @@
                				<img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" />
                			</a>
                		</s:else>
-               		<s:url id="search" action="search">
+               		<s:url var="search" action="search">
                			<s:param name="searchLine"><s:property /></s:param>
                		</s:url>
                		<s:a href="%{search}" cssStyle="text-decoration:none"><s:property /></s:a>

Modified: trunk/src/main/webapp/jsp/inc/footer.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/footer.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/inc/footer.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -35,10 +35,10 @@
 		<a shape="rect" href="http://www.codelutin.com">Code Lutin</a> -
 		<a shape="rect" href="http://www.chorem.org/projects/bow/issues"><s:text name="bow.footer.bugreport" /></a> -
         <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users"><s:text name="bow.footer.userSupport" /></a> -
-       	<s:url id="localeEN">
+       	<s:url var="localeEN">
    			<s:param name="request_locale">en_GB</s:param>
 	  	</s:url>
-	  	<s:url id="localeFR">
+	  	<s:url var="localeFR">
    			<s:param name="request_locale">fr_FR</s:param>
 	  	</s:url>
 	  	<s:a href="%{localeEN}"><s:text name="bow.action.locale.english" /></s:a> -

Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/rightMenu.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -71,7 +71,7 @@
         </div>
         <div id="add" class="clearfix">
             <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2>
-            <s:form id="bookmarkForm" action="%{#request.formAction}">
+            <s:form var="bookmarkForm" action="%{#request.formAction}">
             	<p>
                     <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /><br />
                     <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br />

Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -35,7 +35,7 @@
 	<s:set var="maxTags" value="#session.BowSession.preference.tags" />
 </s:else>
 <s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}">
-	<s:url id="search" action="search" escapeAmp="true">
+	<s:url var="search" action="search" escapeAmp="true">
 		<s:param name="addTag"><s:property value="topicName" /></s:param>
 		<s:if test="%{request.searchLine != null}">
 			<s:param name="searchLine">&searchLine=<s:property value="%{request.searchLine}" /></s:param>

Modified: trunk/src/main/webapp/jsp/login.jsp
===================================================================
--- trunk/src/main/webapp/jsp/login.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/login.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -28,7 +28,7 @@
       xmlns:jsp="http://java.sun.com/JSP/Page">
     <head>
         <title><s:text name="bow.login.title" /></title>
-        <s:url id="css" value="/css/connexion.css" />
+        <s:url var="css" value="/css/connexion.css" />
         <link href="${css}" rel="stylesheet" type="text/css" />
         <s:head />
     </head>

Modified: trunk/src/main/webapp/jsp/preferences.jsp
===================================================================
--- trunk/src/main/webapp/jsp/preferences.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/preferences.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -38,7 +38,7 @@
       xmlns:jsp="http://java.sun.com/JSP/Page">
   <head>
   	<title><s:text name="bow.preferences.title" /></title>
-  	<s:url id="css" value="/css/bookmark.css" />
+  	<s:url var="css" value="/css/bookmark.css" />
     <link href="${css}" rel="stylesheet" type="text/css" />
     <s:head />
   </head>
@@ -78,7 +78,7 @@
               :</strong><%=temporaryToken%>
             </li>
           </ul>
-          <s:url id="regenPermToken" action="regenPermToken"/>
+          <s:url var="regenPermToken" action="regenPermToken"/>
           <s:a href="%{regenPermToken}" id="regenPermToken"><s:text
             name="bow.preferences.regenPermToken"/></s:a>
           </p>
@@ -94,7 +94,7 @@
                    <s:hidden name="update" value="1" />
                    <s:submit key="bow.preferences.submit" name="submit" />
                    <br /><br />
-                   <s:url id="home" action="home" />
+                   <s:url var="home" action="home" />
                    <s:a href="%{home}" id="homePage"><s:text name="bow.home.title" /></s:a>
                </p>
 	        </div>
@@ -120,7 +120,7 @@
     				%>
     				<div class="deleteImport deleteImport<%=bgColors[i % colorsNb]%>">
     					<span><%= date + " (" + bookmarkImport.getCount() + " bookmarks)" %></span>
-    					<s:url id="deleteImport" action="deleteImport">
+    					<s:url var="deleteImport" action="deleteImport">
     						<s:param name="date"><%=dateSave%></s:param>
     					</s:url>
     					<a class="deleteImportButton" href="" onclick="deleteConfirmation('<s:property value="%{deleteImport}" />','<%=bookmarkImport.getCount()%>','<%=date%>'); return(false);"></a>

Modified: trunk/src/main/webapp/jsp/register.jsp
===================================================================
--- trunk/src/main/webapp/jsp/register.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/register.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -29,7 +29,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <head>
     <title><s:text name="bow.register.title" /></title>
-  	<s:url id="css" value="/css/connexion.css" />
+  	<s:url var="css" value="/css/connexion.css" />
     <link href="${css}" rel="stylesheet" type="text/css" />
     <s:head />
   </head>

Modified: trunk/src/main/webapp/jsp/search.jsp
===================================================================
--- trunk/src/main/webapp/jsp/search.jsp	2011-02-17 01:16:20 UTC (rev 206)
+++ trunk/src/main/webapp/jsp/search.jsp	2011-02-18 08:35:57 UTC (rev 207)
@@ -44,7 +44,7 @@
 
   		<head>
     		<title><s:text name="bow.search.title" /></title>
-  			<s:url id="css" value="/css/bookmark.css" />
+  			<s:url var="css" value="/css/bookmark.css" />
     		<link href="${css}" rel="stylesheet" type="text/css" />
     		<s:head />
   		</head>
@@ -65,7 +65,7 @@
 			        <s:submit key="bow.search.submit" name="submit" />
 			        <s:set name="bookmarksToDelete" value="%{#request.bookmarkActions.getBookmarks().size()}" />
 			        <s:if test="%{#bookmarksToDelete > 0}">
-			        	<s:url id="deleteSearchResults" action="deleteSearchResults" escapeAmp="false">
+			        	<s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false">
 			        		<s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param>
 			        		<s:param name="fullTextLine"><s:property value="%{#fullText}" /></s:param>
 			        	</s:url>

    

r207 - in trunk/src/main/webapp: WEB-INF/decorators jsp jsp/inc

vbriand＠users.chorem.org

tags

participants (1)