From f3d062e6b8f2b483d3310a94a94716f86cb1ba2a Mon Sep 17 00:00:00 2001 From: E-A B Date: Mon, 9 Jan 2023 15:32:05 +0100 Subject: [PATCH] up diff --- .../docroot/templates/navigation.ftl | 146 +++++++++--------- .../docroot/templates/header.ftl | 2 +- 2 files changed, 75 insertions(+), 73 deletions(-) diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl index 99b66c16..2a68fb3e 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/templates/navigation.ftl @@ -1,87 +1,89 @@ +

- - <#if propsUtil.get("mwg.test.display")?has_content > - <#assign test_display = propsUtil.get("mwg.test.display") /> -

${test_display}

- <#else> - ${logo_description} - - + + ${logo_description} +

+ +
- <#if user_name != "" > -
- - ${user_name} -
-
- <#assign organizationservice = serviceLocator.findService('com.liferay.portal.service.OrganizationLocalService') /> - <#assign organizations = organizationservice.getUserOrganizations(user_id) > - <#assign org_names = ""> - <#if organizations?has_content> - <#list organizations as org> - <#assign org_names = org_names+" - ${org.getName()}"> - - - <#if org_names?has_content> -

${org_names?substring(3)}

- - - <#assign userGroupRoleService = serviceLocator.findService('com.liferay.portal.service.UserGroupRoleLocalService') /> - <#assign roles = userGroupRoleService.getUserGroupRoles(user_id) > - <#assign role_names = ""> - <#if roles?has_content> - <#list roles as role> - <#assign roleName = role.getRole().getName()> - <#if !roleName?matches('.*Owner') > - <#assign roleName = roleName?replace('portos_', '')?replace('_',' ')?capitalize> - <#if !role_names?contains(roleName) > - <#assign role_names = role_names+", ${roleName}"> - - - - - <#if role_names?has_content> -

${role_names?substring(2)}

- -
-
- + <#if user_name != "" > +
+ + ${user_name} +
+
+ <#assign organizationservice = serviceLocator.findService('com.liferay.portal.service.OrganizationLocalService') /> + <#assign organizations = organizationservice.getUserOrganizations(user_id) > + <#assign org_names = ""> + <#if organizations?has_content> + <#list organizations as org> + <#assign org_names = org_names+" - ${org.getName()}"> + + + <#if org_names?has_content> +

${org_names?substring(3)}

+ + + <#assign userGroupRoleService = serviceLocator.findService('com.liferay.portal.service.UserGroupRoleLocalService') /> + <#assign roles = userGroupRoleService.getUserGroupRoles(user_id) > + <#assign role_names = ""> + <#if roles?has_content> + <#list roles as role> + <#assign roleName = role.getRole().getName()> + <#if !roleName?matches('.*Owner') > + <#assign roleName = roleName?replace('portos_', '')?replace('_',' ')?capitalize> + <#if !role_names?contains(roleName) > + <#assign role_names = role_names+", ${roleName}"> + + + + + <#if role_names?has_content> +

${role_names?substring(2)}

+ +
+
+ -
- - <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> +
+ + <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> - <#assign portlet_id = "2_WAR_notificationsportlet" /> - ${theme.runtime(portlet_id)} + <#assign portlet_id = "2_WAR_notificationsportlet" /> + ${theme.runtime(portlet_id)} -
+
- + - +
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl index f70e5e2f..954c7af7 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl @@ -1,6 +1,6 @@

- + <#assign logo_url = "${images_folder}/logo-rs-testo.png" />