diff --git a/cgi-bin/edit.py b/cgi-bin/edit.py index e09d8a9c..d8a992f5 100644 --- a/cgi-bin/edit.py +++ b/cgi-bin/edit.py @@ -58,9 +58,7 @@ else: selected3 = '' selected4 = '' -print('
' - '

Edit & show HAproxy settings

' - '
' +print('

Runtime API

' '' '' '' diff --git a/cgi-bin/funct.py b/cgi-bin/funct.py index ccb8f67b..bfbc8a0c 100644 --- a/cgi-bin/funct.py +++ b/cgi-bin/funct.py @@ -112,8 +112,14 @@ def head(title): print('Content-type: text/html\n') print('%s' % title) print('' + '' + '' + '' '' '' + '' '' '' '' @@ -147,48 +153,47 @@ def head(title): def links(): print('' - '
HAproxy-WI v1.10.1
') + '
HAproxy-WI v1.10.2
') def show_login_links(): cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) login = cookie.get('login') if login is None: - print('
  • Login
    • ') + print('
  • Login
    • ') else: - print('
  • Logout
    • ' % login.value) + print('
  • Logout
    • ' % login.value) def footer(): print('' @@ -202,7 +207,77 @@ def footer(): 'HAproxy-WI' '' '-->') - +def get_auto_refresh(h2): + print('

    ') + print('%s' % h2) + print('' + 'restart Auto-refresh' + '' + '' + '' + '

    ' + '
    ' + '
    ' + 'Refresh Interval' + '
    ' + '
    ' + '
    ' + '
      ' + '
    • ' + 'Off ' + '
      • ' + '
    ' + '
    ' + '
    ' + '' + '
    ' + '
    ' + '' + '
    ' + '
    ' + '' + '
    ' + '
    ' + '
    ') def ssh_connect(serv): ssh = SSHClient() ssh.load_system_host_keys() diff --git a/cgi-bin/haproxy-webintarface.config b/cgi-bin/haproxy-webintarface.config index 823cd364..79ddcf10 100644 --- a/cgi-bin/haproxy-webintarface.config +++ b/cgi-bin/haproxy-webintarface.config @@ -54,5 +54,3 @@ server_state_file = /etc/haproxy/haproxy.state haproxy_sock = /var/run/haproxy.sock #Temp store configs, for haproxy check tmp_config_path = /tmp -#Time in seconds for auto refresh view stats_port -refresh_time = 120 diff --git a/cgi-bin/logs.py b/cgi-bin/logs.py index f9ceee3e..67f63d70 100644 --- a/cgi-bin/logs.py +++ b/cgi-bin/logs.py @@ -17,9 +17,9 @@ funct.check_login() path_config = "haproxy-webintarface.config" config = configparser.ConfigParser() config.read(path_config) - -print('

    HAproxy Logs

    ' - '
    Server
    ' + +funct.get_auto_refresh("HAproxy logs") +print('
    ' '' '' '' diff --git a/cgi-bin/overview.py b/cgi-bin/overview.py index 3ef5c3fc..deaa43ec 100644 --- a/cgi-bin/overview.py +++ b/cgi-bin/overview.py @@ -23,11 +23,11 @@ try: except IOError: print("Can't load users DB") -print('

    Quick Status

    ' - '
    ServerNumber rows
    ') +funct.get_auto_refresh("Overview") + +print('
    ') if funct.is_admin(): - print('' '' '' @@ -83,9 +83,9 @@ for i in sorted(listhap): funct.ssh_command(listhap.get(i), commands, server_status="1") print('
    LoginGroup') if funct.is_admin(): - print('start' % listhap.get(i)) - print('start' % listhap.get(i)) - print('restart' % listhap.get(i)) + print('start' % listhap.get(i)) + print('start' % listhap.get(i)) + print('restart' % listhap.get(i)) print('show' % listhap.get(i)) print('edit' % listhap.get(i)) print('compare' % listhap.get(i)) diff --git a/cgi-bin/viewsttats.py b/cgi-bin/viewsttats.py index 672d9baf..3b296854 100644 --- a/cgi-bin/viewsttats.py +++ b/cgi-bin/viewsttats.py @@ -42,16 +42,20 @@ except requests.exceptions.Timeout as errt: except requests.exceptions.RequestException as err: print ("OOps: Something Else",err) -print('' % (config.get('haproxy', 'refresh_time') ,serv)) +#print('' % (config.get('haproxy', 'refresh_time') ,serv)) for i in listhap.listhap: if listhap.listhap.get(i) == serv: servname = i -print('

    Choose server!


    ' - '
    ' - '' + '') funct.choose_server_with_vip(serv) @@ -62,4 +66,4 @@ print('
    ') print(data.decode('utf-8')) funct.head("Stats HAproxy configs") print('
    ') -#print('') + diff --git a/inc/awesome.css b/inc/awesome.css new file mode 100644 index 00000000..016191c3 --- /dev/null +++ b/inc/awesome.css @@ -0,0 +1,78 @@ +.menu .svg-inline--fa { + margin-right: 0.5em; + } +.auto-refresh-pause::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\F04C"; +} +.auto-refresh-resume::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f04b"; +} +.overview-link::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f21e"; +} +.stats::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f06e"; +} +.logs::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f02d"; +} +.map::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f279"; +} +.runtime::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f233"; +} +.config-show::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f10a"; +} +.compare::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f0c5"; +} +.add::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f067"; +} +.edit::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f044"; +} +.version::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f021"; +} +.upload::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f093"; +} +.delete::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f00d"; +} +.login::before { + display: none; + font-family: "Font Awesome 5 Solid"; + content: "\f007"; +} \ No newline at end of file diff --git a/inc/fa-solid.min.js b/inc/fa-solid.min.js new file mode 100644 index 00000000..a13729cb --- /dev/null +++ b/inc/fa-solid.min.js @@ -0,0 +1,5 @@ +/*! + * Font Awesome Free 5.0.9 by @fontawesome - https://fontawesome.com + * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) + */ +!function(){"use strict";var c={};try{"undefined"!=typeof window&&(c=window)}catch(c){}var h=(c.navigator||{}).userAgent,v=void 0===h?"":h,l=c,z=(~v.indexOf("MSIE")||v.indexOf("Trident/"),"___FONT_AWESOME___"),H=function(){try{return!0}catch(c){return!1}}(),M=[1,2,3,4,5,6,7,8,9,10],s=M.concat([11,12,13,14,15,16,17,18,19,20]);["xs","sm","lg","fw","ul","li","border","pull-left","pull-right","spin","pulse","rotate-90","rotate-180","rotate-270","flip-horizontal","flip-vertical","stack","stack-1x","stack-2x","inverse","layers","layers-text","layers-counter"].concat(M.map(function(c){return c+"x"})).concat(s.map(function(c){return"w-"+c}));var a=l||{};a[z]||(a[z]={}),a[z].styles||(a[z].styles={}),a[z].hooks||(a[z].hooks={}),a[z].shims||(a[z].shims=[]);var V=a[z],m=Object.assign||function(c){for(var h=1;h1&&void 0!==arguments[1]?arguments[1]:{}).asNewDefault,n=void 0!==e&&e,i=Object.keys(S),r=n?function(t){return~i.indexOf(t)&&!~E.indexOf(t)}:function(t){return~i.indexOf(t)};Object.keys(t).forEach(function(e){r(e)&&(S[e]=t[e])})}s.FontAwesomeConfig=S;var T=s||{};T[g]||(T[g]={}),T[g].styles||(T[g].styles={}),T[g].hooks||(T[g].hooks={}),T[g].shims||(T[g].shims=[]);var R=T[g],H=[],F=!1;m&&((F=(f.documentElement.doScroll?/^loaded|^c/:/^loaded|^i|^c/).test(f.readyState))||f.addEventListener("DOMContentLoaded",function t(){f.removeEventListener("DOMContentLoaded",t),F=1,H.map(function(t){return t()})}));var I=function(t){m&&(F?setTimeout(t,0):H.push(t))},_=h,B={size:16,x:0,y:0,rotate:0,flipX:!1,flipY:!1};function D(t){if(t&&m){var e=f.createElement("style");e.setAttribute("type","text/css"),e.innerHTML=t;for(var n=f.head.childNodes,i=null,r=n.length-1;r>-1;r--){var a=n[r],o=(a.tagName||"").toUpperCase();["STYLE","LINK"].indexOf(o)>-1&&(i=a)}return f.head.insertBefore(e,i),t}}var W=0;function X(){return++W}function Y(t){for(var e=[],n=(t||[]).length>>>0;n--;)e[n]=t[n];return e}function U(t){return t.classList?Y(t.classList):(t.getAttribute("class")||"").split(" ").filter(function(t){return t})}function V(t,e){var n,i=e.split("-"),r=i[0],a=i.slice(1).join("-");return r!==t||""===a||(n=a,~C.indexOf(n))?null:a}function q(t){return(""+t).replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(//g,">")}function K(t){return Object.keys(t||{}).reduce(function(e,n){return e+(n+": ")+t[n]+";"},"")}function G(t){return t.size!==B.size||t.x!==B.x||t.y!==B.y||t.rotate!==B.rotate||t.flipX||t.flipY}function J(t){var e=t.transform,n=t.containerWidth,i=t.iconWidth;return{outer:{transform:"translate("+n/2+" 256)"},inner:{transform:"translate("+32*e.x+", "+32*e.y+") "+" "+("scale("+e.size/16*(e.flipX?-1:1)+", "+e.size/16*(e.flipY?-1:1)+") ")+" "+("rotate("+e.rotate+" 0 0)")},path:{transform:"translate("+i/2*-1+" -256)"}}}var Q={x:0,y:0,width:"100%",height:"100%"},Z=function(t){var e=t.children,n=t.attributes,i=t.main,r=t.mask,a=t.transform,o=i.width,s=i.icon,f=r.width,l=r.icon,c=J({transform:a,containerWidth:f,iconWidth:o}),u={tag:"rect",attributes:O({},Q,{fill:"white"})},m={tag:"g",attributes:O({},c.inner),children:[{tag:"path",attributes:O({},s.attributes,c.path,{fill:"black"})}]},d={tag:"g",attributes:O({},c.outer),children:[m]},g="mask-"+X(),h="clip-"+X(),p={tag:"defs",children:[{tag:"clipPath",attributes:{id:h},children:[l]},{tag:"mask",attributes:O({},Q,{id:g,maskUnits:"userSpaceOnUse",maskContentUnits:"userSpaceOnUse"}),children:[u,d]}]};return e.push(p,{tag:"rect",attributes:O({fill:"currentColor","clip-path":"url(#"+h+")",mask:"url(#"+g+")"},Q)}),{children:e,attributes:n}},$=function(t){var e=t.children,n=t.attributes,i=t.main,r=t.transform,a=K(t.styles);if(a.length>0&&(n.style=a),G(r)){var o=J({transform:r,containerWidth:i.width,iconWidth:i.width});e.push({tag:"g",attributes:O({},o.outer),children:[{tag:"g",attributes:O({},o.inner),children:[{tag:i.icon.tag,children:i.icon.children,attributes:O({},i.icon.attributes,o.path)}]}]})}else e.push(i.icon);return{children:e,attributes:n}},tt=function(t){var e=t.children,n=t.main,i=t.mask,r=t.attributes,a=t.styles,o=t.transform;if(G(o)&&n.found&&!i.found){var s=n.width/n.height/2,f=.5;r.style=K(O({},a,{"transform-origin":s+o.x/16+"em "+(f+o.y/16)+"em"}))}return[{tag:"svg",attributes:r,children:e}]},et=function(t){var e=t.prefix,n=t.iconName,i=t.children,r=t.attributes,a=t.symbol,o=!0===a?e+"-"+S.familyPrefix+"-"+n:a;return[{tag:"svg",attributes:{style:"display: none;"},children:[{tag:"symbol",attributes:O({},r,{id:o}),children:i}]}]};function nt(t){var e=t.icons,n=e.main,i=e.mask,r=t.prefix,a=t.iconName,o=t.transform,s=t.symbol,f=t.title,l=t.extra,c=t.watchable,u=void 0!==c&&c,m=i.found?i:n,d=m.width,g=m.height,h="fa-w-"+Math.ceil(d/g*16),p=[S.replacementClass,a?S.familyPrefix+"-"+a:"",h].concat(l.classes).join(" "),b={children:[],attributes:O({},l.attributes,{"data-prefix":r,"data-icon":a,class:p,role:"img",xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 "+d+" "+g})};u&&(b.attributes[v]=""),f&&b.children.push({tag:"title",attributes:{id:b.attributes["aria-labelledby"]||"title-"+X()},children:[f]});var y=O({},b,{prefix:r,iconName:a,main:n,mask:i,transform:o,symbol:s,styles:l.styles}),w=i.found&&n.found?Z(y):$(y),x=w.children,k=w.attributes;return y.children=x,y.attributes=k,s?et(y):tt(y)}function it(t){var e=t.content,n=t.width,i=t.height,r=t.transform,a=t.title,o=t.extra,s=t.watchable,f=void 0!==s&&s,l=O({},o.attributes,a?{title:a}:{},{class:o.classes.join(" ")});f&&(l[v]="");var c,u,m,g,p,b,y,w,x,k=O({},o.styles);G(r)&&(k.transform=(u=(c={transform:r,startCentered:!0,width:n,height:i}).transform,m=c.width,g=void 0===m?h:m,p=c.height,b=void 0===p?h:p,y=c.startCentered,x="",x+=(w=void 0!==y&&y)&&d?"translate("+(u.x/_-g/2)+"em, "+(u.y/_-b/2)+"em) ":w?"translate(calc(-50% + "+u.x/_+"em), calc(-50% + "+u.y/_+"em)) ":"translate("+u.x/_+"em, "+u.y/_+"em) ",x+="scale("+u.size/_*(u.flipX?-1:1)+", "+u.size/_*(u.flipY?-1:1)+") ",x+="rotate("+u.rotate+"deg) "),k["-webkit-transform"]=k.transform);var z=K(k);z.length>0&&(l.style=z);var C=[];return C.push({tag:"span",attributes:l,children:[e]}),a&&C.push({tag:"span",attributes:{class:"sr-only"},children:[a]}),C}var rt=function(){},at=S.measurePerformance&&c&&c.mark&&c.measure?c:{mark:rt,measure:rt},ot='FA "5.0.9"',st=function(t){at.mark(ot+" "+t+" ends"),at.measure(ot+" "+t,ot+" "+t+" begins",ot+" "+t+" ends")},ft={begin:function(t){return at.mark(ot+" "+t+" begins"),function(){return st(t)}},end:st},lt=function(t,e,n,i){var r,a,o,s,f,l=Object.keys(t),c=l.length,u=void 0!==i?(s=e,f=i,function(t,e,n,i){return s.call(f,t,e,n,i)}):e;for(void 0===n?(r=1,o=t[l[0]]):(r=0,o=n);r"+o.map(wt).join("")+""}var xt=function(){};function kt(t){return"string"==typeof(t.getAttribute?t.getAttribute(v):null)}var zt={replace:function(t){var e=t[0],n=t[1].map(function(t){return wt(t)}).join("\n");if(e.parentNode&&e.outerHTML)e.outerHTML=n+(S.keepOriginalSource&&"svg"!==e.tagName.toLowerCase()?"\x3c!-- "+e.outerHTML+" --\x3e":"");else if(e.parentNode){var i=document.createElement("span");e.parentNode.replaceChild(i,e),i.outerHTML=n}},nest:function(t){var e=t[0],n=t[1];if(~U(e).indexOf(S.replacementClass))return zt.replace(t);var i=new RegExp(S.familyPrefix+"-.*");delete n[0].attributes.style;var r=n[0].attributes.class.split(" ").reduce(function(t,e){return e===S.replacementClass||e.match(i)?t.toSvg.push(e):t.toNode.push(e),t},{toNode:[],toSvg:[]});n[0].attributes.class=r.toSvg.join(" ");var a=n.map(function(t){return wt(t)}).join("\n");e.setAttribute("class",r.toNode.join(" ")),e.setAttribute(v,""),e.innerHTML=a}};function Ct(t,e){var n="function"==typeof e?e:xt;0===t.length?n():(s.requestAnimationFrame||function(t){return t()})(function(){var e=!0===S.autoReplaceSvg?zt.replace:zt[S.autoReplaceSvg]||zt.replace,i=ft.begin("mutate");t.map(e),i(),n()})}var Nt=!1;var At=null;var Ot=function(t){var e=t.getAttribute("style"),n=[];return e&&(n=e.split(";").reduce(function(t,e){var n=e.split(":"),i=n[0],r=n.slice(1);return i&&r.length>0&&(t[i]=r.join(":").trim()),t},{})),n};var Mt=function(t){var e,n,i,r,a=t.getAttribute("data-prefix"),o=t.getAttribute("data-icon"),s=void 0!==t.innerText?t.innerText.trim():"",f=bt(U(t));return a&&o&&(f.prefix=a,f.iconName=o),f.prefix&&s.length>1?f.iconName=(i=f.prefix,r=t.innerText,dt[i][r]):f.prefix&&1===s.length&&(f.iconName=(e=f.prefix,n=function(t){for(var e="",n=0;n-1&&Vt(r.nextSibling),Vt(r),r=null),i&&!r){var a=n.getPropertyValue("content"),o=f.createElement("i");o.setAttribute("class",""+Xt[i[1]]),o.setAttribute(b,e),o.innerText=3===a.length?a.substr(1,1):a,":before"===e?t.insertBefore(o,t.firstChild):t.appendChild(o)}})})}(),Nt=!1,e()}}function Kt(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;if(m){var n=f.documentElement.classList,i=function(t){return n.add(y+"-"+t)},r=function(t){return n.remove(y+"-"+t)},a=Object.keys(Bt),o=["."+Dt+":not(["+v+"])"].concat(a.map(function(t){return"."+t+":not(["+v+"])"})).join(", ");if(0!==o.length){var s=Y(t.querySelectorAll(o));if(s.length>0){i("pending"),r("complete");var l=ft.begin("onTree"),c=s.reduce(function(t,e){try{var n=Ut(e);n&&t.push(n)}catch(t){w||t instanceof Tt&&console.error(t)}return t},[]);l(),Ct(c,function(){i("active"),i("complete"),r("pending"),"function"==typeof e&&e()})}}}}function Gt(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,n=Ut(t);n&&Ct([n],e)}var Jt=function(){var t=p,e=S.familyPrefix,n=S.replacementClass,i="svg:not(:root).svg-inline--fa{overflow:visible}.svg-inline--fa{display:inline-block;font-size:inherit;height:1em;overflow:visible;vertical-align:-.125em}.svg-inline--fa.fa-lg{vertical-align:-.225em}.svg-inline--fa.fa-w-1{width:.0625em}.svg-inline--fa.fa-w-2{width:.125em}.svg-inline--fa.fa-w-3{width:.1875em}.svg-inline--fa.fa-w-4{width:.25em}.svg-inline--fa.fa-w-5{width:.3125em}.svg-inline--fa.fa-w-6{width:.375em}.svg-inline--fa.fa-w-7{width:.4375em}.svg-inline--fa.fa-w-8{width:.5em}.svg-inline--fa.fa-w-9{width:.5625em}.svg-inline--fa.fa-w-10{width:.625em}.svg-inline--fa.fa-w-11{width:.6875em}.svg-inline--fa.fa-w-12{width:.75em}.svg-inline--fa.fa-w-13{width:.8125em}.svg-inline--fa.fa-w-14{width:.875em}.svg-inline--fa.fa-w-15{width:.9375em}.svg-inline--fa.fa-w-16{width:1em}.svg-inline--fa.fa-w-17{width:1.0625em}.svg-inline--fa.fa-w-18{width:1.125em}.svg-inline--fa.fa-w-19{width:1.1875em}.svg-inline--fa.fa-w-20{width:1.25em}.svg-inline--fa.fa-pull-left{margin-right:.3em;width:auto}.svg-inline--fa.fa-pull-right{margin-left:.3em;width:auto}.svg-inline--fa.fa-border{height:1.5em}.svg-inline--fa.fa-li{width:2em}.svg-inline--fa.fa-fw{width:1.25em}.fa-layers svg.svg-inline--fa{bottom:0;left:0;margin:auto;position:absolute;right:0;top:0}.fa-layers{display:inline-block;height:1em;position:relative;text-align:center;vertical-align:-.125em;width:1em}.fa-layers svg.svg-inline--fa{-webkit-transform-origin:center center;transform-origin:center center}.fa-layers-counter,.fa-layers-text{display:inline-block;position:absolute;text-align:center}.fa-layers-text{left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);-webkit-transform-origin:center center;transform-origin:center center}.fa-layers-counter{background-color:#ff253a;border-radius:1em;-webkit-box-sizing:border-box;box-sizing:border-box;color:#fff;height:1.5em;line-height:1;max-width:5em;min-width:1.5em;overflow:hidden;padding:.25em;right:0;text-overflow:ellipsis;top:0;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:top right;transform-origin:top right}.fa-layers-bottom-right{bottom:0;right:0;top:auto;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:bottom right;transform-origin:bottom right}.fa-layers-bottom-left{bottom:0;left:0;right:auto;top:auto;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:bottom left;transform-origin:bottom left}.fa-layers-top-right{right:0;top:0;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:top right;transform-origin:top right}.fa-layers-top-left{left:0;right:auto;top:0;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:top left;transform-origin:top left}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:solid .08em #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fa-rotate-90{-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-webkit-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-webkit-transform:scale(1,-1);transform:scale(1,-1)}.fa-flip-horizontal.fa-flip-vertical{-webkit-transform:scale(-1,-1);transform:scale(-1,-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;position:relative;width:2em}.fa-stack-1x,.fa-stack-2x{bottom:0;left:0;margin:auto;position:absolute;right:0;top:0}.svg-inline--fa.fa-stack-1x{height:1em;width:1em}.svg-inline--fa.fa-stack-2x{height:2em;width:2em}.fa-inverse{color:#fff}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}";if("fa"!==e||n!==t){var r=new RegExp("\\.fa\\-","g"),a=new RegExp("\\."+t,"g");i=i.replace(r,"."+e+"-").replace(a,"."+n)}return i};var Qt=function(){function t(){N(this,t),this.definitions={}}return A(t,[{key:"add",value:function(){for(var t=this,e=arguments.length,n=Array(e),i=0;i1&&void 0!==arguments[1]?arguments[1]:{},n=e.transform,i=void 0===n?B:n,r=e.symbol,a=void 0!==r&&r,o=e.mask,s=void 0===o?null:o,f=e.title,l=void 0===f?null:f,c=e.classes,u=void 0===c?[]:c,m=e.attributes,d=void 0===m?{}:m,g=e.styles,h=void 0===g?{}:g;if(t){var p=t.prefix,v=t.iconName,b=t.icon;return ee(O({type:"icon"},t),function(){return te(),S.autoA11y&&(l?d["aria-labelledby"]=S.replacementClass+"-title-"+X():d["aria-hidden"]="true"),nt({icons:{main:Zt(b),mask:s?Zt(s.icon):{found:!1,width:null,height:null,icon:{}}},prefix:p,iconName:v,transform:O({},B,i),symbol:a,title:l,extra:{attributes:d,styles:h,classes:u}})})}},function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=(t||{}).icon?t:ne(t||{}),i=e.mask;return i&&(i=(i||{}).icon?i:ne(i||{})),ie(n,O({},e,{mask:i}))}),oe={noAuto:function(){var t;P({autoReplaceSvg:t=!1,observeMutations:t}),At&&At.disconnect()},dom:{i2svg:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};if(m){te();var e=t.node,n=void 0===e?f:e,i=t.callback,r=void 0===i?function(){}:i;S.searchPseudoElements&&qt(n),Kt(n,r)}},css:Jt,insertCss:function(){D(Jt())}},library:re,parse:{transform:function(t){return Lt(t)}},findIconDefinition:ne,icon:ae,text:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=e.transform,i=void 0===n?B:n,r=e.title,a=void 0===r?null:r,o=e.classes,s=void 0===o?[]:o,f=e.attributes,l=void 0===f?{}:f,c=e.styles,u=void 0===c?{}:c;return ee({type:"text",content:t},function(){return te(),it({content:t,transform:O({},B,i),title:a,extra:{attributes:l,styles:u,classes:[S.familyPrefix+"-layers-text"].concat(M(s))}})})},layer:function(t){return ee({type:"layer"},function(){te();var e=[];return t(function(t){Array.isArray(t)?t.map(function(t){e=e.concat(t.abstract)}):e=e.concat(t.abstract)}),[{tag:"span",attributes:{class:S.familyPrefix+"-layers"},children:e}]})}},se=function(){m&&S.autoReplaceSvg&&oe.dom.i2svg({node:f})};Object.defineProperty(oe,"config",{get:function(){return S},set:function(t){P(t)}}),function(t){try{t()}catch(t){if(!w)throw t}}(function(){u&&(s.FontAwesome||(s.FontAwesome=oe),I(function(){Object.keys(R.styles).length>0&&se(),S.observeMutations&&"function"==typeof MutationObserver&&function(t){if(l){var e=t.treeCallback,n=t.nodeCallback,i=t.pseudoElementsCallback;At=new l(function(t){Nt||Y(t).forEach(function(t){if("childList"===t.type&&t.addedNodes.length>0&&!kt(t.addedNodes[0])&&(S.searchPseudoElements&&i(t.target),e(t.target)),"attributes"===t.type&&t.target.parentNode&&S.searchPseudoElements&&i(t.target.parentNode),"attributes"===t.type&&kt(t.target)&&~z.indexOf(t.attributeName))if("class"===t.attributeName){var r=bt(U(t.target)),a=r.prefix,o=r.iconName;a&&t.target.setAttribute("data-prefix",a),o&&t.target.setAttribute("data-icon",o)}else n(t.target)})}),m&&At.observe(f.getElementsByTagName("body")[0],{childList:!0,attributes:!0,characterData:!0,subtree:!0})}}({treeCallback:Kt,nodeCallback:Gt,pseudoElementsCallback:qt})})),R.hooks=O({},R.hooks,{addPack:function(t,e){R.styles[t]=O({},R.styles[t]||{},e),ht(),se()},addShims:function(t){var e;(e=R.shims).push.apply(e,M(t)),ht(),se()}})})}(); \ No newline at end of file diff --git a/inc/script.js b/inc/script.js index dca20c7a..7db0a108 100644 --- a/inc/script.js +++ b/inc/script.js @@ -1,3 +1,44 @@ +function setRefreshInterval(interval) { + if (interval == "0") { + Cookies.remove('auto-refresh'); + pauseAutoRefresh(); + $('.auto-refresh').append('restart'); + $('#1').text('Auto-refresh'); + $('#0').text('Auto-refresh'); + $('.auto-refresh-pause').css('display', 'none'); + $('.auto-refresh-resume').css('display', 'none'); + hideAutoRefreshDiv(); + } else { + Cookies.set('auto-refresh', interval, { expires: 365 }); + startSetInterval(interval); + hideAutoRefreshDiv(); + document.location.reload(); + } +} +var intervalId; +function startSetInterval(interval) { + intervalId = setInterval('document.location.reload()', interval); +} +function pauseAutoRefresh() { + clearInterval(intervalId); + $(function() { + $('.auto-refresh-pause').attr('onclick', 'pauseAutoResume()'); + $('.auto-refresh-pause').css('display', 'none'); + $('.auto-refresh-resume').css('display', 'inline'); + }); +} +function pauseAutoResume(){ + var autoRefresh = Cookies.get('auto-refresh'); + setRefreshInterval(autoRefresh); +} + +function hideAutoRefreshDiv() { + $(function() { + $('.auto-refresh-div').hide("blind", "fast"); + $('#1').css("display", "none"); + $('#0').css("display", "inline"); + }); +} $( function() { $( "#tabs" ).tabs(); $( "#redirectBackend" ).on( "click", function() { @@ -86,16 +127,60 @@ $( function() { var location = window.location.href; var cur_url = '/cgi-bin/' + location.split('/').pop(); + cur_url = cur_url.split('?'); $('.menu li').each(function () { var link = $(this).find('a').attr('href'); - if (cur_url == link) + if (cur_url[0] == link) { $(this).addClass('current'); } }); + $('#0').click(function() { + $('.auto-refresh-div').show("blind", "fast"); + $('#0').css("display", "none"); + $('#1').css("display", "inline"); + }); + + $('#1').click(function() { + $('.auto-refresh-div').hide("blind", "fast"); + $('#1').css("display", "none"); + $('#0').css("display", "inline"); + }); + + var autoRefresh = Cookies.get('auto-refresh'); + var pause = '' + + if ($('.auto-refresh')) { + var margin; + if(autoRefresh) { + startSetInterval(autoRefresh) + autoRefresh = autoRefresh / 1000; + + if ( autoRefresh == 60) { + timeRange = " minute" + autoRefresh = autoRefresh / 60; + margin = '-80px'; + } else if ( autoRefresh > 60 && autoRefresh < 3600 ) { + timeRange = " minutes" + autoRefresh = autoRefresh / 60; + margin = '-93px'; + } else if ( autoRefresh >= 3600 && autoRefresh < 86401 ) { + timeRange = " hours" + autoRefresh = autoRefresh / 3600; + margin = '-80px'; + } else { + timeRange = " seconds"; + margin = '-100px'; + } + $('#1').text(autoRefresh + timeRange); + $('#0').text(autoRefresh + timeRange); + $('.auto-refresh-pause').css('display', 'inline'); + $('.auto-refresh-pause').css('margin-left', margin); + } + } $('#select_all').click(function(){ var checkboxes = $(this).closest('form').find(':checkbox'); diff --git a/inc/style.css b/inc/style.css index 296b2b33..3383666b 100644 --- a/inc/style.css +++ b/inc/style.css @@ -13,7 +13,6 @@ body { h2 { background: #5D9CEB; border: 1px solid #5D9CEB; - //border-radius: 5px 5px 0px 0px; padding: 10px; padding-left: 3%; color: #fff; @@ -73,23 +72,73 @@ pre { padding-left: 7px; padding-right: 7px; } -/*.top-link { - margin-top: 115px; -} -.top-link { - margin-left: 28%; -}*/ .footer-link { margin-left: 44%; } .container { min-height: calc(100vh - 115px); - max-width: 89%; + max-width: 91%; min-width: 40%; background-color: #fff; margin-left: 207px; padding-bottom: 10px; } +.auto-refresh { + margin-left: 86%; +} +.auto-refresh a { + color: #fff !important; + cursor: pointer; + font-size: 15px; +} +.auto-refresh-div { + display: none; + position: relative; + padding: 10px 10px 14px; + background-color: #F5F5F5; + border-bottom: solid 1px #D9D9D9; + border-top: solid 1px #D9D9D9; + margin-bottom: 10px; + line-height: 20px; +} +.auto-refresh-div a { + color: #000; + cursor: pointer; +} +.auto-refresh-head { + margin-top: 0; + font-size: 16px; + color: #2d2d2d; + font-weight: bold; + margin-left: 77%; +} +.auto-refresh-interval { + float: left; + padding: 0px 15px; + margin-left: 75%; +} +.auto-refresh-ul{ + float: left; + padding-left: 0; + list-style: none; + margin-top: 10px; +} +.auto-refresh-ul ul li { + margin: 0; + padding: 0; + border: 0; + font-family: inherit; + vertical-align: baseline; + list-style: none; +} +.auto-refresh-pause, .auto-refresh-resume { + margin-top: 10px; + margin-left: -100px; + position: fixed; + color: #000; + font-size: 12px; + height: 15; +} .configShow, .diff { margin-left: 16%; height: 78%; @@ -275,6 +324,7 @@ pre { .menu ul li{ padding: 10px; padding-left: 20px; + margin-right: 0px !important; } .menu ul ul > li:hover{ diff --git a/index.html b/index.html index e4223f91..db877801 100644 --- a/index.html +++ b/index.html @@ -6,26 +6,11 @@ + -
    -
    -

    Welcome to HAproxy-WI!

    -

    Choose your destiny!

    - Overview
    - View stats
    - Logs
    - Map
    - Runtime API
    - Compare
    - Show
    - Add
    - Edit config
    - Upload old config
    - Delete old config
    -
    - HAproxy Web Interface v1.10 -
    -
    +

    + Redirecting... Please wait +