You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2019/08/14 18:09:49 UTC
[qpid-dispatch] branch master updated: DISPATCH-1376 Remove
copyright and rename console config file
This is an automated email from the ASF dual-hosted git repository.
eallen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new 11cb5e5 DISPATCH-1376 Remove copyright and rename console config file
11cb5e5 is described below
commit 11cb5e51e9e87b5f867a1b2ed12ecdc85e671ddd
Author: Ernest Allen <ea...@redhat.com>
AuthorDate: Wed Aug 14 14:08:56 2019 -0400
DISPATCH-1376 Remove copyright and rename console config file
---
console/CMakeLists.txt | 2 +-
console/stand-alone/config.json | 3 +++
console/stand-alone/console-config.json | 4 ----
console/stand-alone/plugin/js/qdrAbout.js | 6 +++---
console/stand-alone/plugin/js/qdrGlobals.js | 17 ++++-------------
5 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index efc4992..07b4a5f 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -79,7 +79,7 @@ if(CONSOLE_INSTALL)
${CONSOLE_SOURCE_DIR}/index.html
${CONSOLE_SOURCE_DIR}/main.js
${CONSOLE_SOURCE_DIR}/favicon-32x32.png
- ${CONSOLE_SOURCE_DIR}/console-config.json
+ ${CONSOLE_SOURCE_DIR}/config.json
)
## Files copied to the img/ dir
set(IMAGES
diff --git a/console/stand-alone/config.json b/console/stand-alone/config.json
new file mode 100644
index 0000000..e0eca01
--- /dev/null
+++ b/console/stand-alone/config.json
@@ -0,0 +1,3 @@
+{
+ "title": "Apache Qpid Dispach Console"
+}
\ No newline at end of file
diff --git a/console/stand-alone/console-config.json b/console/stand-alone/console-config.json
deleted file mode 100644
index 447c3bf..0000000
--- a/console/stand-alone/console-config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "company": "Apache",
- "product": "Dispatch"
-}
\ No newline at end of file
diff --git a/console/stand-alone/plugin/js/qdrAbout.js b/console/stand-alone/plugin/js/qdrAbout.js
index 5d0b794..01737c9 100644
--- a/console/stand-alone/plugin/js/qdrAbout.js
+++ b/console/stand-alone/plugin/js/qdrAbout.js
@@ -25,10 +25,10 @@ export class AboutController {
getConfigVars().then(response => {
$timeout(function() {
- $scope.additionalInfo = `Console for ${
- response.QDR_ROUTER_NAME
+ $scope.additionalInfo = `${
+ response.QDR_CONSOLE_TITLE
}: A high-performance, lightweight AMQP 1.0 message router, written in C and built on Qpid Proton. It provides flexible and scalable interconnect between any AMQP endpoints, whether they be clients, brokers or other AMQP-enabled services.`;
- $scope.copyright = response.QDR_CONSOLE_COPYRIGHT;
+ $scope.copyright = "License Apache 2.0";
$scope.imgAlt = response.QDR_CONSOLE_TITLE;
$scope.imgSrc = "img/logo-alt.svg";
$scope.title = response.QDR_CONSOLE_TITLE;
diff --git a/console/stand-alone/plugin/js/qdrGlobals.js b/console/stand-alone/plugin/js/qdrGlobals.js
index 38c69f6..b2eff32 100644
--- a/console/stand-alone/plugin/js/qdrGlobals.js
+++ b/console/stand-alone/plugin/js/qdrGlobals.js
@@ -70,21 +70,12 @@ export var QDRRedirectWhenConnected = function($location, org) {
};
export var getConfigVars = () =>
- new Promise((resolve, reject) => {
- $.getJSON("console-config.json", function() {}).done(function(s) {
- console.log(
- `got x-stream text ${s.title} - ${s.router} - ${s.copyright}`
- );
- s.QDR_CONSOLE_TITLE = `${s.company} ${s.product} Console`;
+ new Promise(resolve => {
+ $.getJSON("config.json", function() {}).done(function(s) {
+ s.QDR_CONSOLE_TITLE = s.title;
document.title = s.QDR_CONSOLE_TITLE;
-
- s.QDR_ROUTER_NAME = `${s.company} ${s.product} Router`;
- s.COPYRIGHT_YEAR = "2019";
- s.QDR_CONSOLE_COPYRIGHT = `Copyright ${s.COPYRIGHT_YEAR} ${s.company}`;
resolve(s);
});
});
-$(document).ready(function(e) {
- getConfigVars();
-});
+$(document).ready(getConfigVars);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org