diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index 60bb071e1..7c956a05c 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -127,6 +127,7 @@ func initSettings(settingsService portainer.SettingsService, flags *portainer.CL if err == portainer.ErrSettingsNotFound { settings := &portainer.Settings{ LogoURL: *flags.Logo, + DisplayDonationHeader: true, DisplayExternalContributors: false, AuthenticationMethod: portainer.AuthenticationInternal, LDAPSettings: portainer.LDAPSettings{ diff --git a/api/http/handler/settings.go b/api/http/handler/settings.go index 5e47c92f5..40b14977b 100644 --- a/api/http/handler/settings.go +++ b/api/http/handler/settings.go @@ -46,6 +46,7 @@ func NewSettingsHandler(bouncer *security.RequestBouncer) *SettingsHandler { type ( publicSettingsResponse struct { LogoURL string `json:"LogoURL"` + DisplayDonationHeader bool `json:"DisplayDonationHeader"` DisplayExternalContributors bool `json:"DisplayExternalContributors"` AuthenticationMethod portainer.AuthenticationMethod `json:"AuthenticationMethod"` AllowBindMountsForRegularUsers bool `json:"AllowBindMountsForRegularUsers"` @@ -56,6 +57,7 @@ type ( TemplatesURL string `valid:"required"` LogoURL string `valid:""` BlackListedLabels []portainer.Pair `valid:""` + DisplayDonationHeader bool `valid:""` DisplayExternalContributors bool `valid:""` AuthenticationMethod int `valid:"required"` LDAPSettings portainer.LDAPSettings `valid:""` @@ -90,6 +92,7 @@ func (handler *SettingsHandler) handleGetPublicSettings(w http.ResponseWriter, r publicSettings := &publicSettingsResponse{ LogoURL: settings.LogoURL, + DisplayDonationHeader: settings.DisplayDonationHeader, DisplayExternalContributors: settings.DisplayExternalContributors, AuthenticationMethod: settings.AuthenticationMethod, AllowBindMountsForRegularUsers: settings.AllowBindMountsForRegularUsers, @@ -118,6 +121,7 @@ func (handler *SettingsHandler) handlePutSettings(w http.ResponseWriter, r *http TemplatesURL: req.TemplatesURL, LogoURL: req.LogoURL, BlackListedLabels: req.BlackListedLabels, + DisplayDonationHeader: req.DisplayDonationHeader, DisplayExternalContributors: req.DisplayExternalContributors, LDAPSettings: req.LDAPSettings, AllowBindMountsForRegularUsers: req.AllowBindMountsForRegularUsers, diff --git a/api/portainer.go b/api/portainer.go index c437f0df6..050e70fc7 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -73,6 +73,7 @@ type ( TemplatesURL string `json:"TemplatesURL"` LogoURL string `json:"LogoURL"` BlackListedLabels []Pair `json:"BlackListedLabels"` + DisplayDonationHeader bool `json:"DisplayDonationHeader"` DisplayExternalContributors bool `json:"DisplayExternalContributors"` AuthenticationMethod AuthenticationMethod `json:"AuthenticationMethod"` LDAPSettings LDAPSettings `json:"LDAPSettings"` diff --git a/api/swagger.yaml b/api/swagger.yaml index 3e5abf7fc..edbfab891 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -1880,6 +1880,10 @@ definitions: description: "URL to a logo that will be displayed on the login page as well\ \ as on top of the sidebar. Will use default Portainer logo when value is\ \ empty string" + DisplayDonationHeader: + type: "boolean" + example: true + description: "Whether to display or not the donation message in the header."\ DisplayExternalContributors: type: "boolean" example: false @@ -1983,6 +1987,10 @@ definitions: \ when querying containers" items: $ref: "#/definitions/Settings_BlackListedLabels" + DisplayDonationHeader: + type: "boolean" + example: true + description: "Whether to display or not the donation message in the header." DisplayExternalContributors: type: "boolean" example: false @@ -2398,6 +2406,10 @@ definitions: \ when querying containers" items: $ref: "#/definitions/Settings_BlackListedLabels" + DisplayDonationHeader: + type: "boolean" + example: true + description: "Whether to display or not the donation message in the header." DisplayExternalContributors: type: "boolean" example: false diff --git a/app/components/about/about.html b/app/components/about/about.html new file mode 100644 index 000000000..918c8532a --- /dev/null +++ b/app/components/about/about.html @@ -0,0 +1,100 @@ + + + + + About Portainer + + + +
+
+ + + Portainer is a free and open-source software brought to you with by portainer.io and contributors. + + +
+
+ +
+
+ + + +
+

+ It is a community effort to make Portainer as feature-rich as simple it is to deploy and use. We need all the help we can get! +

+

+ Fund our work +

+

+

+ Contribute +

+

+

+ Spread the word +

    +
  • Talk to your friends and colleagues about how awesome Portainer is!
    • +
  • Follow us on Twitter
    • +
+

+
+ + +
+
+ +
+
+ + + +
+

+ Documentation +

+

+

+ Community support +

+

+

+ Services +

+

+
+ + +
+
+ +
+
+ + + +
+ Portainer has full support for Docker >=1.10 and Docker Swarm >= 1.2.3, and partial support for Docker 1.9 (some features may not be available). +
+ + +
+
diff --git a/app/components/settings/settings.html b/app/components/settings/settings.html index 1cc2e712b..a12aa4f0c 100644 --- a/app/components/settings/settings.html +++ b/app/components/settings/settings.html @@ -9,6 +9,43 @@
+
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + You can specify the URL to your logo here. For an optimal display, logo dimensions should be 155px by 55px. + +
+
+ +
+ +
+
+
+
Security @@ -36,36 +73,6 @@
- -
- Logo -
-
-
- - -
-
-
-
- - You can specify the URL to your logo here. For an optimal display, logo dimensions should be 155px by 55px. - -
-
- -
- -
-
-
-
App Templates diff --git a/app/components/settings/settingsController.js b/app/components/settings/settingsController.js index ef177641b..a9ee117fa 100644 --- a/app/components/settings/settingsController.js +++ b/app/components/settings/settingsController.js @@ -9,6 +9,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ $scope.formValues = { customLogo: false, customTemplates: false, + donationHeader: true, externalContributions: false, restrictBindMounts: false, restrictPrivilegedMode: false, @@ -45,6 +46,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ settings.TemplatesURL = DEFAULT_TEMPLATES_URL; } + settings.DisplayDonationHeader = !$scope.formValues.donationHeader; settings.DisplayExternalContributors = !$scope.formValues.externalContributions; settings.AllowBindMountsForRegularUsers = !$scope.formValues.restrictBindMounts; settings.AllowPrivilegedModeForRegularUsers = !$scope.formValues.restrictPrivilegedMode; @@ -63,6 +65,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ .then(function success(data) { Notifications.success('Settings updated'); StateManager.updateLogo(settings.LogoURL); + StateManager.updateDonationHeader(settings.DisplayDonationHeader); StateManager.updateExternalContributions(settings.DisplayExternalContributors); if (resetForm) { resetFormValues(); @@ -87,6 +90,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ if (settings.TemplatesURL !== DEFAULT_TEMPLATES_URL) { $scope.formValues.customTemplates = true; } + $scope.formValues.donationHeader = !settings.DisplayDonationHeader; $scope.formValues.externalContributions = !settings.DisplayExternalContributors; $scope.formValues.restrictBindMounts = !settings.AllowBindMountsForRegularUsers; $scope.formValues.restrictPrivilegedMode = !settings.AllowPrivilegedModeForRegularUsers; diff --git a/app/components/sidebar/sidebar.html b/app/components/sidebar/sidebar.html index db12a7dca..dd1b0d293 100644 --- a/app/components/sidebar/sidebar.html +++ b/app/components/sidebar/sidebar.html @@ -9,75 +9,75 @@
diff --git a/app/directives/header-title.js b/app/directives/header-title.js index 3001d4f34..167c09ef1 100644 --- a/app/directives/header-title.js +++ b/app/directives/header-title.js @@ -1,6 +1,6 @@ angular .module('portainer') -.directive('rdHeaderTitle', ['Authentication', function rdHeaderTitle(Authentication) { +.directive('rdHeaderTitle', ['Authentication', 'StateManager', function rdHeaderTitle(Authentication, StateManager) { var directive = { requires: '^rdHeader', scope: { @@ -8,9 +8,10 @@ angular }, link: function (scope, iElement, iAttrs) { scope.username = Authentication.getUserDetails().username; + scope.displayDonationHeader = StateManager.getState().application.displayDonationHeader; }, transclude: true, - template: '
{{title}} {{username}}
', + template: '
{{title}} {{username}} Help support portainer
', restrict: 'E' }; return directive; diff --git a/app/models/api/settings/settings.js b/app/models/api/settings/settings.js index 4c130b052..300de0733 100644 --- a/app/models/api/settings/settings.js +++ b/app/models/api/settings/settings.js @@ -2,6 +2,7 @@ function SettingsViewModel(data) { this.TemplatesURL = data.TemplatesURL; this.LogoURL = data.LogoURL; this.BlackListedLabels = data.BlackListedLabels; + this.DisplayDonationHeader = data.DisplayDonationHeader; this.DisplayExternalContributors = data.DisplayExternalContributors; this.AuthenticationMethod = data.AuthenticationMethod; this.LDAPSettings = data.LDAPSettings; diff --git a/app/routes.js b/app/routes.js index 265096184..0482b1db6 100644 --- a/app/routes.js +++ b/app/routes.js @@ -537,6 +537,18 @@ function configureRoutes($stateProvider) { } } }) + .state('settings_about', { + url: '^/settings/about', + views: { + 'content@': { + templateUrl: 'app/components/about/about.html' + }, + 'sidebar@': { + templateUrl: 'app/components/sidebar/sidebar.html', + controller: 'SidebarController' + } + } + }) .state('settings_authentication', { url: '^/settings/authentication', views: { diff --git a/app/services/stateManager.js b/app/services/stateManager.js index 9385237a7..bd5e70d9e 100644 --- a/app/services/stateManager.js +++ b/app/services/stateManager.js @@ -29,6 +29,11 @@ angular.module('portainer.services') LocalStorage.storeApplicationState(state.application); }; + manager.updateDonationHeader = function(displayDonationHeader) { + state.application.displayDonationHeader = displayDonationHeader; + LocalStorage.storeApplicationState(state.application); + }; + manager.initialize = function () { var deferred = $q.defer(); @@ -55,6 +60,7 @@ angular.module('portainer.services') state.application.endpointManagement = status.EndpointManagement; state.application.version = status.Version; state.application.logo = settings.LogoURL; + state.application.displayDonationHeader = settings.DisplayDonationHeader; state.application.displayExternalContributors = settings.DisplayExternalContributors; LocalStorage.storeApplicationState(state.application); deferred.resolve(state);