Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Implement site layout for mycraft, engage and intranet sites - EXO-67424 - Meeds-io/MIPs#88 #88

Merged
merged 4 commits into from
Nov 21, 2023
Merged

feat: Implement site layout for mycraft, engage and intranet sites - EXO-67424 - Meeds-io/MIPs#88 #88

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
080203e
feat: Implement top bar container for sites : mycraft , engage and in…
GouadriaHanen Nov 17, 2023
d5e9cde
remove displayed visibility properties from sites navigations
GouadriaHanen Nov 17, 2023
304870c
refactor code
GouadriaHanen Nov 21, 2023
309c1ea
format code
GouadriaHanen Nov 21, 2023
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
1 change: 1 addition & 0 deletions digital-workplace-webapps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<compress>false</compress>
<includes>
<include>digital-workplace.less</include>
<include>siteLayout.less</include>
</includes>
</configuration>
<goals>
Expand Down
6 changes: 3 additions & 3 deletions ...workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<string>portal</string>
</field>
<field name="importMode">
<string>${exo.mycraft.portalConfig.metadata.importmode:insert}</string>
<string>${exo.mycraft.portalConfig.metadata.importmode:overwrite}</string>
</field>
<field name="templateLocation">
<string>war:/conf/digital-workplace/</string>
Expand Down Expand Up @@ -106,7 +106,7 @@
<string>portal</string>
</field>
<field name="importMode">
<string>${exo.intranet.portalConfig.metadata.importmode:insert}</string>
<string>${exo.intranet.portalConfig.metadata.importmode:overwrite}</string>
</field>
<field name="templateLocation">
<string>war:/conf/digital-workplace/</string>
Expand Down Expand Up @@ -141,7 +141,7 @@
<string>portal</string>
</field>
<field name="importMode">
<string>${exo.engage.portalConfig.metadata.importmode:insert}</string>
<string>${exo.engage.portalConfig.metadata.importmode:overwrite}</string>
</field>
<field name="templateLocation">
<string>war:/conf/digital-workplace/</string>
Expand Down
3 changes: 0 additions & 3 deletions ...workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,18 @@
<name>stream</name>
<label>#{portal.dw.stream}</label>
<icon>fas fa-stream</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::stream</page-reference>
</node>
<node>
<name>spaces</name>
<label>#{portal.dw.spaces}</label>
<icon>fas fa-people-arrows</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::all-spaces</page-reference>
</node>
<node>
<name>people</name>
<label>#{portal.dw.people}</label>
<icon>fas fa-users</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::all-people</page-reference>
</node>
</page-nodes>
Expand Down
6 changes: 0 additions & 6 deletions ...place-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,33 @@
<name>overview</name>
<label>#{portal.engage.overview}</label>
<icon>fas fa-award</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::overview</page-reference>
<node>
<name>contributions</name>
<label>#{portal.engage.contributions}</label>
<visibility>DISPLAYED</visibility>
<node>
<name>programs</name>
<label>#{portal.engage.programs}</label>
<icon>fas fa-chalkboard</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::programs</page-reference>
</node>
<node>
<name>actions</name>
<label>#{portal.engage.actions}</label>
<icon>fas fa-list-alt</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::actions</page-reference>
</node>
<node>
<name>achievements</name>
<label>#{portal.engage.achievements}</label>
<icon>fas fa-chart-pie</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::achievements</page-reference>
</node>
</node>
<node>
<name>perkstore</name>
<label>#{portal.engage.perkstore}</label>
<icon>fas fa-shopping-cart</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::perkstore</page-reference>
</node>
</node>
Expand Down
42 changes: 41 additions & 1 deletion ...workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/portal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,46 @@
<entry key="showPortletInfo">0</entry>
</properties>
<portal-layout>
<page-body> </page-body>
<container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
<access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
<container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl" attribute="">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

attribute="" is it needed ?

<access-permissions>Everyone</access-permissions>
<portlet-application>
<portlet>
<application-ref>social-portlet</application-ref>
<portlet-ref>TopBarLogo</portlet-ref>
</portlet>
<title>Company Logo</title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
<portlet-application>
<portlet>
<application-ref>layout-management</application-ref>
<portlet-ref>SiteNavigation</portlet-ref>
</portlet>
<title>site navigation</title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
</container>
<container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
<portlet-application>
<portlet>
<application-ref>social-portlet</application-ref>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

format code of the whole file

<portlet-ref>TopBarMenu</portlet-ref>
</portlet>
<title>Top Bar Menu </title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
</container>
<container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
</container>
</container>
<page-body> </page-body>
</portal-layout>
</portal-config>
3 changes: 0 additions & 3 deletions ...ace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,17 @@
<name>homepage</name>
<label>#{portal.intranet.homepage}</label>
<icon>fas fa-newspaper</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::dw::homepage</page-reference>
<node>
<name>news</name>
<label>#{portal.intranet.news}</label>
<icon>far fa-newspaper</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::intranet::news</page-reference>
</node>
<node>
<name>people</name>
<label>#{portal.intranet.people}</label>
<icon>fas fa-users</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::all-people</page-reference>
</node>
</node>
Expand Down
42 changes: 41 additions & 1 deletion ...rkplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,46 @@
<entry key="showPortletInfo">0</entry>
</properties>
<portal-layout>
<page-body> </page-body>
<container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
<access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

format code of the whole file

<container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl" attribute="">
<access-permissions>Everyone</access-permissions>
<portlet-application>
<portlet>
<application-ref>social-portlet</application-ref>
<portlet-ref>TopBarLogo</portlet-ref>
</portlet>
<title>Company Logo</title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
<portlet-application>
<portlet>
<application-ref>layout-management</application-ref>
<portlet-ref>SiteNavigation</portlet-ref>
</portlet>
<title>site navigation</title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
</container>
<container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
<portlet-application>
<portlet>
<application-ref>social-portlet</application-ref>
<portlet-ref>TopBarMenu</portlet-ref>
</portlet>
<title>Top Bar Menu </title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
</container>
<container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
</container>
</container>
<page-body> </page-body>
</portal-layout>
</portal-config>
4 changes: 0 additions & 4 deletions ...lace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,23 @@
<name>dashboard</name>
<label>#{portal.mycraft.drives}</label>
<icon>fas fa-briefcase</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::drives</page-reference>
<node>
<name>tasks</name>
<label>#{portal.mycraft.tasks}</label>
<icon>fas fa-tasks</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::tasks</page-reference>
</node>
<node>
<name>agenda</name>
<label>#{portal.mycraft.agenda}</label>
<icon>fas fa-calendar-alt</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::agenda</page-reference>
</node>
<node>
<name>processes</name>
<label>#{portal.mycraft.processes}</label>
<icon>fas fa-file-invoice</icon>
<visibility>DISPLAYED</visibility>
<page-reference>portal::global::processes</page-reference>
</node>
</node>
Expand Down
42 changes: 41 additions & 1 deletion ...orkplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,46 @@
<entry key="showPortletInfo">0</entry>
</properties>
<portal-layout>
<page-body> </page-body>
<container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

format code of the whole file

<access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
<container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl" attribute="">
<access-permissions>Everyone</access-permissions>
<portlet-application>
<portlet>
<application-ref>social-portlet</application-ref>
<portlet-ref>TopBarLogo</portlet-ref>
</portlet>
<title>Company Logo</title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
<portlet-application>
<portlet>
<application-ref>layout-management</application-ref>
<portlet-ref>SiteNavigation</portlet-ref>
</portlet>
<title>site navigation</title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
</container>
<container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
<portlet-application>
<portlet>
<application-ref>social-portlet</application-ref>
<portlet-ref>TopBarMenu</portlet-ref>
</portlet>
<title>Top Bar Menu </title>
<access-permissions>Everyone</access-permissions>
<show-info-bar>false</show-info-bar>
<show-application-state>false</show-application-state>
</portlet-application>
</container>
<container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
</container>
</container>
<page-body> </page-body>
</portal-layout>
</portal-config>
6 changes: 6 additions & 0 deletions digital-workplace-webapps/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 @@ -8,5 +8,11 @@
<css-path>/skin/css/digital-workplace.css</css-path>
<css-priority>11</css-priority>
</portal-skin>
<portal-skin>
<skin-name>Enterprise</skin-name>
<skin-module>siteLayout</skin-module>
<css-path>/skin/css/siteLayout.css</css-path>
<css-priority>11</css-priority>
</portal-skin>

</gatein-resources>
7 changes: 7 additions & 0 deletions digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#left-topBar-containerChildren{
display: flex !important;
}
.left-topBar-containerTDContainer{
margin-left: 0 ~'!important; /** orientation=lt */ ';
margin-right: 0 ~'!important; /** orientation=rt */ ';
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#left-topBar-containerChildren{
display: flex !important;
}
.left-topBar-containerTDContainer{
margin-left: 0 ~'!important; /** orientation=lt */ ';
margin-right: 0 ~'!important; /** orientation=rt */ ';
}
#left-topBar-containerChildren {
display: flex !important;
}
.left-topBar-containerTDContainer {
margin-left: 0 ~'!important; /** orientation=lt */ ';
margin-right: 0 ~'!important; /** orientation=rt */ ';
}