Startseite Erkunden Hilfe
Anmelden
RONCC
/
Big-Data-HPC-Platform
Beobachten 1
Favorit hinzufügen 0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

Merge branch 'candidate-7.12.4' into candidate-7.12.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman vor 4 Jahren
Ursprung
ba34854e34 3a541de3fc
Commit
9e9ea82923
2 geänderte Dateien mit 159 neuen und 115 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 117 112
      esp/files/GetUserName.html
  2. 42 3
      esp/files/Login.html

+ 117 - 112
esp/files/GetUserName.html
Datei anzeigen 

@@ -1,128 +1,133 @@
 
 <!DOCTYPE html>
 
 <html>
 
-    <head>
 
-        <meta charset="UTF-8">
 
-        <title class="loginStr"></title>
 
-        <style type="text/css">
 
-            body {
 
-                font-family: Lucida Sans, Lucida Grande, Arial !important;
 
-                font-size: 15px !important;
 
-                background-color: #1A9BD7;
 
-            }
 
 
-            .container {
 
-                width: 99%;
 
-                position: absolute;
 
-                top: 50%;
 
-                transform: translateY(-50%);
 
-            }
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <title class="loginStr"></title>
 
+    <style type="text/css">
 
+        body {
 
+            font-family: Lucida Sans, Lucida Grande, Arial !important;
 
+            font-size: 15px !important;
 
+            background-color: #1A9BD7;
 
+        }
 
 
-            .formContainer {
 
-                width: 500px;
 
-                padding: 20px 0 20px 0;
 
-                border-radius: 5px;
 
-                background-color: #fff;
 
-                margin: auto;
 
-            }
 
+        .container {
 
+            width: 99%;
 
+            position: absolute;
 
+            top: 50%;
 
+            transform: translateY(-50%);
 
+        }
 
 
-            .login {
 
-                width: 400px;
 
-                margin: auto;
 
-            }
 
+        .formContainer {
 
+            width: 500px;
 
+            padding: 20px 0 20px 0;
 
+            border-radius: 5px;
 
+            background-color: #fff;
 
+            margin: auto;
 
+        }
 
 
-            .login input {
 
-                margin-bottom: 20px;
 
-                width: 300px;
 
-                padding: 8px;
 
-                border: 1px solid #bfbfbf;
 
-            }
 
+        .login {
 
+            width: 400px;
 
+            margin: auto;
 
+        }
 
 
-            .login form {
 
-                margin: auto;
 
-                width: 300px;
 
-            }
 
+        .login input {
 
+            margin-bottom: 20px;
 
+            width: 300px;
 
+            padding: 8px;
 
+            border: 1px solid #bfbfbf;
 
+        }
 
 
-            img {
 
-                display: block;
 
-                margin: auto;
 
-            }
 
+        .login form {
 
+            margin: auto;
 
+            width: 300px;
 
+        }
 
 
-            p {
 
-                text-align: center
 
-            }
 
+        img {
 
+            display: block;
 
+            margin: auto;
 
+        }
 
 
-            #button {
 
-                background-color: #1A9BD7;
 
-                border: none;
 
-                color: white;
 
-                padding: 15px 32px;
 
-                text-align: center;
 
-                text-decoration: none;
 
-                display: inline-block;
 
-                font-size: 16px;
 
-                border-radius: 4px;
 
-                cursor: pointer;
 
-                -webkit-transition-duration: 0.4s;
 
-                /* Safari */
 
-                transition-duration: 0.4s;
 
-                margin: auto;
 
-                display: block;
 
-            }
 
+        p {
 
+            text-align: center
 
+        }
 
 
-            .button:hover {
 
-                background-color: #13b1f9;
 
-                color: white;
 
-            }
 
+        #button {
 
+            background-color: #1A9BD7;
 
+            border: none;
 
+            color: white;
 
+            padding: 15px 32px;
 
+            text-align: center;
 
+            text-decoration: none;
 
+            display: inline-block;
 
+            font-size: 16px;
 
+            border-radius: 4px;
 
+            cursor: pointer;
 
+            -webkit-transition-duration: 0.4s;
 
+            /* Safari */
 
+            transition-duration: 0.4s;
 
+            margin: auto;
 
+            display: block;
 
+        }
 
 
-            .visible {
 
-                display: none;
 
-            }
 
-        </style>
 
-        <script>dojoConfig = {async:true, parseOnLoad:false}</script>
 
-        <script src="/esp/files/dist/dojoLib.eclwatch.js"></script>
 
-    </head>
 
-    <body>
 
-        <div id="container" class="container visible">
 
-            <div class="formContainer">
 
-                <img id="logo" src="eclwatch/img/Loginlogo.png">
 
-                <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>
 
-                        <button class="loginStr" id="button" type="submit"></button>
 
-                    </form>
 
-                </div>
 
+        .button:hover {
 
+            background-color: #13b1f9;
 
+            color: white;
 
+        }
 
+
 
+        .visible {
 
+            display: none;
 
+        }
 
+    </style>
 
+    <script>dojoConfig = { async: true, parseOnLoad: false }</script>
 
+    <script src="/esp/files/dist/dojoLib.eclwatch.js"></script>
 
+</head>
 
+
 
+<body>
 
+    <div id="container" class="container visible">
 
+        <div class="formContainer">
 
+            <img id="logo" src="eclwatch/img/Loginlogo.png">
 
+            <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>
 
+                    <button class="loginStr" id="button" type="submit"></button>
 
+                </form>
 
             </div>
 
         </div>
 
+    </div>
 
+
 
+    <script type="text/javascript">
 
+        require(["dojo/ready", "src/nlsHPCC"],
 
+            function (ready, nlsHPCCMod) {
 
+                var nlsHPCC = nlsHPCCMod.default;
 
+                ready(function () {
 
+                    var HPCCSystems = document.getElementById("logo");
 
+                    var loginStr = document.getElementById("loginStr");
 
+                    var error = document.getElementById("hidden_msg");
 
+                    var username = document.getElementById("username");
 
+                    var button = document.getElementById("button");
 
+                    var enableCookies = "";
 
+
 
+                    HPCCSystems.setAttribute("alt", nlsHPCC.HPCCSystems);
 
+                    loginStr.innerHTML = nlsHPCC.PleaseLogIntoECLWatch;
 
+                    username.innerHTML = nlsHPCC.Username;
 
+                    button.innerHTML = nlsHPCC.Login;
 
+                    enableCookies = nlsHPCC.PleaseEnableCookies;
 
+
 
+                    var element = document.getElementById('container');
 
+
 
+                    if (navigator.cookieEnabled) {
 
+                        var element = document.getElementById("container");
 
+                        element.classList.remove("visible");
 
+                    } else {
 
+                        alert(enableCookies);
 
+                    }
 
+                });
 
+            }
 
+        );
 
+    </script>
 
+</body>
 
 
-        <script type="text/javascript">
 
-            require(["dojo/ready", "dojo/i18n", "dojo/i18n!hpcc/nls/hpcc"],
 
-                function(ready, i18n, nlsHPCC){
 
-                    ready(function(){
 
-                        var HPCCSystems = document.getElementById("logo");
 
-                        var loginStr = document.getElementById("loginStr");
 
-                        var error = document.getElementById("hidden_msg");
 
-                        var username = document.getElementById("username");
 
-                        var button = document.getElementById("button");
 
-                        var enableCookies = "";
 
-
 
-                        HPCCSystems.setAttribute("alt", nlsHPCC.HPCCSystems);
 
-                        loginStr.innerHTML = nlsHPCC.PleaseLogIntoECLWatch;
 
-                        username.innerHTML = nlsHPCC.Username;
 
-                        button.innerHTML = nlsHPCC.Login;
 
-                        enableCookies = nlsHPCC.PleaseEnableCookies;
 
-
 
-                        var element = document.getElementById('container');
 
-
 
-                        if (navigator.cookieEnabled) {
 
-                            var element = document.getElementById("container");
 
-                            element.classList.remove("visible");
 
-                        } else {
 
-                            alert(enableCookies);
 
-                        }
 
-                    });
 
-                }
 
-            );
 
-        </script>
 
-    </body>
 
 </html>

+ 42 - 3
esp/files/Login.html
Datei anzeigen 

@@ -109,9 +109,48 @@
 
         </div>
 
     </div>
 
     <script type="text/javascript">
 
-        require([init],
 
-            function (init) {
 
-                init();
 
+        require(["dojo/ready", "src/nlsHPCC"],
 
+            function (ready, nlsHPCCMod) {
 
+                var nlsHPCC = nlsHPCCMod.default;
 
+                ready(function () {
 
+                    var loginStr = document.getElementById("loginStr");
 
+                    var error = document.getElementById("hidden_msg");
 
+                    var username = document.getElementById("username");
 
+                    var password = document.getElementById("password");
 
+                    var button = document.getElementById("button");
 
+                    var enableCookies = "";
 
+                    var HPCCSystems = document.getElementById("logo");
 
+
 
+                    loginStr.innerHTML = nlsHPCC.PleaseLogIntoECLWatch;
 
+                    error.innerHTML = nlsHPCC.InvalidUsernamePassword;
 
+                    username.innerHTML = nlsHPCC.Username;
 
+                    password.innerHTML = nlsHPCC.Password;
 
+                    button.innerHTML = nlsHPCC.Login;
 
+                    enableCookies = nlsHPCC.PleaseEnableCookies;
 
+                    HPCCSystems.setAttribute("alt", nlsHPCC.HPCCSystems);
 
+
 
+                    var element = document.getElementById('container');
 
+
 
+                    if (navigator.cookieEnabled) {
 
+                        var element = document.getElementById("container");
 
+                        element.classList.remove("visible");
 
+                    } else {
 
+                        alert(enableCookies);
 
+                    }
 
+
 
+                    function deleteCookie(cname, cvalue, exMins) {
 
+                        var d = new Date();
 
+                        d.setTime(d.getTime() + (exMins * 60 * 1000));
 
+                        var expires = "expires=" + d.toUTCString();
 
+                        document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
 
+                    }
 
+
 
+                    if (document.cookie.indexOf("ESPAuthenticationMSG") > -1) {
 
+                        var element = document.getElementById('hidden_msg');
 
+                        element.style.display = "inline-block";
 
+                        deleteCookie('ESPAuthenticationMSG', '', 0);
 
+                    }
 
+                });
 
             }
 
         );
 
     </script>