You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/06/24 14:11:56 UTC
[cloudstack-primate] branch master updated: config: allow admins to
configure global footer html
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 5780b40 config: allow admins to configure global footer html
5780b40 is described below
commit 5780b4044ae2164b87d9f0925c10e97b342f3a08
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Jun 24 19:41:22 2020 +0530
config: allow admins to configure global footer html
Fixes #452
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
public/config.json | 1 +
src/components/page/GlobalFooter.vue | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/public/config.json b/public/config.json
index 9f08bb3..ac916c5 100644
--- a/public/config.json
+++ b/public/config.json
@@ -2,6 +2,7 @@
"apiBase": "/client/api",
"docBase": "http://docs.cloudstack.apache.org/en/latest",
"appTitle": "CloudStack",
+ "footer": "Licensed under the <a href='http://www.apache.org/licenses/' target='_blank'>Apache License</a>, Version 2.0.",
"logo": "assets/logo.svg",
"banner": "assets/banner.svg",
"error": {
diff --git a/src/components/page/GlobalFooter.vue b/src/components/page/GlobalFooter.vue
index 1df96d4..bd63d7a 100644
--- a/src/components/page/GlobalFooter.vue
+++ b/src/components/page/GlobalFooter.vue
@@ -17,7 +17,10 @@
<template>
<div class="footer">
- <div class="links">
+ <div class="line">
+ <span v-html="$config.footer" />
+ </div>
+ <div class="line" v-if="$store.getters.userInfo.roletype === 'Admin'">
CloudStack {{ $store.getters.features.cloudstackversion }}
<a-divider type="vertical" />
Primate {{ $store.getters.version }}
@@ -46,7 +49,7 @@ export default {
margin: 48px 0 24px;
text-align: center;
- .links {
+ .line {
margin-bottom: 8px;
a {