Unverified Commit f2b54862 authored by Francesc Guasch's avatar Francesc Guasch Committed by GitHub
Browse files

Merge pull request #553 from omarbr6/527_UPClogo

[#527] UPC logo
parents 8fad4e02 2205bc96
body {
width: 100%;
height: 100%;
height: 73%;
font-family: Lora,"Helvetica Neue",Helvetica,Arial,sans-serif;
color: #fff;
background-color: #000;
......
......@@ -2,6 +2,7 @@
<div class="container ">
<div class="row">
<br>
<a href="https://www.upc.edu/"><img src="http://www.upc.edu/content/assets/images/logoUPC.png"></a>
<a href="https://ravada.upc.edu/"><img src="https://img.shields.io/badge/Website-Ravada-orange.svg"></a>
<a href="https://github.com/UPC/ravada/releases"><img src="https://img.shields.io/badge/version-<%= $version %>-brightgreen.svg"></a>
<a href="https://github.com/UPC/ravada/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg"></a>
......
......@@ -12,23 +12,23 @@
<input class="form-control" id="user" name="login" value ="<%= $login %>" type="text" placeholder="User/Email">
<input class="form-control" id="pssw" type="password" name="password" value="" placeholder="Password">
<!-- <input type="submit" name="submit" value="launch"> -->
<button id="submit" class="btn btn-lg btn-primary btn-block" type="submit" name="submit" value="launch">Launch</button>
% if (scalar @$error) {
% for my $i (@$error) {
<p id="err"><%= $i %></p>
% }
% }
</form>
</div>
</div>
</header>
%= include 'bootstrap/in_scripts'
</body>
</html>
......@@ -81,6 +81,7 @@
<center><div class="container text-center">
<div class="row">
<p><font size= "3" face = "Montserrat"> Ravada is a free to use, open source VDI project.</font></p>
<a href="https://www.upc.edu/"><img src="http://www.upc.edu/content/assets/images/logoUPC.png"></a>
<a href="https://ravada.upc.edu/"><img src="https://img.shields.io/badge/Website-Ravada-orange.svg"></a>
<a href="https://github.com/UPC/ravada/releases"><img src="https://img.shields.io/badge/version-<%= $version %>-brightgreen.svg"></a>
<a href="https://github.com/UPC/ravada/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg"></a>
......
......@@ -8,12 +8,12 @@
<label for="username">Username</label>
<input class="form-control" ng-model="username" placeholder="Enter Username" type="text" ng-maxlength="20" ng-minlength="5" name="username" ng-pattern="/^[a-zA-Z0-9_.-]*$/" id="username" required=""><br/>
</div>
<div class="from-group">
<label for="password">Password</label>
<input class="form-control" ng-model="password" placeholder="Enter Password" type="password" ng-maxlength="20" ng-minlength="5" name="password" ng-pattern="/^[a-zA-Z0-9]*$/" id="password" required=""><br/>
</div>
<div class="from-group">
<label for="password">Confirm Password</label>
<input class="form-control" ng-model="cpassword" placeholder="Confirm Password" type="password" ng-maxlength="20" ng-minlength="5" name="cpassword" ng-pattern="/^[a-zA-Z0-9]*$/" id="confirm_password" onkeyup="checkPass(); return false;" required><span id="confirmMessage" class="confirmMessage"></span><br/>
......@@ -48,7 +48,7 @@
<strong>Error</strong> Password can only contain words and numbers.
</div>
</div>
<div ng-show="new_userForm.$submitted || new_userForm.password.$touched">
<div ng-show="new_userForm.cpassword.$error.required" class="alert alert-warning fade in">
<strong>Error</strong> Confirm Password is required.
......@@ -63,22 +63,22 @@
<strong>Error</strong> Confirm Password can only contain words and numbers.
</div>
</div>
<button type="submit" ng-disabled="new_userForm.$invalid || cpassword != password" id="submitbutton" class="btn btn-default">Submit</button>
<button type="submit" ng-disabled="new_userForm.$invalid || cpassword != password" id="submitbutton" class="btn btn-default">Submit</button>
% if (scalar @$error) {
% for my $i (@$error) {
<h3><div class="alert alert-danger"><%= $i %></div></h3>
% }
% }
</form>
</div>
</div>
<!--check that password matches-->
<!--check that password matches-->
<script>
function checkPass()
{
......@@ -95,13 +95,13 @@ function checkPass()
message.style.color = goodColorLetter;
message.innerHTML = "Passwords Match!"
return true;
}else{
pass2.style.backgroundColor = badColor;
message.style.color = badColorLetter;
message.innerHTML = "Passwords Do Not Match!"
return false;
}
}
}
</script>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment