Reacomodo lo visual

codenautas · Nov 26, 2016 · df45c95 · df45c95
1 parent 52efd80
commit df45c95
Show file tree

Hide file tree

Showing 9 changed files with 4,364 additions and 4,472 deletions.
diff --git a/src/txt-to-sql.jade b/src/txt-to-sql.jade
@@ -5,13 +5,15 @@ doctype html
         labelChoose:'Paso 1: ',
         buttonChoose:'Elegir',
         labelSeparator:'Separador: ',
-        separatorTitle:'Definir separador, si vacío, auto-detecta'
+        separatorTitle:'Definir separador, si vacío, auto-detecta',
+        separatorHint:'auto detectar',
     },
     en:{
         labelChoose:'Step 1: ',
         labelSeparator:'Separator: ',
         buttonChoose:'select file ',
-        separatorTitle:'Define separator, if empty, auto-detects it'
+        separatorTitle:'Define separator, if empty, auto-detects it',
+        separatorHint:'auto detect',
     }
   }[lang||'es'];
 html(lang=lang)
@@ -26,17 +28,17 @@ html(lang=lang)
   body
     a(href="https://github.com/codenautas/txt-to-sql")
       img(style="position: absolute; top: 0; right: 0; border: 0;", src="https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67", alt="Fork me on GitHub", data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png")
-    div(style={float:'right', height:'300px', margin:'80px 30px'})
-      img(src="txt-to-sql.png")
     a(href="https://github.com/codenautas/txt-to-sql/issues")
-      img(style="position: absolute; top: 270px; right: 60px; border: 0;", src="new-issue-es.png", alt="New issue")
+      img(style="position: absolute; top: 80px; right: 90px; border: 0;", src="new-issue-es.png", alt="New issue")
+    div(style={float:'left', height:'180px', margin:'0px 30px'})
+      img(src="txt-to-sql.png")
     h1 txt-to-sql
     div
       label=messages.labelChooselabel=messages.labelChoose
-      label=messages.labelSeparator
-      input(type='text', id='inputSeparator' size=1, title=messages.separatorTitle)
-      span &nbsp;
       input(value=messages.buttonChoose, type='file', id='inputFile')
+      span &nbsp;
+      label=messages.labelSeparator
+      input(type='text', id='inputSeparator' size=8, title=messages.separatorTitle, placeholder=messages.separatorHint)
     div#steps
     pre#log
     pre#errMessage(style={color:'red'})
@@ -317,7 +319,7 @@ html(lang=lang)
                                ]));
                 fields.unshift(html.th({colspan:7}, [html.td("Fields")]));
                 var tblFields = html.table({class:'inner'}, fields).create();
-                addStep(messages.step2, [html.table({class:'outer'}, [
+                addStep("", [html.table({class:'outer'}, [
                                             html.tr([
                                                 html.td([tblOpts]),
                                                 html.td([tblFields])

diff --git a/src/txt-to-sql.styl b/src/txt-to-sql.styl
@@ -1,14 +1,19 @@
+table.outer
+    margin 24px
+
 table.outer
     td
         vertical-align top
-        //border 1px solid #000;
 table.inner
-    td
-        border 1px solid #000;
+    th
+        border-bottom 1px solid #444
     tr td th:last-child{
         width:1%;
         white-space:nowrap;
     }
 
 input
-    width auto
+    width auto
+
+input[type="file"]
+    width 400px    
diff --git a/web/best-globals.js b/web/best-globals.js
@@ -302,19 +302,13 @@ bestGlobals.setGlobals = function setGlobals(theGlobalObj){
     /*jshint forin:true */
 };
 
-bestGlobals.functionName = function functionName(fun) {
-    if(typeof fun !== "function"){
-        throw new Error("non function in functionName");
-    }
-    return fun.name||fun.toString().replace(/^\s*function\s*([^(]*)\((.|\s)*$/i,'$1')||'anonymous';
-};
-
 bestGlobals.constructorName = function constructorName(obj) {
     if(obj){
-        return bestGlobals.functionName(obj.constructor);
-    }else{
-        console.log('deprecate use of constructorName with non-object for',obj);
-        console.log('it will throw Error in future releases');
+        var cn = obj.constructor.name;
+        if(!cn){
+            return obj.constructor.toString().replace(/^\s*function\s*([^(]*)\((.|\s)*$/i,'$1');
+        }
+        return cn;
     }
 };
 
@@ -367,47 +361,6 @@ bestGlobals.forOrder = function forOrder(text){
     return main.join('')+signs.join('')+'   '+text;
 };
 
-bestGlobals.forOrder.Native = function forOrderNative(a){
-    return a;
-};
-
-bestGlobals.nullsOrder = 1; // 1=last -1=first;
-
-bestGlobals.compareForOrder = function compareForOrder(sortColumns){
-    var thisModule = this;
-    return function forOrderComparator(row1,row2){
-        var column;
-        var i=0;
-        do{
-            var order = bestGlobals.coalesce(sortColumns[i].order, 1);
-            column=sortColumns[i].column;
-            if(row1[column]==null){
-                if(row2[column]!=null){
-                    return thisModule.nullsOrder;
-                }
-            }else if(row2[column]==null){
-                return -thisModule.nullsOrder;
-            }else{
-                var a=(sortColumns[i].func||thisModule.forOrder)(row1[column]);
-                var b=(sortColumns[i].func||thisModule.forOrder)(row2[column]);
-                if(a>b){
-                    return 1*order;
-                }else if(a<b){
-                    return -1*order;
-                }
-            }
-            i++;
-        }while(i<sortColumns.length);
-        return 0;
-    };
-};
-
-bestGlobals.sleep = function sleep(milliseconds){
-    return new Promise(function(resolve){
-        setTimeout(resolve,milliseconds);
-    });
-};
-
 return bestGlobals;
 
 });