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

deb/debianize.pl

@@ -94,13 +94,19 @@ sub create_md5sums {
 
     unlink "$DEBIAN/md5sums";
 
+    open my $md5sum,'>>',"$DEBIAN/md5sums" or die $!;
     open my $find, ,'-|', 'find . -type f -printf \'%P\n\'' or die $!;
     while (<$find>) {
         chomp;
         next if /^debian/i;
-        print `md5sum $_ >> $DEBIAN/md5sums`
+        my @cmd = ('md5sum',$_);
+        my ($in,$out,$err);
+        run3(\@cmd, \$in, \$out, \$err);
+        print $md5sum $out;
     }
     close $find;
+    close $md5sum;
+
     chdir "..";
     chmod 0644,"$DIR_DST/$DEBIAN/md5sums" or die "$! $DIR_DST/$DEBIAN/md5sums";
 }

devel-docs/new_documentation.md

+New documentation page
+=======================
+
+Normally the documentation pages are stored in /docs and /devel-docs directories.
+
+When you create a new page keep in mind don't leave blanks in the filename.

devel-docs/release.md

 Steps to release
+===============
 
 # Draft
 
@@ -7,8 +8,8 @@ Steps to release
 At code -> releases draft a new release
 
 
- * tag version : 0.2.2
- * release title : 0.2.2
+ * tag version : v0.2.2
+ * release title : v0.2.2
 
 
 ## Create the milestone

devel-docs/test.md

 
-#Testing environment
+Testing environment
+==================
 
 Previously [install](https://github.com/frankiejol/Test-SQL-Data/blob/master/INSTALL.md) TEST::SQL::DATA module.
 
@@ -13,6 +14,7 @@ At the end, in "Test Summary Report" you can check the result.
 If something goes wrong you see: 
     Result: FAIL    
 
-##Run a single test
+Run a single test
+-----------------
 
     $ make && sudo prove -b t/lxc/*t

devel-docs/translations.md

@@ -2,3 +2,5 @@ Translations
 ============
 
 We use [Transifex](https://www.transifex.com/ravada/ravada/) to provide a cleaner and easy to use interface for translators.
+
+If you works directly in .po file, it's a good option use an application like [Poedit](https://poedit.net/).

docs/How_Create_Virtual_Machine.md

@@ -12,4 +12,3 @@ to create a virtual machine.
 4. Choose a name for your virtual machine and choose an option for the ISO image. the selected image needs to be installed 
 accordingly. please note that you can see any upcoming error or problems in section "messages".
 TEST: adding image to a .md file. ( I need to use git-hub help to figure this out, up to now I know that we need to upload the picture in repository and then add it to the page like what we do in SiWiki)
-![alt tag](http://url/to/img.png) 

docs/Ubuntu_Installation.md

+# Ubuntu Installation
+This document aims to demonstrate how to install Ubuntu operating system on user computer.
+## Steps
+1. The user needs at least 4.5 GB of free space on their computer.
+2. Connect your USB or DVD containing Ubuntu program
+3. When you turn on your computer the below image must show up automatically or by pressing F12.
+(image1)
+4. Make sure you are connected to internet, then the below image is shown. Mark both options and click on "continue".
+(image2)
+5. Below shows how to  Use the checkboxes to choose whether you’d like to Install Ubuntu alongside another operating system, delete your existing operating system and replace it with Ubuntu. in our case we select "Something Else" and click on "continue".
+(image 3)
+6. In this stage, you will create partitions.
+
+### vda
+Select "Free space" and then set the _mount point_ to "/".
+
+### vdb
+Select "Free space" and then assign it to _swap area_
+
+7. The last step is choosing your language and region. after doing so and restarting your computer you can start using Ubuntu.

docs/add_kvm_storage_pool.md

-#How to add a Qemu-KVM storage pool
+# How to add a Qemu-KVM storage pool
 
 If you run out of disk space you may add a new disk. KVM mush then
 be informed about this new space available by creating a new
 storage pool.
 
-##Add the drive to the system
+## Add the drive to the system
 
 Add the drive to the host. Format it.
 
@@ -23,7 +23,7 @@ Format it with large files tunning:
 
     $ sudo mkfs.ext4 -m 0.001 -T largefiles /dev/sdb1
 
-##Mount the new partition
+## Mount the new partition
 
 Add this new partition to the filesystem table:
 
@@ -36,7 +36,7 @@ issuing:
 
     sudo mount -a
 
-##Add the drive to the Virtual Manager
+## Add the drive to the Virtual Manager
 
     $ sudo virsh pool-define-as pool2 dir - - - - /var/lib/libvirt/images.2
     $ sudo virsh pool-autostart pool2

docs/new_iso_image.md

-#How to add a new ISO image
+# How to add a new ISO image
 
 ISO images are required to create KVM virtual machines. They can be placed or downloaded at run time.
 
-##Placing your own ISO image
+## Placing your own ISO image
 
 Copy the .iso file to the KVM storage, it is /var/lib/libvirt/images by default. Make sure everybody can read it
 
@@ -11,18 +11,18 @@ Copy the .iso file to the KVM storage, it is /var/lib/libvirt/images by default.
 Get the md5 for the ISO file, you will need it for the next step:
 
     # md5sum file.iso
-    
+
 Add an entry to the SQL table:
 
     mysql> INSERT INTO iso_images (name, description, arch, xml, xml_volume, md5)
             VALUES ('name','the description', 'i386', 'name.xml' ,'name-vol.xml','bbblamd5sumjustgenerated');
-  
-##XML file
+
+## XML file
 
 A XML template file is required if you want to create machines from this ISO. In the directory etc/xml there are examples. You can make new ones creating a new machine from another tool like virt-manager. Once it is down dump the xml with
 
     # virsh dumpxml machine name.xml
 
-##XML Volume file
+## XML Volume file
 
 Create a new xml volume file based in another one from etc/xml.

lib/Ravada.pm

@@ -120,6 +120,19 @@ sub _update_isos {
                 ,file_re => ,'ubuntu-17.04.*desktop-amd64.iso'
                 ,md5_url => ,'http://releases.ubuntu.com/17.04/MD5SUMS'
         }
+        ,serena64 => {
+            name => 'Mint 18.1 Mate 64 bits'
+    ,description => 'Mint Serena 18.1 with Mate Desktop based on Ubuntu Xenial 64 bits'
+           ,arch => 'amd64'
+            ,xml => 'xenial64-amd64.xml'
+     ,xml_volume => 'xenial64-volume.xml'
+            ,url => 'http://mirrors.evowise.com/linuxmint/stable/18.1/'
+        ,file_re => 'linuxmint-18.1-mate-64bit.iso'
+        ,md5_url => ''
+            ,md5 => 'c5cf5c5d568e2dfeaf705cfa82996d93'
+
+        }
+
     );
 
     my $sth_search = $CONNECTOR->dbh->prepare("SELECT id FROM $table WHERE $field = ?");

lib/Ravada/Front.pm

@@ -428,6 +428,8 @@ sub _ping_backend_localhost {
 Connects to a Virtual Machine Manager ( or VMM ( or VM )).
 Returns a read-only connection to the VM.
 
+  my $vm = $front->open_vm('KVM');
+
 =cut
 
 sub open_vm {

lib/Ravada/I18N/ca.po

 # Translators:
 # Fernando Verdugo <fv3rdugo@gmail.com>, 2017
+# Joel Alarcón <joelalju100@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.0-alpha\n"

lib/Ravada/I18N/en.po

 # Translators:
+# Joel Alarcón <joelalju100@gmail.com>, 2017
 # Fernando Verdugo <fv3rdugo@gmail.com>, 2017
 msgid ""
 msgstr ""

lib/Ravada/I18N/es.po

 # Translators:
 # Fernando Verdugo <fv3rdugo@gmail.com>, 2017
+# Joel Alarcón <joelalju100@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.0-alpha\n"

lib/Ravada/I18N/fa.po

@@ -133,3 +133,45 @@ msgstr "ادمین"
 
 msgid "Show/Hide clones"
 msgstr "نمایش/پنهان همسان ها"
+
+msgid "I want to change my password"
+msgstr ""
+
+msgid "I want to change my language"
+msgstr ""
+
+msgid "Language:"
+msgstr ""
+
+msgid "English"
+msgstr ""
+
+msgid "Spanish"
+msgstr ""
+
+msgid "Catalan"
+msgstr ""
+
+msgid "New Password:"
+msgstr ""
+
+msgid "Confirm Password:"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Your language has been changed successfully"
+msgstr ""
+
+msgid "Your password has been changed successfully"
+msgstr ""
+
+msgid "Password too small"
+msgstr ""
+
+msgid "Password fields aren't equal"
+msgstr ""
+
+msgid "Some of the password's fields are empty"
+msgstr ""

lib/Ravada/I18N/fr.po

 # Translators:
-# Fernando Verdugo <fv3rdugo@gmail.com>, 2017
 # Kimia mirehbar	kimia@etsetb.upc.edu
 # french 
 msgid ""
@@ -10,131 +9,173 @@ msgstr ""
 "PO-Revision-Date: 2017-01-03 12:12+0300\n"
 "Last-Translator: Fernando Verdugo fernando@etsetb.upc.edu\n"
 "Language-Team: \n"
-"Language: ca\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 
-msgid "<%=l 'Ravada broker' %>"
+msgid "Ravada broker"
 msgstr "Ravada Courtier"
 
-msgid "<%=l 'Restore' %>"
+msgid "Restore"
 msgstr "Restaurer"
 
-msgid "<%=l 'Machine Name' %>"
+msgid "Machine Name"
 msgstr "Nom de Machine"
 
-msgid "<%=l 'Tools' %>"
+msgid "Tools"
 msgstr "Outils"
 
-msgid "<%=l 'Machines List' %>"
+msgid "Machines List"
 msgstr "Liste de Machines"
 
-msgid "<%=l 'Users' %>"
+msgid "Users"
 msgstr "Utilisateurs"
 
-msgid "<%=l 'Choose a Machine to Start' %>"
+msgid "Choose a Machine to Start"
 msgstr "Choisir un Machine Pour Commencer"
 
-msgid "<%=l 'Start' %>"
+msgid "Start"
 msgstr "Début"
 
-msgid "<%=l 'Stop' %>"
+msgid "Stop"
 msgstr "Stop"
 
-msgid "<%=l 'View' %>"
+msgid "View"
 msgstr "Vue"
 
-msgid "<%=l 'Prepare Base' %>"
+msgid "Prepare Base"
 msgstr "Preparer Base"
 
-msgid "<%=l 'Clone' %>"
+msgid "Clone"
 msgstr "Cloner"
 
-msgid "<%=l 'Can't Prepare Base, Remove Base nor Delete. Machine has' %>"
+msgid "Can't Prepare Base, Remove Base nor Delete. Machine has"
 msgstr "Ne Se Peux pas Preparer Base, Retirer ou Effacer la Base"
 
-msgid "<%=l 'Clone/s' %>"
+msgid "Clone/s"
 msgstr "Clones"
 
-msgid "<%=l 'NEW' %>"
+msgid "NEW"
 msgstr "Nouveau"
 
-msgid "<%=l 'Users List' %>"
+msgid "Users List"
 msgstr "Liste d'utilisateurs"
 
-msgid "<%=l 'Name' %>"
+msgid "Name"
 msgstr "Nom"
 
-msgid "<%=l 'Log Out' %>"
+msgid "Log Out"
 msgstr "Sortir"
 
-msgid "<%=l 'Available Machines' %>"
+msgid "Available Machines"
 msgstr "Machines Disponibles"
 
-msgid "<%=l 'Help' %>"
+msgid "Help"
 msgstr "Aide"
 
-msgid "<%=l 'Requirements' %>"
+msgid "Requirements"
 msgstr "Exigences"
 
-msgid "<%=l 'About' %>"
+msgid "About"
 msgstr "Sur"
 
-msgid "<%=l 'Messages' %>"
+msgid "Messages"
 msgstr "Messages"
 
-msgid "<%=l 'Mark all as Read' %>"
-msgstr "Marquer Tout Comme Lu' %>"
+msgid "Mark all as Read"
+msgstr "Marquer Tout Comme Lu"
 
-msgid "<%=l 'Settings' %>"
+msgid "Settings"
 msgstr "Réglages"
 
-msgid "<%=l 'New Machine' %>"
+msgid "New Machine"
 msgstr "Machine Nouveau"
 
-msgid "<%=l 'Paused' %>"
+msgid "Paused"
 msgstr "En Pause"
 
-msgid "<%=l 'Prepare base' %>"
+msgid "Prepare base"
 msgstr "Preparer Base"
 
-msgid "<%=l 'Machine locked by requested' %>"
+msgid "Machine locked by requested"
 msgstr "Machine Férme par demande"
 
-msgid "<%=l 'process' %>"
+msgid "process"
 msgstr "Procès"
 
-msgid "<%=l 'Copy' %>"
+msgid "Copy"
 msgstr "Copie"
 
-msgid "<%=l 'Error!' %>"
+msgid "Error!"
 msgstr "Erreur"
 
-msgid "<%=l 'Backend no available!' %>"
+msgid "Backend no available!"
 msgstr "Backend Indisponible"
 
-msgid "<%=l 'Subject' %>"
+msgid "Subject"
 msgstr "Sujet"
 
-msgid "<%=l 'Date' %>"
+msgid "Date"
 msgstr "Date"
 
-msgid "<%=l 'Actions' %>"
+msgid "Actions"
 msgstr "Action"
 
-msgid "<%=l 'Mark as Read' %>"
+msgid "Mark as Read"
 msgstr "Marquer Comme Lu"
  
-msgid "<%=l 'Mark as UnRead' %>"
+msgid "Mark as UnRead"
 msgstr "Marquer Comme Non Lu"
 
-msgid "<%=l 'No message to show!' %>"
-msgstr "Pas de Messages à Lire' %>"
+msgid "No message to show!"
+msgstr "Pas de Messages à Lire"
 
-msgid "<%=l 'Admin' %>"
+msgid "Admin"
 msgstr "Administrateur"
 
-msgid "<%=l 'Show/Hide clones' %>"
+msgid "Show/Hide clones"
 msgstr "Afficher/Masquer des clones"
+
+msgid "I want to change my password"
+msgstr ""
+
+msgid "I want to change my language"
+msgstr ""
+
+msgid "Language:"
+msgstr ""
+
+msgid "English"
+msgstr ""
+
+msgid "Spanish"
+msgstr ""
+
+msgid "Catalan"
+msgstr ""
+
+msgid "New Password:"
+msgstr ""
+
+msgid "Confirm Password:"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Your language has been changed successfully"
+msgstr ""
+
+msgid "Your password has been changed successfully"
+msgstr ""
+
+msgid "Password too small"
+msgstr ""
+
+msgid "Password fields aren't equal"
+msgstr ""
+
+msgid "Some of the password's fields are empty"
+msgstr ""

lib/Ravada/I18N/gl.po

@@ -88,3 +88,45 @@ msgstr "Preferencias"
 
 msgid "New Machine"
 msgstr "Nova máquina"
+
+msgid "I want to change my password"
+msgstr ""
+
+msgid "I want to change my language"
+msgstr ""
+
+msgid "Language:"
+msgstr ""
+
+msgid "English"
+msgstr ""
+
+msgid "Spanish"
+msgstr ""
+
+msgid "Catalan"
+msgstr ""
+
+msgid "New Password:"
+msgstr ""
+
+msgid "Confirm Password:"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Your language has been changed successfully"
+msgstr ""
+
+msgid "Your password has been changed successfully"
+msgstr ""
+
+msgid "Password too small"
+msgstr ""
+
+msgid "Password fields aren't equal"
+msgstr ""
+
+msgid "Some of the password's fields are empty"
+msgstr ""

lib/Ravada/VM/KVM.pm

@@ -685,6 +685,7 @@ sub _iso_name {
     confess "Missing MD5 field on table iso_images FOR $iso->{url}"
         if !$iso->{md5};
 
+    my $downloaded = 0;
     if (! -e $device || ! -s $device) {
         $req->status("downloading $iso_name file"
                 ,"Downloading ISO file for $iso_name "
@@ -699,6 +700,9 @@ sub _iso_name {
             if (! _check_md5($device, $iso->{md5}));
 
         $req->status("done","File $iso->{filename} downloaded") if $req;
+        $downloaded = 1;
+    }
+    if ($downloaded || !$iso->{device} ) {
         my $sth = $$CONNECTOR->dbh->prepare(
                 "UPDATE iso_images SET device=? WHERE id=?"
         );

public/js/admin.js

@@ -105,7 +105,7 @@ ravadaApp.directive("solShowMachine", swMach)
         $scope.orderParam = ['-'+type1,type2];
       else $scope.orderParam = [type1,'-'+type2];
     }
-    $scope.hide_clones = false;
+    $scope.hide_clones = true;
     $scope.hideClones = function(){
       $scope.hide_clones = !$scope.hide_clones;
     }
@@ -189,4 +189,3 @@ ravadaApp.directive("solShowMachine", swMach)
     $scope.getMessages();
     $scope.updatePromise = $interval($scope.updateMessages,3000);
   };
-

templates/bootstrap/user_settings.html.ep

@@ -27,6 +27,9 @@
                                 <option <%= $c->param("tongue") eq 'en' ? "selected" : "" %> value="en" ><%=l 'English' %></option>
                                 <option <%= $c->param("tongue") eq 'es' ? "selected" : "" %> value="es" ><%=l 'Spanish' %></option>
                                 <option <%= $c->param("tongue") eq 'ca' ? "selected" : "" %> value="ca" ><%=l 'Catalan' %></option>
+                                <option <%= $c->param("tongue") eq 'gl' ? "selected" : "" %> value="gl" ><%=l 'Galician' %></option>
+                                <option <%= $c->param("tongue") eq 'fr' ? "selected" : "" %> value="fr" ><%=l 'French' %></option>
+                                <option <%= $c->param("tongue") eq 'fa' ? "selected" : "" %> value="fa" ><%=l 'Persian' %></option>
                              </select>
 %                            if ($changed_lang) {
                                  <font color="green">   <%=l 'Your language has been changed successfully' %></font>