Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-28464 Switch to new logo for lock / login pages #16660

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions esp/src/GetUserName.html
Expand Up @@ -8,7 +8,7 @@
body {
font-family: Lucida Sans, Lucida Grande, Arial !important;
font-size: 15px !important;
background-color: #1A9BD7;
background-color: #155d8a;
}

.container {
Expand Down Expand Up @@ -53,7 +53,7 @@
}

#button {
background-color: #1A9BD7;
background-color: #155d8a;
border: none;
color: white;
padding: 15px 32px;
Expand Down Expand Up @@ -86,12 +86,11 @@
<body>
<div id="container" class="container visible">
<div class="formContainer">
<img id="logo" src="eclwatch/img/Loginlogo.png">
<img id="logo" src="eclwatch/img/hpccsystems.svg" alt="HPCC Systems" style="width: 206px" />
<p id="loginStr" class="loginStr"></p>
<div class="login">
<form method="POST" action="/esp/login">
<input id="username" type="text" name="username" placeholder="username" class="loginStr"
autofocus></input>
<input id="username" type="text" name="username" placeholder="username" class="loginStr" autofocus></input>
<button class="loginStr" id="button" type="submit"></button>
</form>
</div>
Expand Down
12 changes: 5 additions & 7 deletions esp/src/Login.html
Expand Up @@ -9,7 +9,7 @@
body {
font-family: Lucida Sans, Lucida Grande, Arial !important;
font-size: 15px !important;
background-color: #1A9BD7;
background-color: #155d8a;
}

.container {
Expand Down Expand Up @@ -62,7 +62,7 @@
}

#button {
background-color: #1A9BD7;
background-color: #155d8a;
border: none;
color: white;
padding: 15px 32px;
Expand Down Expand Up @@ -94,14 +94,12 @@
<body>
<div id="container" class="container visible">
<div class="formContainer">
<img id="logo" src="eclwatch/img/Loginlogo.png" />
<img id="logo" src="eclwatch/img/hpccsystems.svg" alt="HPCC Systems" style="width: 206px" />
<p id="loginStr" class="loginStr"></p>
<div class="login">
<form method="POST" action="/esp/login">
<input id="username" type="text" name="username" placeholder="username" class="loginStr"
autofocus></input>
<input id="password" type="password" name="password" placeholder="password"
class="loginStr"></input>
<input id="username" type="text" name="username" placeholder="username" class="loginStr" autofocus></input>
<input id="password" type="password" name="password" placeholder="password" class="loginStr"></input>
<p id="hidden_msg" class="loginStr"></p>
<button class="loginStr" id="button" type="submit"></button>
</form>
Expand Down
Binary file removed esp/src/eclwatch/img/Loginlogo.png
Binary file not shown.
37 changes: 37 additions & 0 deletions esp/src/eclwatch/img/hpccsystems-dark.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed esp/src/eclwatch/img/hpccsystems.png
Binary file not shown.
1 change: 1 addition & 0 deletions esp/src/eclwatch/img/hpccsystems.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions esp/src/eclwatch/templates/LockDialogWidget.html
@@ -1,6 +1,6 @@
<span class="${baseClass}">
<div id="${id}UnlockDialog" class="unlockDialogToHide" title="${i18n.ReAuthenticate}" style="width: 480px; z-index: 9999;" data-dojo-props="closable:false, draggable: false, " data-dojo-type="dijit.Dialog">
<img src="${dojoConfig.urlInfo.resourcePath}/img/Loginlogo.png" class="lockLogo" alt="${i18n.HPCCSystems}" />
<img src="${dojoConfig.urlInfo.resourcePath}/img/hpccsystems.svg" class="lockLogo" alt="${i18n.HPCCSystems}" style="width: 206px" />
<div id="${id}UnlockForm" style="width:${_width}" onsubmit="return false;" data-dojo-type="dijit.form.Form">
<div data-dojo-props="cols:2" data-dojo-type="hpcc.TableContainer">
<input id="${id}UnlockUserName" title="${i18n.Username}:" name="username" colspan="2" style="width:90%;" data-dojo-props="trim: true, readonly: true" data-dojo-type="dijit.form.TextBox" />
Expand All @@ -12,4 +12,4 @@
<button id="${id}Unlock" data-dojo-attach-event="onClick:_onUnlock" data-dojo-type="dijit.form.Button">${i18n.Unlock}</button>
</div>
</div>
</span>
</span>