Commit 81633620 authored by fv3rdugo's avatar fv3rdugo
Browse files

Merge branch 'master' into clones4vm

parents 1f707910 f2b54862
# ravada [![GitHub version](https://img.shields.io/badge/version-0.2.8-brightgreen.svg)](https://github.com/frankiejol/ravada/releases) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://github.com/frankiejol/ravada/blob/master/LICENSE) [![Documentation Status](https://readthedocs.org/projects/ravada/badge/?version=latest)](http://ravada.readthedocs.io/en/latest/?badge=latest) [![GitHub Stats](https://img.shields.io/badge/github-stats-ff5500.svg)](http://githubstats.com/upc/ravada)
# ravada [![GitHub version](https://img.shields.io/badge/version-0.2.13-brightgreen.svg)](https://github.com/frankiejol/ravada/releases) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://github.com/frankiejol/ravada/blob/master/LICENSE) [![Documentation Status](https://readthedocs.org/projects/ravada/badge/?version=latest)](http://ravada.readthedocs.io/en/latest/?badge=latest) [![GitHub Stats](https://img.shields.io/badge/github-stats-ff5500.svg)](http://githubstats.com/upc/ravada)
## Remote Virtual Desktops Manager
......
......@@ -247,8 +247,9 @@ sub _update_isos {
,arch => 'amd64'
,xml => 'yakkety64-amd64.xml'
,xml_volume => 'yakkety64-volume.xml'
,md5_url => 'http://archive.ubuntu.com/ubuntu/dists/artful/main/installer-amd64/current/images/MD5SUMS'
,url => 'http://archive.ubuntu.com/ubuntu/dists/artful/main/installer-amd64/current/images/netboot/mini.iso'
,md5_url => '$url/../MD5SUMS'
,url => 'http://archive.ubuntu.com/ubuntu/dists/artful/main/installer-amd64/current/images/netboot/'
,file_re => 'mini.iso'
,rename_file => 'xubuntu_artful.iso'
}
,xubuntu_zesty => {
......@@ -257,8 +258,9 @@ sub _update_isos {
,arch => 'amd64'
,xml => 'yakkety64-amd64.xml'
,xml_volume => 'yakkety64-volume.xml'
,md5_url => 'http://archive.ubuntu.com/ubuntu/dists/zesty/main/installer-amd64/current/images/MD5SUMS'
,url => 'http://archive.ubuntu.com/ubuntu/dists/zesty/main/installer-amd64/current/images/netboot/mini.iso'
,md5_url => '$url/../MD5SUMS'
,url => 'http://archive.ubuntu.com/ubuntu/dists/zesty/main/installer-amd64/current/images/netboot'
,file_re => 'mini.iso'
,rename_file => 'xubuntu_zesty_mini.iso'
}
,xubuntu_xenial => {
......
......@@ -680,9 +680,9 @@ sub _display_file_spice($self,$user) {
"fullscreen=1\n"
."title=".$self->name." - Press SHIFT+F12 to exit\n"
."enable-smartcard=0\n"
."enable-usbredir=1\n"
."enable-usb-autoshare=1\n"
."delete-this-file=1\n"
."usb-filter=-1,-1,-1,-1,0\n";
."delete-this-file=1\n";
$ret .=";" if !$self->tls;
$ret .= "tls-ciphers=DEFAULT\n"
......
......@@ -1001,6 +1001,7 @@ sub _search_iso {
}
sub _download($self, $url) {
$url =~ s{(http://.*)//(.*)}{$1/$2};
if ($url =~ m{\*}) {
my @found = $self->_search_url_file($url);
confess "No match for $url" if !scalar @found;
......@@ -1076,7 +1077,8 @@ sub _cache_filename($url) {
$file =~ tr{a-zA-Z0-9_-}{_}c;
$file =~ s/__+/_/g;
my $dir = "/var/tmp/ravada_cache/$ENV{USER}";
my ($user) = getpwuid($>);
my $dir = "/var/tmp/ravada_cache/$user";
make_path($dir) if ! -e $dir;
return "$dir/$file";
}
......
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>
......@@ -43,7 +43,7 @@
<div class="panel-heading">
% if ($user && $user->is_admin) {
<%=l 'There are no public bases available in this system.' %>
<a href="/admin/"><%=l 'Create one.' %></a>
<a href="/admin/machines"><%=l 'Create one.' %></a>
% } else {
<%=l 'There are no machines available in this system.' %>
% }
......
......@@ -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>
......
......@@ -6,14 +6,14 @@
<form name="new_userForm" role="form" method="post" action="/users/register" novalidate>
<div class="from-group">
<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-Z_.-]*$/" id="username" required=""><br/>
<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