Changeset 6515

Timestamp:

Dec 19, 2017, 9:26:01 AM (2 years ago)

Author:

kbut

Message:

add new feautres

Location:

lmd/trunk/fuentes/admin-center-ltsp.install/modul/lliurex-ltsp/src

Files:

• images.html (modified) (3 diffs)
• js/imageManager.js (modified) (6 diffs)

lmd/trunk/fuentes/admin-center-ltsp.install/modul/lliurex-ltsp/src/images.html

@@ -89 +89 @@
                 <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">
                     <div class="llx_ltsp_template_img col-md-2" style="background-image: url(modules/lliurex-ltsp/src/css/img/llx-mini16.png);"></div>
-                    <div class="llx_ltsp_template_namedesc col-md-10"><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>                
-            </div>
+                    <div class="llx_ltsp_template_namedesc col-md-10"><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>
+                </div>
+                <!-- Image from ISO -->
+                <div i18n image_client_desc="Image from ISO" id="llx_ltsp_lliurex_from_iso" image_client_name="LliureXISO" class="llx_ltsp_template_div col-md-6">
+                  <div class="llx_ltsp_template_img col-md-2" style="background-image: url(modules/lliurex-ltsp/src/css/img/llx-ISO16.png);"></div>
+                  <div class="llx_ltsp_template_namedesc col-md-10"><div class="llx_ltsp_template_name" i18n>Build image from ISO</div><div class="llx_ltsp_template_desc" i18n>Build a client from a downloaded LliureX ISO. This process should be faster than building a client from scratch. </div></div>
+              </div>
           </div></div>
           <div class="modal-footer">
@@ -113 +118 @@
                     
                   <div class="form-group">
-                    <label for="llx_ltsp_new_image_name" class="col-md-2 control-label" i18n>lmd.image.assistant.Name</label>              
+                    <label for="llx_ltsp_new_image_name" class="col-md-2 control-label" i18n>lmd.image.assistant.Name</label>
                     <div class="col-md-10">
                       <input class="form-control" id="llx_ltsp_new_image_name" type="text">
@@ -135 +140 @@
                         </div>
                     </div>
-                                    
+                  
+                  <div class="form-group" id="llx_ltsp_new_image_assistant_iso_selector">
+                      <label for="llx_ltsp_new_image_arch" class="col-md-2 control-label" i18n>lmd.image.assistant.Architecture</label>
+                      <div class="col-md-10">
+                          <input type="file" class="form-control" id="llx_ltsp_new_image_iso" />
+                      </div>
+                  </div>
+
                   <!--div class="form-group" id="llx_ltsp_new_image_assistant_arch_selector">
                     <label class="col-md-2 control-label" i18n>Architecture</label>

lmd/trunk/fuentes/admin-center-ltsp.install/modul/lliurex-ltsp/src/js/imageManager.js

@@ -1389 +1389 @@
                     $("#llx-ltsp-new-image-assistant").fadeOut();
                     //alert("create image");
-                    if(image_data.name=="LliureXMini"){
+                    if(image_data.type == "mini"){
                         self.deployMinimalClient();                        
+                    }
+                    else if( image_data.type == "ISO"){
                     }
                     else { // Let's rock'n'roll
@@ -1500 +1502 @@
     $("#llx-ltsp-goto-image-assistant-stage-2").on("click", function(){
         
-        itemSelected=$(".llx_ltsp_template_div_selected");
-        
-        if(($(itemSelected).attr("id")!="ltsp_template_client")&&
-           ($(itemSelected).attr("id")!="ltsp_template_infantil")&&
-            ($(itemSelected).attr("id")!="llx_ltsp_lliurex_minimal_image")&&
-            ($(itemSelected).attr("id")!="ltsp_template_desktop")) return -1;
-
-        
+        var available_type_images = ["ltsp_template_client", "ltsp_template_infantil", "llx_ltsp_lliurex_minimal_image", "llx_ltsp_lliurex_from_iso", "ltsp_template_desktop"];
+        
+        var itemSelected=$(".llx_ltsp_template_div_selected");
+        var id_image_selected = $(itemSelected).attr("id");
+
+        /* Check template is supported */
+        if( available_type_images.indexOf(id_image_selected) < 0 ) return -1;
+
+        $("#llx_ltsp_new_image_assistant_arch_selector").hide();
+        $("#llx_ltsp_new_image_assistant_iso_selector").hide();
+
         if ($(itemSelected).attr("image_client_name")==="LliureXMini") {
             // Hiding architecture
-            $("#llx_ltsp_new_image_assistant_arch_selector").hide(); 
-        } else {
+        }
+        else if($(itemSelected).attr("image_client_name")==="LliureXISO"){
+            $("#llx_ltsp_new_image_assistant_iso_selector").show();
+        }
+        else {
             // Show architecture
             $("#llx_ltsp_new_image_assistant_arch_selector").show();
@@ -1528 +1536 @@
             
         }
-            
-         
-                    
-        
-        
-        
-        
-        // $("#llx_ltsp_new_image_desc").val("#ltsp_template_desktop".find(".llx_ltsp_template_desc").html());
-
-                
+
         $("#llx-ltsp-image-assistant-stage-1").fadeOut(function(){
             $("#llx-ltsp-image-assistant-stage-2").fadeIn();
@@ -1544 +1543 @@
     
     $("#llx-ltsp-create-new-image").on("click", function(){
+
+        /* Define types values */
+
+        var list_templates = {
+            "ltsp_template_client":{
+                "i386":"lliurex-ltsp-client.conf",
+                "amd64":"lliurex-ltsp-client-amd64.conf",
+            },
+            "ltsp_template_desktop":{
+                "i386":"lliurex-ltsp-desktop.conf",
+                "amd64":"lliurex-ltsp-desktop-amd64.conf",
+            },
+            "ltsp_template_infantil":{
+                "i386":"lliurex-ltsp-infantil.conf",
+                "amd64":"lliurex-ltsp-infantil-amd64.conf"
+            },
+            "llx_ltsp_lliurex_minimal_image":{
+                "i386":"",
+                "amd64":""
+            }
+        };
+
+        var type_image = {
+            "llx_ltsp_lliurex_from_iso" : "ISO",
+            "llx_ltsp_lliurex_minimal_image" : "mini",
+        }
+
         // Check templates
         var id=$(".llx_ltsp_template_div_selected").attr("id");
@@ -1550 +1576 @@
         var image_desc=$("#llx_ltsp_new_image_desc").val();
         var arch=$("#llx_ltsp_new_image_arch").val();
-        
-        var template="";
-        
-        if (id==="ltsp_template_client" && arch==="i386") template="lliurex-ltsp-client.conf";
-        else if (id==="ltsp_template_client" && arch==="amd64") template="lliurex-ltsp-client-amd64.conf";
-        else if (id==="ltsp_template_desktop" && arch==="i386") template="lliurex-ltsp-desktop.conf";
-        else if (id==="ltsp_template_desktop" && arch==="amd64") template="lliurex-ltsp-desktop-amd64.conf";
-        else if (id==="ltsp_template_infantil" && arch==="i386") template="lliurex-ltsp-infantil.conf";
-        else if (id==="ltsp_template_infantil" && arch==="amd64") template="lliurex-ltsp-infantil-amd64.conf";
-        else if (id==="llx_ltsp_lliurex_minimal_image") template="";
+        var iso_file = $("#llx_ltsp_new_image_iso");
+
+        var template = "";
+        var type = "generated";
+
+        /* 
+        Select template according to image selected and architecture . 
+        If not exists template for options selected or it's not needed then template is void 
+        */
+        try{ template = list_templates[id][arch] } catch(err){}
+        try{ type = type_image[id] } catch(err){}
         
         // Setting image arch to description
@@ -1569 +1596 @@
         
         
-        var info_image={"template": template,
-                        "name": image_name,
-                        "desc": image_desc,
-                        "arch": arch};
+        var info_image = {"template": template,
+                          "name": image_name,
+                          "desc": image_desc,
+                          "arch": arch,
+                          "type": type
+                        };
 
         self.confirmImageCreation(info_image);