[xwiki-notifications] r7747 - in xwiki-platform/skins/trunk: dodo/src/main/resources/dodo finch/src/main/resources/finch

[SVN]

Author: sdumitriu
Date: 2008-02-15 03:48:51 +0100 (Fri, 15 Feb 2008)
New Revision: 7747

Modified:
   xwiki-platform/skins/trunk/dodo/src/main/resources/dodo/editrights.vm
   
xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminglobalrights.vm
   xwiki-platform/skins/trunk/finch/src/main/resources/finch/admingroups.vm
   xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminspacerights.vm
   xwiki-platform/skins/trunk/finch/src/main/resources/finch/create.vm
   xwiki-platform/skins/trunk/finch/src/main/resources/finch/editrights.vm
Log:
XWIKI-2103: Add encodeURI and decodeURI to Util, deprecate XWiki.getURLEncoded, 
Utils.encode, Utils.decode
Fix dodo and finch templates


Modified: xwiki-platform/skins/trunk/dodo/src/main/resources/dodo/editrights.vm
===================================================================
--- xwiki-platform/skins/trunk/dodo/src/main/resources/dodo/editrights.vm       
2008-02-15 02:46:28 UTC (rev 7746)
+++ xwiki-platform/skins/trunk/dodo/src/main/resources/dodo/editrights.vm       
2008-02-15 02:48:51 UTC (rev 7747)
@@ -85,7 +85,7 @@
         <td 
align="center">$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
         <td 
align="center">$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
         <td 
align="center">$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
-        <td align="center"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")"
+        <td align="center"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${util.encodeURI($redirect)}")"
     onclick="return confirm('$msg.get("confirmobjectremove")')">
     $msg.get("remove")</a></td>
     </tr>

Modified: 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminglobalrights.vm
===================================================================
--- 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminglobalrights.vm  
    2008-02-15 02:46:28 UTC (rev 7746)
+++ 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminglobalrights.vm  
    2008-02-15 02:48:51 UTC (rev 7747)
@@ -24,7 +24,7 @@
         
<td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
-        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${util.encodeURI($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
     </tr>
 #end
   </table>

Modified: 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/admingroups.vm
===================================================================
--- xwiki-platform/skins/trunk/finch/src/main/resources/finch/admingroups.vm    
2008-02-15 02:46:28 UTC (rev 7746)
+++ xwiki-platform/skins/trunk/finch/src/main/resources/finch/admingroups.vm    
2008-02-15 02:48:51 UTC (rev 7747)
@@ -24,7 +24,7 @@
         
<td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
-        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${util.encodeURI($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
     </tr>
 #end
   </table>

Modified: 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminspacerights.vm
===================================================================
--- 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminspacerights.vm   
    2008-02-15 02:46:28 UTC (rev 7746)
+++ 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/adminspacerights.vm   
    2008-02-15 02:48:51 UTC (rev 7747)
@@ -24,7 +24,7 @@
         
<td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
-        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${util.encodeURI($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
     </tr>
 #end
   </table>

Modified: xwiki-platform/skins/trunk/finch/src/main/resources/finch/create.vm
===================================================================
--- xwiki-platform/skins/trunk/finch/src/main/resources/finch/create.vm 
2008-02-15 02:46:28 UTC (rev 7746)
+++ xwiki-platform/skins/trunk/finch/src/main/resources/finch/create.vm 
2008-02-15 02:48:51 UTC (rev 7747)
@@ -11,7 +11,7 @@
 #set($pcontent = "#")
 #set($pcontent = 
$pcontent.concat("panelheader('${title}')${xwiki.getNl()}${xwiki.getNl()}#"))
 #set($pcontent = $pcontent.concat("panelfooter()"))
-#set($pcontent = $xwiki.getURLEncoded($pcontent))
+#set($pcontent = $util.encodeURI($pcontent))
 $pcontent
 $response.sendRedirect($newdoc.getURL("inline", 
"template=${template}&Panels.PanelClass_0_name=${title}&Panels.PanelClass_0_content=$pcontent"))
 #else

Modified: 
xwiki-platform/skins/trunk/finch/src/main/resources/finch/editrights.vm
===================================================================
--- xwiki-platform/skins/trunk/finch/src/main/resources/finch/editrights.vm     
2008-02-15 02:46:28 UTC (rev 7746)
+++ xwiki-platform/skins/trunk/finch/src/main/resources/finch/editrights.vm     
2008-02-15 02:48:51 UTC (rev 7747)
@@ -26,7 +26,7 @@
         
<td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
         
<td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
-        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${util.encodeURI($redirect)}")"
 onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
     </tr>
 #end
   </table>

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications