etc/vimrc

diff --git a/etc/vim/source/functions.vim b/etc/vim/source/functions.vim
index a504f7aa4108f9cca6a277cd0ae2081bb02e93b1..54aebc99632ecc729f89433ede8490351da99035 100644 (file)
--- a/etc/vim/source/functions.vim
+++ b/etc/vim/source/functions.vim
@@ -5,7 +5,6 @@
 "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-au VimLeave * if filereadable($VIMHOME."/.netrwhist")|call delete($VIMHOME."/.netrwhist")|endif 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " File...()
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -161,7 +160,6 @@ func! FileCommentToggle()
 endfunc
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-let Cmd = $VIMHOME . '/vim-shortcurts'
 let FilePath = expand('%:p')
 
 let Debug = $VIMRC_DEBUG
@@ -185,19 +183,6 @@ func! Debug(...)
 
 endfunc
 
-func! Stats()
-       let stats = expand("$VIMHOME/stats")
-       if ! isdirectory(stats)
-               call mkdir(stats)
-       endif
-       call FileExec(stats.'/set.all','set all')
-       call FileExec(stats.'/setglob.all','setglob all')
-       call FileExec(stats.'/setloc.all','setloc all')
-       call FileExec(stats.'/let.g','let g:')
-       call FileExec(stats.'/let.v','let v:')
-       return
-endfunc
-
 func! Test()
        let @a = ''
        setloc nomore
@@ -231,54 +216,4 @@ func! GetExec(...)
        return rd
        echo "ZAZA"
 endfunc
-
-func! VimrcReload2(...)
-       " echo GetExec('set all')
-       " call FileExec('/tmp/zaza.vim','set all')
-       return
-       echo "ZAZA"
-endfunc
-
-if !exists('*VimrcReload')
-       " call Debug("VimrcReload: Create")
-       func! VimrcReload(...)
-               call Debug("VimrcReload: Start")
-
-               call Debug("VimrcReload: ".$MYVIMRC)
-               exec "source $MYVIMRC"
-
-               call Debug("VimrcReload: End")
-               call VimrcReload2()
-               
-               return Debug()
-       endfunc
 endif
-
-func! FileScript(...)
-       let Out = shellescape(g:Cmd). ' ' . join(a:000,' ')
-       let Out = system(Out)
-       let Out = substitute(Out,'[\n\s]\+$','','')
-       " let Out = substitute(Out,'[\t\r\n ]\+$','','')
-       return Out
-       echo "<".Out.">"
-endfunc
-
-func! VS(...)
-   let Cmd = g:Cmd
-   let FilePath = expand('%:p')
-       if (a:0 == 0) || (a:1 == "auto") || (g:FilePath == "") || (g:VimShortcurtsAutoType == "")
-               " echon "DEBUG"
-       let g:FilePath = expand('%:p')
-               let g:VimShortcurtsAutoType = system(g:Cmd .' file_type ' . g:FilePath)
-               if (a:0 == 0) || (a:1 == "auto")
-                       return g:FilePath.':'.g:VimShortcurtsAutoType
-               endif
-       end
-   for o in a:000
-      let o = substitute(o, '^%$', FilePath, '')
-      let o = substitute(o, '^auto_', g:VimShortcurtsAutoType.'_', '')
-      let Cmd = Cmd . ' ' . o
-   endfor
-   " return system(Cmd)
-   return Cmd
-endfunc

diff --git a/etc/vim/source/option.vim b/etc/vim/source/option.vim
index 0e2f2c9ecf4fe5623c82d3c7ffa5bbe5b3950293..48c64b6a9e2855542ba00aea4491900510c7501d 100644 (file)
--- a/etc/vim/source/option.vim
+++ b/etc/vim/source/option.vim
@@ -30,7 +30,6 @@ set history=1000
 " NB 05.03.16 endif
 
 let $PS1 = "\u@\h:" " See /etc/profile
-let $MYVIMRC = "/etc/vim/vimrc"
 for file in ["~/.profile", "~/.bash_profile", "~/.bashrc", "~/.zshrc", "/etc/profile"]
   if !empty(glob(file))
     let $BASH_ENV = resolve(expand(file))

diff --git a/etc/vimrc b/etc/vimrc
index 0545cf5fdd68cb032fea0e36f3867fbef4b812ec..386327f99f2cd090a47373af8028c97328f665a6 100644 (file)
--- a/etc/vimrc
+++ b/etc/vimrc
@@ -4,16 +4,18 @@
 " ln -s /opt/nb/etc/vimrc ~/.vimrc
 "
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-let $VIMHOME = fnamemodify(resolve(fnamemodify(expand('<sfile>'),':p')),':h').'/vim'
-if empty(glob($VIMHOME)) && filereadable(expand('~/.vim'))
-  let $VIMHOME =  resolve(expand('~/.vim'))
-endif
+let $MYVIMRC = expand('<sfile>')
+" NB 19.01.18: infinite loop ? 
+" NB 19.01.18 if empty(glob($VIMHOME)) && filereadable(expand('~/.vim'))
+" NB 19.01.18   let $VIMHOME =  resolve(expand('~/.vim'))
+" NB 19.01.18 endif
 
 " NB 08.03.17: infinite loop when link on /etc/vim/vimrc.local 
 " NB 08.03.17 if filereadable("/etc/vim/vimrc")
 " NB 08.03.17   source /etc/vim/vimrc
 " NB 08.03.17 endif
 
+let $VIMHOME = fnamemodify(resolve(fnamemodify(expand('<sfile>'),':p')),':h').'/vim'
 if &runtimepath !~ $VIMHOME
   let &runtimepath = &runtimepath . ',' . $VIMHOME
 endif

diff --git a/www/dbq/html/default.min.css b/www/dbq/html/default.min.css
index 5ae2796bd35e52c7685727081bf8fb6c812b24a0..90b00e518f46d115d8123280a963db5de2d2645f 100644 (file)
--- a/www/dbq/html/default.min.css
+++ b/www/dbq/html/default.min.css
@@ -1 +1 @@
-table,table.rows{border-collapse:collapse}.button,a,a:visited{text-decoration:none}html{font:90% 'Trebuchet MS',sans-serif;background-color:#EEE}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.loader{border:16px solid #FFF;border-radius:50%;border-top:16px solid #000;padding:0;margin:0 auto;width:8em;height:8em;animation:spin 2s linear infinite;display:block}body.loader{margin-top:8em}.loader *{display:none!important}h1{margin:0 0 .5em;font-size:180%;padding-bottom:.3em;border-bottom:dashed 1px #444}h1 select{padding:0;border:none;background:inherit;font:inherit}a{color:inherit}.button,div>a,li a,p a,td a{color:#3572B0}.button:hover,a:hover{opacity:.8}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 .3em}td,th{padding:.2em .7em}th a.sort{float:left;margin-right:.1em}input:not([type]),input[type=text],input[type=password],input[type=date],input[type=email],input[type=url],input[type=''],select,textarea{border-radius:3px;border:1px solid #DDD;padding:.3em .4em;box-shadow:0 1px 1px #EEE}input[size]{max-width:70%}div.row div label:after,form label:after{content:':'}form input,form label,form select{vertical-align:middle;margin:.2em .4em .2em 0}.rows{padding:0}.rows form{display:inline-block}.block,.menu,div.row,form.edit,iframe,pre,table.rows,ul.row{border-radius:4px;border-spacing:0;padding:.5em .2em;margin-bottom:.5em;border:1px solid #DDD;background-color:#FAFAFA;box-shadow:0 1px 2px #EEE}table.rows{border-style:hidden;box-shadow:0 0 0 1px #DDD;table-layout:fixed}table.rows tr:nth-child(even) td{background-color:#FEFEFE}div.row div,table.rows td,table.rows th,ul.row li{border-bottom:solid 1px #DDD}div.row div,table.rows tr:last-child td,ul.row li{border-bottom:none}table.rows td,table.rows th{border-right:dashed 1px #DDD}.rows .count{text-align:right}table.rows th{text-align:left}div.buttons,div.row div.delete,div.row div.view{text-align:center}table.rows td{padding:.3em}table.rows.fixed{width:100%}div.row div label,table.rows.fixed td,table.rows.fixed th{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}table.rows.fixed th{white-space:normal}table.rows td.delete,table.rows td.view{width:1%;white-space:nowrap}table.rows.fixed th.view{width:2em}table.rows.fixed th.delete{width:2.7em}div.rows{clear:both}div.row{float:left;margin-right:4px;min-width:24%}.nofloat{float:none}div.row div{margin:0;padding:.1em .2em;border-bottom:solid 1px #fff}div.row div.view .button{margin-bottom:5px}div.row div.delete .button{margin-top:5px}div.row div:last-child{border-bottom:none;padding-bottom:0}div.row div.delete label,div.row div.view label{display:none}div.row div label,ul.row li label{padding:.1em .5em .1em 0;min-width:20%;display:inline-block}.button{font:inherit;display:inline-block;line-height:1.6em;cursor:pointer;white-space:nowrap;box-sizing:border-box;margin:0 .1em 0 0;padding:0 .3em;border-radius:4px;border:none;background-color:#EEE;background:linear-gradient(to bottom right,#EEE,#DDD);box-shadow:0 1px 1px #BBB}.bottom,.center,.menu,.nav,.rows{clear:both;display:table}.bottom,.buttons,.center,.menu,.nav,.rows,td.button{margin-left:auto;margin-right:auto}div.buttons{margin-top:.5em}form.menu{padding:.5em;background-color:#FAFAFA;max-width:1024px}form.menu .button.add{float:right;margin-top:.2em}form.menu .criterias{border-top:dashed 1px #DDD;margin-top:.3em;padding-top:.3em;clear:both}form.menu .criterias span.label{border-right:solid 1px #fff;border-radius:3px;margin:0 .2em;white-space:nowrap;float:left}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]{width:4em}div.row label,form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}div.row .label span,form.edit .fields .label span{width:54%;display:inline-block;text-align:left;vertical-align:middle;margin-top:.2em}form.edit .fields input[size],form.edit .fields select,form.edit .fields textarea{width:65%}
+html{font:90% 'Trebuchet MS',sans-serif;background-color:#eee}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.loader{border:16px solid #fff;border-radius:50%;border-top:16px solid #000;padding:0;margin:0 auto 0 auto;width:8em;height:8em;animation:spin 2s linear infinite;display:block}body.loader{margin-top:8em}.loader *{display:none!important}h1{margin:0 0 .2em 0;font-size:180%;padding-bottom:.3em;margin-bottom:.5em;border-bottom:dashed 1px #444}h1 select{padding:0;border:none;background:inherit;font:inherit}a{color:inherit}div>a,li a,p a,td a{color:#3572b0}a,a:visited{text-decoration:none}.button:hover,a:hover{opacity:.8}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 .3em}table{border-collapse:collapse}td,th{padding:.2em .7em}th a.sort{float:left;margin-right:.1em}input:not([type]),input[type=''],input[type=date],input[type=email],input[type=password],input[type=text],input[type=url],select,textarea{border-radius:3px;border:solid 1px #ddd;padding:.3em .4em;box-shadow:0 1px 1px #eee}input[size]{max-width:70%}div.row div label:after,form label:after{content:':'}form input,form label,form select{vertical-align:middle;margin:.2em .4em .2em 0}.rows{padding:0}.rows form{display:inline-block}.block,.menu,div.row,form.edit,iframe,pre,table.rows,ul.row{border-radius:4px;border-spacing:0;padding:.5em .2em;margin-bottom:.5em;border:solid 1px #ddd;background-color:#fafafa;box-shadow:0 1px 2px #eee}table.rows{border-style:hidden;border-collapse:collapse;box-shadow:0 0 0 1px #ddd;table-layout:fixed}table.rows tr:nth-child(even) td{background-color:#fefefe}div.row div,table.rows td,table.rows th,ul.row li{border-bottom:solid 1px #ddd}div.row div,table.rows tr:last-child td,ul.row li{border-bottom:none}table.rows td,table.rows th{border-right:dashed 1px #ddd}.rows .count{text-align:right}table.rows th{text-align:left}table.rows td{padding:.3em .3em}table.rows.fixed{width:100%}div.row div label,table.rows.fixed td,table.rows.fixed th{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}table.rows.fixed th{white-space:normal}table.rows td.delete,table.rows td.view{width:1%;white-space:nowrap}table.rows.fixed th.view{width:2em}table.rows.fixed th.delete{width:2.7em}div.rows{clear:both}div.row{float:left;margin-right:4px;min-width:24%}.nofloat{float:none}div.row div{margin:0;padding:.1em .2em;border-bottom:solid 1px #fff}div.row div.view .button{margin-bottom:5px}div.row div.delete .button{margin-top:5px}div.row div:last-child{border-bottom:none;padding-bottom:0}div.row div.delete label,div.row div.view label{display:none}div.row div.delete,div.row div.view{text-align:center}div.row div label,ul.row li label{padding:.1em .5em .1em 0;min-width:20%;display:inline-block}.button{font:inherit;display:inline-block;text-decoration:none;line-height:1.6em;cursor:pointer;white-space:nowrap;box-sizing:border-box;margin:0 .1em 0 0;padding:0 .3em;border-radius:4px;border:none;color:#3572b0;background-color:#eee;background:linear-gradient(to bottom right,#eee,#ddd);box-shadow:0 1px 1px #bbb}.bottom,.center,.menu,.nav,.rows{clear:both;display:table}.bottom,.buttons,.center,.menu,.nav,.rows,td.button{margin-left:auto;margin-right:auto}div.buttons{text-align:center;margin-top:.5em}form.menu{padding:.5em;background-color:#fafafa;max-width:1024px}form.menu .button.add{float:right;margin-top:.2em}form.menu .criterias{border-top:dashed 1px #ddd;margin-top:.3em;padding-top:.3em;clear:both}form.menu .criterias span.label{border-right:solid 1px #fff;border-radius:3px;margin:0 .2em;white-space:nowrap;float:left}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]{width:4em}div.row label,form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}div.row .label span,form.edit .fields .label span{width:54%;display:inline-block;text-align:left;vertical-align:middle;margin-top:.2em}form.edit .fields input[size],form.edit .fields select,form.edit .fields textarea{width:65%}