Commit 7bca9a83 authored by frankiejol's avatar frankiejol
Browse files

Merge branch 'master' of https://github.com/UPC/ravada

parents 61123c77 98c65ff5
......@@ -17,3 +17,4 @@ yarn.lock
node_modules/
t/vm/b10*
public/fallback
public/img/version-*svg
morris.js/morris.css https://cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.css
https://use.fontawesome.com/releases/v5.10.1/fontawesome-free-5.10.1-web.zip
introjs/bin/introjs.css https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/introjs.css
jquery/jquery.min.js https://code.jquery.com/jquery-3.3.1.min.js
https://jqueryui.com/resources/download/jquery-ui-1.11.1.zip
bootstrap/dist/js/bootstrap.min.js https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js
https://code.angularjs.org/1.5.5/angular-1.5.5.zip
https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/2.5.0/ui-bootstrap.min.js
raphael.js/ https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js
https://github.com/snapappointments/bootstrap-select/archive/v1.13.9.zip
morris.js/ https://cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js
intro.js/ https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/intro.js
bootstrap/ https://github.com/twbs/bootstrap/releases/download/v4.3.1/bootstrap-4.3.1-dist.zip
../img/logoUPC.png https://www.upc.edu/"><img src="https://www.upc.edu/content/assets/images/logoUPC.png
../img/version-$version-brightbreen.svg wget https://img.shields.io/badge/version-$version-brightgreen.svg
../img/latest.svg https://readthedocs.org/projects/ravada/badge/?version=latest
../img/License-AGPL%20v3-blue.svg https://img.shields.io/badge/License-AGPL%20v3-blue.svg
......@@ -16,7 +16,7 @@
,secrets => ['changeme1','changeme2']
,login_custom => ''
,footer => '/bootstrap/footer'
,login_bg_file => 'img/custom/background.jpg'
,login_bg_file => 'img/intro-bg.jpg'
,login_message => 'Acme VDI service'
,monitoring => 0
,guide => ''
......@@ -24,4 +24,5 @@
,session_timeout => 5*60
,session_timeout_admin => 15*60
,auto_view => 0
,fallback => 0
};
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="108" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="108" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h51v20H0z"/><path fill="#007ec6" d="M51 0h57v20H51z"/><path fill="url(#b)" d="M0 0h108v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"> <text x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">License</text><text x="265" y="140" transform="scale(.1)" textLength="410">License</text><text x="785" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="470">AGPL v3</text><text x="785" y="140" transform="scale(.1)" textLength="470">AGPL v3</text></g> </svg>
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="104" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h53v20H0z"/><path fill="#fe7d37" d="M53 0h51v20H53z"/><path fill="url(#b)" d="M0 0h104v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"> <text x="275" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">Website</text><text x="275" y="140" transform="scale(.1)" textLength="430">Website</text><text x="775" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">Ravada</text><text x="775" y="140" transform="scale(.1)" textLength="410">Ravada</text></g> </svg>
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="86" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="86" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h35v20H0z"/><path fill="#4c1" d="M35 0h51v20H35z"/><path fill="url(#b)" d="M0 0h86v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">docs</text><text x="185" y="140" transform="scale(.1)" textLength="250">docs</text><text x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">passing</text><text x="595" y="140" transform="scale(.1)" textLength="410">passing</text></g> </svg>
\ No newline at end of file
......@@ -145,7 +145,8 @@ hook before_routes => sub {
return if _logged_in($c);
return if $url =~ m{^/(anonymous|login|logout|requirements|robots.txt)}
|| $url =~ m{^/(css|font|img|js)};
|| $url =~ m{^/(css|font|img|js)}
|| $url =~ m{^/fallback/.*\.(css|js|map)$};
# anonymous URLs
if (($url =~ m{^/machine/(clone|display|info|view)/}
......
......@@ -2,14 +2,25 @@
<div class="container ">
<div class="row">
<div class="col">
% if ($fallback) {
<a href="https://www.upc.edu/"><img src="/img/logoUPC.png"></a>
% } else {
<a href="https://www.upc.edu/"><img src="https://www.upc.edu/content/assets/images/logoUPC.png"></a>
% }
</div>
<div class="col-5 mt-4">
<a href="https://ravada.upc.edu/"><img src="https://img.shields.io/badge/Website-Ravada-orange.svg"></a>
% $version =~ s/-/--/g;
% if ($fallback) {
<a href="https://ravada.upc.edu/"><img src="/img/Website-Ravada-orange.svg"></a>
<a href="https://github.com/UPC/ravada/releases"><img src="/img/version-<%= $version %>-brightgreen.svg"></a>
<a href="https://github.com/UPC/ravada/blob/master/LICENSE"><img src="/img/License-AGPL%20v3-blue.svg"></a>
<a href="https://ravada.readthedocs.io"><img src="/img/latest.svg"></a>
% } else {
<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>
<a href="https://ravada.readthedocs.io"><img src="https://readthedocs.org/projects/ravada/badge/?version=latest"></a>
% }
</div>
<div class="col mt-3">
<p class="p-1 text-muted"><font size="2">Copyright &copy; 2016 - 2018 RavadaVDI</font></p>
......
......@@ -16,15 +16,13 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.7/css/bootstrap-select.css">
<link href="https://use.fontawesome.com/releases/v5.0.7/css/all.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/introjs.css" rel="stylesheet" type="text/css">
<script src="https://cdn.ckeditor.com/4.11.3/standard/ckeditor.js"></script>
% } else {
<link rel="stylesheet" href="/fallback/bootstrap/dist/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="/fallback/morris.js/morris.css" type="text/css">
<link rel="stylesheet" href="/fallback/morris.js/morris.css">
<link rel="stylesheet" href="/fallback/bootstrap-4.3.1-dist/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="/fallback/bootstrap-select/dist/css/bootstrap-select.css" type="text/css">
<link rel="stylesheet" href="/fallback/font-awesome5/css/fontawesome-all.min.css" type="text/css">
<link rel="stylesheet" href="/fallback/introjs/bin/introjs.css" type="text/css">
<script src="/fallback/ckeditor/ckeditor.js"></script>
<link rel="stylesheet" href="/fallback/bootstrap-select-1.13.9/dist/css/bootstrap-select.css" type="text/css">
<link rel="stylesheet" href="/fallback/fontawesome-free-5.10.1-web/css/all.css" type="text/css">
<link rel="stylesheet" href="/fallback/intro.js/bin/introjs.css" type="text/css">
% }
% foreach my $csslink (@$css) {
......
......@@ -21,24 +21,24 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/intro.js"></script>
% } else {
<script src="/fallback/jquery/dist/jquery.min.js"></script>
<script src="/fallback/jqueryui/jquery-ui.min.js"></script>
<script src="/fallback/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="/fallback/angular/angular.min.js"></script>
<script src="/fallback/angular-resource/angular-resource.min.js"></script>
<script src="/fallback/angular-animate/angular-animate.min.js"></script>
<script src="/fallback/angular-aria/angular-aria.min.js"></script>
<script src="/fallback/angular-messages/angular-messages.min.js"></script>
<script src="/fallback/jquery/jquery-3.3.1.min.js"></script>
<script src="/fallback/jquery-ui-1.11.1/jquery-ui.min.js"></script>
<script src="/fallback/bootstrap-4.3.1-dist/js/bootstrap.min.js"></script>
<script src="/fallback/angular-1.5.5/angular.min.js"></script>
<script src="/fallback/angular-1.5.5/angular-resource.min.js"></script>
<script src="/fallback/angular-1.5.5/angular-animate.min.js"></script>
<script src="/fallback/angular-1.5.5/angular-aria.min.js"></script>
<script src="/fallback/angular-1.5.5/angular-messages.min.js"></script>
<script src="/fallback/angular-sanitize/angular-sanitize.min.js"></script>
<script src="/fallback/angular-1.5.5/angular-sanitize.min.js"></script>
<script src="/fallback/angular-material/angular-material.min.js"></script>
<script src="/fallback/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="/fallback/raphael/raphael-min.js"></script>
<script src="/fallback/morris/main.js"></script>
<script src="/fallback/morris.js/morris.min.js"></script>
<script src="/fallback/bootstrap-select/dist/js/bootstrap-select.js"></script>
%# <script src="/fallback/bootstrap-select/dist/js/bootstrap-select.js"></script>
<script src="/fallback/intro.js/intro.js"></script>
% }
......
Supports Markdown
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