Author: ktlili
Date: Wed Oct 3 16:32:08 2007
New Revision: 18740
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18740&repname=
=3Djahia
Log:
- PORTAL-55: upate clipbuilder url in order to be processed by JahiaAdminis=
tartion and not Jahia servlet (clipbuilder is in the administartion panel)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
enu.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
enuBuilder.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/menu.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/menu.jsp&rev=3D18740&repna=
me=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
enu.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
enu.jsp Wed Oct 3 16:32:08 2007
@@ -517,7 +517,7 @@
</td>
<td >
<% if (aclService.getSiteActionPermission("admin.clipBuilder.MenuBuild=
erAction", user, JahiaBaseACL.READ_RIGHTS, currentSiteID) > 0) { %>
- <a href=3D'<%=3DjData.params().composeStrutsUrl("menuBuilder","")%=
>' onMouseOut=3D"MM_swapImgRestore()" onMouseOver=3D"MM_swapImage('clip_bui=
lder','','<%=3DURL%>images/icons/admin/window_earth_on.gif',1)">
+ <a href=3D'<%=3DJahiaAdministration.composeActionURL(request,respo=
nse,null,"/menuBuilder?do=3Dclipbuilder")%>' onMouseOut=3D"MM_swapImgRestor=
e()" onMouseOver=3D"MM_swapImage('clip_builder','','<%=3DURL%>images/icons/=
admin/window_earth_on.gif',1)">
<img name=3D"clip_builder" src=3D"<%=3DURL%>images/icons/admin=
/window_earth_off.gif" width=3D"48" height=3D"48" border=3D"0">
<br>
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.cli=
pbuilder.label"/>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/menuBuilder.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/menuBuilder.jsp&rev=3D1874=
0&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
enuBuilder.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
enuBuilder.jsp Wed Oct 3 16:32:08 2007
@@ -40,8 +40,8 @@
</h2>
=
<ul class=3D"linkList">
- <li><a href=3D'<%=3DjData.params().composeStrutsUrl("manageAction","we=
bClippingAction=3Dinit")%>'><jahia:adminResourceBundle resourceName=3D"org.=
jahia.admin.clipbuilder.htmllabel"/></a></li>
- <li><a href=3D'<%=3DjData.params().composeStrutsUrl("buildSqlPortlet",=
"webClippingAction=3Dinit")%>'><jahia:adminResourceBundle resourceName=3D"o=
rg.jahia.admin.clipbuilder.sqllabel"/></a></li>
+ <li><a href=3D'<%=3DJahiaAdministration.composeActionURL(request,respo=
nse,null,"/manageAction?do=3Dclipbuilder&webClippingAction=3Dinit")%>'><jah=
ia:adminResourceBundle resourceName=3D"org.jahia.admin.clipbuilder.htmllabe=
l"/></a></li>
+ <li><a href=3D'<%=3DJahiaAdministration.composeActionURL(request,respo=
nse,null,"/buildSqlPortlet?do=3Dclipbuilder&webClippingAction=3Dinit")%>'><=
jahia:adminResourceBundle resourceName=3D"org.jahia.admin.clipbuilder.sqlla=
bel"/></a></li>
</ul>
=
<div id=3D"operationMenu" style=3D"clear:both">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
