clockwerk-guacamole – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

Only display areas with differences – Ignore whitespace

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Clockwerk</title>
 <link rel="stylesheet" href="styles/gray.css" type="text/css" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
 </head>
 <body class="dark-grey">
 <div class="center">
 <img src="images/clockwerk-logo.png"/>
 <h1>OpenSim Console Access</h1>
 <hr/>
 <script type="text/javascript" src="scripts/jquery.min.js"></script>
 <div id="login-ui" style="display; none">
 <p id="login-error"></p>
 <form id="login-form" class="dark-grey" style="color:#000;text-shadow:none;text-align:left;max-width:480px;min-width:150px" method="post" action="#"><div class="title"></div>
 	<div class="element-input" ><label class="title">Username<span class="required"></span></label><input class="large" type="text" name="username" id="username" required="required"/></div>
 	<div class="element-password" ><label class="title">Password<span class="required"></span></label><input class="large" type="password" name="password" id="password" value="" required="required"/></div>
 	<div class="submit">
 		<input type="submit" name="login" id="login" value="Login" />
 		<input type="button" onclick="parent.location='/welcome.php'" value="Cancel" />
 	</div>
 </form>
 </div>
         <!-- Connection list UI -->
         <div id="connection-list-ui" style="display: none">
             <div id="logout-panel">
                 <button id="logout">Logout</button>
             </div>
             <h1>
                 <img class="logo" src="images/guacamole-logo-64.png" alt=""/>
                 Available Connections
             </h1>
             <table class="connections">
                 <thead>
                     <tr>
                         <th class="protocol"> </th>
                         <th class="name">Name</th>
                     </tr>
                 </thead>
                 <tbody id="connections-tbody">
                 </tbody>
             </table>
         </div>
         <script type="text/javascript" src="scripts/connections.js"></script>
         <!-- Init -->
         <script type="text/javascript"> /* <![CDATA[ */
             // Constructs the URL for a client which connects to the connection
             // with the given id.
             function getClientURL(id) {
                 // Construct URL for client with given id
                 return "client.xhtml?id=" + encodeURIComponent(id);
+            }
             // Resets the interface such that the login UI is displayed if
             // the user is not authenticated (or authentication fails) and
             // the connection list UI (or the client for the only available
             // connection, if there is only one) is displayed if the user is
             // authenticated.
             function resetUI() {
                 // Get parameters from query string
                 var parameters = window.location.search.substring(1);
                 var configs;
                 try {
                     configs = getConfigList(parameters);
+                }
                 catch (e) {
                     // Show login UI if unable to get configs
                     loginUI.style.display = "";
                     connectionListUI.style.display = "none";
                     return;
+                }
                 // If only one connection, redirect to that.
                 if (configs.length == 1) {
                     window.location.href = getClientURL(configs[0].id);
                     return;
+                }
                 // Remove all rows from connections list
                 var tbody = document.getElementById("connections-tbody");
                 tbody.innerHTML = "";
                 // Add one row per connection
                 for (var i=0; i<configs.length; i++) {
                     // Create row and cells
                     var tr = document.createElement("tr");
                     var protocol = document.createElement("td");
                     var id = document.createElement("td");
                     var protocolIcon = document.createElement("div");
                     protocolIcon.className = "protocol icon " + configs[i].protocol;
                     // Set CSS
                     protocol.className = "protocol";
                     id.className = "name";
                     // Create link to client
                     var clientLink = document.createElement("a");
                     clientLink.setAttribute("href", getClientURL(configs[i].id));
                     // Set cell contents
                     protocol.appendChild(protocolIcon);
                     //protocol.textContent   = configs[i].protocol;
                     clientLink.textContent = configs[i].id;
                     id.appendChild(clientLink);
                     // Add cells
                     tr.appendChild(protocol);
                     tr.appendChild(id);
                     // Add row
                     tbody.appendChild(tr);
+                }
                 // If configs could be retrieved, display list
                 loginUI.style.display = "none";
                 connectionListUI.style.display = "";
+            }
             var loginForm = document.getElementById("login-form");
             var loginUI = document.getElementById("login-ui");
             var connectionListUI = document.getElementById("connection-list-ui");
             var logout = document.getElementById("logout");
             var username = document.getElementById("username");
             var password = document.getElementById("password");
             logout.onclick = function() {
-                window.location.href = "logout";
+                window.location.href = "/guacamole";
             };
             loginForm.onsubmit = function() {
                 // Get parameters from query string
                 var parameters = window.location.search.substring(1);
                 // Get username and password from form
                 var data =
                        "username=" + encodeURIComponent(username.value)
                     + "&password=" + encodeURIComponent(password.value)
                 // Include query parameters in submission data
                 if (parameters) data += "&" + parameters;
                 try {
                     // Log in
                     var xhr = new XMLHttpRequest();
                     xhr.open("POST", "login", false);
                     xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                     xhr.send(data);
                     // Handle failures
                     if (xhr.status != 200)
                         throw new Error("Invalid login");
                     // Ensure username/password fiels are blurred after submit
                     username.blur();
                     password.blur();
                     resetUI();
+                }
                 catch (e) {
                     var loginError = document.getElementById("login-error");
                     // Display error, reset and refocus password field
                     loginError.textContent = e.message;
                     password.value = "";
                     password.focus();
                     return false;
+                }
                 // On success, hide loginUI, get and show connection list.
                 return false;
+            }
             // Turn off autocorrect and autocapitalization on usename
             username.setAttribute("autocorrect", "off");
             username.setAttribute("autocapitalize", "off");
             resetUI();
             /* ]]> */ </script>
 </div>
 </body>
 </html>