From 82177dd82bdaee4cc2f241ff532586c08e089763 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 29 Nov 2024 10:24:45 +0100 Subject: [PATCH] feat: Review Spaces Form Creation Drawer - MEED-7804 - Meeds-io/MIP#159 (#4209) This change will review the Spaces Creation form to adopt the fields selection Inputs display switch selected Template. --- .../social/rest/impl/space/SpaceRest.java | 103 ++-- .../SpacesListApplication_ar.properties | 7 - .../SpacesListApplication_aro.properties | 7 - .../SpacesListApplication_az.properties | 7 - .../SpacesListApplication_ca.properties | 7 - .../SpacesListApplication_ceb.properties | 7 - .../SpacesListApplication_co.properties | 7 - .../SpacesListApplication_cs.properties | 7 - .../SpacesListApplication_de.properties | 7 - .../SpacesListApplication_el.properties | 7 - .../SpacesListApplication_en.properties | 30 +- .../SpacesListApplication_es_ES.properties | 7 - .../SpacesListApplication_eu.properties | 7 - .../SpacesListApplication_fa.properties | 7 - .../SpacesListApplication_fi.properties | 7 - .../SpacesListApplication_fil.properties | 7 - .../SpacesListApplication_fr.properties | 7 - .../SpacesListApplication_hi.properties | 7 - .../SpacesListApplication_hu.properties | 7 - .../SpacesListApplication_id.properties | 7 - .../SpacesListApplication_in.properties | 7 - .../SpacesListApplication_it.properties | 7 - .../SpacesListApplication_ja.properties | 7 - .../SpacesListApplication_kab.properties | 7 - .../SpacesListApplication_ko.properties | 7 - .../SpacesListApplication_lt.properties | 7 - .../SpacesListApplication_ms.properties | 7 - .../SpacesListApplication_nl.properties | 7 - .../SpacesListApplication_no.properties | 7 - .../SpacesListApplication_pcm.properties | 7 - .../SpacesListApplication_pl.properties | 7 - .../SpacesListApplication_pt_BR.properties | 7 - .../SpacesListApplication_pt_PT.properties | 7 - .../SpacesListApplication_ro.properties | 7 - .../SpacesListApplication_ru.properties | 7 - .../SpacesListApplication_sk.properties | 7 - .../SpacesListApplication_sl.properties | 7 - .../SpacesListApplication_sq.properties | 7 - .../SpacesListApplication_sv_SE.properties | 7 - .../SpacesListApplication_th.properties | 7 - .../SpacesListApplication_tl.properties | 7 - .../SpacesListApplication_tr.properties | 7 - .../SpacesListApplication_uk.properties | 7 - .../SpacesListApplication_ur_IN.properties | 7 - .../SpacesListApplication_vi.properties | 7 - .../SpacesListApplication_zh_CN.properties | 7 - .../SpacesListApplication_zh_TW.properties | 7 - .../main/webapp/WEB-INF/gatein-resources.xml | 16 +- .../WEB-INF/jsp/portlet/hamburgerMenu.jsp | 7 +- .../jsp/portlet/spaceTemplateManagement.jsp | 16 + .../jsp/portlet/spacesAdministration.jsp | 16 + .../webapp/WEB-INF/jsp/portlet/spacesList.jsp | 6 +- webapp/src/main/webapp/WEB-INF/portlet.xml | 8 +- .../webapp/html/spaceTemplateManagement.html | 9 - .../webapp/html/spacesAdministration.html | 9 - .../vue-apps/common/js/SuggesterService.js | 1 + .../hamburger-menu/components/Sidebar.vue | 5 + .../components/SidebarButton.vue | 8 +- .../webapp/vue-apps/hamburger-menu/main.js | 36 +- .../space-form/components/SpaceFormAccess.vue | 152 ++++++ .../space-form/components/SpaceFormAvatar.vue | 123 +++++ .../space-form/components/SpaceFormBanner.vue | 116 +++++ .../space-form/components/SpaceFormDrawer.vue | 484 ++++++++---------- .../components/SpaceFormInvitation.vue | 112 ++++ .../components/SpaceFormInviteEmailDrawer.vue | 229 +++++++++ .../SpaceFormInviteEmailListItem.vue | 93 ++++ .../SpaceFormInviteUserListItem.vue | 97 ++++ .../components/SpaceFormInviteUsersDrawer.vue | 94 ++++ .../components/SpaceFormInviteUsersInput.vue | 86 ++++ .../vue-apps/space-form/initComponents.js | 21 + .../drawer/SpaceInviteInputEmailDrawer.vue | 2 +- .../drawer/SpaceInviteInputUsersDrawer.vue | 2 +- .../space-templates-management/main.js | 3 +- .../vue-apps/spaces-administration/main.js | 3 +- .../main/webapp/vue-apps/spaces-list/main.js | 4 +- 75 files changed, 1534 insertions(+), 672 deletions(-) create mode 100644 webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceTemplateManagement.jsp create mode 100644 webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesAdministration.jsp delete mode 100644 webapp/src/main/webapp/html/spaceTemplateManagement.html delete mode 100644 webapp/src/main/webapp/html/spacesAdministration.html create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAccess.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAvatar.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormBanner.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormInvitation.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormInviteEmailDrawer.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormInviteEmailListItem.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormInviteUserListItem.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormInviteUsersDrawer.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormInviteUsersInput.vue diff --git a/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java b/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java index d4936025246..dd843a1dbce 100644 --- a/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java +++ b/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java @@ -367,6 +367,15 @@ public Response createSpace( .entity(e.getCode().name()) .build()); } + saveSpaceAvatar(space, model); + saveSpaceBanner(model, space); + try { + inviteExternalUsers(uriInfo, model, space, authenticatedUser); + } catch (Exception e) { + LOG.warn("Error while sending external users invitations to space {}", + space.getGroupId(), + e); + } return EntityBuilder.getResponse(EntityBuilder.buildEntityFromSpace(space, authenticatedUser, uriInfo.getPath(), expand), uriInfo, RestUtils.getJsonMediaType(), @@ -771,36 +780,7 @@ public Response updateSpaceById( spaceService.renameSpace(space, model.getDisplayName(), authenticatedUser); } - if (model.getExternalInvitedUsers() != null - && (securitySettingService.getRegistrationType() == UserRegistrationType.OPEN - || securitySettingService.isRegistrationExternalUser())) { - String uri = uriInfo.getBaseUri() - .toString() - .substring(0, - uriInfo.getBaseUri() - .toString() - .lastIndexOf("/")); - StringBuilder url = new StringBuilder(uri); - - PasswordRecoveryService passwordRecoveryService = CommonsUtils.getService(PasswordRecoveryService.class); - LocaleConfigService localeConfigService = CommonsUtils.getService(LocaleConfigService.class); - Locale locale = null; - try { - String defaultLanguage = localeConfigService.getDefaultLocaleConfig().getLocale().toLanguageTag(); - locale = LocaleUtils.toLocale(defaultLanguage); - } catch (Exception e) { - LOG.error("Failure to retrieve portal config", e); - } - for (String externalInvitedUser : model.getExternalInvitedUsers()) { - String tokenId = passwordRecoveryService.sendExternalRegisterEmail(authenticatedUser, - externalInvitedUser, - locale, - space.getDisplayName(), - url); - spaceService.saveSpaceExternalInvitation(space.getId(), externalInvitedUser, tokenId); - } - } - + inviteExternalUsers(uriInfo, model, space, authenticatedUser); fillSpaceFromModel(space, model); space.setEditor(authenticatedUser); space = spaceService.updateSpace(space, model.getInvitedMembers()); @@ -1007,11 +987,11 @@ private void fillSpaceFromModel(Space space, SpaceEntity model) { space.setTemplateId(model.getTemplateId()); } - if (StringUtils.isNotBlank(model.getBannerId())) { + if (StringUtils.isNotBlank(model.getId()) && StringUtils.isNotBlank(model.getBannerId())) { updateProfileField(space, Profile.BANNER, model.getBannerId()); } - if (StringUtils.isNotBlank(model.getAvatarId())) { + if (StringUtils.isNotBlank(model.getId()) && StringUtils.isNotBlank(model.getAvatarId())) { updateProfileField(space, Profile.AVATAR, model.getAvatarId()); } @@ -1194,4 +1174,63 @@ private Response.ResponseBuilder getDefaultBannerBuilder() throws IOException { return builder; } + private void saveSpaceAvatar(Space space, SpaceEntity model) { + if (StringUtils.isNotBlank(model.getAvatarId())) { + try { + updateProfileField(space, Profile.AVATAR, model.getAvatarId()); + } catch (IOException e) { + LOG.warn("Error adding Space Avatar. Avoid stopping space creation process and continue", e); + } + } + } + + private void saveSpaceBanner(SpaceEntity model, Space space) { + if (StringUtils.isNotBlank(model.getBannerId())) { + try { + updateProfileField(space, Profile.BANNER, model.getBannerId()); + } catch (IOException e) { + LOG.warn("Error adding Space Banner. Avoid stopping space creation process and continue", e); + } + } + } + + private boolean inviteExternalUsers(UriInfo uriInfo, SpaceEntity model, Space space, String authenticatedUser) throws Exception { + int errorsCount = 0; + if (model.getExternalInvitedUsers() != null + && (securitySettingService.getRegistrationType() == UserRegistrationType.OPEN + || securitySettingService.isRegistrationExternalUser())) { + String uri = uriInfo.getBaseUri() + .toString() + .substring(0, + uriInfo.getBaseUri() + .toString() + .lastIndexOf("/")); + StringBuilder url = new StringBuilder(uri); + + PasswordRecoveryService passwordRecoveryService = CommonsUtils.getService(PasswordRecoveryService.class); + LocaleConfigService localeConfigService = CommonsUtils.getService(LocaleConfigService.class); + Locale locale = null; + try { + String defaultLanguage = localeConfigService.getDefaultLocaleConfig().getLocale().toLanguageTag(); + locale = LocaleUtils.toLocale(defaultLanguage); + } catch (Exception e) { + LOG.error("Failure to retrieve portal config", e); + } + for (String externalInvitedUser : model.getExternalInvitedUsers()) { + try { + String tokenId = passwordRecoveryService.sendExternalRegisterEmail(authenticatedUser, + externalInvitedUser, + locale, + space.getDisplayName(), + url); + spaceService.saveSpaceExternalInvitation(space.getId(), externalInvitedUser, tokenId); + } catch (Exception e) { + LOG.warn("Error while sending external invitation to user {}", externalInvitedUser, e); + errorsCount++; + } + } + } + return errorsCount == 0; + } + } diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties index c111593409d..233b938dc90 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=ولكن يمكنك البدء ب spacesList.label.noSpacesLink=إضافة الفضاء الأول الخاص بك. spacesList.label.addNewSpace=إضافة فضاء spacesList.label.editSpace=تعديل الفضاء {0} -spacesList.label.spaceDetails=تفاصيل الفضاء -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=دعوة المستخدمين -spacesList.label.displayName=الاسم الظاهر -spacesList.label.description=الوصف -spacesList.label.name=الاسم -spacesList.label.spaceTemplate=نموذج spacesList.label.yes=نعم spacesList.label.no=لا spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=إزالة من الإشارات المرجعي spacesList.button.requestJoin=طلب الوصول spacesList.button.cancelRequest=إلغاء الطلب spacesList.button.close=اغلاق -spacesList.button.continue=متابعة spacesList.button.back=الرجوع spacesList.button.cancel=إلغاء spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties index ee0e3769c71..2f05f86f1fa 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=ولكن يمكنك البدء ب spacesList.label.noSpacesLink=إضافة الفضاء الأول الخاص بك. spacesList.label.addNewSpace=مساحة spacesList.label.editSpace=تعديل الفضاء {0} -spacesList.label.spaceDetails=تفاصيل الفضاء -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=دعوة المستخدمين -spacesList.label.displayName=الاسم المعروض -spacesList.label.description=الوصف -spacesList.label.name=الاسم -spacesList.label.spaceTemplate=القالب spacesList.label.yes=نعم spacesList.label.no=لا spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=إزالة من الإشارات المرجعي spacesList.button.requestJoin=طلب الوصول spacesList.button.cancelRequest=إلغاء الطلب spacesList.button.close=اغلاق -spacesList.button.continue=واصل spacesList.button.back=رجوع spacesList.button.cancel=الغاء spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties index caea1acf1ce..d47c774c91e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Açıqlama -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Ləğv Et spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties index ecf4c691e1c..8fcc493dd9d 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Afegeix un Espai spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Descripció -spacesList.label.name=Nom -spacesList.label.spaceTemplate=Plantilla spacesList.label.yes=Sí spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Tanca -spacesList.button.continue=Continua spacesList.button.back=Enrere spacesList.button.cancel=Cancel·la spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties index c04350424c2..2977c002e86 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Ang Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties index 73a3f022218..49fd28614cc 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Přidat skupinu spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Popis -spacesList.label.name=Název -spacesList.label.spaceTemplate=Šablona spacesList.label.yes=Ano spacesList.label.no=Ne spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Zavřít -spacesList.button.continue=Pokračovat spacesList.button.back=Zpět spacesList.button.cancel=Zrušit spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties index d7b94c23f16..fae383a7976 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=aber Sie können jetzt spacesList.label.noSpacesLink=Ihren ersten Raum hinzufügen. spacesList.label.addNewSpace=Raum hinzufügen spacesList.label.editSpace=Raum {0} bearbeiten -spacesList.label.spaceDetails=Raumdetails: -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Benutzer einladen -spacesList.label.displayName=Anzeigename -spacesList.label.description=Beschreibung -spacesList.label.name=Name -spacesList.label.spaceTemplate=Vorlage spacesList.label.yes=Ja spacesList.label.no=Nein spacesList.label.apply=Anwenden @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Aus Lesezeichen entfernen spacesList.button.requestJoin=Zugang anfordern spacesList.button.cancelRequest=Anfrage abbrechen spacesList.button.close=Schließen -spacesList.button.continue=Fortsetzen spacesList.button.back=Zurück spacesList.button.cancel=Abbrechen spacesList.button.add=Hinzufügen diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties index d2c48563fea..755337c2321 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Προσθήκη Χώρου spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Περιγραφή -spacesList.label.name=Όνομα -spacesList.label.spaceTemplate=Πρότυπο spacesList.label.yes=Ναι spacesList.label.no=Όχι spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Κλείσιμο -spacesList.button.continue=Συνέχεια spacesList.button.back=Επιστροφή spacesList.button.cancel=Ακύρωση spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties index 7be91786b7a..58858f611fa 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties @@ -21,13 +21,23 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template +spacesList.label.nameTitle=Name +spacesList.label.nameLabel=Give a name to your space +spacesList.label.namePlaceholder=Name your space +spacesList.label.propertiesTitle=Properties +spacesList.label.descriptionLabel=Describe your space +spacesList.label.descriptionPlaceholder=Detail purpose of your space +spacesList.label.spaceAccessTitle=Access Control +spacesList.label.avatarLabel=Avatar +spacesList.label.bannerLabel=Banner +spacesList.label.changeBanner=Change Banner +spacesList.label.deleteBanner=Delete Banner +spacesList.label.changeAvatar=Change Avatar +spacesList.label.deleteAvatar=Delete Avatar +spacesList.label.invitationTitle=Invitation +spacesList.label.accessTitle=Access +spacesList.label.visibilityTitle=Visibility spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -35,12 +45,16 @@ spacesList.label.hidden=Hidden spacesList.label.hiddenSpace=Hidden space spacesList.label.registration=Registration spacesList.label.open=Open +spacesList.description.open=Any user can join the space. No validation required. spacesList.label.validation=Request Approval +spacesList.description.validation=User can request to join. Membership must be approved by a host. spacesList.label.closed=Invite Only +spacesList.description.closed=Users can't request to join. They should be invited. spacesList.description.open=Anyone can join. No approval needed. spacesList.description.validation=User can request to join. Membership must be approved by an admin. spacesList.description.closed=Users can't request to join. Admins must send invitations. spacesList.description.hidden=The space is not listed in the space directory +spacesList.label.private=Listed spacesList.description.private=The space is visible in the directory. spacesList.warning=Warning spacesList.warning.descriptionExceededLength=The length of the text in field "Description" must be less than {0} characters. @@ -64,7 +78,7 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue +spacesList.button.next=Next spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add @@ -106,3 +120,5 @@ spacesList.button.copyLink.success=Link copied into the clipboard spacesList.button.copyLink.error=Error while copying site URL spacesList.button.visitPublicSite=Visit public site spacesList.button.openSpace=Open Space +spacesList.title.usersToInvite=Invite users +spacesList.label.pending=Pending diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties index 5b2fac12119..69daa425f82 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=pero puedes empezar por spacesList.label.noSpacesLink=añadir tu primer espacio. spacesList.label.addNewSpace=Añadir un Espacio spacesList.label.editSpace=Editar espacio {0} -spacesList.label.spaceDetails=Detalles del espacio -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invitar usuarios -spacesList.label.displayName=Mostrar nombre -spacesList.label.description=Descripción -spacesList.label.name=Nombre -spacesList.label.spaceTemplate=Plantilla spacesList.label.yes=Sí spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Eliminar de marcadores spacesList.button.requestJoin=Solicitar acceso spacesList.button.cancelRequest=Cancelar solicitud spacesList.button.close=Cerrar -spacesList.button.continue=Continuar spacesList.button.back=Volver spacesList.button.cancel=Cancelar spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties index 0cadea3db8d..e800880a128 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=اضافه کردن فضا spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=شرح -spacesList.label.name=نام -spacesList.label.spaceTemplate=قالب spacesList.label.yes=بله spacesList.label.no=خیر spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=بستن -spacesList.button.continue=ادامه spacesList.button.back=بازگشت spacesList.button.cancel=انصراف spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties index b7970c6b5ec..38bd29ab8d2 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Magdagdag ng Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Paglalarawan -spacesList.label.name=Pangalan -spacesList.label.spaceTemplate=Ang template spacesList.label.yes=Oo spacesList.label.no=Hindi spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Isara -spacesList.button.continue=Ipagpatuloy spacesList.button.back=Likuran spacesList.button.cancel=Kanselahin spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties index 92019adaf79..9eb4d1ae5b6 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=mais vous pouvez commencer par spacesList.label.noSpacesLink=créer votre premier espace. spacesList.label.addNewSpace=Créer un Espace spacesList.label.editSpace=Modifier l'espace {0} -spacesList.label.spaceDetails=Détails de l'espace -spacesList.label.spaceAccess=Gestion des accès spacesList.label.inviteUsers=Inviter des utilisateurs -spacesList.label.displayName=Nom affiché -spacesList.label.description=Description -spacesList.label.name=Nom -spacesList.label.spaceTemplate=Modèle spacesList.label.yes=Oui spacesList.label.no=Non spacesList.label.apply=Appliquer @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Retirer des favoris spacesList.button.requestJoin=Demander l’accès spacesList.button.cancelRequest=Annuler la demande spacesList.button.close=Fermer -spacesList.button.continue=Poursuivre spacesList.button.back=Retour spacesList.button.cancel=Annuler spacesList.button.add=Ajouter diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties index 63aec7618cd..ac7afdaa4dc 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=Tapi Anda bisa memulainya dari spacesList.label.noSpacesLink=Menambahkan forum pertama Anda spacesList.label.addNewSpace=Tambah Forum spacesList.label.editSpace=Edit Forum {0} -spacesList.label.spaceDetails=Rincian Forum -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Undang pengguna -spacesList.label.displayName=Nama Tampilan -spacesList.label.description=Deskripsi -spacesList.label.name=Nama -spacesList.label.spaceTemplate=Templete spacesList.label.yes=Ya spacesList.label.no=Tidak spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Hapus dari yang ditandai spacesList.button.requestJoin=Minta akses spacesList.button.cancelRequest=Batalkan permintaan spacesList.button.close=Tutup -spacesList.button.continue=Lanjutan spacesList.button.back=Kembali spacesList.button.cancel=Batal spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties index d9e936f9d94..9d420a767eb 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Space access spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.hidden=Hidden @@ -63,7 +57,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.filter.all=All spaces diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties index 4cf92514e79..bc732e4de0d 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=ma puoi cominciare spacesList.label.noSpacesLink=aggiungendo il tuo primo spazio. spacesList.label.addNewSpace=Aggiungi spazio spacesList.label.editSpace=Modifica Spazio {0} -spacesList.label.spaceDetails=Dettagli dello spazio -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invita utenti -spacesList.label.displayName=Visualizza nome -spacesList.label.description=Descrizione -spacesList.label.name=Nome -spacesList.label.spaceTemplate=Modello spacesList.label.yes=Si spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Rimuover dai preferiti spacesList.button.requestJoin=Richiedi accesso spacesList.button.cancelRequest=Annulla richiesta spacesList.button.close=Chiudere -spacesList.button.continue=Continua spacesList.button.back=Indietro spacesList.button.cancel=Annulla spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties index 1a69d28500f..b794e31dddf 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=スペースを追加 spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=説明 -spacesList.label.name=名前 -spacesList.label.spaceTemplate=テンプレート spacesList.label.yes=はい spacesList.label.no=いいえ spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=閉じる -spacesList.button.continue=続ける spacesList.button.back=戻る spacesList.button.cancel=キャンセル spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties index d31e5458a1e..0d0e5508b1e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties @@ -20,13 +20,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Space access spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.hidden=Hidden @@ -59,7 +53,6 @@ spacesList.button.join=Join spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.filter.all=All spaces diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties index 447fc245fb9..98d65256701 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Pridėti erdvę spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Aprašymas -spacesList.label.name=Pavadinimas -spacesList.label.spaceTemplate=Šablonas spacesList.label.yes=Taip spacesList.label.no=Ne spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Uždaryti -spacesList.button.continue=Toliau spacesList.button.back=Atgal spacesList.button.cancel=Atšaukti spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties index e1cefecd83a..578aaf4e1e1 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Batal spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties index df3ebc24467..0909597212c 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Ruimte toevoegen spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Beschrijving -spacesList.label.name=Naam -spacesList.label.spaceTemplate=Sjablonen spacesList.label.yes=Ja spacesList.label.no=Nee spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Sluiten -spacesList.button.continue=ga verder spacesList.button.back=Terug spacesList.button.cancel=Annuleren spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties index a21987d0089..27b3f627e6e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Legg til fellesskap spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Beskrivelse -spacesList.label.name=Navn -spacesList.label.spaceTemplate=Mal spacesList.label.yes=Ja spacesList.label.no=Nei spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Lukk -spacesList.button.continue=Gå videre spacesList.button.back=Tilbake spacesList.button.cancel=Avbryt spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties index 73d6f66fa28..26636d98855 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Dodaj przestrzeń spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Opis -spacesList.label.name=Nazwa -spacesList.label.spaceTemplate=Szablon spacesList.label.yes=Tak spacesList.label.no=Nie spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Zamknij -spacesList.button.continue=Kontynuuj spacesList.button.back=Wstecz spacesList.button.cancel=Anuluj spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties index 7a3127e4247..97b45406501 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Adicionar espaço spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Mostrar nome -spacesList.label.description=Descrição -spacesList.label.name=Nome -spacesList.label.spaceTemplate=Modelo spacesList.label.yes=Sim spacesList.label.no=Não spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancelar pedido spacesList.button.close=Fechar -spacesList.button.continue=Continar spacesList.button.back=Voltar spacesList.button.cancel=Cancelar spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties index 377034cef4e..ad5da9d9106 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Adicionar espaço spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Descrição -spacesList.label.name=Nome -spacesList.label.spaceTemplate=Modelo spacesList.label.yes=Sim spacesList.label.no=Não spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Fechar -spacesList.button.continue=Continar spacesList.button.back=Voltar spacesList.button.cancel=Cancelar spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties index 2097c412056..51541c2ca6c 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Adaugă spaţiu spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Descriere -spacesList.label.name=Nume -spacesList.label.spaceTemplate=Şablon spacesList.label.yes=Da spacesList.label.no=Nu spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Închide -spacesList.button.continue=Continuați spacesList.button.back=Înapoi spacesList.button.cancel=Renunță spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties index 2c0c65432f4..a540b1a2b9c 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Добавить область spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Описание -spacesList.label.name=Название -spacesList.label.spaceTemplate=Шаблон spacesList.label.yes=Да spacesList.label.no=Нет spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Закрыть -spacesList.button.continue=Продолжить spacesList.button.back=Назад spacesList.button.cancel=Отмена spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties index 89ae3d2130a..28caa0b56b2 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Dodaj prostor spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Prikazno ime -spacesList.label.description=Opis -spacesList.label.name=Ime -spacesList.label.spaceTemplate=Predloga spacesList.label.yes=Da spacesList.label.no=Ne spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Prekliči prošnjo spacesList.button.close=Zapri -spacesList.button.continue=Nadaljuj spacesList.button.back=Nazaj spacesList.button.cancel=Prekliči spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties index 5690663a40c..6bf312e791e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=crwdns42012:0crwdne42012:0 spacesList.label.noSpacesLink=crwdns42014:0crwdne42014:0 spacesList.label.addNewSpace=crwdns42016:0crwdne42016:0 spacesList.label.editSpace=crwdns42018:0{0}crwdne42018:0 -spacesList.label.spaceDetails=crwdns42020:0crwdne42020:0 -spacesList.label.spaceAccess=crwdns42022:0crwdne42022:0 spacesList.label.inviteUsers=crwdns42024:0crwdne42024:0 -spacesList.label.displayName=crwdns42026:0crwdne42026:0 -spacesList.label.description=crwdns42028:0crwdne42028:0 -spacesList.label.name=crwdns42030:0crwdne42030:0 -spacesList.label.spaceTemplate=crwdns42032:0crwdne42032:0 spacesList.label.yes=crwdns42034:0crwdne42034:0 spacesList.label.no=crwdns42036:0crwdne42036:0 spacesList.label.apply=crwdns91216:0crwdne91216:0 @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=crwdns42096:0crwdne42096:0 spacesList.button.requestJoin=crwdns42098:0crwdne42098:0 spacesList.button.cancelRequest=crwdns42100:0crwdne42100:0 spacesList.button.close=crwdns42102:0crwdne42102:0 -spacesList.button.continue=crwdns42104:0crwdne42104:0 spacesList.button.back=crwdns42106:0crwdne42106:0 spacesList.button.cancel=crwdns42108:0crwdne42108:0 spacesList.button.add=crwdns91220:0crwdne91220:0 diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties index 82aaef8f484..0d67e5203fa 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Lägg till webb-yta spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Beskrivning -spacesList.label.name=Namn -spacesList.label.spaceTemplate=Mall spacesList.label.yes=Ja spacesList.label.no=Nej spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Stäng -spacesList.button.continue=Fortsätt spacesList.button.back=Tillbaka spacesList.button.cancel=Avbryt spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties index 7be91786b7a..a406a728e0e 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Close -spacesList.button.continue=Continue spacesList.button.back=Back spacesList.button.cancel=Cancel spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties index 82cc81c4f00..f38afb6129b 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Magdagdag ng Espasyo spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Description -spacesList.label.name=Name -spacesList.label.spaceTemplate=Ang Template spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Sarado -spacesList.button.continue=Magpatuloy spacesList.button.back=Bumalik spacesList.button.cancel=Kanselahin spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties index 3ba70575905..48e3ea60f02 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=ancak ilk alanınızı spacesList.label.noSpacesLink=ekleyerek başlayabilirsiniz. spacesList.label.addNewSpace=Alan Ekle spacesList.label.editSpace={0} Alanını Düzenleyin -spacesList.label.spaceDetails=Alan ayrıntıları -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Kullanıcıları davet et -spacesList.label.displayName=Ekran adı -spacesList.label.description=Açıklama -spacesList.label.name=Ad -spacesList.label.spaceTemplate=Şablon spacesList.label.yes=Evet spacesList.label.no=Hayır spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Erişim isteği gönderin spacesList.button.cancelRequest=İsteği iptal et spacesList.button.close=Kapat -spacesList.button.continue=Devam spacesList.button.back=Geri spacesList.button.cancel=İptal spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties index 4c41101a496..114410a7d3d 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=але ви можете почати spacesList.label.noSpacesLink=додавання вашої першої області. spacesList.label.addNewSpace=Додати область spacesList.label.editSpace=Редагувати область {0} -spacesList.label.spaceDetails=Деталі області -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Запросити користувачів -spacesList.label.displayName=Відображуване ім'я -spacesList.label.description=Опис -spacesList.label.name=Ім’я -spacesList.label.spaceTemplate=Шаблон spacesList.label.yes=Так spacesList.label.no=Ні spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Запит доступу spacesList.button.cancelRequest=Скасувати запит spacesList.button.close=Закрити -spacesList.button.continue=Продовжити spacesList.button.back=Назад spacesList.button.cancel=Скасувати spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties index e08c0d7d673..08eb7f529b7 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Add Space spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=تفصیل -spacesList.label.name=نام -spacesList.label.spaceTemplate=سانچا spacesList.label.yes=Yes spacesList.label.no=No spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=بند -spacesList.button.continue=Continue spacesList.button.back=پىچھے spacesList.button.cancel=منسوخ spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties index ff60ac23daa..ec9220d7f42 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=Thêm Nhóm spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=Mô tả -spacesList.label.name=Tên -spacesList.label.spaceTemplate=Mẫu thiết kế spacesList.label.yes=Có spacesList.label.no=Không spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=Đóng -spacesList.button.continue=Tiếp tục spacesList.button.back=Trở lại spacesList.button.cancel=Hủy bỏ spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties index 9a8f17e3ce2..7b67a66f907 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=添加空间 spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=说明 -spacesList.label.name=名称 -spacesList.label.spaceTemplate=模板 spacesList.label.yes=是 spacesList.label.no=否 spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=关闭 -spacesList.button.continue=继续 spacesList.button.back=返回 spacesList.button.cancel=取消 spacesList.button.add=Add diff --git a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties index f468963e6ab..75273044b08 100644 --- a/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties +++ b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties @@ -21,13 +21,7 @@ spacesList.label.noSpacesYetDescription2=but you can start by spacesList.label.noSpacesLink=adding your first space. spacesList.label.addNewSpace=新增空間 spacesList.label.editSpace=Edit Space {0} -spacesList.label.spaceDetails=Space details -spacesList.label.spaceAccess=Access Rules spacesList.label.inviteUsers=Invite users -spacesList.label.displayName=Display name -spacesList.label.description=描述 -spacesList.label.name=名稱 -spacesList.label.spaceTemplate=模板 spacesList.label.yes=是 spacesList.label.no=否 spacesList.label.apply=Apply @@ -64,7 +58,6 @@ spacesList.button.removeBookmark=Remove from bookmarked spacesList.button.requestJoin=Request access spacesList.button.cancelRequest=Cancel request spacesList.button.close=關閉 -spacesList.button.continue=繼續 spacesList.button.back=返回 spacesList.button.cancel=取消 spacesList.button.add=Add diff --git a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml index 577561fa9ba..fa42926a1d5 100644 --- a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml @@ -47,7 +47,7 @@ HamburgerMenu Enterprise /skin/css/portlet/HamburgerMenu/Style.css - 1 + ImageCropper @@ -103,6 +103,20 @@ ImageCropper + + social + SpacesAdministration + Enterprise + ImageCropper + + + + social + SpacesList + Enterprise + ImageCropper + + social MembersPortlet diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp index d3255677759..fb0a21d3e5d 100644 --- a/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp @@ -1,5 +1,7 @@ <%@page import="io.meeds.social.navigation.constant.SidebarMode"%> <%@page import="io.meeds.social.navigation.service.NavigationConfigurationService"%> +<%@page import="io.meeds.portal.security.service.SecuritySettingService"%> +<%@page import="io.meeds.portal.security.constant.UserRegistrationType"%> <%@page import="org.exoplatform.social.core.identity.model.Identity"%> <%@page import="io.meeds.social.util.JsonUtils"%> <%@page import="org.exoplatform.social.notification.service.SpaceWebNotificationService"%> @@ -41,6 +43,9 @@ } ((PortalHttpServletResponseWrapper) rcontext.getResponse()).addHeader("Link", "; rel=preload; as=fetch; crossorigin=use-credentials", false); + + SecuritySettingService securitySettingService = ExoContainerContext.getService(SecuritySettingService.class); + boolean isExternalFeatureEnabled = securitySettingService.getRegistrationType() == UserRegistrationType.OPEN || securitySettingService.isRegistrationExternalUser(); %>
@@ -79,7 +84,7 @@ <% } %>
\ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceTemplateManagement.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceTemplateManagement.jsp new file mode 100644 index 00000000000..0efd5754e31 --- /dev/null +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceTemplateManagement.jsp @@ -0,0 +1,16 @@ +<%@page import="org.exoplatform.container.ExoContainerContext"%> +<%@page import="io.meeds.portal.security.service.SecuritySettingService"%> +<%@page import="io.meeds.portal.security.constant.UserRegistrationType"%> +<% + SecuritySettingService securitySettingService = ExoContainerContext.getService(SecuritySettingService.class); + boolean isExternalFeatureEnabled = securitySettingService.getRegistrationType() == UserRegistrationType.OPEN || securitySettingService.isRegistrationExternalUser(); +%> +
+
+ +
+
diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesAdministration.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesAdministration.jsp new file mode 100644 index 00000000000..6780fdbc527 --- /dev/null +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesAdministration.jsp @@ -0,0 +1,16 @@ +<%@page import="org.exoplatform.container.ExoContainerContext"%> +<%@page import="io.meeds.portal.security.service.SecuritySettingService"%> +<%@page import="io.meeds.portal.security.constant.UserRegistrationType"%> +<% + SecuritySettingService securitySettingService = ExoContainerContext.getService(SecuritySettingService.class); + boolean isExternalFeatureEnabled = securitySettingService.getRegistrationType() == UserRegistrationType.OPEN || securitySettingService.isRegistrationExternalUser(); +%> +
+
+ +
+
\ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp index a45d6a81053..977a8d6a71c 100644 --- a/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp @@ -1,5 +1,7 @@ <%@page import="io.meeds.social.space.template.service.SpaceTemplateService"%> <%@page import="org.exoplatform.container.ExoContainerContext"%> +<%@page import="io.meeds.portal.security.service.SecuritySettingService"%> +<%@page import="io.meeds.portal.security.constant.UserRegistrationType"%> <% Object filter = request.getAttribute("filter"); if (filter == null) { @@ -9,6 +11,8 @@ } boolean canCreateSpace = ExoContainerContext.getService(SpaceTemplateService.class) .canCreateSpace(request.getRemoteUser()); + SecuritySettingService securitySettingService = ExoContainerContext.getService(SecuritySettingService.class); + boolean isExternalFeatureEnabled = securitySettingService.getRegistrationType() == UserRegistrationType.OPEN || securitySettingService.isRegistrationExternalUser(); %>
diff --git a/webapp/src/main/webapp/WEB-INF/portlet.xml b/webapp/src/main/webapp/WEB-INF/portlet.xml index a84b33f6758..79f4e854653 100644 --- a/webapp/src/main/webapp/WEB-INF/portlet.xml +++ b/webapp/src/main/webapp/WEB-INF/portlet.xml @@ -432,10 +432,8 @@ org.exoplatform.commons.api.portlet.GenericDispatchedViewPortlet portlet-view-dispatched-file-path - /html/spacesAdministration.html + /WEB-INF/jsp/portlet/spacesAdministration.jsp - -1 - PUBLIC text/html @@ -1057,10 +1055,8 @@ org.exoplatform.commons.api.portlet.GenericDispatchedViewPortlet portlet-view-dispatched-file-path - /html/spaceTemplateManagement.html + /WEB-INF/jsp/portlet/spaceTemplateManagement.jsp - -1 - PUBLIC text/html diff --git a/webapp/src/main/webapp/html/spaceTemplateManagement.html b/webapp/src/main/webapp/html/spaceTemplateManagement.html deleted file mode 100644 index 2cbaacc41a2..00000000000 --- a/webapp/src/main/webapp/html/spaceTemplateManagement.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
- -
-
diff --git a/webapp/src/main/webapp/html/spacesAdministration.html b/webapp/src/main/webapp/html/spacesAdministration.html deleted file mode 100644 index ddcbfcee67c..00000000000 --- a/webapp/src/main/webapp/html/spacesAdministration.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
- -
-
\ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/common/js/SuggesterService.js b/webapp/src/main/webapp/vue-apps/common/js/SuggesterService.js index e4b9b1c0fa7..6586e378bdd 100644 --- a/webapp/src/main/webapp/vue-apps/common/js/SuggesterService.js +++ b/webapp/src/main/webapp/vue-apps/common/js/SuggesterService.js @@ -51,6 +51,7 @@ function searchSpaces(filter, items, onlyRedactor, excludeRedactionalSpace, only fullName: item.displayName, originalName: item.shortName, avatarUrl: item.avatarUrl ? item.avatarUrl : `/portal/rest/v1/social/spaces/${item.prettyName}/avatar`, + membersCount: item.membersCount, }, }); } diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/Sidebar.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/Sidebar.vue index 25172bcb99a..b11521445ea 100644 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/Sidebar.vue +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/Sidebar.vue @@ -189,6 +189,11 @@ export default { this.interval = window.setTimeout(() => this.closeMenu(), 500); } }, + icon() { + if (this.icon) { + this.firstLevelDrawer = false; + } + }, site() { this.$root.openedSiteName = this.site?.name; }, diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarButton.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarButton.vue index 4f9a8d45e20..a140ff73eb1 100644 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarButton.vue +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarButton.vue @@ -30,12 +30,8 @@ fa-bars
+ :class="$vuetify.rtl && 'l-0' || 'r-0'" + class="hamburger-unread-badge position-absolute">
diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/main.js b/webapp/src/main/webapp/vue-apps/hamburger-menu/main.js index bb440e51eb8..652cc73fee5 100644 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/main.js +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/main.js @@ -39,7 +39,7 @@ document.dispatchEvent(new CustomEvent('displayTopBarLoading')); const appId = 'HamburgerNavigationMenu'; -export function init(mode, defaultUserPath, unreadPerSpace, avatarUrl) { +export function init(mode, defaultUserPath, unreadPerSpace, avatarUrl, isExternalFeatureEnabled) { exoi18n.loadLanguageAsync(lang, url) .then(i18n => { // init Vue app when locale ressources are ready @@ -49,6 +49,7 @@ export function init(mode, defaultUserPath, unreadPerSpace, avatarUrl) { unreadPerSpace, avatarUrl, mode, + isExternalFeatureEnabled, hoverFirstLevel: false, hoverSecondLevel: false, hoverThirdLevel: false, @@ -61,7 +62,7 @@ export function init(mode, defaultUserPath, unreadPerSpace, avatarUrl) { openedSpaceTemplateName: null, sites: null, settings: null, - overlayOpened: null, + openedOverlay: false, hoverDeferred: false, rtl: eXo.env.portal.orientation === 'rtl', ltr: eXo.env.portal.orientation === 'ltr', @@ -112,14 +113,14 @@ export function init(mode, defaultUserPath, unreadPerSpace, avatarUrl) { expand() { if (this.icon) { window.setTimeout(() => { - if (this.expand && !this.overlayOpened) { + if (this.expand && !this.openedOverlay) { document.dispatchEvent(new CustomEvent('drawerOpened')); - this.overlayOpened = true; - } else if (!this.expand && this.overlayOpened) { + this.openedOverlay = true; + } else if (!this.expand && this.openedOverlay) { if (!eXo.openedDrawers?.length) { document.dispatchEvent(new CustomEvent('drawerClosed')); } - this.overlayOpened = false; + this.openedOverlay = false; } }, 200); } @@ -142,8 +143,29 @@ export function init(mode, defaultUserPath, unreadPerSpace, avatarUrl) { immediate: true, handler() { this.updateParentStyle(); + if (this.hover) { + this.openedOverlay = true; + } else { + window.setTimeout(() => { + document.dispatchEvent(new CustomEvent('drawerClosed')); + }, 300); + } }, - } + }, + sticky() { + if (this.sticky) { + window.setTimeout(() => { + document.dispatchEvent(new CustomEvent('drawerClosed')); + }, 300); + } + }, + hidden() { + if (!this.hidden) { + if (eXo.openedDrawers?.find?.(d => d?.$el?.classList?.contains('HamburgerMenuFirstLevelParent'))) { + eXo.openedDrawers = eXo.openedDrawers.filter(d => !d?.$el?.classList?.contains('HamburgerMenuFirstLevelParent')); + } + } + }, }, created() { document.addEventListener('homeLinkUpdated', this.updateUserHome); diff --git a/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAccess.vue b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAccess.vue new file mode 100644 index 00000000000..1e75d8010ea --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAccess.vue @@ -0,0 +1,152 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAvatar.vue b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAvatar.vue new file mode 100644 index 00000000000..9f94c71d3c3 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormAvatar.vue @@ -0,0 +1,123 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormBanner.vue b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormBanner.vue new file mode 100644 index 00000000000..4a22b410d83 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormBanner.vue @@ -0,0 +1,116 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormDrawer.vue b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormDrawer.vue index d0032c904da..f85e5234b9a 100644 --- a/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormDrawer.vue +++ b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormDrawer.vue @@ -29,196 +29,155 @@ @opened="stepper = 1" @closed="stepper = 0"> -