Changeset 2844


Ignore:
Timestamp:
Nov 14, 2016, 9:08:57 AM (3 years ago)
Author:
joamuran
Message:

New release, view changelog

Location:
lmd/trunk/fuentes
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/css/imageManager.css

    r2061 r2844  
    139139           
    140140
    141 
    142141/* Image Creation Assistant */
    143142
  • lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/exported.html

    r2694 r2844  
    44<div class="container">
    55
    6 <div class="panel panel-default" style="padding: 0px; margin-top: 100px">
     6<div class="panel panel-default" style="padding: 0px;">
    77<div class="panel-heading"><h2 i18n>lmd.Image.Exports</h2></div>
    88        <!--div class='col-md-9 well bs-component col-md-offset-2' id="Llx_ltsp_images_exported"-->
  • lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/images.html

    r2694 r2844  
    66
    77<div class="container">
    8 <div class="panel panel-default" style="padding: 0px; margin-top: 100px">
     8<div class="panel panel-default" style="padding: 0px;">
    99<div class="panel-heading"><h2  i18n>lmd.Image.List</h2></div>
    1010<div id="LtspImageManagerContainer" class="panel-body">
     
    3636       
    3737      <!-- Stage 1 -->
    38       <div id="llx-ltsp-image-assistant-stage-1" style="display:none">
     38      <div id="llx-ltsp-image-assistant-stage-1" style="display:none; overflow: hidden">
    3939          <div class="modal-header">
    4040            <button type="button" class="close llx-ltsp-image-assistant-close" data-dismiss="llx-ltsp-new-image-assistant" aria-hidden="true">×</button>
     
    4646            <div id="llx-ltsp-assistant-image-templates">
    4747               
    48                 <div i18n image_client_desc="Minimal Thin Client Image" id="llx_ltsp_lliurex_minimal_image" image_client_name="LliureXMini" class="llx_ltsp_template_div">
     48                <div i18n image_client_desc="Minimal Thin Client Image" id="llx_ltsp_lliurex_minimal_image" image_client_name="LliureXMini" class="llx_ltsp_template_div col-md-6">
    4949                    <div class="llx_ltsp_template_img" style="background-image: url(modules/lliurex-ltsp/src/css/img/llx-desktop13.png);"></div>
    5050                    <div class="llx_ltsp_template_namedesc"><div class="llx_ltsp_template_name" i18n>Minimal Thin Client</div><div class="llx_ltsp_template_desc" i18n>This is a minimal image to run thin clients with no need of a mirror in the server. Easy and quick.</div></div>               
     
    6161     
    6262      <!-- Stage 2 -->
    63       <div id="llx-ltsp-image-assistant-stage-2" style="display:none">
     63      <div id="llx-ltsp-image-assistant-stage-2" style="display:none; overflow: hidden">
    6464          <div class="modal-header">
    6565            <button type="button" class="close llx-ltsp-image-assistant-close" data-dismiss="llx-ltsp-new-image-assistant" aria-hidden="true">×</button>
  • lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/js/imageManager.js

    r2670 r2844  
    66    this.imageMinimalInstalled=null;
    77    this.timer=null;
     8    this.mirrorReady=false;
     9    this.mirror32bit=false;
     10    this.mirror64bit=false;
    811}
    912
     
    988991        //console.log(typeof(templatelist));
    989992       
    990         for (template in templatelist) {       
     993        for (var template in templatelist) {       
    991994            var templatefile=templatelist[template];
    992995            var credentials="";
     
    996999   
    9971000            Utils.n4d(credentials, n4dclass, n4dmethod, arglist, function(response){
    998                 self.DrawTemplateIntoAssistant(response);
     1001                //console.log(response);
     1002                template=JSON.parse(response);
     1003                //alert("Compare "+template.default.arch+ "with i386 and check mirror32 is: "+self.mirror32bit);
     1004                //alert("or "+template.default.arch+ "with amd64 and check mirror64 is: "+self.mirror64bit);
     1005                if ((template.default.arch==="i386" && self.mirror32bit) || (template.default.arch==="amd64" && self.mirror64bit))
     1006                    self.DrawTemplateIntoAssistant(template);
    9991007             });
    10001008             
     
    10091017ImageManager.prototype.DrawTemplateIntoAssistant=function DrawTemplateIntoAssistant(template){
    10101018    //var self=this;
    1011     template=JSON.parse(template);
    1012     var templateDiv=$(document.createElement("div")).attr("templateFileName", template.meta_inf.name).addClass("llx_ltsp_template_div");
     1019    var templateDiv=$(document.createElement("div")).attr("templateFileName", template.meta_inf.name).addClass("llx_ltsp_template_div col-md-5");
    10131020    var img=$(document.createElement("div")).css("background-image", "url(modules/lliurex-ltsp/src/css/img/"+template.default.llx_img+")").addClass("llx_ltsp_template_img");
    10141021    var namedesc=$(document.createElement("div")).addClass("llx_ltsp_template_namedesc");
     
    12451252}
    12461253
     1254ImageManager.prototype.getMirrorConfig=function getMirrorConfig(callback){
     1255    var self=this;
     1256   
     1257    var credentials="";
     1258    var n4dclass="MirrorManager";
     1259    var n4dmethod="get_all_configs";
     1260    var arglist=[];
     1261   
     1262    Utils.n4d(credentials, n4dclass, n4dmethod, arglist, function(response){
     1263       
     1264        self.mirrorReady=response.status;
     1265        var archs=response.msg.llx16.ARCHITECTURES;
     1266       
     1267        for (i in archs){
     1268           if (archs[i]==="amd64") self.mirror64bit=true;
     1269           if (archs[i]==="i386") self.mirror32bit=true;
     1270        }
     1271       
     1272        callback();
     1273       
     1274    });
     1275}
     1276
    12471277
    12481278ImageManager.prototype.init=function init(){
    12491279  var self=this;
    1250   //console.log(self.getImageList);
    1251   //console.log(self.RenderImageList);
    1252  
    1253   /*
    1254    * DEPRECATED....
    1255    *self.getImageList(function(imagelist){
    1256     // getimagelist: returns list of images
    1257     console.log("IMAGELIST1 ************************* INIT ************************** INIT **********************************");
    1258     self.imageList=imagelist; // assign to self.imagelist
    1259     console.log("IMAGELIST2 ************************* INIT ************************** INIT **********************************");
    1260     self.RenderImageList();   // and draw it
    1261     });
    1262   */
    1263  
    1264   //self.checkImageList();
     1280 
    12651281  self.getImageList();
    12661282 
    12671283  self.checkMinimalImageIsInstalled();
    1268   self.getAvailableTemplates();
     1284  self.getMirrorConfig(function(){self.getAvailableTemplates();});
    12691285  self.bindEvents();
    12701286}
  • lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/llx-ltsconf.html

    r1527 r2844  
    1 <div class='container row ' id="Llx_ltsconf_contendor"  style='margin-top:100px'>       
     1<div class='container row ' id="Llx_ltsconf_contendor" >       
    22        <div class='col-md-6 well bs-component col-md-offset-3'>
    33                <form class="form-horizontal" id="llx_ltsconf_bootoptions">
  • lmd/trunk/fuentes/admin-center-ltsp.install/lliurex-ltsp/src/ltsp-client-management.html

    r2670 r2844  
    55</div-->
    66
    7 <div class="panel panel-default col-md-10 col-md-offset-1" style="padding: 0px; margin-top: 100px">
     7<div class="panel panel-default col-md-10 col-md-offset-1" style="padding: 0px;">
    88        <div class="panel-heading"><h2 i18n>Clients</h2></div>
    99        <div id="ltsp-clients" class="panel-body">
  • lmd/trunk/fuentes/debian/changelog

    r2781 r2844  
     1lmd (2.4.58) xenial; urgency=high
     2
     3  * Removed netinstall methods to fix it in netinstall module
     4  * Fixed some mirror names
     5  * Fixed image manager to check mirror before create an image
     6
     7 --  <joamuran@gmail.com>  Mon, 14 Nov 2016 09:02:27 +0100
     8
    19lmd (2.4.57) xenial; urgency=high
    210
  • lmd/trunk/fuentes/debian/control

    r2727 r2844  
    1515
    1616Package: lmd-server
    17 Depends: ${misc:Depends}, dnsmasq, ltsp-server-standalone, ltsp-server, php7.0-cli, apache2, libapache2-mod-php7.0, n4d-remote-gui-plugin, llx-netinstall ( >= 0.21), n4d-lliurex-base ( >= 0.6 ), python, syslinux-common, llx-bootmanager (>>0.1), util-linux, python-apt, python-simplewebsocketserver
     17Depends: ${misc:Depends}, dnsmasq, ltsp-server-standalone, ltsp-server, php7.0-cli, apache2, libapache2-mod-php7.0, n4d-remote-gui-plugin, llx-netinstall ( >= 0.21), n4d-lliurex-base ( >= 0.6 ), python, syslinux-common, llx-bootmanager (>>0.1), util-linux, python-apt, python-simplewebsocketserver, xpra ( >= 0.17.3-1)
    1818Conflicts: lliurex-ltsp, n4d-ltsp-plugins
    1919Replaces: lliurex-ltsp, n4d-ltsp-plugins
  • lmd/trunk/fuentes/lmd-lliurex-data.install/usr/share/ltsp/plugins/ltsp-build-client/Ubuntu/094-lliurex

    r928 r2844  
    1111        esac
    1212
    13         [ ! -d /opt/ltsp/$CHROOT/net/mirror/llx1605 ] || umount -l /opt/ltsp/$CHROOT/net/mirror/llx1605
     13        [ ! -d /opt/ltsp/$CHROOT/net/mirror/llx1605 ] || umount -l /opt/ltsp/$CHROOT/net/mirror/llx16
    1414        # Working about nsswitch and friends
    1515        if [ -f /opt/ltsp/$CHROOT/etc/ldap.conf ] ; then
  • lmd/trunk/fuentes/lmd-server.install/usr/share/n4d/python-plugins/LmdBootManager.py

    r2671 r2844  
    1515        def getNetinstall(self):
    1616                '''
     17                DEPRECATED
    1718                Reads file /etc/ltsp/bootopts/netinstall and returns true or false
    1819                '''
     
    4647        def setNetinstall(self, status, unattended):
    4748                '''
     49                DEPRECATED
    4850                sets option for netinstall int bootopt.json (status and unattended install)
    4951                '''
     
    7981        def setNetinstallUnattended(self, status, username, password, rootpassword):
    8082                '''
     83                DEPRECATED
    8184                Writing in presseed username and password
    8285                '''                             
Note: See TracChangeset for help on using the changeset viewer.