Skip to content
This repository has been archived by the owner on Oct 5, 2020. It is now read-only.

Commit

Permalink
Fixed #434: replaced ML-logo with powered-by-ML logo in header
Browse files Browse the repository at this point in the history
  • Loading branch information
grtjn committed Dec 4, 2017
1 parent 67e890b commit 9fa153b
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 22 deletions.
2 changes: 1 addition & 1 deletion app/templates/ui/styles/default.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ nav.nav {
text-indent: 100%;
white-space: nowrap;
overflow: hidden;
background: url('/images/marklogic.png') no-repeat;
background: url('/images/MarkLogic-Powered-By.png') no-repeat;
background-size: contain;
min-height: 30px;
height: 30px;
Expand Down
70 changes: 54 additions & 16 deletions test-clean-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,91 @@ HOST=ml9-ml1
USER=admin
PASS=admin

## SLUSH DEFAULT ##
## WIPE ##

if [ -d slush-default ]; then
cd slush-default
./ml local wipe
cd ..
rm -rf slush-default
fi

## SLUSH 3COLUMN ##

if [ -d slush-3column ]; then
cd slush-3column
./ml local wipe
cd ..
rm -rf slush-3column
fi

## SLUSH DASHBOARD ##

if [ -d slush-dashboard ]; then
cd slush-dashboard
./ml local wipe
cd ..
rm -rf slush-dashboard
fi

## SLUSH MAP ##

if [ -d slush-map ]; then
cd slush-map
./ml local wipe
cd ..
rm -rf slush-map
fi

## SLUSH CARDS ##

if [ -d slush-cards ]; then
cd slush-cards
./ml local wipe
cd ..
rm -rf slush-cards
fi

./ml local restart
sleep 10
## RESTART ##

if [ -d slush-default ]; then
cd slush-default
./ml local restart
sleep 10
cd ..
elif [ -d slush-3column ]; then
cd slush-3column
./ml local restart
sleep 10
cd ..
rm -rf slush-3column
elif [ -d slush-dashboard ]; then
cd slush-dashboard
./ml local restart
sleep 10
cd ..
rm -rf slush-dashboard
elif [ -d slush-map ]; then
cd slush-map
./ml local restart
sleep 10
cd ..
rm -rf slush-map
elif [ -d slush-cards ]; then
cd slush-cards
./ml local restart
sleep 10
cd ..
fi

## REMOVE ##

if [ -d slush-default ]; then
rm -rf slush-default
fi

if [ -d slush-3column ]; then
rm -rf slush-3column
fi

if [ -d slush-dashboard ]; then
rm -rf slush-dashboard
fi

if [ -d slush-map ]; then
rm -rf slush-map
fi

if [ -d slush-cards ]; then
rm -rf slush-cards
fi

####

Expand Down
11 changes: 6 additions & 5 deletions test-generate-all.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

HOST=ml9-ml1
VERSION=9
USER=admin
PASS=admin

Expand All @@ -14,7 +15,7 @@ if [ -d slush-default ]; then
rm -rf slush-default
fi

gulp --gulpfile=slushfile.js --app-name=slush-default --theme=default --ml-version=8 --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8040 --node-port=8050 --guest-access=true --disallow-updates=true --appusers-only=true
gulp --gulpfile=slushfile.js --app-name=slush-default --theme=default --ml-version=$VERSION --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8040 --node-port=8050 --guest-access=true --disallow-updates=true --appusers-only=true

cd slush-default

Expand All @@ -34,7 +35,7 @@ if [ -d slush-3column ]; then
rm -rf slush-3column
fi

gulp --gulpfile=slushfile.js --app-name=slush-3column --theme=3column --ml-version=8 --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8041 --node-port=8051 --guest-access=true --disallow-updates=true --appusers-only=true
gulp --gulpfile=slushfile.js --app-name=slush-3column --theme=3column --ml-version=$VERSION --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8041 --node-port=8051 --guest-access=true --disallow-updates=true --appusers-only=true

cd slush-3column

Expand All @@ -54,7 +55,7 @@ if [ -d slush-dashboard ]; then
rm -rf slush-dashboard
fi

gulp --gulpfile=slushfile.js --app-name=slush-dashboard --theme=dashboard --ml-version=8 --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8042 --node-port=8052 --guest-access=true --disallow-updates=true --appusers-only=true
gulp --gulpfile=slushfile.js --app-name=slush-dashboard --theme=dashboard --ml-version=$VERSION --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8042 --node-port=8052 --guest-access=true --disallow-updates=true --appusers-only=true

cd slush-dashboard

Expand All @@ -74,7 +75,7 @@ if [ -d slush-map ]; then
rm -rf slush-map
fi

gulp --gulpfile=slushfile.js --app-name=slush-map --theme=map --ml-version=8 --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8043 --node-port=8053 --guest-access=true --disallow-updates=true --appusers-only=true
gulp --gulpfile=slushfile.js --app-name=slush-map --theme=map --ml-version=$VERSION --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8043 --node-port=8053 --guest-access=true --disallow-updates=true --appusers-only=true

cd slush-map

Expand All @@ -94,7 +95,7 @@ if [ -d slush-cards ]; then
rm -rf slush-cards
fi

gulp --gulpfile=slushfile.js --app-name=slush-cards --theme=cards --ml-version=8 --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8044 --node-port=8054 --guest-access=true --disallow-updates=true --appusers-only=true
gulp --gulpfile=slushfile.js --app-name=slush-cards --theme=cards --ml-version=$VERSION --ml-host=$HOST --ml-admin-user=$USER --ml-admin-pass=$PASS ---ml-http-port=8044 --node-port=8054 --guest-access=true --disallow-updates=true --appusers-only=true

cd slush-cards

Expand Down

0 comments on commit 9fa153b

Please sign in to comment.