Commit 593d3385 authored by Francesc Guasch's avatar Francesc Guasch
Browse files

[#289] improved new machine template descriptions

parent b697804e
......@@ -226,8 +226,8 @@ sub _update_isos {
,xml_volume => 'yakkety64-volume.xml'
}
,debian_stretch => {
name =>'Debian Stretch 64 bits XFCE'
,description => 'Debian 9.0 Stretch 64 bits'
name =>'Debian Stretch 64 bits'
,description => 'Debian 9.0 Stretch 64 bits (XFCE desktop)'
,url => 'https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-9.0.0-amd64-xfce-CD-1.iso'
,md5 => '9346436c0cf1862af71cb0a03d9a703c'
,xml => 'jessie-amd64.xml'
......@@ -235,7 +235,8 @@ sub _update_isos {
}
,windows_7 => {
name => 'windows_7'
,description => 'Windows 7 64 bits'
,description => 'Windows 7 64 bits. Requires an user provided ISO image.'
.'<a target="_blank" href="http://ravada.readthedocs.io/en/latest/docs/new_iso_image.html">[help]</a>'
,xml => 'windows_7.xml'
,xml_volume => 'windows10-volume.xml'
}
......
INSERT INTO iso_images
(name,description,arch,xml,xml_volume,url,file_re,md5)
VALUES('Debian Jessie 32 bits netinst'
VALUES('Debian Jessie 32 bits'
,'Debian 8.5.0 Jessie 32 bits (netsinst)'
,'i386'
,'jessie-i386.xml'
......@@ -66,7 +66,7 @@ VALUES('Ubuntu Yakkety Yak 64 bits',' Ubuntu 16.10 Yakkety Yak 64 bits'
);
INSERT INTO iso_images
(name,description,arch,xml,xml_volume,url,file_re,md5_url)
VALUES('Debian Jessie 64 bits netinst'
VALUES('Debian Jessie 64 bits'
,'Debian 8.5.0 Jessie 64 bits (netsinst)'
,'amd64'
,'jessie-amd64.xml'
......
......@@ -45,17 +45,21 @@
ng-change="iso_file = change_iso(id_iso.device)"
required=""
></select>
<div ng-show="id_iso.description">
<i ng-bind-html="id_iso.description">{{id_iso.description}}</i>
</div>
<div ng-show="id_iso.name && ( !id_iso.device && id_iso.url )
&& (iso_file == '<NONE>' || !iso_file) ">
<font color="#500000"><%=l 'This ISO image has not been already downloaded. This may take many minutes, even hours until the file is fetched from Internet.' %></font>
<a type="button" class="btn btn-warning"
ng-click="iso_download(id_iso.id)"
> <%=l "Download now" %></a>
</div><br>
</div>
</div>
</div>
<div class="from-group row">
<div ng-show="id_iso.name">
<br/>
<label for="iso_file" class="col-lg-2 control-label"><%=l 'Select ISO' %></label>
<div class="col-lg-10" ng-init="iso_file = '<NONE>'" >
<select class="form-control"
......@@ -172,10 +176,6 @@
</div>
</form>
</div>
<div class="tab-pane fade" id="frommachine" >
<form method="post" action="/machine/copy">
</div>
</div>
</div>
</div>
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