Changeset 2061 for lmd/trunk

Timestamp:

Jun 29, 2016, 3:10:33 PM (5 years ago)

Author:

joamuran

Message:

release 2.4.46

Location:

lmd/trunk/fuentes

Files:

• admin-center-ltsp.install/lliurex-ltsp/src/css/imageManager.css (modified) (6 diffs)
• admin-center-ltsp.install/lliurex-ltsp/src/i18n (added)
• admin-center-ltsp.install/lliurex-ltsp/src/i18n/ca_ES@valencia (added)
• admin-center-ltsp.install/lliurex-ltsp/src/i18n/ca_ES@valencia/messages.json (added)
• admin-center-ltsp.install/lliurex-ltsp/src/i18n/en-US (added)
• admin-center-ltsp.install/lliurex-ltsp/src/i18n/en-US/messages.json (added)
• admin-center-ltsp.install/lliurex-ltsp/src/i18n/es-ES (added)
• admin-center-ltsp.install/lliurex-ltsp/src/i18n/es-ES/messages.json (added)
• admin-center-ltsp.install/lliurex-ltsp/src/images.html (modified) (8 diffs)
• admin-center-ltsp.install/lliurex-ltsp/src/js/imageManager.js (modified) (6 diffs)
• admin-center-ltsp.install/lliurex-ltsp/src/main.html (modified) (1 diff)
• debian/changelog (modified) (1 diff)

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

@@ -22 +22 @@
 }
 
-.llx-ltsp-image-file-available {background: radial-gradient(circle, #dddddd, #cccccc);}
+.llx-ltsp-image-file-available {
+    /*background: radial-gradient(circle, #dddddd, #cccccc);*/
+    background: #fafafa;
+    padding: 5px;
+    /*border-bottom: 1px solid #cccccc;
+    border: 1px solid #cccccc;*/
+    /*box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);*/
+     box-shadow: 0 1px 3px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+    
+    }
+
+
+/*.llx-ltsp-image-file-available:after {
+    content: "";
+    width: 150px;
+    height: 1px;
+    margin-top: 88px;
+    margin-left: -75px;
+    display: block;
+    position: absolute;
+    left: 50%;
+    z-index: -1;
+    box-shadow: 0px 0px 8px 2px #000000;
+}*/
 
 
@@ -48 +71 @@
 
 .llx-ltsp-image-file-broken {
-  background: radial-gradient(circle, #ffdddd, #ffcccc);
+  /*background: radial-gradient(circle, #ffdddd, #ffcccc);*/
+  background-color: #ffcdd2;
+  
 }
 
@@ -69 +94 @@
 
 .llx-ltsp-image-picture{
-    background-size: cover;
+    /*background-size: cover;
     background-repeat: no-repeat;
     background-image: url(img/llx-client13.png);
-    width: 96px;
-    height: 96px;
+    /*width: 96px;
+    height: 96px;*/
     border-radius: 50%;
     position: relative;
@@ -143 +168 @@
 .llx_ltsp_template_img{
     background-repeat: no-repeat;
-    background-size: cover;
     width: 160px;
     height:73px;
@@ -176 +200 @@
     padding: 5px;
   /*  background-color: #03A9F4;*/
-    background: radial-gradient(circle, #B3E5FC, #03A9F4);
-    color: #ffffff;
+    /*background: radial-gradient(circle, #B3E5FC, #03A9F4);
+    
+    color: #ffffff;*/
+    background: #E1F5FE;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
     float: left;
     display: block;
@@ -192 +219 @@
     width: 86px !important;
     height: 86px !important;
-    margin: 3px  10px 3px 15px !important;
+    margin: 3px  10px 3px 10px !important;
+    border: 1px solid #2196f3;
+    background-color: rgba(0,0,0,0) !important;
+    color: #2196f3 !important;
 }
 

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

@@ -1 @@
-<h1 class="topBanner" i18n>LliureX LTSP Image Manager</h1>
+<h1 class="topBanner" i18n>lmd.LliureX.LTSP.Image.Manager</h1>
 
 <!--div id="LtspImageManagerContainer" class="jumbotron  col-lg-12"-->
 
 <div class="panel panel-default">
-<h2>Image List</h2>
+<div class="panel-heading"><h2  i18n>lmd.Image.List</h2></div>
 <div id="LtspImageManagerContainer" class="panel-body">
-    
+<p i18n>lmd.img.list.description</p>
 <div id="llx-ltsp-imagelist"></div>
 <div id="llx-ltsp-createImage-button" class="ltsp-image-name">
-    <div class="btn btn-primary btn-fab llx-ltsp-createImage-icon"><i class="material-icons">computer</i></div>
-    <span i18n>Create.New.LTSP.Image</span>
+    <div class="btn btn-fab llx-ltsp-createImage-icon"><i class="material-icons md-48">computer</i></div>
+    <span class="ltsp-image-name" i18n>Create.New.LTSP.Image</span>
 </div>
 
@@ -36 +36 @@
           <div class="modal-header">
             <button type="button" class="close llx-ltsp-image-assistant-close" data-dismiss="llx-ltsp-new-image-assistant" aria-hidden="true">×</button>
-            <h4 class="modal-title" i18n>Step 1. Select Flavour</h4>
+            <h4 class="modal-title" i18n>lmd.image.assistant.step1</h4>
           </div>
           <div class="modal-body">
-            <p  i18n>Aci teniu les possibles imatges....</p>
+            <p  i18n>lmd.image.assistant.step1.desc</p>
             
             <div id="llx-ltsp-assistant-image-templates">
@@ -49 +49 @@
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn" id="llx-ltsp-goto-image-assistant-stage-2">Endavant ></button>
+            <button type="button" class="btn" id="llx-ltsp-goto-image-assistant-stage-2" i18n>llx.ltsp.go.forward</button>
             <!--button type="button" class="btn btn-primary">Desplega la minima</button-->
           </div>
@@ -61 +61 @@
           <div class="modal-header">
             <button type="button" class="close llx-ltsp-image-assistant-close" data-dismiss="llx-ltsp-new-image-assistant" aria-hidden="true">×</button>
-            <h4 class="modal-title" i18n>Step 2. Configure image</h4>
+            <h4 class="modal-title" i18n>lmd.image.assistant.step2</h4>
           </div>
           <div class="modal-body">
-            <p  i18n>Image Config...</p>
+            <p  i18n>lmd.image.assistant.step2.desc</p>
             
             <form class="form-horizontal">
@@ -70 +70 @@
                     
                   <div class="form-group">
-                    <label for="llx_ltsp_new_image_name" class="col-md-2 control-label">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">
@@ -77 +77 @@
                   
                   <div class="form-group">
-                    <label for="llx_ltsp_new_image_desc" class="col-md-2 control-label">Description</label>
+                    <label for="llx_ltsp_new_image_desc" class="col-md-2 control-label" i18n>lmd.image.assistant.Description</label>
                     <div class="col-md-10">
                       <textarea class="form-control" id="llx_ltsp_new_image_desc" type="text"></textarea>
@@ -84 +84 @@
                                     
                     <div class="form-group" id="llx_ltsp_new_image_assistant_arch_selector">
-                        <label for="llx_ltsp_new_image_arch" class="col-md-2 control-label">Arch</label>
+                        <label for="llx_ltsp_new_image_arch" class="col-md-2 control-label" i18n>lmd.image.assistant.Architecture</label>
                         <div class="col-md-10">
                           <textarea class="form-control" id="llx_ltsp_new_image_arch" type="text" readonly></textarea>
@@ -115 +115 @@
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-default" i18n id="llx-ltsp-goback-image-assistant-stage-1">Back</button>
-            <button type="button" class="btn btn-primary" id="llx-ltsp-create-new-image">Create</button>
+            <button type="button" class="btn btn-default" i18n id="llx-ltsp-goback-image-assistant-stage-1">lmd.image.assistant.Back</button>
+            <button type="button" class="btn btn-primary" i18n id="llx-ltsp-create-new-image">lmd.image.assistant.Create</button>
           </div>
       </div>

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

@@ -192 +192 @@
                 if (response!=-1) {
                   console.log("Closing window...");
-                  console.log("111111111111111111111111111");
                   Utils.waitwin.RemoveModalInfo();
-                  console.log("22222222222222222222");
                   message="Connection closed sucessful!";
-                  console.log("33333333333333333333333333333333");
                   Utils.msg(message, MSG_INFO);
-                  console.log("44444444444444444444444444444444");
                   //var text=self._("lmd.ask.for.regenerate.after.update");
                   var text=self._("lmd.ask.for.regenerate.after.update");
-                  console.log("555555555555555555555555555555555");
                   bootbox.confirm(text, function(res){
-                    console.log("6666666666666666666666666666");
                     // Removing image with targetid
                     if (res) self.regenerateImage(id);
                 });
-                  console.log("677777777777777777777");
                   
                   
@@ -220 +213 @@
     
     
-        } catch (e){console.log("EXCEPTIONNNNNNNNNNNNNNNN");console.log(e);}
+        } catch (e){console.log("EXCEPTION");console.log(e);}
       }
       }, 200);
@@ -298 +291 @@
 
 
-            var picColumn=$(document.createElement("div")).addClass("col-md-1");
-            var picItem=$(document.createElement("div")).addClass("llx-ltsp-image-picture");
+            var picColumn=$(document.createElement("div")).addClass("col-md-1").css("padding","0");
+            //var picItem=$(document.createElement("div")).addClass("llx-ltsp-image-picture");
+            var picItem=$(document.createElement("img")).attr("src", "modules/lliurex-ltsp/src/css/img/llx-client16.png");
             picColumn.append(picItem);
             var imgName=$(document.createElement("div")).html(imageContent.name).addClass("ltsp-image-name");
@@ -306 +300 @@
             $(descColumn).append(imgName, imgDesc);
           
-            var ImageButtonsColumn=$(document.createElement("div")).addClass("llx-ltsp-image-buttons col-md-6");
-            var editImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-xs btn-info ltsp-img-bt btn-raised").attr("title", "Edit");
+            var ImageButtonsColumn=$(document.createElement("div")).addClass("llx-ltsp-image-buttons col-md-7");
+            var editImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-xs btn-info ltsp-img-bt btn-raised").attr("title", self._("lmd.Edit"));
             $(editImgBt).html("<i class='material-icons' style='vertical-align:middle;'>cast</i>&nbsp;Edit");
-            var regenerateImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-info btn-xs ltsp-img-bt btn-raised").attr("title", "Regenerate");
+            var regenerateImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-info btn-xs ltsp-img-bt btn-raised").attr("title", self._("lmd.Regenerate"));
             $(regenerateImgBt).html("<i class='material-icons' style='vertical-align:middle;'>refresh</i>&nbsp;Regenerate");
-            var imgOptsBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-xs btn-info ltsp-img-bt btn-raised").attr("title", "Options");
+            var imgOptsBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-xs btn-info ltsp-img-bt btn-raised").attr("title", self._("lmd.Options"));
             $(imgOptsBt).html("<i class='material-icons' style='vertical-align:middle;'>edit</i>&nbsp;Options");
-            var cloneImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-info btn-xs ltsp-img-bt btn-raised").attr("title", "Clone");
+            var cloneImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-info btn-xs ltsp-img-bt btn-raised").attr("title", self._("lmd.Clone"));
             $(cloneImgBt).html("<i class='material-icons' style='vertical-align:middle;'>filter</i>&nbsp;Clone");
-            var listenImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-info btn-xs ltsp-img-bt btn-raised").attr("title", "Listen");
+            var listenImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-info btn-xs ltsp-img-bt btn-raised").attr("title", self._("lmd.Listen"));
             $(listenImgBt).html("<i class='material-icons' style='vertical-align:middle;'>pageview</i>&nbsp;Listen");
             $(listenImgBt).attr("taskid", imageContent.taskid);
-            var removeImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-danger btn-xs ltsp-img-bt btn-raised").attr("title", "Delete");
+            var removeImgBt=$(document.createElement("button")).attr("type", "button").addClass("btn btn-danger btn-xs ltsp-img-bt btn-raised").attr("title", self._("lmd.Delete"));
             $(removeImgBt).html("<i class='material-icons' style='vertical-align:middle;'>clear</i>&nbsp;Delete");
                 
@@ -743 +737 @@
             //  if there is no image with this id, let's ask user for confirm
             var text="We are going to create a new image client with these data: <br\><br\>";
-            text +="<table style='margin-left: 20px;'><tr><td><b>"+self._("Id (chroot folder):")+"</b></td><td>  "+id+"<td></tr>"+
-            "<tr><td><b>"+self._("Name:")+"</b></td><td>"+image_data.name+"<td style='margin-left: 20px;'></tr>"+
-            "<tr><td><b>"+self._("Description:")+"</b></td><td>"+image_data.desc+"<td style='margin-left: 20px;'></tr>"+
-            "<tr><td><b>"+self._("Architecture:")+"</b></td><td>"+image_data.arch+"<td style='margin-left: 20px;'></tr></table>";
+            text +="<table style='margin-left: 20px;'><tr><td><b>"+self._("lmd.id.chroot.folder")+"</b></td><td>  "+id+"<td></tr>"+
+            "<tr><td><b>"+self._("lmd.image.assistant.Name.info")+"</b></td><td>"+image_data.name+"<td style='margin-left: 20px;'></tr>"+
+            "<tr><td><b>"+self._("lmd.image.assistant.desc.info")+"</b></td><td>"+image_data.desc+"<td style='margin-left: 20px;'></tr>"+
+            "<tr><td><b>"+self._("lmd.image.assistant.arch.info")+"</b></td><td>"+image_data.arch+"<td style='margin-left: 20px;'></tr></table>";
             
             bootbox.confirm(text, function(res){
@@ -764 +758 @@
                     
             } else {
-                bootbox.alert(self._("Image id is in use or any field is empty. Please, change or set image name and description."));
+                bootbox.alert(self._("lmd.img.confirm.error"));
             }
     });

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

@@ -1 @@
-<h1 class="topBanner" i18n>LliureX Thin Client Management</h1>
+<h1 class="topBanner" i18n>lmd.LliureX.Thin.Client.Management</h1>
 
 <div id="bttest">Push me!</div>

lmd/trunk/fuentes/debian/changelog

@@ +1 @@
+lmd (2.4.46) xenial; urgency=high
+
+  * CSS fixed
+
+ -- joamuran <joamuran@gmail.com>  Wed, 29 Jun 2016 15:07:54 +0200
+
 lmd (2.4.45) xenial; urgency=high