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/04/12 15:45:10 UTC
[qpid-dispatch] branch master updated: DISPATCH-1320 Add downstream
logo for masthead
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 8b467ea DISPATCH-1320 Add downstream logo for masthead
8b467ea is described below
commit 8b467ea966703d8691c55d80431d65ca51474d49
Author: Ernest Allen <ea...@redhat.com>
AuthorDate: Fri Apr 12 11:44:50 2019 -0400
DISPATCH-1320 Add downstream logo for masthead
---
bin/make_standalone_console_tarball.sh | 1 +
console/CMakeLists.txt | 2 ++
console/stand-alone/index.html | 4 +---
console/stand-alone/plugin/css/dispatch.css | 1 +
console/stand-alone/plugin/img/console_logo.png | Bin 0 -> 6568 bytes
.../stand-alone/plugin/img/downstream_console_logo.png | Bin 0 -> 11622 bytes
console/stand-alone/plugin/js/qdrGlobals.js | 1 +
7 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bin/make_standalone_console_tarball.sh b/bin/make_standalone_console_tarball.sh
index 14015e6..8c473e8 100755
--- a/bin/make_standalone_console_tarball.sh
+++ b/bin/make_standalone_console_tarball.sh
@@ -90,6 +90,7 @@ echo Working Directory=${WORKDIR}
cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_BUILD_TYPE=Release ../$PREFIX
make install
pushd $INSTALL_DIR/share/qpid-dispatch/
+ cp console/img/downstream_console_logo.png console/img/console_logo.png
tar -c -h -z \
--owner=root --group=root --numeric-owner \
--mtime="${MTIME}" \
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 66e4c0c..e953c42 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -84,6 +84,8 @@ if(CONSOLE_INSTALL)
set(IMAGES
${CONSOLE_SOURCE_DIR}/plugin/img/bg-modal-about-pf.png
${CONSOLE_SOURCE_DIR}/plugin/img/logo-alt.svg
+ ${CONSOLE_SOURCE_DIR}/plugin/img/console_logo.png
+ ${CONSOLE_SOURCE_DIR}/plugin/img/downstream_console_logo.png
)
## Files copied to the css/ dir
set(CSS_FONTS
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 220cf50..d836b54 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -55,9 +55,7 @@ under the License.
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="/">
- <span class="logo">Apache Qpid Dispatch Console</span>
- </a>
+ <span class="logo"><img src="img/downstream_console_logo.png" /></span>
<div class="masthead-icons">
<div class="about" ng-controller="QDR.AboutController" title="About this console">
<span class="fa fa-question-circle-o" ng-click="open()"></span>
diff --git a/console/stand-alone/plugin/css/dispatch.css b/console/stand-alone/plugin/css/dispatch.css
index 2a7472a..73811dd 100644
--- a/console/stand-alone/plugin/css/dispatch.css
+++ b/console/stand-alone/plugin/css/dispatch.css
@@ -2105,6 +2105,7 @@ svg {
.masthead-icons {
position: absolute;
right: 1em;
+ top: 0;
color: white;
padding-top: 5px;
font-size: large;
diff --git a/console/stand-alone/plugin/img/console_logo.png b/console/stand-alone/plugin/img/console_logo.png
new file mode 100644
index 0000000..0cae841
Binary files /dev/null and b/console/stand-alone/plugin/img/console_logo.png differ
diff --git a/console/stand-alone/plugin/img/downstream_console_logo.png b/console/stand-alone/plugin/img/downstream_console_logo.png
new file mode 100644
index 0000000..a9adea5
Binary files /dev/null and b/console/stand-alone/plugin/img/downstream_console_logo.png differ
diff --git a/console/stand-alone/plugin/js/qdrGlobals.js b/console/stand-alone/plugin/js/qdrGlobals.js
index 42f5ee3..fa21d13 100644
--- a/console/stand-alone/plugin/js/qdrGlobals.js
+++ b/console/stand-alone/plugin/js/qdrGlobals.js
@@ -52,6 +52,7 @@ export const QDRTemplatePath = 'html/';
export const QDR_SETTINGS_KEY = 'QDRSettings';
export const QDR_LAST_LOCATION = 'QDRLastLocation';
export const QDR_INTERVAL = 'QDRInterval';
+export const STAND_ALONE = true;
export var QDRRedirectWhenConnected = function ($location, org) {
$location.path('/connect');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org