Changeset 3160 for admin-center/trunk/fuentes/admin-center.install/usr

Timestamp:

Dec 22, 2016, 8:40:07 PM (3 years ago)

Author:

joamuran

Message:

Fixed form factory and key size

Location:

admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center

Files:

• css/main.css (modified) (2 diffs)
• js/main.js (modified) (4 diffs)
• lib/formFactory.js (modified) (5 diffs)
• lib/utils.js (modified) (1 diff)

admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/css/main.css

@@ -76 +76 @@
         width: 100%;
         z-index: -9999999;
-        background-image: url(img/AdminCenterTopBanner.png);*/
+        background-image: url(img/AdminCenterTopBanner.png);
         background-repeat: no-repeat;
         background-size: cover;
         background-color: #fbc02d;
+        transition: all 0.2s;
 }
 .AdminCenterHeader{
@@ -451 +452 @@
     min-width: 610px;
     overflow-y: auto !important;
+        
 }
 

admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/js/main.js

@@ -4 +4 @@
   this.loadedModules=[];
         this.history=["info"];
+        this.lastScrollTop=0;
 
 
@@ -110 +111 @@
   $("#"+target).show();
   //alert("Loading: "+target);
+        
+        // Bind scroll event
+        $(".moduleWindow").on("scroll", function(ev){
+                ev.stopPropagation();
+                ev.preventDefault();
+                
+                var st = $(this).scrollTop();
+   if (st > self.lastScrollTop){
+                if ($(this).scrollTop()>0) 
+                                {
+                                        $("#AdminCenterTopBack").css("height", 50);
+                                        $("body").css("padding-top", 30);
+                                        $("#AdminCenterTopBack").css("filter", "opacity(0%)");
+                                        $(".container").css("margin-bottom", 150);
+                                }
+   } else {
+                if (($(this).scrollTop()<=50)) {
+                                $("#AdminCenterTopBack").css("height", 250);
+                                $("body").css("padding-top", 150);
+                                $("#AdminCenterTopBack").css("filter", "opacity(100%)");
+                                $(".container").css("margin-bottom", 15);
+                        }
+   }
+         self.lastScrollTop= st;
+                
+                         
+                                /*console.log($(this).scrollTop());
+                                console.log($(this).innerHeight());
+                                console.log($(this)[0].scrollHeight);
+                                console.log(ev);*/
+        });
+        
   $.material.init();
 
 }
+
 
 
@@ -313 +347 @@
       $("#"+target).show();
     }
+                
+                
+                // Setting scroll to default values
+                $("#AdminCenterTopBack").css("height", 250);
+                $("body").css("padding-top", 150);
+                $("#AdminCenterTopBack").css("filter", "opacity(100%)");
+                $(".container").css("margin-bottom", 15);
+                
   });
 
@@ -440 +482 @@
           $("#AdminCenterFooter").css("height", 25);
       });
-    
+                
 });

admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/lib/formFactory.js

@@ -4 +4 @@
 }
 
-formFactory.prototype.createSelect=function createSelect(item){
+formFactory.prototype.createSelect=function createSelect(item, expanded_columns=false){
   
   var disabled="";
   if (item.disabled==="true") disabled=' disabled="disabled" ';
   
+  var left_col_size="col-md-2";
+  var right_col_size="col-md-10";
+  if (expanded_columns) {
+      left_col_size="col-md-4";
+      right_col_size="col-md-6";
+    }
+  
   var sel='<div class="form-group col-md-12" title="'+item.help+'"  style="margin-top:30;">';
-    sel+='<label for="'+item.id+'" class="col-md-2 control-label">'+item.label+'</label>';
-    sel+='<div class="col-md-10">';
+    sel+='<label for="'+item.id+'" class="'+left_col_size+' control-label">'+item.label+'</label>';
+    sel+='<div class="'+right_col_size+'">';
     sel+='<select id="'+item.id+'" class="form-control" '+disabled+'>';
     for (var i in item.options){
@@ -23 +30 @@
 };
 
-formFactory.prototype.createCheckbox=function createCheckbox(item){
+formFactory.prototype.createCheckbox=function createCheckbox(item, expanded_columns=false){
+    var left_col_size="col-md-2";
+    var right_col_size="col-md-10";
+    if (expanded_columns) {
+        left_col_size="col-md-4";
+        right_col_size="col-md-6";
+      }
+  
     var checked="";
     var disabled="";
@@ -29 +43 @@
     if (item.disabled=="true") disabled=" disabled ";
     var content='<div class="form-group col-md-12" title="'+item.help+'">';
-    content+='<label class="col-md-2 control-label">';
+    content+='<label class="'+left_col_size+' control-label">';
     content+=item.label+'</label>';
-    content+='<div class="col-md-10">';
+    content+='<div class="'+right_col_size+'">';
     content+='<div class="checkbox"><label>';
     content+='<input type="checkbox" '+checked+' '+disabled+' name="'+item.id+'" id="'+item.id+'"/></label></div>';
@@ -39 +53 @@
 
 
-formFactory.prototype.createText=function createText(item){
+formFactory.prototype.createText=function createText(item, expanded_columns=false){
+    var left_col_size="col-md-2";
+    var right_col_size="col-md-10";
+    if (expanded_columns) {
+        left_col_size="col-md-4";
+        right_col_size="col-md-6";
+      }
+
+  
   var disabled="";
   if (item.disabled==="true") disabled=' disabled="disabled" ';
   
   var sel='<div class="form-group col-md-12" title="'+item.help+'"  style="margin-top:30;">';
-    sel+='<label for="'+item.id+'" class="col-md-2 control-label">'+item.label+'</label>';
-    sel+='<div class="col-md-10">';
+    sel+='<label for="'+item.id+'" class="'+left_col_size+' control-label">'+item.label+'</label>';
+    sel+='<div class="'+right_col_size+'">';
     sel+='<input id="'+item.id+'" class="form-control" type="text" value="'+item.value+'" '+disabled+'>';
     sel+="</input></div></div>";
@@ -51 +73 @@
 };
 
-formFactory.prototype.createTextArea=function createTextArea(item){
+formFactory.prototype.createTextArea=function createTextArea(item, expanded_columns=false){
+  var left_col_size="col-md-2";
+  var right_col_size="col-md-10";
+  if (expanded_columns) {
+       left_col_size="col-md-4";
+       right_col_size="col-md-6";
+  }
+
   var disabled="";
   if (item.disabled==="true") disabled=' disabled="disabled" ';
   
   var sel='<div class="form-group col-md-12" title="'+item.help+'"  style="margin-top:30;">';
-    sel+='<label for="'+item.id+'" class="col-md-2 control-label">'+item.label+'</label>';
-    sel+='<div class="col-md-10">';
+    sel+='<label for="'+item.id+'" class="'+left_col_size+' control-label">'+item.label+'</label>';
+    sel+='<div class="'+right_col_size+'">';
     sel+='<textarea id="'+item.id+'" class="form-control" type="text" '+disabled+'>'+item.value;
     sel+="</textarea></div></div>";

admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/lib/utils.js

@@ -12 +12 @@
         this.formFactory=new formFactory();
         this.crypt=new JSEncrypt(); // Class to encrypt and decrypt keys
-        this.crypt.default_key_size=8192;
+        //this.crypt.default_key_size=8192;
+        this.crypt.default_key_size=2048;
         
         this.showMarkDown=new showdown.Converter();