gatein SVN: r9328 - epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: tkobayas(a)redhat.com
Date: 2014-04-16 06:29:37 -0400 (Wed, 16 Apr 2014)
New Revision: 9328
Modified:
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl
Log:
revert UIRightClickPopupMenu.gtmpl for GTNPORTAL-3268
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl 2014-04-16 10:29:37 UTC (rev 9328)
@@ -18,7 +18,7 @@
<%for(action in uicomponent.getActions()) {%>
<div class="MenuItem">
- <a exo:attr="$action" href="javascript:void(0);" onclick="<%= uicomponent.event(action)%>; eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this)" class="ItemIcon ${action}16x16Icon" >
+ <a exo:attr="$action" href="<%= uicomponent.event(action)%>" onclick="eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" class="ItemIcon ${action}16x16Icon" >
<%=_ctx.appRes(uicomponent.getId() + ".event." + action) %>
</a>
</div>
@@ -34,4 +34,4 @@
</div>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
10 years, 8 months
- 1
- 0
gatein SVN: r9327 - in epp/portal/branches/EPP_5_2_2_GA_BZ1082601: portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component and 15 other directories.
by do-not-reply＠jboss.org
Author: tkobayas(a)redhat.com
Date: 2014-04-03 04:27:20 -0400 (Thu, 03 Apr 2014)
New Revision: 9327
Modified:
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupManagement.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIOrganizationPortlet.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/eXoResources/src/main/webapp/javascript/eXo.js
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipSelector.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIPageNodeSelector.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSearchForm.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIDropDownControl.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIPageIterator.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIToolbar.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UIFormInputIconSelector.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
Log:
BZ1082601 [One-off] Cannot edit page with IE when Dashboard 2nd tab name contains multibyte characters backporting GTNPORTAL-3247 and GTNPORTAL-3253
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -35,19 +35,19 @@
<ul class="MenuItemContainer portlet-menu-cascade" style="display:none;">
<% if(userCouldEditNavigation){ %>
<li class="MenuItem portlet-menu-cascade-item">
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'PageCreationWizard', true))" title="" class="ItemIcon AddPageIcon">$addPageLabel</a>
+ <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'PageCreationWizard', true))" title="" class="ItemIcon AddPageIcon">$addPageLabel</a>
</li>
<% } %>
<% if(userCouldEditPage){ %>
<li class="MenuItem portlet-menu-cascade-item">
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
+ <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditCurrentPage', true))" title="" class="ItemIcon EditPageIcon">$editPageLabel</a>
</li>
<% } %>
<% if(userCouldEditPortal){ %>
<li class="MenuItem portlet-menu-cascade-item">
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
+ <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
</li>
<% } %>
</ul>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -13,7 +13,7 @@
EntityEncoder encoder = HTMLEntityEncoder.getInstance();
fullName = encoder.encode(uicomponent.getUser().getFullName());
%>
- <a href="$accountSetting"><%=fullName%></a>
+ <a href="javascript:void(0);" onclick="$accountSetting"><%=fullName%></a>
<%} else {%>
<span></span>
<%}%>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -42,9 +42,9 @@
<div>$descriptionLabel: $groupDescription</div>
</td>
<td class="ActionBlock">
- <a href="<%=editLink%>" class="EditNavIcon">$editNavigationLabel</a>
- <a href="<%=editProperties%>" class="EditProIcon">$editPropertiesLabel</a>
- <a href="<%=deleteLink%>" class="DeleteIcon">$deleteNavigationLabel</a>
+ <a href="javascript:void(0);" onclick="<%=editLink%>" class="EditNavIcon">$editNavigationLabel</a>
+ <a href="javascript:void(0);" onclick="<%=editProperties%>" class="EditProIcon">$editPropertiesLabel</a>
+ <a href="javascript:void(0);" onclick="<%=deleteLink%>" class="DeleteIcon">$deleteNavigationLabel</a>
</td>
</tr>
</table>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -42,9 +42,9 @@
%>
</td>
<td class="ActionBlock">
- <a href="<%=uicomponent.event("EditPortalLayout", portalConfig.getName());%>" class="EditLayoutIcon">$editLayoutLabel</a>
- <a href="<%=uicomponent.event("EditNavigation", portalConfig.getName());%>" class="EditNavIcon">$editNavigationLabel</a>
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'EditPortalProperties', true, [{name:'portalName',value:'<%=portalConfig.getName()%>'}]))" class="EditNavIcon">$editPortalPropLabel</a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditPortalLayout", portalConfig.getName());%>" class="EditLayoutIcon">$editLayoutLabel</a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditNavigation", portalConfig.getName());%>" class="EditNavIcon">$editNavigationLabel</a>
+ <a href="javascript:void(0);" onclick="ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'EditPortalProperties', true, [{name:'portalName',value:'<%=portalConfig.getName()%>'}]))" class="EditNavIcon">$editPortalPropLabel</a>
<% if(defaultPortalName != null && !defaultPortalName.equals(portalConfig.getName())) {%>
<a href="<%=uicomponent.url("DeletePortal", portalConfig.getName());%>" class="DeleteIcon">$deletePortalLabel</a>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupManagement.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupManagement.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupManagement.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -16,7 +16,7 @@
<div class="GroupNavigation">
<div class="TitleBar">
<div class="Title"><%=_ctx.appRes("UIGroupManagement.label.Groups")%></div>
- <% String actionLink = "#";
+ <% String actionLink = "javascript:void(0);";
Group group = uicomponent.getChild(UIGroupExplorer.class).getCurrentGroup();
String groupId = null;
if (group != null)
@@ -25,11 +25,11 @@
((groupId != null) && GroupManagement.isSuperUserOfGroup(null, groupId))) {
%>
<% actionLink = uicomponent.event("DeleteGroup","delete"); %>
- <a class="TreeActionIcon RemoveGroupIcon" href="$actionLink" title="<%=_ctx.appRes("UIGroupManagement.label.DeleteGroup")%>"><span></span></a>
+ <a class="TreeActionIcon RemoveGroupIcon" href="javascript:void(0);" onclick="$actionLink" title="<%=_ctx.appRes("UIGroupManagement.label.DeleteGroup")%>"><span></span></a>
<% actionLink = uicomponent.event("EditGroup","Edit"); %>
- <a class="TreeActionIcon EditGroupIcon" href="$actionLink" title="<%=_ctx.appRes("UIGroupManagement.label.EditGroup")%>"><span></span></a>
+ <a class="TreeActionIcon EditGroupIcon" href="javascript:void(0);" onclick="$actionLink" title="<%=_ctx.appRes("UIGroupManagement.label.EditGroup")%>"><span></span></a>
<% actionLink = uicomponent.event("AddGroup","add"); %>
- <a class="TreeActionIcon AddGroupIcon" href="$actionLink" title="<%=_ctx.appRes("UIGroupManagement.label.AddGroup")%>"><span></span></a>
+ <a class="TreeActionIcon AddGroupIcon" href="javascript:void(0);" onclick="$actionLink" title="<%=_ctx.appRes("UIGroupManagement.label.AddGroup")%>"><span></span></a>
<%}%>
</div>
<div class="GroupNavigationContainer"><% uicomponent.renderChild(UIGroupExplorer.class) %></div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipForm.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -21,7 +21,7 @@
<td class="FieldLabel"><%=_ctx.appRes(uicomponent.getName() + ".label.username")%></td>
<td class="FieldComponent" >
<div class="FloatLeft"><% uiform.renderField(name) %></div>
- <a class="Icon SearchIcon" href="<%=uicomponent.event("SearchUser")%>" title="<%=_ctx.appRes(uicomponent.getName() + ".label.SearchUser")%>"></a>
+ <a class="Icon SearchIcon" href="javascript:void(0);" onclick="<%=uicomponent.event("SearchUser")%>" title="<%=_ctx.appRes(uicomponent.getName() + ".label.SearchUser")%>"></a>
<div class="ClearLeft"><span></span></div>
</td>
</tr>
@@ -29,7 +29,7 @@
<td class="FieldLabel"><%=_ctx.appRes(uicomponent.getName() + ".label.membership")%></td>
<td class="FieldComponent">
<% uiform.renderField(membership) %>
- <a class="Icon Refresh16x16Icon" href="<%=uicomponent.event("Refresh")%>" title="<%=_ctx.appRes(uicomponent.getName() + ".label.Refresh")%>"></a>
+ <a class="Icon Refresh16x16Icon" href="javascript:void(0);" onclick="<%=uicomponent.event("Refresh")%>" title="<%=_ctx.appRes(uicomponent.getName() + ".label.Refresh")%>"></a>
</td>
</tr>
</table>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIOrganizationPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIOrganizationPortlet.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIOrganizationPortlet.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -18,7 +18,7 @@
style = "ButtonLabel";
if(uicomponent.getChild(0).isRendered()){ style = "SelectButtonLabel"; }
%>
- <a class="UserButton" href="<%=uicomponent.event("ViewChild", "UIUserManagement")%>">
+ <a class="UserButton" href="javascript:void(0);" onclick="<%=uicomponent.event("ViewChild", "UIUserManagement")%>">
<div class="UserManagementIcon"><span></span></div>
<div class="$style"><%=_ctx.appRes("UIOrganizationPortlet.label.userManagement")%></div>
</a>
@@ -27,7 +27,7 @@
style = "ButtonLabel";
if(uicomponent.getChild(1).isRendered()){ style = "SelectButtonLabel"; }
%>
- <a class="GroupButton" href="<%=uicomponent.event("ViewChild", "UIGroupManagement")%>">
+ <a class="GroupButton" href="javascript:void(0);" onclick="<%=uicomponent.event("ViewChild", "UIGroupManagement")%>">
<div class="GroupManagementIcon"><span></span></div>
<div class="$style"><%=_ctx.appRes("UIOrganizationPortlet.label.groupManagement")%></div>
</a>
@@ -36,7 +36,7 @@
style = "ButtonLabel";
if(uicomponent.getChild(2).isRendered()){ style = "SelectButtonLabel"; }
%>
- <a class="MembershipButton" href="<%=uicomponent.event("ViewChild", "UIMembershipManagement")%>">
+ <a class="MembershipButton" href="javascript:void(0);" onclick="<%=uicomponent.event("ViewChild", "UIMembershipManagement")%>">
<div class="MembershipManagementIcon"><span></span></div>
<div class="$style"><%=_ctx.appRes("UIOrganizationPortlet.label.membershipManagement")%></div>
</a>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/eXoResources/src/main/webapp/javascript/eXo.js
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/eXoResources/src/main/webapp/javascript/eXo.js 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/eXoResources/src/main/webapp/javascript/eXo.js 2014-04-03 08:27:20 UTC (rev 9327)
@@ -108,8 +108,8 @@
* @return full url request
*/
eXo.env.server.createPortalURL = function(targetComponentId, actionName, useAjax, params) {
- var url = eXo.env.server.portalURLTemplate.replace("{portal:componentId}", targetComponentId);
- url = url.replace("{portal:action}", actionName);
+ var url = eXo.env.server.portalURLTemplate.replace("_portal:componentId_", targetComponentId);
+ url = url.replace("_portal:action_", actionName);
if(params != null) {
var len = params.length ;
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipSelector.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipSelector.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIGroupMembershipSelector.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -23,7 +23,7 @@
even = !even;
%>
<div class="$rowCssClass">
- <a class="ItemIcon" href="<%=uicomponent.event("SelectMembership", member)%>" title="$member">$member</a>
+ <a class="ItemIcon" href="javascript:void(0);" onclick="<%=uicomponent.event("SelectMembership", member)%>" title="$member">$member</a>
</div>
<%}%>
</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/organization/webui/component/UIUserMembershipSelector.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -41,7 +41,7 @@
<td>
<div class="ActionContainer" style="width: 19px; margin: auto">
<div class="OverflowContainer">
- <a class="DustBin16x16Icon" href="<%=uicomponent.event("DeleteMembership", String.valueOf(i))%>"><span></span></a>
+ <a class="DustBin16x16Icon" href="javascript:void(0);" onclick="<%=uicomponent.event("DeleteMembership", String.valueOf(i))%>"><span></span></a>
</div>
</div>
</td>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -39,7 +39,7 @@
<td><%=_ctx.appRes("UILoginForm.label.RememberOnComputer")%></td>
</tr>
</table>
- <div class="ForgetPass"><a href="<%= uicomponent.event("ForgetPassword") %>"><%=_ctx.appRes("UILoginForm.label.forgot")%></a></div>
+ <div class="ForgetPass"><a href="javascript:void(0);" onclick="<%= uicomponent.event("ForgetPassword") %>"><%=_ctx.appRes("UILoginForm.label.forgot")%></a></div>
<div class="UIAction">
<a href="javascript:void(0);" onclick="login(this);" id="UIPortalLoginFormAction" class="ActionButton SimpleStyle"><%=_ctx.appRes("UILoginForm.label.Signin");%></a>
<a href="javascript:void(0);" onclick="<%=uicomponent.event("Close");%>" class="ActionButton SimpleStyle"><%=_ctx.appRes("UILoginForm.label.Discard")%></a>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -130,7 +130,7 @@
String upper = mode.charAt(0).toString();
mode = mode.replaceFirst(upper, upper.toUpperCase());
%>
- <a class="CategoryItem" href="$actionLink" title="$modeLabel">
+ <a class="CategoryItem" href="javascript:void(0);" onclick="$actionLink" title="$modeLabel">
$modeLabel
</a>
<%
@@ -138,7 +138,7 @@
if(supportModes != null && supportModes.size() > 0 && !supportModes.contains("view")) {
String modeLabel = _ctx.appRes("PortletMode.label.view");
%>
- <a class="CategoryItem" href="<%=uicomponent.event("ChangePortletMode", "view")%>" title="$modeLabel">
+ <a class="CategoryItem" href="javascript:void(0);" onclick="<%=uicomponent.event("ChangePortletMode", "view")%>" title="$modeLabel">
$modeLabel
</a>
<%}%>
@@ -236,8 +236,8 @@
%>
<div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
@@ -246,4 +246,4 @@
</div>
</div>
</div>
-<%}%>
\ No newline at end of file
+<%}%>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -73,10 +73,10 @@
<div class="UIPopupCategory" style="display: none;">
<div class="PopupCategoryDecorator">
- <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>">
+ <a class="CategoryItem" href="javascript:void(0);" onclick="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>">
<div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div>
</a>
- <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>">
+ <a class="CategoryItem" href="javascript:void(0);" onclick="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>">
<div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div>
</a>
@@ -85,8 +85,8 @@
</div>
<% /*End Popup Menu*/ %>
</div>
- <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -63,8 +63,8 @@
%>
<div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
- <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -73,8 +73,8 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
<%}%>
<div class="ClearBoth"><span></span></div>
</div>
@@ -95,4 +95,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -73,8 +73,8 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
</div>
@@ -94,4 +94,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -63,8 +63,8 @@
%>
<div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
<%if(hasPermission) {%>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<%}%>
</div>
<%/*End InfoBar*/ %>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -25,7 +25,7 @@
<div class="Label"><%= groupName %></div>
</td>
<td class="ActionBlock">
- <a href="$addLink" class="AddGroupIcon"><%=_ctx.appRes("UIAddGroupNavigation.Action.Add")%></a>
+ <a href="javascript:void(0);" onclick="$addLink" class="AddGroupIcon"><%=_ctx.appRes("UIAddGroupNavigation.Action.Add")%></a>
</td>
</tr>
</table>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIPageNodeSelector.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIPageNodeSelector.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIPageNodeSelector.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -31,7 +31,7 @@
<%/*Begin PageNodeSelectorContainer*/%>
<div class="UIContainerConfigOptions ItemSelectorAncestor">
<div class="ContainerConfigOptions">
- <a class="AddNavigationIcon" href ="<%=uicomponent.event("CreateNavigation"); %>" title="<%=_ctx.appRes("UIPageNodeSelector.tooltip.newPageNavigation")%>"><span></span></a>
+ <a class="AddNavigationIcon" href="javascript:void(0);" onclick="<%=uicomponent.event("CreateNavigation"); %>" title="<%=_ctx.appRes("UIPageNodeSelector.tooltip.newPageNavigation")%>"><span></span></a>
<div class="ClearLeft" style="height: 0px"><span></span></div>
<div class="UIVerticalSlideTabs ItemList CategoryContainer" style="padding: 1px;">
<% uicomponent.renderChild(UITree.class);%>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSearchForm.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSearchForm.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageSearchForm.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -21,7 +21,7 @@
uiform.renderField(field)
}
%>
- <a class="SearchIcon" href="$quickSearchlink" title="<%= _ctx.appRes("UIPageSearchForm.label.QuickSearch") %>">
+ <a class="SearchIcon" href="javascript:void(0);" onclick="$quickSearchlink" title="<%= _ctx.appRes("UIPageSearchForm.label.QuickSearch") %>">
<span></span>
</a>
</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -11,12 +11,12 @@
<div class="OverflowContainer ClearFix">
<span class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"></span>
<% if(uicomponent.isShowControl) { %>
- <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("CloseComposer")%>"><span></span></a>
+ <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="javascript:void(0);" onclick="<%=uicomponent.event("CloseComposer")%>"><span></span></a>
<% if (uicomponent.isUsedInWizard()) { %>
<a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.url("Finish")%>" onclick="eXo.core.DOMUtil.disableOnClick(this);" ></a>
- <a class="BackButton" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"></a>
+ <a class="BackButton" title="<%=_ctx.appRes("word.back")%>" href="javascript:void(0);" onclick="<%=uicomponent.event("Back")%>"></a>
<% } else {%>
- <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"></a>
+ <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="javascript:void(0);" onclick="<%=uicomponent.event("Finish")%>"></a>
<% }
} %>
<span class="PopupTitle"><%=_ctx.appRes(popupId + ".title."+ popupId)%></span>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortletForm.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -101,17 +101,17 @@
<%if(action.contains("Close")) {
String closeLabel = _ctx.appRes("word.close");
%>
- <a style="display: none;" class="ActionButton LightBlueStyle" href="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a>
+ <a style="display: none;" class="ActionButton LightBlueStyle" href="javascript:void(0);" onclick="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a>
<%} else {%>
- <a style="display: none;" class="ActionButton LightBlueStyle" href="$link" id="$action" >$actionLabel</a>
+ <a style="display: none;" class="ActionButton LightBlueStyle" href="javascript:void(0);" onclick="$link" id="$action" >$actionLabel</a>
<%}%>
<%} else {%>
<%if(action.contains("Close")) {
String closeLabel = _ctx.appRes("word.close");
%>
- <a class="ActionButton LightBlueStyle" href="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a>
+ <a class="ActionButton LightBlueStyle" href="javascript:void(0);" onclick="$link" id="$action" closeLabel="$closeLabel" cancelLabel="$actionLabel"><%=(uicomponent.hasEditMode() && (selTabId.equals("") || selTabId.equals("EditMode"))) ? closeLabel : actionLabel%></a>
<%} else {%>
- <a class="ActionButton LightBlueStyle" href="$link" id="$action" >$actionLabel</a>
+ <a class="ActionButton LightBlueStyle" href="javascript:void(0);" onclick="$link" id="$action" >$actionLabel</a>
<%}%>
<%}%>
<%}%>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -132,7 +132,7 @@
<span class="LoadingProgressBar"></span>
<div class="UIAction">
- <a href="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a>
+ <a onclick="javascript:ajaxAbort();" class="ActionButton LightBlueStyle"><%=_ctx.appRes("UIPortalApplication.label.Abort")%></a>
</div>
</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -32,7 +32,15 @@
String label = entityEncoder.encode(localPath.label)
if(i == list.size()-1) note = "Selected";
%>
- <a href="<%=(localPath.getId() == null) ? "#" : actionLink%>" class="$note">$label</a>
+ <% if (localPath.getId() == null) { %>
+ <a href="#" class="$note">$label</a>
+ <% } else { %>
+ <% if (useAJAX) { %>
+ <a href="javascript:void(0);" onclick="<%=actionLink%>" class="$note">$label</a>
+ <% } else { %>
+ <a href="<%=actionLink%>" class="$note">$label</a>
+ <% } %>
+ <%} %>
<%
if(i != list.size()-1) {
%>
@@ -46,4 +54,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIDropDownControl.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIDropDownControl.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIDropDownControl.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -56,9 +56,9 @@
String label = _ctx.appRes(uicomponent.getId() + ".item." + option.label);
if(label.length() > 30) {
%>
- <a class="OptionItem" href="<%=uicomponent.event(selectedIndex)%>" onclick="eXo.webui.UIDropDownControl.onclickEvt(this)" title="<%=label%>"><%=label.substring(0,25)%>...</a>
+ <a class="OptionItem" href="javascript:void(0);" onclick="<%=uicomponent.event(selectedIndex)%>; eXo.webui.UIDropDownControl.onclickEvt(this)" title="<%=label%>"><%=label.substring(0,25)%>...</a>
<% } else { %>
- <a class="OptionItem" href="<%=uicomponent.event(selectedIndex)%>" onclick="eXo.webui.UIDropDownControl.onclickEvt(this)"><%=label%></a>
+ <a class="OptionItem" href="javascript:void(0);" onclick="<%=uicomponent.event(selectedIndex)%>; eXo.webui.UIDropDownControl.onclickEvt(this)"><%=label%></a>
<% } %>
</div>
<% selectedIndex++;}%>
@@ -75,4 +75,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIPageIterator.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIPageIterator.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIPageIterator.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -6,14 +6,14 @@
<div class="UIPageIterator">
<% if(totalPage > 1) {%>
<% if(currentPage + 10 <= totalPage) {%>
- <a href="<%=uicomponent.event("ShowPage","${currentPage + 10}")%>" class="Icon NextTopPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.nextTenPages")%>"></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("ShowPage","${currentPage + 10}")%>" class="Icon NextTopPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.nextTenPages")%>"></a>
<% } else if(currentPage + 1 <= totalPage) { %>
<a class="Icon DisableNextTopPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.nextTenPages")%>"><span></span></a>
<% } else {%>
<a class="Icon DisableNextTopPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.nextTenPages")%>"><span></span></a>
<% }%>
<% if(currentPage +1 <= totalPage) { %>
- <a href="<%=uicomponent.event("ShowPage","${currentPage + 1}")%>" class="Icon NextPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.next")%>"></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("ShowPage","${currentPage + 1}")%>" class="Icon NextPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.next")%>"></a>
<% } else { %>
<a class="Icon DisableNextPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.next")%>"><span></span></a>
<%}%>
@@ -31,19 +31,19 @@
}
for( i = max ; i >= min; i--) { %>
<% if( i == currentPage) { %>
- <a href="<%=uicomponent.event("ShowPage","$i")%>" class="Number PageSelected"><%=i%></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("ShowPage","$i")%>" class="Number PageSelected"><%=i%></a>
<% } else { %>
- <a href="<%=uicomponent.event("ShowPage","$i")%>" class="Number"><%=i%></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("ShowPage","$i")%>" class="Number"><%=i%></a>
<% } %>
<%}%>
<%if( currentPage - 1 > 0 ){%>
- <a href="<%=uicomponent.event("ShowPage","${currentPage - 1}")%>" class="Icon LastPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.previous")%>"></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("ShowPage","${currentPage - 1}")%>" class="Icon LastPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.previous")%>"></a>
<% } else {%>
<a class="Icon DisableLastPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.previous")%>"><span></span></a>
<%}%>
<%if(currentPage > 10) { %>
- <a href="<%=uicomponent.event("ShowPage","${currentPage -10}")%>" class="Icon LastTopPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.backTenPages")%>"></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event("ShowPage","${currentPage -10}")%>" class="Icon LastTopPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.backTenPages")%>"></a>
<% }else { %>
<a class="Icon DisableLastTopPageIcon" title="<%=_ctx.appRes("UIPageIterator.label.backTenPages")%>"></a>
<%}%>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -76,7 +76,7 @@
String title = _ctx.appRes(uiParent.getParent().getName() + ".action.title." + action);
String actionLink = uiParent.event(action, beanId);
%>
- <img onclick="$actionLink" alt="" title="$title" src="/eXoResources/skin/sharedImages/Blank.gif" class="${action}Icon" />
+ <a href="javascript:void(0);" onclick="$actionLink" title="$title"><img alt="$title" title="$title" src="/eXoResources/skin/sharedImages/Blank.gif" class="${action}Icon" /></a>
<%}%>
</div>
</td>
@@ -89,4 +89,4 @@
%>
</tbody>
</table>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIRightClickPopupMenu.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -18,7 +18,7 @@
<%for(action in uicomponent.getActions()) {%>
<div class="MenuItem">
- <a exo:attr="$action" href="<%= uicomponent.event(action)%>" onclick="eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" class="ItemIcon ${action}16x16Icon" >
+ <a exo:attr="$action" href="javascript:void(0);" onclick="<%= uicomponent.event(action)%>; eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this)" class="ItemIcon ${action}16x16Icon" >
<%=_ctx.appRes(uicomponent.getId() + ".event." + action) %>
</a>
</div>
@@ -34,4 +34,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIToolbar.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIToolbar.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UIToolbar.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -21,7 +21,7 @@
%>
<a class="Icon <%=event.getName();%>Icon" <%=uicomponent.getJavascript();%> title="<%=_ctx.appRes(uicomponent.id + ".tooltip." + event.getName())%>"><span></span></a>
<% } else { %>
- <a class="Icon <%=event.getName();%>Icon" href="<%=uicomponent.event(event.getName())%>" title="<%=_ctx.appRes(uicomponent.id + ".tooltip." + event.getName())%>"><span></span></a>
+ <a class="Icon <%=event.getName();%>Icon" href="javascript:void(0);" onclick="<%=uicomponent.event(event.getName())%>" title="<%=_ctx.appRes(uicomponent.id + ".tooltip." + event.getName())%>"><span></span></a>
<% } %>
<%}%>
<div style="clear: both"><span></span></div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -19,7 +19,7 @@
<div class="TreeContainer JSContainer">
<div style="padding-bottom: 12px">
<div class="HomeNode">
- <a class="LevelUpArrowIcon" href="<%=uicomponent.getActionLink();%>" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UITree.tooltip.UpLevel")%>" style="display: block;"><span></span></a>
+ <a class="LevelUpArrowIcon" href="javascript:void(0);" onclick="<%=uicomponent.getActionLink();%>" onmousedown="event.cancelBubble=true;" title="<%=_ctx.appRes("UITree.tooltip.UpLevel")%>" style="display: block;"><span></span></a>
</div>
<%
int count=0;
@@ -83,4 +83,4 @@
<%count++;}%>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UIFormInputIconSelector.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UIFormInputIconSelector.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UIFormInputIconSelector.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -54,7 +54,7 @@
<div class="TitleIcon ViewListIcon"><span></span></div>
<div class="Title"><%=_ctx.appRes("UIFormInputIconSelector.label.iconPreview")%></div>
<div class="SetDefault FloatRight">
- <a href="<%=form.event('SelectIcon', "Default");%>"><%= _ctx.appRes(uicomponent.getParent().getId() + "." + uicomponent.getId() + ".title.SetDefault") %></a>
+ <a href="javascript:void(0);" onclick="<%=form.event('SelectIcon', "Default");%>"><%= _ctx.appRes(uicomponent.getParent().getId() + "." + uicomponent.getId() + ".title.SetDefault") %></a>
</div>
<div class="ClearBoth"><span></span></div>
</div>
@@ -99,4 +99,4 @@
<%/*End Item Detail List*/%>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/UISearchForm.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -18,7 +18,7 @@
uiform.renderField(field)
}
%>
- <a class="SimpleSearchIcon" href="$quickSearchlink" title="<%= _ctx.appRes("UISearch.label.QuickSearch") %>">
+ <a class="SimpleSearchIcon" href="javascript:void(0);" onclick="$quickSearchlink" title="<%= _ctx.appRes("UISearch.label.QuickSearch") %>">
<span></span>
</a>
</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/form/ext/UIFormInputSetWithAction.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -73,7 +73,7 @@
<img onclick="if(confirm('<%=confirm%>')) eXo.webui.UIForm.submitEvent('<%=formName%>', '<%=actionInfo[0]%>', '&objectId=<%=arrInfor[i]%>');" alt="" class="DeleteIconInfo" src="/eXoResources/skin/DefaultSkin/background/Blank.gif"/>
<%} else { %>
<div class="ActionField" style="float:left;">
- [ <a href="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>', '<%=actionInfo[0]%>', '&objectId=<%=arrInfor[i]%>');">
+ [ <a href="javascript:void(0);" onclick="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>', '<%=actionInfo[0]%>', '&objectId=<%=arrInfor[i]%>');">
<%=arrInfor[i]%>
</a> ]
</div>
@@ -85,7 +85,7 @@
%>
<div class="ActionFieldContainer">
<div class="ActionField">
- [ <a href="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>', '<%=actionInfo[0]%>', '&objectId=<%=arrInfor[i]%>');">
+ [ <a href= "javascript:void(0);" onclick="javascript:eXo.webui.UIForm.submitEvent('<%=formName%>', '<%=actionInfo[0]%>', '&objectId=<%=arrInfor[i]%>');">
<%=arrInfor[i]%>
</a> ]
</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIGroupSelector.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -25,12 +25,12 @@
even = !even;
%>
<div class="$rowCssClass">
- <a class="ItemIcon" href="<%=uicomponent.event("SelectGroup", member)%>" title="$member">$member</a>
+ <a class="ItemIcon" href="javascript:void(0);" onclick="<%=uicomponent.event("SelectGroup", member)%>" title="$member">$member</a>
</div>
<%}%>
<% } else if( groups != null && groups.size() == 0 ) { %>
<div class="AddButton">
- <a class="ItemIcon" href="<%= uicomponent.event("SelectGroup",uicomponent.getCurrentGroup().getId()) %>"><%=_ctx.appRes("UIGroupSelector.title.addGroupButton")%></a>
+ <a class="ItemIcon" href="javascript:void(0);" onclick="<%= uicomponent.event("SelectGroup",uicomponent.getCurrentGroup().getId()) %>"><%=_ctx.appRes("UIGroupSelector.title.addGroupButton")%></a>
</div>
<% } %>
</div>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl 2014-04-03 08:27:20 UTC (rev 9327)
@@ -28,9 +28,9 @@
</div>
<div class="GroupInput">
<%uiform.renderField(uiform.FIELD_GROUP)%>
- <a class="SearchIcon" style="display: none" href="<%=uicomponent.event('FindGroup')%>"><span></span></a>
+ <a class="SearchIcon" style="display: none" href="javascript:void(0);" onclick="<%=uicomponent.event('FindGroup')%>"><span></span></a>
</div>
- <a class="SearchIcon" href="<%=uicomponent.event('SearchGroup')%>" title="<%=uiform.getLabel(uiform.FIELD_GROUP)%>"><span></span></a>
+ <a class="SearchIcon" href="javascript:void(0);" onclick="<%=uicomponent.event('SearchGroup')%>" title="<%=uiform.getLabel(uiform.FIELD_GROUP)%>"><span></span></a>
<% } %>
<% if(uicomponent.isShowSearchUser()) { %>
<% if(!uicomponent.isShowSearchGroup()) {%>
@@ -42,7 +42,7 @@
<div class="FilterSelect">
<%uiform.renderField(uiform.FIELD_FILTER)%>
</div>
- <a class="SearchIcon" href="<%=uicomponent.event('Search')%>" title="<%=uiform.getLabel(uiform.FIELD_KEYWORD)%>"><span></span></a>
++ <a class="SearchIcon" href="javascript:void(0);" onclick="<%=uicomponent.event('Search')%>" title="<%=uiform.getLabel(uiform.FIELD_KEYWORD)%>"><span></span></a>
<% } %>
<div class="ClearLeft"><span></span></div>
</div>
@@ -138,10 +138,10 @@
<% if(isMulti) { %>
<div class="UIAction">
<%for(String action : uicomponent.getActions()){%>
- <a href="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=uiform.getLabel(action)%></a>
+ <a href="javascript:void(0);" onclick="<%=uicomponent.event(action)%>" class="ActionButton LightBlueStyle"><%=uiform.getLabel(action)%></a>
<%}%>
</div>
<% } %>
<%uicomponent.renderChild(UIPopupWindow.class);%>
</div>
-<% uiform.end() %>
\ No newline at end of file
+<% uiform.end() %>
Modified: epp/portal/branches/EPP_5_2_2_GA_BZ1082601/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ1082601/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2014-04-03 05:14:55 UTC (rev 9326)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ1082601/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2014-04-03 08:27:20 UTC (rev 9327)
@@ -61,6 +61,7 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -98,7 +99,7 @@
public static final int CONTAINER_VIEW_EDIT_MODE = 4;
public static final UIComponent EMPTY_COMPONENT = new UIComponent(){
- public String getId() { return "{portal:componentId}"; };
+ public String getId() { return "_portal:componentId_"; };
};
private int modeState = NORMAL_MODE;
@@ -819,8 +820,8 @@
urlTemplate.setMimeType(MimeType.PLAIN);
urlTemplate.setPath(pcontext.getNodePath());
urlTemplate.setResource(EMPTY_COMPONENT);
- urlTemplate.setAction("{portal:action}");
+ urlTemplate.setAction("_portal:action_");
- return URLDecoder.decode(urlTemplate.toString(), "UTF-8");
+ return urlTemplate.toString();
}
}
10 years, 8 months
- 1
- 0
gatein SVN: r9326 - epp/portal/branches.
by do-not-reply＠jboss.org
Author: tkobayas(a)redhat.com
Date: 2014-04-03 01:14:55 -0400 (Thu, 03 Apr 2014)
New Revision: 9326
Added:
epp/portal/branches/EPP_5_2_2_GA_BZ1082601/
Log:
BZ1082601 : creating one-off patch branch
10 years, 8 months
- 1
- 0
- ← Newer
- 1
- Older →