Skip to content
This repository was archived by the owner on Jan 15, 2022. It is now read-only.

Fix/4.0.x/plf 5463 #388

Open
trungthanh-tran wants to merge 1 commit into
base: stable/4.0.x
Choose a base branch
from
Open

Fix/4.0.x/plf 5463 #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions extension/portlets/platformNavigation/src/main/webapp/WEB-INF/gatein-resources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@
<depends>
<module>bts_dropdown</module>
</depends>
<depends>
<module>bts_hover_dropdown</module>
</depends>
</module>
</portlet>
<portlet>
Expand All @@ -76,9 +73,6 @@
<depends>
<module>bts_dropdown</module>
</depends>
<depends>
<module>bts_hover_dropdown</module>
</depends>
</module>
</portlet>
<portlet>
Expand All @@ -89,9 +83,6 @@
</depends>
<depends>
<module>bts_dropdown</module>
</depends>
<depends>
<module>bts_hover_dropdown</module>
</depends>
<!--
<depends>
Expand All @@ -116,9 +107,6 @@
<depends>
<module>bts_dropdown</module>
</depends>
<depends>
<module>bts_hover_dropdown</module>
</depends>
</module>
</portlet>
<!--Begin-->
Expand Down Expand Up @@ -213,16 +201,4 @@
<module>jquery</module>
</depends>
</module>

<module>
<name>bts_hover_dropdown</name>
<load-group>plf_navigation</load-group>
<script>
<path>/javascript/eXo/platform/navigation/ToolBarNavigation/twitter-bootstrap-hover-dropdown.js</path>
</script>
<depends>
<module>jquery</module>
<as>jQuery</as>
</depends>
</module>
</gatein-resources>
2 changes: 1 addition & 1 deletion ...app/groovy/platformNavigation/portlet/UIAdminToolbarPortlet/UIAdminToolbarContainer.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
%>

<div class="uiAdminToolbarPortlet uiDropdownWithIcon dropdown pull-left" id="$uicomponent.id">
<a class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown">
<i class="uiIconPLF24x24Edit"></i>$editorLabel
</a>

Expand Down
2 changes: 1 addition & 1 deletion ...ormNavigation/portlet/UICreatePlatformToolBarPortlet/UICreatePlatformToolBarPortlet.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ JavascriptManager jsmanager = rcontext.getJavascriptManager();
%>

<div class="uiCreateToolBarPortlet uiDropdownWithIcon dropdown pull-right" id="$uicomponent.id">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown"><i class="uiIconPLF24x24Add"></i></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="uiIconPLF24x24Add"></i></a>
<%uicomponent.renderChild(UICreateList.class);%>
</div>

Expand Down
2 changes: 1 addition & 1 deletion ...tformNavigation/portlet/UISetupPlatformToolBarPortlet/UISetupPlatformToolBarPortlet.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if(pagesNodes!=null && !pagesNodes.isEmpty()) {

%>
<div class="uiSetupPlatformToolBarPortlet uiDropdownWithIcon dropdown pull-left" id="$uicomponent.id">
<a class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown">
<i class="uiIconPLF24x24Setup"></i><%=_ctx.appRes("UISetupPlatformToolBarPortlet.label.administration")%>
</a>
<ul class="dropdown-menu">
Expand Down
2 changes: 1 addition & 1 deletion ...latformNavigation/portlet/UIUserPlatformToolBarPortlet/UIUserPlatformToolBarPortlet.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
%>
<div class="uiUserToolBarPortlet uiDropdownWithIcon dropdown pull-right" id="$uicomponent.id">

<a class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown">
<%
EntityEncoder encoder = EntityEncoder.FULL;
fullName = encoder.encode(user.fullName);
Expand Down
18 changes: 0 additions & 18 deletions .../javascript/eXo/platform/navigation/ToolBarNavigation/twitter-bootstrap-hover-dropdown.js
View file
Open in desktop

This file was deleted.