diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties index 63eb680f2..de1c14324 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties @@ -40,11 +40,12 @@ spring.http.multipart.max-file-size=1024MB spring.http.multipart.max-request-size=-1 # UI help links -hawkbit.server.ui.links.documentation.root=https://github.com/eclipse/hawkbit -hawkbit.server.ui.links.documentation.deployment-view=https://github.com/eclipse/hawkbit -hawkbit.server.ui.links.documentation.distribution-view=https://github.com/eclipse/hawkbit -hawkbit.server.ui.links.documentation.rollout-view=https://github.com/eclipse/hawkbit -hawkbit.server.ui.links.documentation.security=https://github.com/eclipse/hawkbit -hawkbit.server.ui.links.documentation.system-configuration-view=https://github.com/eclipse/hawkbit -hawkbit.server.ui.links.documentation.targetfilter-view=https://github.com/eclipse/hawkbit -hawkbit.server.ui.links.documentation.upload-view=https://github.com/eclipse/hawkbit +hawkbit.server.ui.links.documentation.root=https://www.eclipse.org/hawkbit/documentation/overview/introduction.html +hawkbit.server.ui.links.documentation.security=https://www.eclipse.org/hawkbit/documentation/security/security.html + +hawkbit.server.ui.links.documentation.deployment-view=https://www.eclipse.org/hawkbit/documentation/interfaces/management-ui.html +hawkbit.server.ui.links.documentation.distribution-view=https://www.eclipse.org/hawkbit/documentation/interfaces/management-ui.html +hawkbit.server.ui.links.documentation.rollout-view=https://www.eclipse.org/hawkbit/documentation/interfaces/management-ui.html +hawkbit.server.ui.links.documentation.system-configuration-view=https://www.eclipse.org/hawkbit/documentation/interfaces/management-ui.html +hawkbit.server.ui.links.documentation.targetfilter-view=https://www.eclipse.org/hawkbit/documentation/interfaces/management-ui.html +hawkbit.server.ui.links.documentation.upload-view=https://www.eclipse.org/hawkbit/documentation/interfaces/management-ui.html diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/public/favicon.ico b/hawkbit-runtime/hawkbit-update-server/src/main/resources/public/favicon.ico new file mode 100644 index 000000000..12c8777d5 Binary files /dev/null and b/hawkbit-runtime/hawkbit-update-server/src/main/resources/public/favicon.ico differ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java index 7c1938466..59f03cc8e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java @@ -319,6 +319,7 @@ public final class SPUIComponentProvider { final Link link = new Link(name, new ExternalResource(resource)); link.setId(id); link.setIcon(icon); + link.setDescription(name); link.setTargetName(targetOpen); if (style != null) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java index 0d76764e8..ac1d43f1b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import org.springframework.util.StringUtils; import org.eclipse.hawkbit.HawkbitServerProperties; import org.eclipse.hawkbit.im.authentication.PermissionService; import org.eclipse.hawkbit.ui.UiProperties; @@ -28,6 +27,7 @@ import org.eclipse.hawkbit.ui.menu.DashboardEvent.PostViewChangeEvent; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.eclipse.hawkbit.ui.utils.VaadinMessageSource; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import com.vaadin.server.FontAwesome; import com.vaadin.server.Page; @@ -145,7 +145,6 @@ public final class DashboardMenu extends CustomComponent { final Link docuLink = SPUIComponentProvider.getLink(UIComponentIdProvider.LINK_DOCUMENTATION, i18n.getMessage("link.documentation.name"), uiProperties.getLinks().getDocumentation().getRoot(), FontAwesome.QUESTION_CIRCLE, "_blank", linkStyle); - docuLink.setDescription(i18n.getMessage("link.documentation.name")); docuLink.setSizeFull(); links.addComponent(docuLink); links.setComponentAlignment(docuLink, Alignment.BOTTOM_CENTER); @@ -155,7 +154,6 @@ public final class DashboardMenu extends CustomComponent { final Link userManagementLink = SPUIComponentProvider.getLink(UIComponentIdProvider.LINK_USERMANAGEMENT, i18n.getMessage("link.usermanagement.name"), uiProperties.getLinks().getUserManagement(), FontAwesome.USERS, "_blank", linkStyle); - userManagementLink.setDescription(i18n.getMessage("link.usermanagement.name")); links.addComponent(userManagementLink); userManagementLink.setSizeFull(); links.setComponentAlignment(userManagementLink, Alignment.BOTTOM_CENTER); @@ -165,7 +163,6 @@ public final class DashboardMenu extends CustomComponent { final Link supportLink = SPUIComponentProvider.getLink(UIComponentIdProvider.LINK_SUPPORT, i18n.getMessage("link.support.name"), uiProperties.getLinks().getSupport(), FontAwesome.ENVELOPE_O, "", linkStyle); - supportLink.setDescription(i18n.getMessage("link.support.name")); supportLink.setSizeFull(); links.addComponent(supportLink); links.setComponentAlignment(supportLink, Alignment.BOTTOM_CENTER); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java index d9aafa9f3..d0d8e8340 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.ui.tenantconfiguration; import org.eclipse.hawkbit.repository.TenantConfigurationManagement; import org.eclipse.hawkbit.security.SecurityTokenGenerator; +import org.eclipse.hawkbit.ui.UiProperties; import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.tenantconfiguration.authentication.AnonymousDownloadAuthenticationConfigurationItem; import org.eclipse.hawkbit.ui.tenantconfiguration.authentication.CertificateAuthenticationConfigurationItem; @@ -24,6 +25,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; @@ -47,6 +49,8 @@ public class AuthenticationConfigurationView extends BaseConfigurationView private final AnonymousDownloadAuthenticationConfigurationItem anonymousDownloadAuthenticationConfigurationItem; + private final UiProperties uiProperties; + private CheckBox gatewaySecTokenCheckBox; private CheckBox targetSecTokenCheckBox; @@ -57,8 +61,9 @@ public class AuthenticationConfigurationView extends BaseConfigurationView AuthenticationConfigurationView(final VaadinMessageSource i18n, final TenantConfigurationManagement tenantConfigurationManagement, - final SecurityTokenGenerator securityTokenGenerator) { + final SecurityTokenGenerator securityTokenGenerator, final UiProperties uiProperties) { this.i18n = i18n; + this.uiProperties = uiProperties; this.certificateAuthenticationConfigurationItem = new CertificateAuthenticationConfigurationItem( tenantConfigurationManagement, i18n); this.targetSecurityTokenAuthenticationConfigurationItem = new TargetSecurityTokenAuthenticationConfigurationItem( @@ -86,11 +91,14 @@ public class AuthenticationConfigurationView extends BaseConfigurationView headerDisSetType.addStyleName("config-panel-header"); vLayout.addComponent(headerDisSetType); + final Link linkToSecurityHelp = SPUIComponentProvider + .getHelpLink(uiProperties.getLinks().getDocumentation().getSecurity()); + vLayout.addComponent(linkToSecurityHelp); + final GridLayout gridLayout = new GridLayout(2, 4); gridLayout.setSpacing(true); gridLayout.setImmediate(true); gridLayout.setColumnExpandRatio(1, 1.0F); - gridLayout.setSizeFull(); certificateAuthCheckbox = SPUIComponentProvider.getCheckBox("", DIST_CHECKBOX_STYLE, null, false, ""); certificateAuthCheckbox.setValue(certificateAuthenticationConfigurationItem.isConfigEnabled()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java index 6d60a245b..3528959c3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java @@ -86,7 +86,7 @@ public class TenantConfigurationDashboardView extends CustomComponent implements this.defaultDistributionSetTypeLayout = new DefaultDistributionSetTypeLayout(systemManagement, distributionSetTypeManagement, i18n, permChecker); this.authenticationConfigurationView = new AuthenticationConfigurationView(i18n, tenantConfigurationManagement, - securityTokenGenerator); + securityTokenGenerator, uiProperties); this.pollingConfigurationView = new PollingConfigurationView(i18n, controllerPollProperties, tenantConfigurationManagement); this.repositoryConfigurationView = new RepositoryConfigurationView(i18n, tenantConfigurationManagement);