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

dockerfy/docker-compose.yml

@@ -25,6 +25,7 @@ services:
       - ravada_network
     #By default download from dockerhub
     image: ravada/front
+    env_file: .env
     #If you want to local build
     #build: dockers/front/.
     restart: unless-stopped
@@ -50,6 +51,7 @@ services:
       - ravada_network
     #By default download from dockerhub
     image: ravada/back
+    env_file: .env
     #If you want to local build
     #build: dockers/back/.
     privileged: true

etc/fallback.conf

@@ -7,7 +7,6 @@ https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js
 https://code.angularjs.org/1.7.8/angular-1.7.8.zip
 https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/2.5.0/ui-bootstrap.min.js
 https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js raphael.js/
-https://github.com/snapappointments/bootstrap-select/archive/v1.13.15.zip
 https://cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js morris.js/
 https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/intro.js intro.js/
 https://github.com/twbs/bootstrap/releases/download/v4.3.1/bootstrap-4.3.1-dist.zip

lib/Ravada.pm

@@ -1325,6 +1325,7 @@ sub _insert_data {
     open my $in,'<',$file_sql or die "$! $file_sql";
     my $sql = '';
     while (my $line = <$in>) {
+        $line =~ s{/\*.*?\*/}{};
         $sql .= $line;
         next if $sql !~ /\w/ || $sql !~ /;\s*$/;
         $CONNECTOR->dbh->do($sql);

package.json

@@ -12,7 +12,6 @@
     "angular-sanitize": "1.5.5",
     "bootstrap": ">=4.3.1",
     "popper": "1.0.1",
-     "bootstrap-select": "1.13.15",
     "ckeditor": ">=4.11.0",
     "font-awesome5": "^1.0.5",
     "intro.js": "2.7.0",

templates/bootstrap/header.html.ep

@@ -12,8 +12,7 @@
 % if ( !$fallback ) {
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.css">
 	<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.15/css/bootstrap-select.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ui-bootstrap4@3.0.6/dist/ui-bootstrap-csp.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>
@@ -21,7 +20,6 @@
     <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-1.13.15/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">
     <script src="/fallback/ckeditor/ckeditor.js"></script>

templates/bootstrap/scripts.html.ep

@@ -16,7 +16,6 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.15/js/bootstrap-select.js"></script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/intro.js"></script>
 
@@ -37,8 +36,6 @@
 <script src="/fallback/raphael.js/raphael-min.js"></script>
 <script src="/fallback/morris.js/morris.min.js"></script>
 
-<script src="/fallback/bootstrap-select-1.13.15/dist/js/bootstrap-select.js"></script>
-
 <script src="/fallback/intro.js/intro.js"></script>
 % }
 

templates/main/vm_drivers.html.ep

@@ -24,7 +24,7 @@
                     for="driver_<%= $driver_name %>"><%= $driver_name %></label>
             </div>
             <div class="col-md-4 mt-2">
-                <select data-live-search="true" class="selectpicker form-control show-tick"
+                <select data-live-search="true" class="custom-select form-control show-tick"
                         name="driver_<%= $driver_name %>">
 %              for my $option( $driver->get_options ) {
 %                  my $selected;

templates/main/vm_graphics.html.ep

@@ -27,7 +27,7 @@
                         for="driver_<%= $driver_name %>"><%= $driver_name %></label>
                     </div>
                     <div class="col-md-4 mt-2">
-                    <select class="selectpicker form-control"
+                    <select class="custom-select form-control"
                         id="driver_<%= $driver_name %>" name="driver_<%= $driver_name %>">
 %                       if ( !$domain->get_driver($driver_name)) {
                             <option value="" selected ><%=l 'none' %></option>