From 5c3afbf6f40e0800ece88b7aca7d117f3a4b56ad Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 09:21:14 -0600 Subject: [PATCH 001/170] Add Tab Colors Closes mescon/Muximux#92 Re-commit. New PR due to technical issues. Spectrum is minified, debug commits removed, no references to browser-specific values, new functions commented. --- css/spectrum.min.css | 1 + css/style.css | 19 +++- index.php | 2 + js/main.js | 16 ++- js/spectrum.min.js | 217 +++++++++++++++++++++++++++++++++++++++ muximux.php | 10 +- settings.ini.php-example | 23 +++++ 7 files changed, 282 insertions(+), 6 deletions(-) create mode 100644 css/spectrum.min.css create mode 100644 js/spectrum.min.js diff --git a/css/spectrum.min.css b/css/spectrum.min.css new file mode 100644 index 0000000..73c7668 --- /dev/null +++ b/css/spectrum.min.css @@ -0,0 +1 @@ +.sp-container{position:absolute;top:0;left:0;display:inline-block;*display:inline;*zoom:1;z-index:9999994;overflow:hidden}.sp-container.sp-flat{position:relative}.sp-container,.sp-container *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.sp-top{position:relative;width:100%;display:inline-block}.sp-top-inner{position:absolute;top:0;left:0;bottom:0;right:0}.sp-color{position:absolute;top:0;left:0;bottom:0;right:20%}.sp-hue{position:absolute;top:0;right:0;bottom:0;left:84%;height:100%}.sp-clear-enabled .sp-hue{top:33px;height:77.5%}.sp-fill{padding-top:80%}.sp-sat,.sp-val{position:absolute;top:0;left:0;right:0;bottom:0}.sp-alpha-enabled .sp-top{margin-bottom:18px}.sp-alpha-enabled .sp-alpha{display:block}.sp-alpha-handle{position:absolute;top:-4px;bottom:-4px;width:6px;left:50%;cursor:pointer;border:1px solid black;background:white;opacity:.8}.sp-alpha{display:none;position:absolute;bottom:-14px;right:0;left:0;height:8px}.sp-alpha-inner{border:solid 1px #333}.sp-clear{display:none}.sp-clear.sp-clear-display{background-position:center}.sp-clear-enabled .sp-clear{display:block;position:absolute;top:0;right:0;bottom:0;left:84%;height:28px}.sp-container,.sp-replacer,.sp-preview,.sp-dragger,.sp-slider,.sp-alpha,.sp-clear,.sp-alpha-handle,.sp-container.sp-dragging .sp-input,.sp-container button{-webkit-user-select:none;-moz-user-select:-moz-none;-o-user-select:none;user-select:none}.sp-container.sp-input-disabled .sp-input-container{display:none}.sp-container.sp-buttons-disabled .sp-button-container{display:none}.sp-container.sp-palette-buttons-disabled .sp-palette-button-container{display:none}.sp-palette-only .sp-picker-container{display:none}.sp-palette-disabled .sp-palette-container{display:none}.sp-initial-disabled .sp-initial{display:none}.sp-sat{background-image:-webkit-gradient(linear,0 0,100% 0,from(#FFF),to(rgba(204,154,129,0)));background-image:-webkit-linear-gradient(left,#FFF,rgba(204,154,129,0));background-image:-moz-linear-gradient(left,#fff,rgba(204,154,129,0));background-image:-o-linear-gradient(left,#fff,rgba(204,154,129,0));background-image:-ms-linear-gradient(left,#fff,rgba(204,154,129,0));background-image:linear-gradient(to right,#fff,rgba(204,154,129,0));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType = 1, startColorstr=#FFFFFFFF, endColorstr=#00CC9A81)";filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#FFFFFFFF',endColorstr='#00CC9A81')}.sp-val{background-image:-webkit-gradient(linear,0 100%,0 0,from(#000000),to(rgba(204,154,129,0)));background-image:-webkit-linear-gradient(bottom,#000000,rgba(204,154,129,0));background-image:-moz-linear-gradient(bottom,#000,rgba(204,154,129,0));background-image:-o-linear-gradient(bottom,#000,rgba(204,154,129,0));background-image:-ms-linear-gradient(bottom,#000,rgba(204,154,129,0));background-image:linear-gradient(to top,#000,rgba(204,154,129,0));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#00CC9A81, endColorstr=#FF000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00CC9A81',endColorstr='#FF000000')}.sp-hue{background:-moz-linear-gradient(top,#ff0000 0%,#ffff00 17%,#00ff00 33%,#00ffff 50%,#0000ff 67%,#ff00ff 83%,#ff0000 100%);background:-ms-linear-gradient(top,#ff0000 0%,#ffff00 17%,#00ff00 33%,#00ffff 50%,#0000ff 67%,#ff00ff 83%,#ff0000 100%);background:-o-linear-gradient(top,#ff0000 0%,#ffff00 17%,#00ff00 33%,#00ffff 50%,#0000ff 67%,#ff00ff 83%,#ff0000 100%);background:-webkit-gradient(linear,left top,left bottom,from(#ff0000),color-stop(.17,#ffff00),color-stop(.33,#00ff00),color-stop(.5,#00ffff),color-stop(.67,#0000ff),color-stop(.83,#ff00ff),to(#ff0000));background:-webkit-linear-gradient(top,#ff0000 0%,#ffff00 17%,#00ff00 33%,#00ffff 50%,#0000ff 67%,#ff00ff 83%,#ff0000 100%);background:linear-gradient(to bottom,#ff0000 0%,#ffff00 17%,#00ff00 33%,#00ffff 50%,#0000ff 67%,#ff00ff 83%,#ff0000 100%)}.sp-1{height:17%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0000',endColorstr='#ffff00')}.sp-2{height:16%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff00',endColorstr='#00ff00')}.sp-3{height:17%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ff00',endColorstr='#00ffff')}.sp-4{height:17%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ffff',endColorstr='#0000ff')}.sp-5{height:16%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0000ff',endColorstr='#ff00ff')}.sp-6{height:17%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff00ff',endColorstr='#ff0000')}.sp-hidden{display:none!important}.sp-cf:before,.sp-cf:after{content:"";display:table}.sp-cf:after{clear:both}.sp-cf{*zoom:1}@media (max-device-width:480px){.sp-color{right:40%}.sp-hue{left:63%}.sp-fill{padding-top:60%}}.sp-dragger{border-radius:5px;height:5px;width:5px;border:1px solid #fff;background:#000;cursor:pointer;position:absolute;top:0;left:0}.sp-slider{position:absolute;top:0;cursor:pointer;height:3px;left:-1px;right:-1px;border:1px solid #000;background:white;opacity:.8}.sp-container{border-radius:0;background-color:#ECECEC;border:solid 1px #f0c49B;padding:0}.sp-container,.sp-container button,.sp-container input,.sp-color,.sp-hue,.sp-clear{font:normal 12px "Lucida Grande","Lucida Sans Unicode","Lucida Sans",Geneva,Verdana,sans-serif;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.sp-top{margin-bottom:3px}.sp-color,.sp-hue,.sp-clear{border:solid 1px #666}.sp-input-container{float:right;width:100px;margin-bottom:4px}.sp-initial-disabled .sp-input-container{width:100%}.sp-input{font-size:12px!important;border:1px inset;padding:4px 5px;margin:0;width:100%;background:transparent;border-radius:3px;color:#222}.sp-input:focus{border:1px solid orange}.sp-input.sp-validation-error{border:1px solid red;background:#fdd}.sp-picker-container,.sp-palette-container{float:left;position:relative;padding:10px;padding-bottom:300px;margin-bottom:-290px}.sp-picker-container{width:172px;border-left:solid 1px #fff}.sp-palette-container{border-right:solid 1px #ccc}.sp-palette-only .sp-palette-container{border:0}.sp-palette .sp-thumb-el{display:block;position:relative;float:left;width:24px;height:15px;margin:3px;cursor:pointer;border:solid 2px transparent}.sp-palette .sp-thumb-el:hover,.sp-palette .sp-thumb-el.sp-thumb-active{border-color:orange}.sp-thumb-el{position:relative}.sp-initial{float:left;border:solid 1px #333}.sp-initial span{width:30px;height:25px;border:none;display:block;float:left;margin:0}.sp-initial .sp-clear-display{background-position:center}.sp-palette-button-container,.sp-button-container{float:right}.sp-replacer{margin:0;overflow:hidden;cursor:pointer;padding:4px;display:inline-block;*zoom:1;*display:inline;border:solid 1px #91765d;background:#eee;color:#333;vertical-align:middle}.sp-replacer:hover,.sp-replacer.sp-active{border-color:#F0C49B;color:#111}.sp-replacer.sp-disabled{cursor:default;border-color:silver;color:silver}.sp-dd{padding:2px 0;height:16px;line-height:16px;font-size:10px}.sp-preview{position:relative;width:25px;height:20px;border:solid 1px #222;margin-right:5px;z-index:0}.sp-palette{*width:220px;max-width:220px}.sp-palette .sp-thumb-el{width:16px;height:16px;margin:2px 1px;border:solid 1px #d0d0d0}.sp-container{padding-bottom:0}.sp-container button{background-color:#eee;background-image:-webkit-linear-gradient(top,#eeeeee,#cccccc);background-image:-moz-linear-gradient(top,#eeeeee,#cccccc);background-image:-ms-linear-gradient(top,#eeeeee,#cccccc);background-image:-o-linear-gradient(top,#eeeeee,#cccccc);background-image:linear-gradient(to bottom,#eeeeee,#cccccc);border:1px solid #ccc;border-bottom:1px solid #bbb;border-radius:3px;color:#333;font-size:14px;line-height:1;padding:5px 4px;text-align:center;text-shadow:0 1px 0 #eee;vertical-align:middle}.sp-container button:hover{background-color:#ddd;background-image:-webkit-linear-gradient(top,#dddddd,#bbbbbb);background-image:-moz-linear-gradient(top,#dddddd,#bbbbbb);background-image:-ms-linear-gradient(top,#dddddd,#bbbbbb);background-image:-o-linear-gradient(top,#dddddd,#bbbbbb);background-image:linear-gradient(to bottom,#dddddd,#bbbbbb);border:1px solid #bbb;border-bottom:1px solid #999;cursor:pointer;text-shadow:0 1px 0 #ddd}.sp-container button:active{border:1px solid #aaa;border-bottom:1px solid #888;-webkit-box-shadow:inset 0 0 5px 2px #aaaaaa,0 1px 0 0 #eee;-moz-box-shadow:inset 0 0 5px 2px #aaaaaa,0 1px 0 0 #eee;-ms-box-shadow:inset 0 0 5px 2px #aaaaaa,0 1px 0 0 #eee;-o-box-shadow:inset 0 0 5px 2px #aaaaaa,0 1px 0 0 #eee;box-shadow:inset 0 0 5px 2px #aaaaaa,0 1px 0 0 #eee}.sp-cancel{font-size:11px;color:#d93f3f!important;margin:0;padding:2px;margin-right:5px;vertical-align:middle;text-decoration:none}.sp-cancel:hover{color:#d93f3f!important;text-decoration:underline}.sp-palette span:hover,.sp-palette span.sp-thumb-active{border-color:#000}.sp-preview,.sp-alpha,.sp-thumb-el{position:relative;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.sp-preview-inner,.sp-alpha-inner,.sp-thumb-inner{display:block;position:absolute;top:0;left:0;bottom:0;right:0}.sp-palette .sp-thumb-inner{background-position:50% 50%;background-repeat:no-repeat}.sp-palette .sp-thumb-light.sp-thumb-active .sp-thumb-inner{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAIVJREFUeNpiYBhsgJFMffxAXABlN5JruT4Q3wfi/0DsT64h8UD8HmpIPCWG/KemIfOJCUB+Aoacx6EGBZyHBqI+WsDCwuQ9mhxeg2A210Ntfo8klk9sOMijaURm7yc1UP2RNCMbKE9ODK1HM6iegYLkfx8pligC9lCD7KmRof0ZhjQACDAAceovrtpVBRkAAAAASUVORK5CYII=)}.sp-palette .sp-thumb-dark.sp-thumb-active .sp-thumb-inner{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAMdJREFUOE+tkgsNwzAMRMugEAahEAahEAZhEAqlEAZhEAohEAYh81X2dIm8fKpEspLGvudPOsUYpxE2BIJCroJmEW9qJ+MKaBFhEMNabSy9oIcIPwrB+afvAUFoK4H0tMaQ3XtlrggDhOVVMuT4E5MMG0FBbCEYzjYT7OxLEvIHQLY2zWwQ3D+9luyOQTfKDiFD3iUIfPk8VqrKjgAiSfGFPecrg6HN6m/iBcwiDAo7WiBeawa+Kwh7tZoSCGLMqwlSAzVDhoK+6vH4G0P5wdkAAAAASUVORK5CYII=)}.sp-clear-display{background-repeat:no-repeat;background-position:center;background-image:url(data:image/gif;base64,R0lGODlhFAAUAPcAAAAAAJmZmZ2dnZ6enqKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq/Hx8fLy8vT09PX19ff39/j4+Pn5+fr6+vv7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAP8ALAAAAAAUABQAAAihAP9FoPCvoMGDBy08+EdhQAIJCCMybCDAAYUEARBAlFiQQoMABQhKUJBxY0SPICEYHBnggEmDKAuoPMjS5cGYMxHW3IiT478JJA8M/CjTZ0GgLRekNGpwAsYABHIypcAgQMsITDtWJYBR6NSqMico9cqR6tKfY7GeBCuVwlipDNmefAtTrkSzB1RaIAoXodsABiZAEFB06gIBWC1mLVgBa0AAOw==)} \ No newline at end of file diff --git a/css/style.css b/css/style.css index 4a2e05f..98fa650 100644 --- a/css/style.css +++ b/css/style.css @@ -349,7 +349,7 @@ body ul { /*Settings*/ -input[type='text'] { +input[type='text']:not(.appName) { width: 300px; height: 25px; -webkit-border-radius: 5px 5px 5px 5px; @@ -357,6 +357,23 @@ input[type='text'] { margin: 5px 5px 5px 10px; padding: 2px; } +input[type='text']:(.appName) { + width: 200px; + height: 25px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + margin: 5px 5px 5px 10px; + padding: 2px; +} + +input[type='color'] { + width: 20px; + height: 25px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + margin: 5px 5px 5px 10px; + padding: 2px; +} input[type='text'], select { color: #000; diff --git a/index.php b/index.php index 0b97d49..78acb5a 100644 --- a/index.php +++ b/index.php @@ -23,6 +23,7 @@ + <?php echo getTitle(); ?> @@ -154,6 +155,7 @@ + $('#upgradeModal').modal();"; ?> ","
","
▼
",""].join(''),markup=(function(){var gradientFix="";if(IE){for(var i=1;i<=6;i++){gradientFix+="
"}} +return["
","
","
","
","","
","
","
","
","
","
","
","
","
","
","
","
","
","
","
","
","
",gradientFix,"
","
","
","
","
","","
","
","
","","","
","
","
"].join("")})();function paletteTemplate(p,color,className,opts){var html=[];for(var i=0;i')}else{var cls='sp-clear-display';html.push($('
').append($('').attr('title',opts.noColorSelectedText)).html())}} +return "
"+html.join('')+"
"} +function hideAll(){for(var i=0;iMath.abs(dragY-oldDragY);shiftMovementDirection=furtherFromX?"x":"y"} +var setSaturation=!shiftMovementDirection||shiftMovementDirection==="x";var setValue=!shiftMovementDirection||shiftMovementDirection==="y";if(setSaturation){currentSaturation=parseFloat(dragX/dragWidth)} +if(setValue){currentValue=parseFloat((dragHeight-dragY)/dragHeight)} +isEmpty=!1;if(!opts.showAlpha){currentAlpha=1} +move()},dragStart,dragStop);if(!!initialColor){set(initialColor);updateUI();currentPreferredFormat=opts.preferredFormat||tinycolor(initialColor).format;addColorToSelectionPalette(initialColor)} +else{updateUI()} +if(flat){show()} +function paletteElementClick(e){if(e.data&&e.data.ignore){set($(e.target).closest(".sp-thumb-el").data("color"));move()} +else{set($(e.target).closest(".sp-thumb-el").data("color"));move();updateOriginalInput(!0);if(opts.hideAfterPaletteSelect){hide()}} +return!1} +var paletteEvent=IE?"mousedown.spectrum":"click.spectrum touchstart.spectrum";paletteContainer.delegate(".sp-thumb-el",paletteEvent,paletteElementClick);initialColorContainer.delegate(".sp-thumb-el:nth-child(1)",paletteEvent,{ignore:!0},paletteElementClick)} +function updateSelectionPaletteFromStorage(){if(localStorageKey&&window.localStorage){try{var oldPalette=window.localStorage[localStorageKey].split(",#");if(oldPalette.length>1){delete window.localStorage[localStorageKey];$.each(oldPalette,function(i,c){addColorToSelectionPalette(c)})}} +catch(e){} +try{selectionPalette=window.localStorage[localStorageKey].split(";")} +catch(e){}}} +function addColorToSelectionPalette(color){if(showSelectionPalette){var rgb=tinycolor(color).toRgbString();if(!paletteLookup[rgb]&&$.inArray(rgb,selectionPalette)===-1){selectionPalette.push(rgb);while(selectionPalette.length>maxSelectionSize){selectionPalette.shift()}} +if(localStorageKey&&window.localStorage){try{window.localStorage[localStorageKey]=selectionPalette.join(";")} +catch(e){}}}} +function getUniqueSelectionPalette(){var unique=[];if(opts.showPalette){for(var i=0;iviewWidth&&viewWidth>dpWidth)?Math.abs(offset.left+dpWidth-viewWidth):0);offset.top-=Math.min(offset.top,((offset.top+dpHeight>viewHeight&&viewHeight>dpHeight)?Math.abs(dpHeight+inputHeight-extraY):extraY));return offset} +function noop(){} +function stopPropagation(e){e.stopPropagation()} +function bind(func,obj){var slice=Array.prototype.slice;var args=slice.call(arguments,2);return function(){return func.apply(obj,args.concat(slice.call(arguments)))}} +function draggable(element,onmove,onstart,onstop){onmove=onmove||function(){};onstart=onstart||function(){};onstop=onstop||function(){};var doc=document;var dragging=!1;var offset={};var maxHeight=0;var maxWidth=0;var hasTouch=('ontouchstart' in window);var duringDragEvents={};duringDragEvents.selectstart=prevent;duringDragEvents.dragstart=prevent;duringDragEvents["touchmove mousemove"]=move;duringDragEvents["touchend mouseup"]=stop;function prevent(e){if(e.stopPropagation){e.stopPropagation()} +if(e.preventDefault){e.preventDefault()} +e.returnValue=!1} +function move(e){if(dragging){if(IE&&doc.documentMode<9&&!e.button){return stop()} +var t0=e.originalEvent&&e.originalEvent.touches&&e.originalEvent.touches[0];var pageX=t0&&t0.pageX||e.pageX;var pageY=t0&&t0.pageY||e.pageY;var dragX=Math.max(0,Math.min(pageX-offset.left,maxWidth));var dragY=Math.max(0,Math.min(pageY-offset.top,maxHeight));if(hasTouch){prevent(e)} +onmove.apply(element,[dragX,dragY,e])}} +function start(e){var rightclick=(e.which)?(e.which==3):(e.button==2);if(!rightclick&&!dragging){if(onstart.apply(element,arguments)!==!1){dragging=!0;maxHeight=$(element).height();maxWidth=$(element).width();offset=$(element).offset();$(doc).bind(duringDragEvents);$(doc.body).addClass("sp-dragging");move(e);prevent(e)}}} +function stop(){if(dragging){$(doc).unbind(duringDragEvents);$(doc.body).removeClass("sp-dragging");setTimeout(function(){onstop.apply(element,arguments)},0)} +dragging=!1} +$(element).bind("touchstart mousedown",start)} +function throttle(func,wait,debounce){var timeout;return function(){var context=this,args=arguments;var throttler=function(){timeout=null;func.apply(context,args)};if(debounce)clearTimeout(timeout);if(debounce||!timeout)timeout=setTimeout(throttler,wait)}} +function inputTypeColorSupport(){return $.fn.spectrum.inputTypeColorSupport()} +var dataID="spectrum.id";$.fn.spectrum=function(opts,extra){if(typeof opts=="string"){var returnValue=this;var args=Array.prototype.slice.call(arguments,1);this.each(function(){var spect=spectrums[$(this).data(dataID)];if(spect){var method=spect[opts];if(!method){throw new Error("Spectrum: no such method: '"+opts+"'")} +if(opts=="get"){returnValue=spect.get()} +else if(opts=="container"){returnValue=spect.container} +else if(opts=="option"){returnValue=spect.option.apply(spect,args)} +else if(opts=="destroy"){spect.destroy();$(this).removeData(dataID)} +else{method.apply(spect,args)}}});return returnValue} +return this.spectrum("destroy").each(function(){var options=$.extend({},opts,$(this).data());var spect=spectrum(this,options);$(this).data(dataID,spect.id)})};$.fn.spectrum.load=!0;$.fn.spectrum.loadOpts={};$.fn.spectrum.draggable=draggable;$.fn.spectrum.defaults=defaultOpts;$.fn.spectrum.inputTypeColorSupport=function inputTypeColorSupport(){if(typeof inputTypeColorSupport._cachedResult==="undefined"){var colorInput=$("")[0];inputTypeColorSupport._cachedResult=colorInput.type==="color"&&colorInput.value!==""} +return inputTypeColorSupport._cachedResult};$.spectrum={};$.spectrum.localization={};$.spectrum.palettes={};$.fn.spectrum.processNativeColorInputs=function(){var colorInputs=$("input[type=color]");if(colorInputs.length&&!inputTypeColorSupport()){colorInputs.spectrum({preferredFormat:"hex6"})}};(function(){var trimLeft=/^[\s,#]+/,trimRight=/\s+$/,tinyCounter=0,math=Math,mathRound=math.round,mathMin=math.min,mathMax=math.max,mathRandom=math.random;var tinycolor=function(color,opts){color=(color)?color:'';opts=opts||{};if(color instanceof tinycolor){return color} +if(!(this instanceof tinycolor)){return new tinycolor(color,opts)} +var rgb=inputToRGB(color);this._originalInput=color,this._r=rgb.r,this._g=rgb.g,this._b=rgb.b,this._a=rgb.a,this._roundA=mathRound(100*this._a)/100,this._format=opts.format||rgb.format;this._gradientType=opts.gradientType;if(this._r<1){this._r=mathRound(this._r)} +if(this._g<1){this._g=mathRound(this._g)} +if(this._b<1){this._b=mathRound(this._b)} +this._ok=rgb.ok;this._tc_id=tinyCounter++};tinycolor.prototype={isDark:function(){return this.getBrightness()<128},isLight:function(){return!this.isDark()},isValid:function(){return this._ok},getOriginalInput:function(){return this._originalInput},getFormat:function(){return this._format},getAlpha:function(){return this._a},getBrightness:function(){var rgb=this.toRgb();return(rgb.r*299+rgb.g*587+rgb.b*114)/1000},setAlpha:function(value){this._a=boundAlpha(value);this._roundA=mathRound(100*this._a)/100;return this},toHsv:function(){var hsv=rgbToHsv(this._r,this._g,this._b);return{h:hsv.h*360,s:hsv.s,v:hsv.v,a:this._a}},toHsvString:function(){var hsv=rgbToHsv(this._r,this._g,this._b);var h=mathRound(hsv.h*360),s=mathRound(hsv.s*100),v=mathRound(hsv.v*100);return(this._a==1)?"hsv("+h+", "+s+"%, "+v+"%)":"hsva("+h+", "+s+"%, "+v+"%, "+this._roundA+")"},toHsl:function(){var hsl=rgbToHsl(this._r,this._g,this._b);return{h:hsl.h*360,s:hsl.s,l:hsl.l,a:this._a}},toHslString:function(){var hsl=rgbToHsl(this._r,this._g,this._b);var h=mathRound(hsl.h*360),s=mathRound(hsl.s*100),l=mathRound(hsl.l*100);return(this._a==1)?"hsl("+h+", "+s+"%, "+l+"%)":"hsla("+h+", "+s+"%, "+l+"%, "+this._roundA+")"},toHex:function(allow3Char){return rgbToHex(this._r,this._g,this._b,allow3Char)},toHexString:function(allow3Char){return '#'+this.toHex(allow3Char)},toHex8:function(){return rgbaToHex(this._r,this._g,this._b,this._a)},toHex8String:function(){return '#'+this.toHex8()},toRgb:function(){return{r:mathRound(this._r),g:mathRound(this._g),b:mathRound(this._b),a:this._a}},toRgbString:function(){return(this._a==1)?"rgb("+mathRound(this._r)+", "+mathRound(this._g)+", "+mathRound(this._b)+")":"rgba("+mathRound(this._r)+", "+mathRound(this._g)+", "+mathRound(this._b)+", "+this._roundA+")"},toPercentageRgb:function(){return{r:mathRound(bound01(this._r,255)*100)+"%",g:mathRound(bound01(this._g,255)*100)+"%",b:mathRound(bound01(this._b,255)*100)+"%",a:this._a}},toPercentageRgbString:function(){return(this._a==1)?"rgb("+mathRound(bound01(this._r,255)*100)+"%, "+mathRound(bound01(this._g,255)*100)+"%, "+mathRound(bound01(this._b,255)*100)+"%)":"rgba("+mathRound(bound01(this._r,255)*100)+"%, "+mathRound(bound01(this._g,255)*100)+"%, "+mathRound(bound01(this._b,255)*100)+"%, "+this._roundA+")"},toName:function(){if(this._a===0){return "transparent"} +if(this._a<1){return!1} +return hexNames[rgbToHex(this._r,this._g,this._b,!0)]||!1},toFilter:function(secondColor){var hex8String='#'+rgbaToHex(this._r,this._g,this._b,this._a);var secondHex8String=hex8String;var gradientType=this._gradientType?"GradientType = 1, ":"";if(secondColor){var s=tinycolor(secondColor);secondHex8String=s.toHex8String()} +return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr="+hex8String+",endColorstr="+secondHex8String+")"},toString:function(format){var formatSet=!!format;format=format||this._format;var formattedString=!1;var hasAlpha=this._a<1&&this._a>=0;var needsAlphaFormat=!formatSet&&hasAlpha&&(format==="hex"||format==="hex6"||format==="hex3"||format==="name");if(needsAlphaFormat){if(format==="name"&&this._a===0){return this.toName()} +return this.toRgbString()} +if(format==="rgb"){formattedString=this.toRgbString()} +if(format==="prgb"){formattedString=this.toPercentageRgbString()} +if(format==="hex"||format==="hex6"){formattedString=this.toHexString()} +if(format==="hex3"){formattedString=this.toHexString(!0)} +if(format==="hex8"){formattedString=this.toHex8String()} +if(format==="name"){formattedString=this.toName()} +if(format==="hsl"){formattedString=this.toHslString()} +if(format==="hsv"){formattedString=this.toHsvString()} +return formattedString||this.toHexString()},_applyModification:function(fn,args){var color=fn.apply(null,[this].concat([].slice.call(args)));this._r=color._r;this._g=color._g;this._b=color._b;this.setAlpha(color._a);return this},lighten:function(){return this._applyModification(lighten,arguments)},brighten:function(){return this._applyModification(brighten,arguments)},darken:function(){return this._applyModification(darken,arguments)},desaturate:function(){return this._applyModification(desaturate,arguments)},saturate:function(){return this._applyModification(saturate,arguments)},greyscale:function(){return this._applyModification(greyscale,arguments)},spin:function(){return this._applyModification(spin,arguments)},_applyCombination:function(fn,args){return fn.apply(null,[this].concat([].slice.call(args)))},analogous:function(){return this._applyCombination(analogous,arguments)},complement:function(){return this._applyCombination(complement,arguments)},monochromatic:function(){return this._applyCombination(monochromatic,arguments)},splitcomplement:function(){return this._applyCombination(splitcomplement,arguments)},triad:function(){return this._applyCombination(triad,arguments)},tetrad:function(){return this._applyCombination(tetrad,arguments)}};tinycolor.fromRatio=function(color,opts){if(typeof color=="object"){var newColor={};for(var i in color){if(color.hasOwnProperty(i)){if(i==="a"){newColor[i]=color[i]} +else{newColor[i]=convertToPercentage(color[i])}}} +color=newColor} +return tinycolor(color,opts)};function inputToRGB(color){var rgb={r:0,g:0,b:0};var a=1;var ok=!1;var format=!1;if(typeof color=="string"){color=stringInputToObject(color)} +if(typeof color=="object"){if(color.hasOwnProperty("r")&&color.hasOwnProperty("g")&&color.hasOwnProperty("b")){rgb=rgbToRgb(color.r,color.g,color.b);ok=!0;format=String(color.r).substr(-1)==="%"?"prgb":"rgb"} +else if(color.hasOwnProperty("h")&&color.hasOwnProperty("s")&&color.hasOwnProperty("v")){color.s=convertToPercentage(color.s);color.v=convertToPercentage(color.v);rgb=hsvToRgb(color.h,color.s,color.v);ok=!0;format="hsv"} +else if(color.hasOwnProperty("h")&&color.hasOwnProperty("s")&&color.hasOwnProperty("l")){color.s=convertToPercentage(color.s);color.l=convertToPercentage(color.l);rgb=hslToRgb(color.h,color.s,color.l);ok=!0;format="hsl"} +if(color.hasOwnProperty("a")){a=color.a}} +a=boundAlpha(a);return{ok:ok,format:color.format||format,r:mathMin(255,mathMax(rgb.r,0)),g:mathMin(255,mathMax(rgb.g,0)),b:mathMin(255,mathMax(rgb.b,0)),a:a}} +function rgbToRgb(r,g,b){return{r:bound01(r,255)*255,g:bound01(g,255)*255,b:bound01(b,255)*255}} +function rgbToHsl(r,g,b){r=bound01(r,255);g=bound01(g,255);b=bound01(b,255);var max=mathMax(r,g,b),min=mathMin(r,g,b);var h,s,l=(max+min)/2;if(max==min){h=s=0} +else{var d=max-min;s=l>0.5?d/(2-max-min):d/(max+min);switch(max){case r:h=(g-b)/d+(g1)t-=1;if(t<1/6)return p+(q-p)*6*t;if(t<1/2)return q;if(t<2/3)return p+(q-p)*(2/3-t)*6;return p} +if(s===0){r=g=b=l} +else{var q=l<0.5?l*(1+s):l+s-l*s;var p=2*l-q;r=hue2rgb(p,q,h+1/3);g=hue2rgb(p,q,h);b=hue2rgb(p,q,h-1/3)} +return{r:r*255,g:g*255,b:b*255}} +function rgbToHsv(r,g,b){r=bound01(r,255);g=bound01(g,255);b=bound01(b,255);var max=mathMax(r,g,b),min=mathMin(r,g,b);var h,s,v=max;var d=max-min;s=max===0?0:d/max;if(max==min){h=0} +else{switch(max){case r:h=(g-b)/d+(g>1))+720)%360;--results;){hsl.h=(hsl.h+part)%360;ret.push(tinycolor(hsl))} +return ret} +function monochromatic(color,results){results=results||6;var hsv=tinycolor(color).toHsv();var h=hsv.h,s=hsv.s,v=hsv.v;var ret=[];var modification=1/results;while(results--){ret.push(tinycolor({h:h,s:s,v:v}));v=(v+modification)%1} +return ret} +tinycolor.mix=function(color1,color2,amount){amount=(amount===0)?0:(amount||50);var rgb1=tinycolor(color1).toRgb();var rgb2=tinycolor(color2).toRgb();var p=amount/100;var w=p*2-1;var a=rgb2.a-rgb1.a;var w1;if(w*a==-1){w1=w}else{w1=(w+a)/(1+w*a)} +w1=(w1+1)/2;var w2=1-w1;var rgba={r:rgb2.r*w1+rgb1.r*w2,g:rgb2.g*w1+rgb1.g*w2,b:rgb2.b*w1+rgb1.b*w2,a:rgb2.a*p+rgb1.a*(1-p)};return tinycolor(rgba)};tinycolor.readability=function(color1,color2){var c1=tinycolor(color1);var c2=tinycolor(color2);var rgb1=c1.toRgb();var rgb2=c2.toRgb();var brightnessA=c1.getBrightness();var brightnessB=c2.getBrightness();var colorDiff=(Math.max(rgb1.r,rgb2.r)-Math.min(rgb1.r,rgb2.r)+Math.max(rgb1.g,rgb2.g)-Math.min(rgb1.g,rgb2.g)+Math.max(rgb1.b,rgb2.b)-Math.min(rgb1.b,rgb2.b));return{brightness:Math.abs(brightnessA-brightnessB),color:colorDiff}};tinycolor.isReadable=function(color1,color2){var readability=tinycolor.readability(color1,color2);return readability.brightness>125&&readability.color>500};tinycolor.mostReadable=function(baseColor,colorList){var bestColor=null;var bestScore=0;var bestIsReadable=!1;for(var i=0;i125&&readability.color>500;var score=3*(readability.brightness/125)+(readability.color/500);if((readable&&!bestIsReadable)||(readable&&bestIsReadable&&score>bestScore)||((!readable)&&(!bestIsReadable)&&score>bestScore)){bestIsReadable=readable;bestScore=score;bestColor=tinycolor(colorList[i])}} +return bestColor};var names=tinycolor.names={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"0ff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000",blanchedalmond:"ffebcd",blue:"00f",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",burntsienna:"ea7e5d",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"0ff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkgrey:"a9a9a9",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkslategrey:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dimgrey:"696969",dodgerblue:"1e90ff",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"f0f",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",grey:"808080",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgray:"d3d3d3",lightgreen:"90ee90",lightgrey:"d3d3d3",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslategray:"789",lightslategrey:"789",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"0f0",limegreen:"32cd32",linen:"faf0e6",magenta:"f0f",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370db",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"db7093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",rebeccapurple:"663399",red:"f00",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",slategrey:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",wheat:"f5deb3",white:"fff",whitesmoke:"f5f5f5",yellow:"ff0",yellowgreen:"9acd32"};var hexNames=tinycolor.hexNames=flip(names);function flip(o){var flipped={};for(var i in o){if(o.hasOwnProperty(i)){flipped[o[i]]=i}} +return flipped} +function boundAlpha(a){a=parseFloat(a);if(isNaN(a)||a<0||a>1){a=1} +return a} +function bound01(n,max){if(isOnePointZero(n)){n="100%"} +var processPercent=isPercentage(n);n=mathMin(max,mathMax(0,parseFloat(n)));if(processPercent){n=parseInt(n*max,10)/100} +if((math.abs(n-max)<0.000001)){return 1} +return(n%max)/parseFloat(max)} +function clamp01(val){return mathMin(1,mathMax(0,val))} +function parseIntFromHex(val){return parseInt(val,16)} +function isOnePointZero(n){return typeof n=="string"&&n.indexOf('.')!=-1&&parseFloat(n)===1} +function isPercentage(n){return typeof n==="string"&&n.indexOf('%')!=-1} +function pad2(c){return c.length==1?'0'+c:''+c} +function convertToPercentage(n){if(n<=1){n=(n*100)+"%"} +return n} +function convertDecimalToHex(d){return Math.round(parseFloat(d)*255).toString(16)} +function convertHexToDecimal(h){return(parseIntFromHex(h)/255)} +var matchers=(function(){var CSS_INTEGER="[-\\+]?\\d+%?";var CSS_NUMBER="[-\\+]?\\d*\\.\\d+%?";var CSS_UNIT="(?:"+CSS_NUMBER+")|(?:"+CSS_INTEGER+")";var PERMISSIVE_MATCH3="[\\s|\\(]+("+CSS_UNIT+")[,|\\s]+("+CSS_UNIT+")[,|\\s]+("+CSS_UNIT+")\\s*\\)?";var PERMISSIVE_MATCH4="[\\s|\\(]+("+CSS_UNIT+")[,|\\s]+("+CSS_UNIT+")[,|\\s]+("+CSS_UNIT+")[,|\\s]+("+CSS_UNIT+")\\s*\\)?";return{rgb:new RegExp("rgb"+PERMISSIVE_MATCH3),rgba:new RegExp("rgba"+PERMISSIVE_MATCH4),hsl:new RegExp("hsl"+PERMISSIVE_MATCH3),hsla:new RegExp("hsla"+PERMISSIVE_MATCH4),hsv:new RegExp("hsv"+PERMISSIVE_MATCH3),hsva:new RegExp("hsva"+PERMISSIVE_MATCH4),hex3:/^([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,hex6:/^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,hex8:/^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/}})();function stringInputToObject(color){color=color.replace(trimLeft,'').replace(trimRight,'').toLowerCase();var named=!1;if(names[color]){color=names[color];named=!0} +else if(color=='transparent'){return{r:0,g:0,b:0,a:0,format:"name"}} +var match;if((match=matchers.rgb.exec(color))){return{r:match[1],g:match[2],b:match[3]}} +if((match=matchers.rgba.exec(color))){return{r:match[1],g:match[2],b:match[3],a:match[4]}} +if((match=matchers.hsl.exec(color))){return{h:match[1],s:match[2],l:match[3]}} +if((match=matchers.hsla.exec(color))){return{h:match[1],s:match[2],l:match[3],a:match[4]}} +if((match=matchers.hsv.exec(color))){return{h:match[1],s:match[2],v:match[3]}} +if((match=matchers.hsva.exec(color))){return{h:match[1],s:match[2],v:match[3],a:match[4]}} +if((match=matchers.hex8.exec(color))){return{a:convertHexToDecimal(match[1]),r:parseIntFromHex(match[2]),g:parseIntFromHex(match[3]),b:parseIntFromHex(match[4]),format:named?"name":"hex8"}} +if((match=matchers.hex6.exec(color))){return{r:parseIntFromHex(match[1]),g:parseIntFromHex(match[2]),b:parseIntFromHex(match[3]),format:named?"name":"hex"}} +if((match=matchers.hex3.exec(color))){return{r:parseIntFromHex(match[1]+''+match[1]),g:parseIntFromHex(match[2]+''+match[2]),b:parseIntFromHex(match[3]+''+match[3]),format:named?"name":"hex"}} +return!1} +window.tinycolor=tinycolor})();$(function(){if($.fn.spectrum.load){$.fn.spectrum.processNativeColorInputs()}})}) \ No newline at end of file diff --git a/muximux.php b/muximux.php index 1f5cea6..03a5190 100644 --- a/muximux.php +++ b/muximux.php @@ -138,6 +138,8 @@ function parse_ini() $pageOutput .= "
"; else if ($key == "name") { $pageOutput .= "
"; + } else if ($key == "color") { + $pageOutput .= "

"; } else if ($key == "icon") { $pageOutput .= "
"; } elseif ($key == "default") { @@ -153,7 +155,7 @@ function parse_ini() else $pageOutput .= ">
"; } else if ($key == "landingpage") { - $pageOutput .= "
Landing page: +
\n
"; @@ -200,9 +202,9 @@ function menuItems() if (!empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true") && (!isset($section["dd"]) || $section["dd"] == "false")) { if (!empty($section["default"]) && !($section["default"] == "false") && ($section["default"] == "true")) { - $standardmenu .= "
  • " . $section["name"] . "
    • \n"; + $standardmenu .= "
  • " . $section["name"] . "
    • \n"; } else { - $standardmenu .= "
  • " . $section["name"] . "
    • \n"; + $standardmenu .= "
  • " . $section["name"] . "
    • \n"; } } if (isset($section["dd"]) && ($section["dd"] == "true") && !empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true") && $section['name'] == "Settings") { diff --git a/settings.ini.php-example b/settings.ini.php-example index 49438b6..b28870f 100644 --- a/settings.ini.php-example +++ b/settings.ini.php-example @@ -13,10 +13,21 @@ landingpage = "false" icon = "fa fa-cog" dd = "true" +[Diskstation] +name = "Diskstation" +url = "http://localhost:5000" +icon = "fa-hdd-o" +color="#3d6fae" +enabled = "true" +default = "true" +landingpage = "false" +dd = "false" + [RuTorrent] name = "RuTorrent" url = "https://github.com/Novik/ruTorrent" icon = "fa-globe" +color="#1a1bfe" enabled = "true" default = "false" landingpage = "false" @@ -26,6 +37,7 @@ dd = "true" name = "NZBGet" url = "https://nzbget.net/" icon = "fa-download" +color="#3f8927" enabled = "true" default = "false" landingpage = "false" @@ -44,6 +56,7 @@ dd = "true" name = "Pydio" url = "https://pydio.com/" icon = "fa-cloud" +color = "#FF796B" enabled = "true" default = "false" landingpage = "false" @@ -53,6 +66,7 @@ dd = "true" name = "Sonarr" url = "https://sonarr.tv/" icon = "fa-calendar" +color = "#35c5f4" enabled = "true" default = "true" landingpage = "false" @@ -62,6 +76,7 @@ dd = "false" name = "SickBeard" url = "http://sickbeard.com/" icon = "fa-calendar" +color = "#b6f000" enabled = "true" default = "false" landingpage = "false" @@ -71,6 +86,7 @@ dd = "false" name = "CouchPotato" url = "https://couchpota.to/" icon = "fa-film" +color = "#f85c22" enabled = "true" default = "false" landingpage = "false" @@ -80,6 +96,7 @@ dd = "false" name = "Headphones" url = "https://github.com/rembo10/headphones" icon = "fa-headphones" +color = "#444444" enabled = "true" default = "false" landingpage = "false" @@ -89,6 +106,7 @@ dd = "false" name = "PlexRequests" url = "https://github.com/lokenx/plexrequests-meteor" icon = "fa-bullhorn" +color = "#df691a" enabled = "true" default = "false" landingpage = "false" @@ -98,6 +116,7 @@ dd = "false" name = "PlexPy" url = "https://github.com/drzoidberg33/plexpy" icon = "fa-list" +color = "#ba8e36" enabled = "true" default = "false" landingpage = "false" @@ -107,6 +126,7 @@ dd = "false" name = "Glances" url = "https://github.com/nicolargo/glances" icon = "fa-eye" +color = "#59D16C" enabled = "true" default = "false" landingpage = "false" @@ -116,6 +136,7 @@ dd = "false" name = "NZB Hydra" url = "https://github.com/theotherp/nzbhydra" icon = "fa-search" +color = "#108f34" enabled = "true" default = "false" landingpage = "false" @@ -125,6 +146,7 @@ dd = "false" name = "Plex" url = "https://www.plex.tv/" icon = "fa-play-circle" +color = "#f9be03" enabled = "true" default = "false" landingpage = "false" @@ -134,6 +156,7 @@ dd = "false" name = "Deluge" url = "http://deluge-torrent.org/" icon = "fa-tint" +color = "#D1DAE5" enabled = "true" default = "false" landingpage = "false" From 5947538b85bbf70b57d8ae9d88ed273ef87c32fb Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 10:27:33 -0600 Subject: [PATCH 002/170] Close dropdown menu on item selection. Fixes mescon/Muximux#29 Replace CSS hover method with javascript method to detect click on menu button. --- css/style.css | 7 ++++++- js/main.js | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index 98fa650..912496c 100644 --- a/css/style.css +++ b/css/style.css @@ -225,7 +225,7 @@ Main components .main-nav > li:hover { color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); + } .main-nav > li { @@ -306,6 +306,11 @@ Main components display: block; } +*/ +.drop-nav:hide-nav { + display: none; +} + .drop-nav > li:hover, .drop-nav > li:hover a { color: #f1f3f2; background-color: rgba(233, 230, 202, 0.3); diff --git a/js/main.js b/js/main.js index d8658a8..8e13988 100644 --- a/js/main.js +++ b/js/main.js @@ -71,6 +71,17 @@ jQuery(document).ready(function ($) { $('.drop-nav').on('mouseout', function () { $('.main-nav a span:first').removeClass('dd-active'); }); + + $('li.dd').on('click', function () { + console.log("Nav: Click"); + if ($('.drop-nav').hasClass('.open')) { + $('.drop-nav').css('display','none'); + $('.drop-nav').removeClass('.open'); + } else { + $('.drop-nav').css('display','block'); + $('.drop-nav').addClass('.open'); + } + }); // This fetches the broweser-appropriate box-shadow value so we can set it From 5d11075e511d2cb17ffebf63e1d830fdcf5b48a1 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 11:59:59 -0600 Subject: [PATCH 003/170] Fix mobile menu (for real) Initial commit only worked on mobile emulator, not actual mobile device. This is tested and working on Chrome/android as well as mobile emulator on desktop. --- css/style.css | 8 ++++++-- js/main.js | 25 +++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/css/style.css b/css/style.css index 912496c..9c8513b 100644 --- a/css/style.css +++ b/css/style.css @@ -302,15 +302,19 @@ Main components border-bottom: 1px solid rgba(255, 255, 255, .2); } -.dd:hover > .drop-nav { +.dd:hover > .drop-nav:not .hide-nav { display: block; } */ -.drop-nav:hide-nav { +.hide-nav { display: none; } +.show-nav { + display: block; +} + .drop-nav > li:hover, .drop-nav > li:hover a { color: #f1f3f2; background-color: rgba(233, 230, 202, 0.3); diff --git a/js/main.js b/js/main.js index 8e13988..1d799bf 100644 --- a/js/main.js +++ b/js/main.js @@ -12,9 +12,10 @@ jQuery(document).ready(function ($) { // Set default title to the selected item on load var activeTitle = $('li .selected').attr("data-title"); setTitle(activeTitle); - //get appropriate CSS3 box-shadow property - var boxshadowprop=getsupportedprop(['boxShadow', 'MozBoxShadow', 'WebkitBoxShadow']) - + //get appropriate CSS3 box-shadow property + var boxshadowprop=getsupportedprop(['boxShadow', 'MozBoxShadow', 'WebkitBoxShadow']) + //Hide the nav to start + $('.drop-nav').toggleClass('hide-nav'); tabs.each(function () { var tab = $(this), tabItems = tab.find('ul.cd-tabs-navigation, .main-nav'), @@ -73,14 +74,7 @@ jQuery(document).ready(function ($) { }); $('li.dd').on('click', function () { - console.log("Nav: Click"); - if ($('.drop-nav').hasClass('.open')) { - $('.drop-nav').css('display','none'); - $('.drop-nav').removeClass('.open'); - } else { - $('.drop-nav').css('display','block'); - $('.drop-nav').addClass('.open'); - } + toggleClasses(); }); // This fetches the broweser-appropriate box-shadow value so we can set it @@ -175,4 +169,11 @@ function muximuxMobileResize() { $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); $('.drop-nav').css('max-height', ''); } -} \ No newline at end of file +} + +// Simple method to toggle show/hide classes in navigation + +function toggleClasses() { + $('.drop-nav').toggleClass('hide-nav'); + $('.drop-nav').toggleClass('show-nav'); +} From 3f2cb5fb09a47c895e87b7b80303f4bac6ad8311 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 12:09:50 -0600 Subject: [PATCH 004/170] Add flag for mobile detection. Will be used to enable a mobile override menu item. --- js/main.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/main.js b/js/main.js index 1d799bf..b483dd2 100644 --- a/js/main.js +++ b/js/main.js @@ -1,3 +1,4 @@ +var isMobile; jQuery(document).ready(function ($) { // Custom function to do case-insensitive selector matching $.extend($.expr[":"], { @@ -160,12 +161,12 @@ $( window ).resize(muximuxMobileResize); function muximuxMobileResize() { if($( window ).width() < 800) { - // isMobile = true; + isMobile = true; $('.cd-tabs-navigation nav').children().appendTo(".drop-nav"); var menuHeight = $( window ).height() * .80; $('.drop-nav').css('max-height', menuHeight+'px'); } else { - // isMobile = false; + isMobile = false; $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); $('.drop-nav').css('max-height', ''); } From b90187031b0284e1437522dcc93c65e898a1dd3c Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 16:29:36 -0600 Subject: [PATCH 005/170] More work on Menu, Tab colors Resolve other strange behavior with new menu toggles. Set "tab color" to apply to text in mobile menu, show highlight in destop menu. Adjust scaling method to handle color switch on re-scale. Adjust layout of settings menu to better display color picker, create room for additional WIP settings. Adjust scaling of settings menu to handle mobile view, render more uniformly, and minimize unused space. --- css/style.css | 17 ++++------- js/main.js | 81 ++++++++++++++++++++++++++++++++++----------------- muximux.php | 14 ++++----- 3 files changed, 68 insertions(+), 44 deletions(-) diff --git a/css/style.css b/css/style.css index 9c8513b..816c214 100644 --- a/css/style.css +++ b/css/style.css @@ -358,16 +358,9 @@ body ul { /*Settings*/ -input[type='text']:not(.appName) { - width: 300px; - height: 25px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; - margin: 5px 5px 5px 10px; - padding: 2px; -} -input[type='text']:(.appName) { - width: 200px; +input[type='text'] { + max-width: 300px; + width: 90%; height: 25px; -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; @@ -430,7 +423,8 @@ input[type='button']:hover { } .modal-dialog { - width: 80%; + width: 90%; + max-width: 550px; } .modal-body { @@ -462,6 +456,7 @@ input[type='button']:hover { font-size: 16px; font-size: 1.6rem; border: 1px solid #FFF; + max-width: 500px; width: 90%; padding: 10px; margin-left: auto; diff --git a/js/main.js b/js/main.js index b483dd2..d21d9b0 100644 --- a/js/main.js +++ b/js/main.js @@ -1,4 +1,5 @@ var isMobile; +var color; jQuery(document).ready(function ($) { // Custom function to do case-insensitive selector matching $.extend($.expr[":"], { @@ -12,6 +13,7 @@ jQuery(document).ready(function ($) { // Set default title to the selected item on load var activeTitle = $('li .selected').attr("data-title"); + muximuxMobileResize(); setTitle(activeTitle); //get appropriate CSS3 box-shadow property var boxshadowprop=getsupportedprop(['boxShadow', 'MozBoxShadow', 'WebkitBoxShadow']) @@ -24,10 +26,19 @@ jQuery(document).ready(function ($) { tabNavigation = tab.find('nav'); tabItems.on('click', 'a:not(#reload, #hamburger)', function (event) { + + // Set up menu for desktip view + + if (!isMobile) { + $('.drop-nav').addClass('hide-nav'); + $('.drop-nav').removeClass('show-nav'); + $('.main-nav a span:first').removeClass('dd-active'); + } + resizeIframe(); // Call resizeIframe when document is ready event.preventDefault(); var selectedItem = $(this); - var color = selectedItem.attr("data-color"); + color = selectedItem.attr("data-color"); if (!selectedItem.hasClass('selected')) { var selectedTab = selectedItem.data('content'), selectedContent = tabContentWrapper.find('li[data-content="' + selectedTab + '"]'), @@ -41,20 +52,23 @@ jQuery(document).ready(function ($) { if (sifsrc === undefined || sifsrc === "") { selectedContent.children('iframe').attr('src', selectedContent.children('iframe').data('src')); } - $(".selected").css("Box-Shadow",""); - tabItems.find('a.selected').removeClass('selected'); - selectedItem.addClass('selected'); - - // Change window title after class "selected" has been added to item - var activeTitle = selectedItem.attr("data-title"); - setTitle(activeTitle); - - selectedContent.addClass('selected').siblings('li').removeClass('selected'); - // animate tabContentWrapper height when content changes - $(".selected").css("Box-Shadow","inset 0 5px 0 " + color + ""); - tabContentWrapper.animate({ - 'height': selectedContentHeight - }, 200); + + // Fix issue with color not resetting on settings close + if (!(selectedItem.attr("data-title") == "Settings")) { + clearColors(); + tabItems.find('a.selected').removeClass('selected'); + selectedItem.addClass('selected'); + setSelectedColor(); + // Change window title after class "selected" has been added to item + var activeTitle = selectedItem.attr("data-title"); + setTitle(activeTitle); + + selectedContent.addClass('selected').siblings('li').removeClass('selected'); + // animate tabContentWrapper height when content changes + tabContentWrapper.animate({ + 'height': selectedContentHeight + }, 200); + } } }); @@ -64,15 +78,7 @@ jQuery(document).ready(function ($) { checkScrolling($(this)); }); }); - - // Keep hamburger-menu white when hovering items UNDER the hamburger menu. - $('.drop-nav').on('mouseover', function () { - $('.main-nav a span:first').addClass('dd-active'); - }); - - $('.drop-nav').on('mouseout', function () { - $('.main-nav a span:first').removeClass('dd-active'); - }); + $('li.dd').on('click', function () { toggleClasses(); @@ -124,8 +130,7 @@ jQuery(document).ready(function ($) { jQuery.fn.reverse = [].reverse; // Move items to the dropdown on mobile devices - muximuxMobileResize(); - + settingsEventHandlers(); scaleFrames(); resizeIframe(); // Call resizeIframe when document is ready @@ -170,6 +175,8 @@ function muximuxMobileResize() { $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); $('.drop-nav').css('max-height', ''); } + clearColors(); + setSelectedColor(); } // Simple method to toggle show/hide classes in navigation @@ -177,4 +184,26 @@ function muximuxMobileResize() { function toggleClasses() { $('.drop-nav').toggleClass('hide-nav'); $('.drop-nav').toggleClass('show-nav'); + $('.main-nav a span:first').toggleClass('dd-active'); +} +// Clear color values from tabs + +function clearColors() { + + $(".selected").children("span").css("color",""); + $(".selected").css("color",""); + $(".selected").css("Box-Shadow",""); + +} +// Add relevant color value to tabs + +function setSelectedColor() { + + color = $('li .selected').attr("data-color"); + if (isMobile) { + $(".selected").children("span").css("color","" + color + ""); + $(".selected").css("color","" + color + ""); + } else { + $(".selected").css("Box-Shadow","inset 0 5px 0 " + color + ""); + } } diff --git a/muximux.php b/muximux.php index 03a5190..efe91be 100644 --- a/muximux.php +++ b/muximux.php @@ -114,8 +114,8 @@ function parse_ini() $pageOutput = "
    "; $pageOutput .= "

    General

    "; - $pageOutput .= ""; - $pageOutput .= "
    Branch tracking:"; + $pageOutput .= "
    get('general', 'enabledropdown') == true) $pageOutput .= "checked>
    $showUpdates


    "; else @@ -135,15 +135,15 @@ function parse_ini() $pageOutput .= "
    "; foreach ($name as $key => $val) { if ($key == "url") - $pageOutput .= "
    "; + $pageOutput .= "
    "; else if ($key == "name") { - $pageOutput .= "
    "; + $pageOutput .= "
    "; } else if ($key == "color") { - $pageOutput .= "

    "; + $pageOutput .= "
    "; } else if ($key == "icon") { - $pageOutput .= "
    "; + $pageOutput .= "
    "; } elseif ($key == "default") { - $pageOutput .= "
    Default: Date: Fri, 25 Nov 2016 16:31:43 -0600 Subject: [PATCH 006/170] Adjust colors to better match iFrame contents. I noticed the main bar has a bluish tint to it, this seems to clash somewhat with most other web-apps (Couchpotato, Plex, Sonarr, PlexPy, etc.). Adjusting to a "not-bluish" tint seems to make the bar fit more with rendered content. Also, change iFrame default background color to black - looks better in the short time between frame loads. --- css/style.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/css/style.css b/css/style.css index 816c214..7e37086 100644 --- a/css/style.css +++ b/css/style.css @@ -40,7 +40,7 @@ p { iframe { width: 100%; height: 926px; - background-color: #fff; + background-color: #000; border: 0; padding: 0; margin: 0; @@ -127,7 +127,7 @@ Main components -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-weight: 700; - color: #747b8b; + color: #818181; padding-top: 32px; } @@ -141,7 +141,7 @@ Main components } .cd-tabs-navigation a.selected:not(#reload) { - background-color: #41434f !important; /* Selected tab colour */ + background-color: #3f3f3f !important; /* Selected tab colour */ color: #f1f3f2; /* Selected text colour */ } @@ -149,7 +149,7 @@ Main components .cd-tabs-navigation { /* tabbed on top of devices */ width: 100%; - background-color: #343843; /* Main nav colour */ + background-color: #222222; /* Main nav colour */ box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); } @@ -213,7 +213,7 @@ Main components } .main-nav, .drop-nav { - background: #343843; + background: #222222; box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); z-index: 100002; } @@ -255,7 +255,7 @@ Main components -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-weight: 700; - color: #747b8b; + color: #818181; } .dd { @@ -428,11 +428,11 @@ input[type='button']:hover { } .modal-body { - background: #343843; + background: #222222; } .modal-header, .modal-footer { - background: #41434f; + background: #3f3f3f; } .upgradeBody { @@ -525,7 +525,7 @@ input[type='button']:hover { } #updateContainer { - background-color: #343843; + background-color: #222222; color: #f1f3f2; display: none; font-size: 14px; @@ -569,4 +569,4 @@ input[type='button']:hover { form input { background-color: #fff; color: #000; -} \ No newline at end of file +} From bc8c4c6c9dc78a0d4f6288aeaa93f05efe00d701 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 22:29:14 -0600 Subject: [PATCH 007/170] More menu refinements, color tuning, fix "no overflow" breaks settings access... Add logic for disabling overflow menu, and a settings button when disabled. Fixes mescon/muximux#37. Adjust menu element positions in code to float items to right - this will help with a "mobile override" option to come. Add missing code for "new item" in menu for color picker. Refine settings UI more for continuity between mobile and desktop views. --- css/style.css | 22 ++++++-------- js/functions.js | 9 +++--- js/main.js | 9 +++--- muximux.php | 81 +++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 84 insertions(+), 37 deletions(-) diff --git a/css/style.css b/css/style.css index 7e37086..93fcce3 100644 --- a/css/style.css +++ b/css/style.css @@ -112,30 +112,26 @@ Main components float: left; } -.cd-tabs-navigation li:last-child { - float: right; - right: 0px; -} - -.cd-tabs-navigation a, #reload { +.cd-tabs-navigation a, #reload, #settings { position: relative; display: block; - height: 160px; - width: 30px; + height: 35px; + width: 35px; + padding-top: 10px; text-align: center; font-size: 1.6rem; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-weight: 700; color: #818181; - padding-top: 32px; + } #reload, .cd-tabs-navigation li { cursor: pointer; } -.no-touch .cd-tabs-navigation a:hover, #reload:hover { +.no-touch .cd-tabs-navigation a:hover, #reload:hover, #settings:hover { color: #f1f3f2; /* Hover text colour */ background-color: rgba(233, 230, 202, 0.3); } @@ -153,7 +149,7 @@ Main components box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); } - .cd-tabs-navigation a, #reload { + .cd-tabs-navigation a:not(#reload) { height: 40px; line-height: 40px; width: 100%; @@ -424,7 +420,9 @@ input[type='button']:hover { .modal-dialog { width: 90%; - max-width: 550px; + margin-left: auto; + margin-right: auto; + max-width: 550px; } .modal-body { diff --git a/js/functions.js b/js/functions.js index 7a7049d..acf5734 100644 --- a/js/functions.js +++ b/js/functions.js @@ -134,11 +134,12 @@ function settingsEventHandlers() { var rand = Math.floor((Math.random() * 999999) + 1); $('#sortable').append( '
    ' + - '
    ' + - '
    ' + - '
    ' + + '

    ' + + '

    ' + + '

    ' + + '
    ' + '
    ' + - '
    ' + + '

    ' + '
    ' + '
    ' + '
    '); diff --git a/js/main.js b/js/main.js index d21d9b0..fe8b26d 100644 --- a/js/main.js +++ b/js/main.js @@ -32,7 +32,7 @@ jQuery(document).ready(function ($) { if (!isMobile) { $('.drop-nav').addClass('hide-nav'); $('.drop-nav').removeClass('show-nav'); - $('.main-nav a span:first').removeClass('dd-active'); + $('.main-nav #hamburger span:first').removeClass('dd-active'); } resizeIframe(); // Call resizeIframe when document is ready @@ -68,7 +68,6 @@ jQuery(document).ready(function ($) { tabContentWrapper.animate({ 'height': selectedContentHeight }, 200); - } } }); @@ -124,8 +123,8 @@ jQuery(document).ready(function ($) { scaleFrames(); // Scale frames when window is resized. }); - $('.main-nav').hover(function () { - dropDownFixPosition($('.main-nav'), $('.drop-nav')); + $('.dd').hover(function () { + dropDownFixPosition($('.dd'), $('.drop-nav')); }); jQuery.fn.reverse = [].reverse; @@ -184,7 +183,7 @@ function muximuxMobileResize() { function toggleClasses() { $('.drop-nav').toggleClass('hide-nav'); $('.drop-nav').toggleClass('show-nav'); - $('.main-nav a span:first').toggleClass('dd-active'); + $('.main-nav #hamburger span:first').toggleClass('dd-active'); } // Clear color values from tabs diff --git a/muximux.php b/muximux.php index efe91be..56d3a86 100644 --- a/muximux.php +++ b/muximux.php @@ -200,34 +200,83 @@ function menuItems() } } - if (!empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true") && (!isset($section["dd"]) || $section["dd"] == "false")) { + if (!empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true") && ((!isset($section["dd"]) || $section["dd"] == "false") || ($enabledropdown != "true"))) { if (!empty($section["default"]) && !($section["default"] == "false") && ($section["default"] == "true")) { - $standardmenu .= "
  • " . $section["name"] . "
    • \n"; + $standardmenu .= " +
  • + + " . $section["name"] . " + +
    • "; } else { - $standardmenu .= "
  • " . $section["name"] . "
    • \n"; + $standardmenu .= " +
  • + + " . $section["name"] . " + +
    • "; } } if (isset($section["dd"]) && ($section["dd"] == "true") && !empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true") && $section['name'] == "Settings") { - $dropdownmenu .= "
  • " . $section["name"] . "
    • \n"; - } else if (isset($section["dd"]) && ($section["dd"] == "true") && !empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true")) { - $dropdownmenu .= "
  • " . $section["name"] . "
    • \n"; + $dropdownmenu .= " +
  • + + " . $section["name"] . " + +
    • "; + } else if (($enabledropdown == "true") && isset($section["dd"]) && ($section["dd"] == "true") && !empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true")) { + $dropdownmenu .= " +
  • + + " . $section["name"] . " + +
    • "; } else { $dropdownmenu .= ""; } } if ($enabledropdown == "true") { - $item = "
      -
    • - -
        \n" . $dropdownmenu . - "
    \n\n\n
    "; + $item = " +
      +
    • + + + +
      • +
    • + + + +
        " . + $dropdownmenu ." +
      +
      • +
    \n\n\n +
      +
    + "; } else { - $item = ""; + $item = " + +
      +
    + "; } return $item; } From ff60b3218891f31f048a9abf9b7767dc7b530d51 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 23:21:06 -0600 Subject: [PATCH 008/170] Fix issue with dashes in tab names. Fixes mescon/Muximux#36 Replace all usages of a " - " or "-" or '-' in code with a less common string like "_-_" fixes parsing issues. --- muximux.php | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/muximux.php b/muximux.php index 56d3a86..0eba6da 100644 --- a/muximux.php +++ b/muximux.php @@ -58,7 +58,7 @@ function write_ini() $config = new Config_Lite(CONFIG); foreach ($_POST as $parameter => $value) { - $splitParameter = explode('-', $parameter); + $splitParameter = explode('_-_', $parameter); if ($value == "on") $value = "true"; $config->set($splitParameter[0], $splitParameter[1], $value); @@ -108,26 +108,26 @@ function parse_ini() } else { $develop = ""; } if ($config->get('general', 'updatepopup', 'false') == "true") { - $showUpdates = "
    "; - } else { $showUpdates = "
    "; } + $showUpdates = "
    "; + } else { $showUpdates = "
    "; } $pageOutput = ""; - $pageOutput .= "

    General

    "; - $pageOutput .= "
    "; - $pageOutput .= "
    get('general', 'title', 'Muximux - Application Management Console') . "'>"; + $pageOutput .= "
    "; + $pageOutput .= "
    get('general', 'enabledropdown') == true) $pageOutput .= "checked>
    $showUpdates


    "; else $pageOutput .= ">
    $showUpdates

    "; - $pageOutput .= "" . - "" . - "" . - "" . - "" . - "" . - ""; + $pageOutput .= "" . + "" . + "" . + "" . + "" . + "" . + ""; $pageOutput .= "
    "; foreach ($config as $section => $name) { @@ -135,33 +135,33 @@ function parse_ini() $pageOutput .= "
    "; foreach ($name as $key => $val) { if ($key == "url") - $pageOutput .= "
    "; + $pageOutput .= "
    "; else if ($key == "name") { - $pageOutput .= "
    "; + $pageOutput .= "
    "; } else if ($key == "color") { - $pageOutput .= "
    "; + $pageOutput .= "
    "; } else if ($key == "icon") { - $pageOutput .= "
    "; + $pageOutput .= "
    "; } elseif ($key == "default") { - $pageOutput .= "
    Default:Enabled: Enabled: Landing page: Landing page: Put in dropdown: Put in dropdown: - "; $pageOutput .= $scaleRange ."
    \n
    "; } @@ -455,4 +455,4 @@ function exec_enabled() if(empty($_GET)) { createSecret(); -} +} \ No newline at end of file From 39fc152a6cbc9563f1ac13e86e7a12f296a8b6ac Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Fri, 25 Nov 2016 23:21:33 -0600 Subject: [PATCH 009/170] Lost a bracket... --- js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/main.js b/js/main.js index fe8b26d..caa7a35 100644 --- a/js/main.js +++ b/js/main.js @@ -68,6 +68,7 @@ jQuery(document).ready(function ($) { tabContentWrapper.animate({ 'height': selectedContentHeight }, 200); + } } }); @@ -110,8 +111,7 @@ jQuery(document).ready(function ($) { setTitle(activeTitle); }); - - + $(window).on('resize', function () { tabs.each(function () { var tab = $(this); From f00c2bb4fca39f9f50a0ba0bef7602793f4b4a3b Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sat, 26 Nov 2016 01:09:58 -0600 Subject: [PATCH 010/170] Show selected zoom percentage in settings. Either I broke this, or I never noticed it wasn't working before. It works now. --- muximux.php | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/muximux.php b/muximux.php index 0eba6da..ec3ccec 100644 --- a/muximux.php +++ b/muximux.php @@ -166,13 +166,19 @@ function parse_ini() $pageOutput .= " checked>
    "; else $pageOutput .= ">
    "; - } + } else if ($key == "scale") { + $scaleRange2 = "0"; + $scaleRange2 = buildScale($val); + $pageOutput .= "
    + + +
    "; + + } + } - $pageOutput .= " -
    -
    \n"; + $pageOutput .= ""; + } } $pageOutput .= " @@ -184,6 +190,26 @@ function parse_ini() return $pageOutput; } +// Build a custom scale using our set value, show it as selected +function buildScale($selectValue) +{ + $f=10; + $scaleRange = ""; + while($f<251) { + $pra = $f / 100; + if ($pra == $selectValue) { + + $scaleRange .= "\n"; + $f++; + } else { + + $scaleRange .= "\n"; + $f++; + } + } + return $scaleRange; + +} function menuItems() { From c0d64d13bd91d210a69db892b84fbc8b42f39dee Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sat, 26 Nov 2016 11:40:12 -0600 Subject: [PATCH 011/170] Add Mobile Override Button Fixes mescon/Muximux#68 Add a settings item for a "Mobile override button". When enabled, and when Muximux is rendering in Mobile mode, the button will be displayed next to the refresh button. When pressed, the button toggles between rendering for desktop and mobile mode, causing app tiles to be displayed in the top bar. --- css/style.css | 13 ++++++++++-- js/main.js | 46 +++++++++++++++++++++++++++++++--------- muximux.php | 40 +++++++++++++++++++++++++++------- settings.ini.php-example | 1 + 4 files changed, 80 insertions(+), 20 deletions(-) diff --git a/css/style.css b/css/style.css index 93fcce3..c326bca 100644 --- a/css/style.css +++ b/css/style.css @@ -112,7 +112,7 @@ Main components float: left; } -.cd-tabs-navigation a, #reload, #settings { +.cd-tabs-navigation a, #reload, #settings, #override { position: relative; display: block; height: 35px; @@ -131,7 +131,7 @@ Main components cursor: pointer; } -.no-touch .cd-tabs-navigation a:hover, #reload:hover, #settings:hover { +.cd-tabs-navigation a:hover, #reload:hover, #settings:hover { color: #f1f3f2; /* Hover text colour */ background-color: rgba(233, 230, 202, 0.3); } @@ -277,6 +277,15 @@ Main components color: #f1f3f2; } +.or-active { + background-color: rgba(233, 230, 202, 0.3); +} + +.or-active > span { + color: #ffffff; /* Hover text colour */ + +} + .drop-nav { position: absolute; display: none; diff --git a/js/main.js b/js/main.js index caa7a35..8b9c392 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,4 @@ -var isMobile; -var color; +var isMobile, overrideMobile, color; jQuery(document).ready(function ($) { // Custom function to do case-insensitive selector matching $.extend($.expr[":"], { @@ -14,6 +13,12 @@ jQuery(document).ready(function ($) { // Set default title to the selected item on load var activeTitle = $('li .selected').attr("data-title"); muximuxMobileResize(); + if (isMobile) { + $('#override').css('display','block'); + } else { + $('#override').css('display','none'); + } + overrideMobile=false; setTitle(activeTitle); //get appropriate CSS3 box-shadow property var boxshadowprop=getsupportedprop(['boxShadow', 'MozBoxShadow', 'WebkitBoxShadow']) @@ -25,7 +30,7 @@ jQuery(document).ready(function ($) { tabContentWrapper = tab.children('ul.cd-tabs-content'), tabNavigation = tab.find('nav'); - tabItems.on('click', 'a:not(#reload, #hamburger)', function (event) { + tabItems.on('click', 'a:not(#reload, #hamburger, #override)', function (event) { // Set up menu for desktip view @@ -68,8 +73,8 @@ jQuery(document).ready(function ($) { tabContentWrapper.animate({ 'height': selectedContentHeight }, 200); - } - } + } + } }); // hide the .cd-tabs::after element when tabbed navigation has scrolled to the end (mobile version) @@ -100,6 +105,18 @@ jQuery(document).ready(function ($) { selectedFrame.attr('src', selectedFrame.attr('src')); }); +// Detect click on override button, fire resize + + $('#override').on('click', function () { + overrideMobile = !overrideMobile; + muximuxMobileResize(); + if (overrideMobile && isMobile) { + $('#override').addClass('or-active'); + } else { + $('#override').removeClass('or-active'); + } + }); + // When settings modal is open, set title to "Settings" $('#settingsModal').on('show.bs.modal', function () { setTitle("Settings"); @@ -166,14 +183,23 @@ $( window ).resize(muximuxMobileResize); function muximuxMobileResize() { if($( window ).width() < 800) { isMobile = true; - $('.cd-tabs-navigation nav').children().appendTo(".drop-nav"); - var menuHeight = $( window ).height() * .80; - $('.drop-nav').css('max-height', menuHeight+'px'); } else { isMobile = false; - $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); - $('.drop-nav').css('max-height', ''); } + if (isMobile) { + $('#override').css('display','block'); + } else { + $('#override').css('display','none'); + } + if (isMobile && !overrideMobile) { + console.log("Resize called, rendering mobile."); + $('.cd-tabs-navigation nav').children().appendTo(".drop-nav"); + var menuHeight = $( window ).height() * .80; + $('.drop-nav').css('max-height', menuHeight+'px'); + } else { + $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); + $('.drop-nav').css('max-height', ''); + } clearColors(); setSelectedColor(); } diff --git a/muximux.php b/muximux.php index ec3ccec..1931f4a 100644 --- a/muximux.php +++ b/muximux.php @@ -108,9 +108,14 @@ function parse_ini() } else { $develop = ""; } if ($config->get('general', 'updatepopup', 'false') == "true") { - $showUpdates = "
    "; - } else { $showUpdates = "
    "; } + $showUpdates = "

    "; + } else { $showUpdates = "

    "; } + if ($config->get('general', 'mobileoverride', 'false') == "true") { + $showUpdates .= "
    "; + } else { $showUpdates .= "
    "; } + + $pageOutput = ""; $pageOutput .= "

    General

    "; @@ -224,6 +229,11 @@ function menuItems() } else { $enabledropdown = "false"; } + if (isset($section["mobileoverride"]) && ($section["mobileoverride"] == "true")) { + $mobileoverride = "true"; + } else { + $mobileoverride = "false"; + } } if (!empty($section["enabled"]) && !($section["enabled"] == "false") && ($section["enabled"] == "true") && ((!isset($section["dd"]) || $section["dd"] == "false") || ($enabledropdown != "true"))) { @@ -261,16 +271,29 @@ function menuItems() $dropdownmenu .= ""; } } + + if ($mobileoverride == "true") { + $moButton = " +
  • + + + +
    • + "; + } else { + $moButton = ""; + } if ($enabledropdown == "true") { $item = " -
      -
    • +
        " . + $moButton ." +
        • -
      • +
      • @@ -286,13 +309,14 @@ function menuItems() "; } else { $item = " -
          -
        • +
            " . + $moButton ." +
            • -
          • +
          • diff --git a/settings.ini.php-example b/settings.ini.php-example index b28870f..1252492 100644 --- a/settings.ini.php-example +++ b/settings.ini.php-example @@ -3,6 +3,7 @@ title = "Muximux - Application Management Console" branch = "master" enabledropdown = "true" +mobileoverride = "false" [settings] enabled = "true" From 5024a3350f8bdc404aeb204eaf45f9f006254ffb Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sat, 26 Nov 2016 11:45:31 -0600 Subject: [PATCH 012/170] Forgot to set color on override... Need to check for new boolean to appropriately set color. --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index 8b9c392..1cf79ae 100644 --- a/js/main.js +++ b/js/main.js @@ -225,7 +225,7 @@ function clearColors() { function setSelectedColor() { color = $('li .selected').attr("data-color"); - if (isMobile) { + if (isMobile && !overrideMobile) { $(".selected").children("span").css("color","" + color + ""); $(".selected").css("color","" + color + ""); } else { From 4dcff8653d76ec59d40c9d4065eaa00ca270aa59 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sat, 26 Nov 2016 12:06:37 -0600 Subject: [PATCH 013/170] Change default box-shadow tab color Remove the green color, change it to the default dark color until JS loads up the appropriate hue. --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index c326bca..f1ef914 100644 --- a/css/style.css +++ b/css/style.css @@ -159,7 +159,7 @@ Main components } .cd-tabs-navigation a.selected:not(#reload) { - box-shadow: inset 0 5px 0 #31ac63; /* Selected tab marker colour */ + box-shadow: inset 0 5px 0 #36363b; /* Selected tab marker colour */ } .cd-tabs-navigation a::before { From 87ea9bc8816fbd3f7e5bc2315864350bd9d0c1c5 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sun, 27 Nov 2016 00:24:13 -0600 Subject: [PATCH 014/170] Add auto-hide function to navbar. It's soooooo buttery. Mostly. Worked out issues with the mobile override button and auto-hide by only allowing one or the other in settings. Looks wonky when there are more than one row of buttons, but it responds well otherwise to scaling. Also, added basic retrieval of favicons, but only works for flat domains, no subdirectory listings. Fixes mescon/Muximux#91. --- css/style.css | 17 ++++++++++++++++- js/functions.js | 30 +++++++++++++++++++++++++++--- js/main.js | 46 ++++++++++++++++++++++++++++++++++++++-------- muximux.php | 32 ++++++++++++++++++++++++++++---- 4 files changed, 109 insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index f1ef914..e57774c 100644 --- a/css/style.css +++ b/css/style.css @@ -76,7 +76,22 @@ Main components font-size: 18px; color: #f1f3f2; } - +.cd-tabs-bar.drawer, .cd-tabs-bar.drawer .cd-tab, .cd-tabs-bar.drawer .navbtn { + max-height: 7px; + -webkit-transition: max-height 1s; + -moz-transition: max-height 1s; + -ms-transition: max-height 1s; + -o-transition: max-height 1s; + transition: max-height 1s; + -webkit-transition-timing-function: ease-in-out; /* Safari and Chrome */ + transition-timing-function: ease-in-out; +} +.cd-tabs-bar.drawer:hover, .cd-tabs-bar.drawer .cd-tab:hover, .cd-tabs-bar.drawer .navbtn:hover { + max-height: 200px; +} +.cd-tabs-bar.drawer .navbtn:hover > .cd-tab, .cd-tabs-bar.drawer { + max-height: 200px; +} .cd-tabs nav { margin: 0; padding: 0; diff --git a/js/functions.js b/js/functions.js index acf5734..961a011 100644 --- a/js/functions.js +++ b/js/functions.js @@ -9,11 +9,21 @@ function checkScrolling(tabs) { } // Measure viewport and subtract the height the navigation tabs, then resize the iframes. -function resizeIframe() { +// drawer is just a boolean value as to whether or not we have the drawer. +// If we do, then we need to make the iframe taller than bar height. +function resizeIframe(drawer) { + if (drawer) { + var newSize = $(window).height() - 5; + $('iframe').css({ + 'height': newSize + 'px' + }); + } else { var newSize = $(window).height() - $('nav').height(); - $('iframe').css({'height': newSize + 'px'}); + $('iframe').css({ + 'height': newSize + 'px' + }); +} } - // From https://css-tricks.com/snippets/javascript/htmlentities-for-javascript/ - don't render tags retrieved from Github function htmlEntities(str) { return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); @@ -446,3 +456,17 @@ function scaleFrames() { } }) } +// Like the name implies, it changes the favicon to whatever +// url is passed to it +function changeFavicon(src) { + document.head = document.head || document.getElementsByTagName('head')[0]; + var link = document.createElement('link'), + oldLink = document.getElementById('dynamic-favicon'); + link.id = 'dynamic-favicon'; + link.rel = 'shortcut icon'; + link.href = src; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); +} \ No newline at end of file diff --git a/js/main.js b/js/main.js index 1cf79ae..f2a3f9e 100644 --- a/js/main.js +++ b/js/main.js @@ -1,4 +1,4 @@ -var isMobile, overrideMobile, color; +var isMobile, overrideMobile, hasDrawer, color; jQuery(document).ready(function ($) { // Custom function to do case-insensitive selector matching $.extend($.expr[":"], { @@ -9,7 +9,11 @@ jQuery(document).ready(function ($) { var tabs = $('.cd-tabs'); - + if ($('.cd-tabs-bar').hasClass('drawer')) { + hasDrawer = "true"; + } else { + hasDrawer = "false"; + } // Set default title to the selected item on load var activeTitle = $('li .selected').attr("data-title"); muximuxMobileResize(); @@ -40,7 +44,7 @@ jQuery(document).ready(function ($) { $('.main-nav #hamburger span:first').removeClass('dd-active'); } - resizeIframe(); // Call resizeIframe when document is ready + resizeIframe(hasDrawer); // Call resizeIframe when document is ready event.preventDefault(); var selectedItem = $(this); color = selectedItem.attr("data-color"); @@ -54,9 +58,13 @@ jQuery(document).ready(function ($) { }); var sifsrc = selectedContent.children('iframe').attr('src'); + var srcUrl = selectedContent.children('iframe').data('src'); if (sifsrc === undefined || sifsrc === "") { - selectedContent.children('iframe').attr('src', selectedContent.children('iframe').data('src')); + selectedContent.children('iframe').attr('src', srcUrl); } + // This doesn't work often, but it's a nice surprise when it does + // Work on a way to do this with PHP that isn't taxing + changeFavicon('http://api.byi.pw/favicon?url=' + srcUrl); // Fix issue with color not resetting on settings close if (!(selectedItem.attr("data-title") == "Settings")) { @@ -136,20 +144,37 @@ jQuery(document).ready(function ($) { tab.find('.cd-tabs-content').css('height', 'auto'); }); - resizeIframe(); // Resize iframes when window is resized. + resizeIframe(hasDrawer); // Resize iframes when window is resized. scaleFrames(); // Scale frames when window is resized. }); - $('.dd').hover(function () { + $('.dd').click(function() { dropDownFixPosition($('.dd'), $('.drop-nav')); }); + $('#autohideCheckbox').click(function() { + console.log("Check1"); + $('#mobileoverrideCheckbox').prop('checked',false); + }); + $('#mobileoverrideCheckbox').click(function() { + console.log("Check2"); + $('#autohideCheckbox').prop('checked',false); + }); + // This triggers a menu close when mouse has left the drop nav. + $('.dd').mouseout(function() { + if (!($('.drop-nav:hover').length != 0 || $('.dd:hover').length != 0)) { + timeoutId = setTimeout(function() { + $('.drop-nav').addClass('hide-nav'); + $('.drop-nav').removeClass('show-nav'); + }, 500); + } + }); jQuery.fn.reverse = [].reverse; // Move items to the dropdown on mobile devices settingsEventHandlers(); scaleFrames(); - resizeIframe(); // Call resizeIframe when document is ready + resizeIframe(hasDrawer); // Call resizeIframe when document is ready initIconPicker('.iconpicker'); getSecret(); getBranch(); @@ -221,14 +246,19 @@ function clearColors() { } // Add relevant color value to tabs - +// Refactor to a more appropriate name function setSelectedColor() { color = $('li .selected').attr("data-color"); if (isMobile && !overrideMobile) { + $(".cd-tabs-bar").removeClass("drawer"); $(".selected").children("span").css("color","" + color + ""); $(".selected").css("color","" + color + ""); } else { $(".selected").css("Box-Shadow","inset 0 5px 0 " + color + ""); + // Super hacky, but we're refrencing a placeholder div to quickly see if we have a drawer + if ($('.canary').hasClass('drawer')) { + $(".cd-tabs-bar").addClass("drawer"); } + } } diff --git a/muximux.php b/muximux.php index 1931f4a..fc27c4d 100644 --- a/muximux.php +++ b/muximux.php @@ -115,6 +115,9 @@ function parse_ini() $showUpdates .= "
            "; } else { $showUpdates .= "
            "; } + if ($config->get('general', 'autohide', 'false') == "true") { + $showUpdates .= "
            "; + } else { $showUpdates .= "
            "; } $pageOutput = ""; @@ -224,6 +227,11 @@ function menuItems() foreach ($config as $keyname => $section) { if (($keyname == "general")) { + if (isset($section["autohide"]) && ($section["autohide"] == "true")) { + $autohide = "true"; + } else { + $autohide = "false"; + } if (isset($section["enabledropdown"]) && ($section["enabledropdown"] == "true")) { $enabledropdown = "true"; } else { @@ -284,8 +292,19 @@ function menuItems() $moButton = ""; } + if ($autohide == "true") { + $drawerdiv .= " +
            +
            + "; + } else { + $drawerdiv .= " +
            +
            + "; + } if ($enabledropdown == "true") { - $item = " + $item = $drawerdiv . "
              " . $moButton ."
            • @@ -305,10 +324,13 @@ function menuItems()
              - "; +
            +
            + "; } else { - $item = " + $item = $drawerdiv . "
              " . $moButton ."
            • @@ -325,8 +347,10 @@ function menuItems()
              - "; +
    + "; } return $item; } From 4a410df133ea44710ab66c94821f129735367f58 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sun, 27 Nov 2016 12:32:37 -0600 Subject: [PATCH 015/170] Partial fix for Async, PHP Cleanup Fixes async errors caused by internal methods, some still occur as a result of using outdated JQuery. Need to investigate the .form extension and see if we can do without it. Reformat PHP returns so that resulting source code is pretty. Makes dev-work much easier, can be minified for release builds if desired. --- index.php | 18 ++-- js/functions.js | 39 ++------- js/main.js | 10 +-- muximux.php | 178 +++++++++++++++++++++++++-------------- settings.ini.php-example | 2 + 5 files changed, 138 insertions(+), 109 deletions(-) diff --git a/index.php b/index.php index 78acb5a..2cbedb5 100644 --- a/index.php +++ b/index.php @@ -34,8 +34,8 @@ your browser to improve your experience.

    -
    - +
    +
      @@ -43,6 +43,7 @@
    +
    - -
    diff --git a/js/functions.js b/js/functions.js index 3ff5dc6..bfe3d26 100644 --- a/js/functions.js +++ b/js/functions.js @@ -177,9 +177,11 @@ function settingsEventHandlers() { }); $('#tabcolorCheckbox').click(function(event) { if ($(this).prop('checked')) { - $('.appsColor').removeClass('hidden'); + $('.appsColor').toggle('slide', {direction: 'left'}, 200); + $('.generalColor').toggle('slide', {direction: 'left'}, 200); } else { - $('.appsColor').addClass('hidden'); + $('.appsColor').toggle('slide', {direction: 'left'}, 200); + $('.generalColor').toggle('slide', {direction: 'left'}, 200); } }); @@ -453,14 +455,4 @@ function htmlDecode(value) { return $('
    ').html(value).text(); } -function rgb2hex(rgb) { - if ( rgb.search("rgb") == -1 ) { - return rgb; - } else { - rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/); - function hex(x) { - return ("0" + parseInt(x).toString(16)).slice(-2); - } - return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]); - } -} + diff --git a/js/main.js b/js/main.js index 4ef65ea..3999a7e 100644 --- a/js/main.js +++ b/js/main.js @@ -9,12 +9,14 @@ jQuery(document).ready(function($) { branch = $("#branch-data").attr('data'); hasDrawer = ($('#drawer').attr('data') == 'true'); tabColor = ($("#tabcolor").attr('data') == 'true'); - themeColor = rgb2hex($('.colorgrab').css("color")); + themeColor = $('#themeColor-data').attr("data"); + authentication = $('#authentication-data').attr("data"); tabs = $('.cd-tabs'); activeTitle = $('li .selected').attr("data-title"); getSecret(); muximuxMobileResize(); $('#override').css('display', (isMobile ? 'block' : 'none')); + $('.inputdiv').css('display',(authentication ? 'block' : 'none')); overrideMobile = false; setTitle(activeTitle); //get appropriate CSS3 box-shadow property @@ -105,9 +107,9 @@ jQuery(document).ready(function($) { // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { - $('.userinput').removeClass('hidden'); + $('.inputdiv').slideDown('fast'); } else { - $('.userinput').addClass('hidden'); + $('.inputdiv').slideUp('fast'); } }); $("#logout").click(function() { @@ -168,9 +170,11 @@ jQuery(document).ready(function($) { menuItem.trigger("click"); } if ($('#tabcolorCheckbox').prop('checked')) { - $('.appsColor').removeClass('hidden'); + $('.appsColor').show(); + $('.generalColor').hide(); } else { - $('.appsColor').addClass('hidden'); + $('.appsColor').hide(); + $('.generalColor').show(); } diff --git a/muximux.php b/muximux.php index 0c8ec06..3d2950d 100644 --- a/muximux.php +++ b/muximux.php @@ -120,6 +120,23 @@ function parse_ini() fetchBranches(false); $branchArray = getBranches(); $branchList = ""; + if ($config->get('settings', 'sha', '0') == "0") { + $mySha = fetchSha(); + } else { + $mySha = $config->get('settings', 'sha', '0'); + } + $css = './css/theme/' . getTheme() . '.css'; + $tabColorEnabled = $config->getBool('general', 'tabcolor', false); + $enableDropDown = $config->getBool('general', 'enabledropdown', false); + $updatePopup = $config->getBool('general', 'updatepopup', false); + $mobileOverride = $config->getBool('general', 'mobileoverride', false); + $cssColor = ((parseCSS($css,'.colorgrab','color') != false) ? parseCSS($css,'.colorgrab','color') : '#FFFFFF'); + $themeColor = $config->get('general','color',$cssColor); + $autoHide = $config->getBool('general', 'autohide', false); + $userName = $config->get('general', 'userNameInput', 'admin'); + $passHash = $config->get('general', 'password', 'Muximux'); + $authentication = $config->getBool('general', 'authentication', false); + foreach ($branchArray as $branchName => $shaSum ) { $branchList .= " "; @@ -148,34 +165,40 @@ function parse_ini()
    - getBool('general', 'enabledropdown', false) ? 'checked' : '') ." +
    - getBool('general', 'updatepopup', false) ? 'checked' : '') ."> +
    - getBool('general', 'mobileoverride', false) ? 'checked' : '')."> +

    +
    + + +
    - - getBool('general', 'tabcolor', false) ? 'checked' : '')."> + +
    - getBool('general', 'autohide', false) ? 'checked' : '')."> +
    - getBool('general', 'authentication', false) ? 'checked' : '')."> -

    -
    - +

    -
    - +
    +
    + +

    +
    + +
    @@ -228,15 +251,16 @@ function parse_ini()
    -
    +
    +
    + + +
    +
    -
    - - -
    @@ -195,7 +195,7 @@ function parse_ini()
    -

    +
    @@ -479,13 +479,17 @@ function fetchBranches($skip) { $config = new Config_Lite(CONFIG); $last = $config->get('settings', 'last_check', "0"); if ((time() >= $last + 3600) || $skip) { // Check to make sure we haven't checked in an hour or so, to avoid making GitHub mad - $curl_handle=curl_init(); - curl_setopt($curl_handle, CURLOPT_URL,'https://api.github.com/repos/mescon/Muximux/branches'); - curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 2); - curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl_handle, CURLOPT_USERAGENT, 'Muximux'); - $json = curl_exec($curl_handle); - curl_close($curl_handle); + $url = 'https://api.github.com/repos/mescon/Muximux/branches'; + $options = array( + 'http'=>array( + 'method'=>"GET", + 'header'=>"Accept-language: en\r\n" . + "User-Agent: Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.102011-10-16 20:23:10\r\n" // i.e. An iPad + ) + ); + + $context = stream_context_create($options); + $json = file_get_contents($url,false,$context); if ($json == false) { $result = false; } else { @@ -525,6 +529,14 @@ function fetchBranches($skip) { return $result; } + +function console_log( $data ) { + $output = ""; + echo $output; +} + // We run this when parsing settings to make sure that we have a SHA saved just as // soon as we know we'll need it (on install or new settings). This is how we track whether or not // we need to update. @@ -742,10 +754,13 @@ function downloadUpdate($sha) { $zip = new ZipArchive; $res = $zip->open($zipFile); if ($res === TRUE) { - //$zip->extractTo('./stage'); - //$zip->close(); - //cpy("./stage/Muximux-".$sha, "./"); - //deleteDir("./stage"); + $extracted = $zip->extractTo('./.stage'); + $zip->close(); + cpy("./stage/Muximux-".$sha, "./"); + deleteDir("./stage"); + if ($extracted === TRUE) { + $gone = unlink($zipFile); + } $config = new Config_Lite(CONFIG); $config->set('settings','sha',$sha); try { @@ -759,11 +774,7 @@ function downloadUpdate($sha) { } return $result; } -function console_log( $data ){ - echo ''; -} + function cpy($source, $dest){ if(is_dir($source)) { $dir_handle=opendir($source); From deed9a764db2daa3b5b165f6c38346a9e32adf01 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 12 Dec 2016 16:33:25 -0600 Subject: [PATCH 073/170] Update Config_Lite extension Update extension to latest revision. --- vendor/pear-pear.php.net/Config_Lite/Config/Lite.php | 11 ++++------- .../Config_Lite/Config/Lite/Exception.php | 2 +- .../Config/Lite/Exception/InvalidArgument.php | 2 +- .../Config_Lite/Config/Lite/Exception/Runtime.php | 2 +- .../Config/Lite/Exception/UnexpectedValue.php | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php b/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php index 2a6cc49..a55ad73 100644 --- a/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php +++ b/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php @@ -380,7 +380,7 @@ public function getString($sec, $key, $default = null) * if the option is not set, this is practical when dealing with * editable files, to keep an application stable with default settings. * - * @param string $sec Section|null - null to get global option + * @param string $sec Section|null - null,$key to get global option * @param string $key Key * @param mixed $default return default value if is $key is not set * @@ -392,9 +392,9 @@ public function getString($sec, $key, $default = null) */ public function get($sec = null, $key = null, $default = null) { - // handle get without parameters, because we can + // handle get without parameters if ((null === $sec) && (null === $key) && (null === $default)) { - return $this; // arrayaccess or $this->sections; + return $this->sections; } if ((null !== $sec) && array_key_exists($sec, $this->sections) && isset($this->sections[$sec][$key]) @@ -409,10 +409,7 @@ public function get($sec = null, $key = null, $default = null) if ((null === $key) && array_key_exists($sec, $this->sections)) { return $this->sections[$sec]; } - // all sections - if (null === $sec && array_key_exists($sec, $this->sections)) { - return $this->sections; - } + if (null !== $default) { return $default; } diff --git a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception.php b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception.php index 68f06c0..c842694 100644 --- a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception.php +++ b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception.php @@ -25,7 +25,7 @@ * @author Patrick C. Engel * @copyright 2010-2011 * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version Release: 0.2.4 + * @version Release: 0.2.5 * @link https://github.com/pce/config_lite */ diff --git a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/InvalidArgument.php b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/InvalidArgument.php index b48da83..a10f4dd 100644 --- a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/InvalidArgument.php +++ b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/InvalidArgument.php @@ -25,7 +25,7 @@ * @author Patrick C. Engel * @copyright 2010-2011 * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version Release: 0.2.4 + * @version Release: 0.2.5 * @link https://github.com/pce/config_lite */ class Config_Lite_Exception_InvalidArgument diff --git a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/Runtime.php b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/Runtime.php index 323356e..3d1f33c 100644 --- a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/Runtime.php +++ b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/Runtime.php @@ -25,7 +25,7 @@ * @author Patrick C. Engel * @copyright 2010-2011 * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version Release: 0.2.4 + * @version Release: 0.2.5 * @link https://github.com/pce/config_lite */ diff --git a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/UnexpectedValue.php b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/UnexpectedValue.php index 3f60ac1..df72385 100644 --- a/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/UnexpectedValue.php +++ b/vendor/pear-pear.php.net/Config_Lite/Config/Lite/Exception/UnexpectedValue.php @@ -25,7 +25,7 @@ * @author Patrick C. Engel * @copyright 2010-2011 * @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1 - * @version Release: 0.2.4 + * @version Release: 0.2.5 * @link https://github.com/pce/config_lite */ From 541b995f5a3a05fa7637a98d53af4dc8235eeccd Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 12 Dec 2016 21:28:39 -0600 Subject: [PATCH 074/170] Fix extraction path Fix the path where we copy our update from. --- muximux.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/muximux.php b/muximux.php index d6d7abb..ffa8ed8 100644 --- a/muximux.php +++ b/muximux.php @@ -756,8 +756,8 @@ function downloadUpdate($sha) { if ($res === TRUE) { $extracted = $zip->extractTo('./.stage'); $zip->close(); - cpy("./stage/Muximux-".$sha, "./"); - deleteDir("./stage"); + cpy("./.stage/Muximux-".$sha, "./"); + deleteDir("./.stage"); if ($extracted === TRUE) { $gone = unlink($zipFile); } From 3671c27cd12cb48bc736711e6ab2b69127f0daf6 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 12 Dec 2016 22:31:25 -0600 Subject: [PATCH 075/170] Fix delete error Syntax... --- muximux.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/muximux.php b/muximux.php index ffa8ed8..c6a3bf7 100644 --- a/muximux.php +++ b/muximux.php @@ -805,7 +805,7 @@ function deleteDir($dirPath) { $files = glob($dirPath . '*', GLOB_MARK); foreach ($files as $file) { if (is_dir($file)) { - self::deleteDir($file); + $this->deleteDir($file); } else { unlink($file); } From 1218b3c7ca5ac4a4df7b0b257659120c73a995fc Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Tue, 13 Dec 2016 07:34:47 -0600 Subject: [PATCH 076/170] Slight changes --- js/functions.js | 9 +++++---- js/main.js | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/js/functions.js b/js/functions.js index b75aeab..782e128 100644 --- a/js/functions.js +++ b/js/functions.js @@ -242,6 +242,7 @@ function viewChangelog() { }); $('#refreshUpdate').click(function(){ refreshBranches(); + updateBox(true); }); @@ -332,8 +333,8 @@ function setTitle(title) { $(document).attr("title", title + " - " + $('#maintitle').attr('data')); } // Idea and implementation graciously borrowed from PlexPy (https://github.com/drzoidberg33/plexpy) -function updateBox() { - if (!sessionStorage.getItem('JSONData')) { +function updateBox($force) { + if ((!sessionStorage.getItem('JSONData')) || ($force === true)) { updateJson(); } json = JSON.parse(sessionStorage.getItem('JSONData')); @@ -351,9 +352,9 @@ function updateBox() { if (difference > 0) { if (!getCookie('updateDismiss')) { - $('#updateContainer').html("" + + $('#updateContainer').html("" + "You are currently " + difference + " "+ ((difference > 1) ? 'commits' : 'commit')+" behind!
    " + - "See changelog or
    click here
    to install now.    "); + "See changelog or
    click here
    to install now."); $('#updateContainer').fadeIn("slow"); $('#downloadModal').click(function(){ downloadUpdate(json[0].sha); diff --git a/js/main.js b/js/main.js index f7b2e1b..4b45de3 100644 --- a/js/main.js +++ b/js/main.js @@ -90,6 +90,10 @@ jQuery(document).ready(function($) { } } $('#reload').on('click', function() { + $('.fa-refresh').addClass('fa-spin'); + setTimeout(function() { + $('.fa-refresh').removeClass('fa-spin'); + }, 3900); var selectedFrame = $('.cd-tabs-content').find('.selected').children('iframe'); selectedFrame.attr('src', selectedFrame.attr('src')); }); @@ -186,7 +190,7 @@ jQuery(document).ready(function($) { window $(window).load(function() { if ($('#popupdate').attr('data') == 'true') { - var updateCheck = setInterval(updateBox(), 1000 * 60 * 10); + var updateCheck = setInterval(updateBox(false), 1000 * 60 * 10); } }); // Close modal on escape key From 51fb27fdee3d1d1ca36ade6ddc81fcefdd75375e Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Tue, 13 Dec 2016 10:59:47 -0600 Subject: [PATCH 077/170] Hey, look, no more config_lite errors Fix some issues with config_lite extension throwing errors. Will need to submit a PR for this to main. --- .../Config_Lite/Config/Lite.php | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php b/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php index a55ad73..e584e25 100644 --- a/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php +++ b/vendor/pear-pear.php.net/Config_Lite/Config/Lite.php @@ -1,5 +1,8 @@ sections; } - if ((null !== $sec) && array_key_exists($sec, $this->sections) - && isset($this->sections[$sec][$key]) - ) { - return $this->sections[$sec][$key]; - } + if (is_array($this->sections)) { + if ((null !== $sec) && array_key_exists(strval($sec), $this->sections) + && isset($this->sections[$sec][$key]) + ) { + return $this->sections[$sec][$key]; + } + } // global value if ((null === $sec) && array_key_exists($key, $this->sections)) { return $this->sections[$key]; @@ -461,23 +466,24 @@ public function getBool($sec, $key, $default = null) return $this->_booleans[$value]; } } - } - if (array_key_exists($key, $this->sections[$sec])) { - if (empty($this->sections[$sec][$key])) { - return false; - } - $value = strtolower($this->sections[$sec][$key]); - if (!in_array($value, $this->_booleans) && (null === $default)) { - throw new Config_Lite_Exception_InvalidArgument( - sprintf( - 'Not a boolean: %s, and no default value given.', - $value - ) - ); - } else { - return $this->_booleans[$value]; - } - } + } else if (is_array($this->sections[strval($sec)])) { + if (array_key_exists($key, $this->sections[$sec])) { + if (empty($this->sections[$sec][$key])) { + return false; + } + $value = strtolower($this->sections[$sec][$key]); + if (!in_array($value, $this->_booleans) && (null === $default)) { + throw new Config_Lite_Exception_InvalidArgument( + sprintf( + 'Not a boolean: %s, and no default value given.', + $value + ) + ); + } else { + return $this->_booleans[$value]; + } + } + } if (null !== $default) { return $default; } From 84d66a48eb27537042ddefbc055a30ca9640a147 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Tue, 13 Dec 2016 11:50:50 -0600 Subject: [PATCH 078/170] Use a recursive delete function that works This one doesn't throw errors. --- muximux.php | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/muximux.php b/muximux.php index c6a3bf7..b61528e 100644 --- a/muximux.php +++ b/muximux.php @@ -754,11 +754,12 @@ function downloadUpdate($sha) { $zip = new ZipArchive; $res = $zip->open($zipFile); if ($res === TRUE) { - $extracted = $zip->extractTo('./.stage'); + $result = $zip->extractTo('./.stage'); $zip->close(); - cpy("./.stage/Muximux-".$sha, "./"); - deleteDir("./.stage"); - if ($extracted === TRUE) { + + if ($result === TRUE) { + cpy("./.stage/Muximux-".$sha, "./"); + deleteContent("./.stage"); $gone = unlink($zipFile); } $config = new Config_Lite(CONFIG); @@ -770,7 +771,6 @@ function downloadUpdate($sha) { } rewrite_config_header(); } - $result = $res; } return $result; } @@ -795,23 +795,26 @@ function cpy($source, $dest){ copy($source, $dest); } } -function deleteDir($dirPath) { - if (! is_dir($dirPath)) { - throw new InvalidArgumentException("$dirPath must be a directory"); - } - if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') { - $dirPath .= '/'; - } - $files = glob($dirPath . '*', GLOB_MARK); - foreach ($files as $file) { - if (is_dir($file)) { - $this->deleteDir($file); - } else { - unlink($file); - } - } - rmdir($dirPath); +function deleteContent($path){ + try{ + $iterator = new DirectoryIterator($path); + foreach ( $iterator as $fileinfo ) { + if($fileinfo->isDot())continue; + if($fileinfo->isDir()){ + if(deleteContent($fileinfo->getPathname())) + @rmdir($fileinfo->getPathname()); + } + if($fileinfo->isFile()){ + @unlink($fileinfo->getPathname()); + } + } + } catch ( Exception $e ){ + // write log + return false; + } + return true; } + function is_session_started() { if ( php_sapi_name() !== 'cli' ) { if ( version_compare(phpversion(), '5.4.0', '>=') ) { From 75b78b2e7b8690947353a5007a90e51c6f4cc98a Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Tue, 13 Dec 2016 16:39:54 -0600 Subject: [PATCH 079/170] Add Logging Feature Because everybody is happier when they can see what a program is doing. --- css/style.css | 13 ++ css/theme/classic.css | 412 +++++++++++++++++++++--------------------- css/theme/modern.css | 408 +++++++++++++++++++++-------------------- index.php | 19 ++ js/functions.js | 12 ++ login.php | 118 ++++++------ muximux.php | 95 +++++++++- 7 files changed, 618 insertions(+), 459 deletions(-) diff --git a/css/style.css b/css/style.css index 3fd8722..5eb9eaa 100644 --- a/css/style.css +++ b/css/style.css @@ -399,6 +399,19 @@ input[type='button'] { font-size: 1.6rem; display: none; } +#logContainer { + width: 90%; + margin: auto; + padding: 10px 10px; + text-align: left; + font-size: 16px; + font-size: 1.6rem; + display: block; +} + +.logLine { + display: block; +} #changelog, #changelogContainer h3 { margin-left: auto; diff --git a/css/theme/classic.css b/css/theme/classic.css index 2968fcd..35af66f 100644 --- a/css/theme/classic.css +++ b/css/theme/classic.css @@ -1,202 +1,212 @@ - - -body { - background: #41434f; -} - -.logo { - color: #ffffff; -} - -.logo path { - fill: #31ac63; -} - -.login-block { - background: #36363b; - border-top: 5px solid #31ac63; -} - -.colorgrab { - color:#31ac63; -} - -.login-block h1 { - color: #41434f; -} - -.login-block input { - border: 1px solid #8A8A8A; -} - -.login-block input:active, .login-block input:focus { - border: 1px solid #31ac63; -} - -.login-block button { - background: #31ac63; - border: 1px solid #31ac63; - color: #fff; -} - -.login-block button:hover { - background: #31ac63; -} - - - -iframe { - background-color: #41434f; -} - -.modal-title { - color: #f1f3f2; -} - -.cd-tabs nav { - box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); -} - -.cd-tabs-navigation a { - color: #747b8b; - -} - -.cd-tabs-navigation a:hover { - color: #f1f3f2; /* Hover text colour */ - background-color: rgba(233, 230, 202, 0.3); -} - -.cd-tabs-navigation a.selected { - background-color: #535358 !important; /* Selected tab colour */ - color: #f1f3f2; /* Selected text colour */ -} - -@media only screen and (min-width: 0px) { - .cd-tabs-navigation { - background-color: #343843; /* Main nav colour */ - box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); - } - - - .cd-tabs-navigation a.selected { - box-shadow: inset 0 5px 0 #31ac63; /* Selected tab marker colour */ - } - -} - -.cd-tabs-content { - background: #36363b; /* Content background colour */ -} - -.cd-tabs-content li p { - color: #8493bf; -} - -.main-nav, .drop-nav { - background: #343843; - box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); -} - - -.main-nav > li:hover { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); -} - -.main-nav a { - color: #747b8b; -} - -.dd a:hover { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); -} -.navbtn a:hover { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); -} -.or-active { - background-color: rgba(233, 230, 202, 0.3); -} - -.or-active > span { - color: #ffffff; /* Hover text colour */ - -} - -.drop-nav { - -webkit-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); - box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); -} - -.drop-nav li { - border-bottom: 1px solid rgba(255, 255, 255, .2); -} - -.drop-nav > li:hover, .drop-nav > li:hover a { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); - -webkit-box-shadow: inset 0px 0px 13px 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0px 0px 13px 5px rgba(0, 0, 0, 0.3); - box-shadow: inset 0px 0px 13px 5px rgba(0, 0, 0, 0.3); -} - -input[type='text'], select { - color: #000; -} - -input[type="text"][disabled] { - color: #696969; -} - -input[disabled]:hover { - background-color: #8b0000; - color: #fff; -} - -input[type='button'] { - color: #FFF; - background: #8b0000; -} - -input[type='button']:hover { - background: #003147; -} - -.modal-body { - background: #343843; -} - -.modal-header, .modal-footer { - background: #41434f; -} - -.applicationContainer { - background: #f5f6f7; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; - -webkit-box-shadow: 5px 5px 5px 1px #000; - box-shadow: 5px 5px 5px 1px #000; - color: #000; -} - -#updateContainer { - background-color: #343843; - color: #f1f3f2; -} - -.close { - color: #f1f3f2; -} - -.close:hover, -.close:focus { - color: #fff; -} - -form input { - background-color: #fff; - color: #000; + + +body { + background: #41434f; +} + +.logo { + color: #ffffff; +} + +.logo path { + fill: #31ac63; +} + +.login-block { + background: #36363b; + border-top: 5px solid #31ac63; +} + +.colorgrab { + color:#31ac63; +} + +.login-block h1 { + color: #41434f; +} + +.login-block input { + border: 1px solid #8A8A8A; +} + +.login-block input:active, .login-block input:focus { + border: 1px solid #31ac63; +} + +.login-block button { + background: #31ac63; + border: 1px solid #31ac63; + color: #fff; +} + +.login-block button:hover { + background: #31ac63; +} + +iframe { + background-color: #41434f; +} + +.modal-title { + color: #f1f3f2; +} + +.cd-tabs nav { + box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); +} + +.cd-tabs-navigation a { + color: #747b8b; + +} + +.cd-tabs-navigation a:hover { + color: #f1f3f2; /* Hover text colour */ + background-color: rgba(233, 230, 202, 0.3); +} + +.cd-tabs-navigation a.selected { + background-color: #535358 !important; /* Selected tab colour */ + color: #f1f3f2; /* Selected text colour */ +} + +@media only screen and (min-width: 0px) { + .cd-tabs-navigation { + background-color: #343843; /* Main nav colour */ + box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); + } + + + .cd-tabs-navigation a.selected { + box-shadow: inset 0 5px 0 #31ac63; /* Selected tab marker colour */ + } + +} + +.cd-tabs-content { + background: #36363b; /* Content background colour */ +} + +.cd-tabs-content li p { + color: #8493bf; +} + +.main-nav, .drop-nav { + background: #343843; + box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); +} + + +.main-nav > li:hover { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); +} + +.main-nav a { + color: #747b8b; +} + +.dd a:hover { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); +} +.navbtn a:hover { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); +} +.or-active { + background-color: rgba(233, 230, 202, 0.3); +} + +.or-active > span { + color: #ffffff; /* Hover text colour */ + +} + +.drop-nav { + -webkit-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); + -moz-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); + box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); +} + +.drop-nav li { + border-bottom: 1px solid rgba(255, 255, 255, .2); +} + +.drop-nav > li:hover, .drop-nav > li:hover a { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); + -webkit-box-shadow: inset 0px 0px 13px 5px rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0px 0px 13px 5px rgba(0, 0, 0, 0.3); + box-shadow: inset 0px 0px 13px 5px rgba(0, 0, 0, 0.3); +} + +input[type='text'], select { + color: #000; +} + +input[type="text"][disabled] { + color: #696969; +} + +input[disabled]:hover { + background-color: #8b0000; + color: #fff; +} + +input[type='button'] { + color: #FFF; + background: #8b0000; +} + +input[type='button']:hover { + background: #003147; +} + +.modal-body { + background: #343843; +} + +.modal-header, .modal-footer { + background: #41434f; +} + +.redLine { + color: #ff0000; +} + +.greenLine { + color: #00b300; +} + +.blackLine { + color: #000000; +} + +.applicationContainer { + background: #f5f6f7; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + -webkit-box-shadow: 5px 5px 5px 1px #000; + box-shadow: 5px 5px 5px 1px #000; + color: #000; +} + +#updateContainer { + background-color: #343843; + color: #f1f3f2; +} + +.close { + color: #f1f3f2; +} + +.close:hover, +.close:focus { + color: #fff; +} + +form input { + background-color: #fff; + color: #000; } \ No newline at end of file diff --git a/css/theme/modern.css b/css/theme/modern.css index 1b40b82..d057a0a 100644 --- a/css/theme/modern.css +++ b/css/theme/modern.css @@ -1,200 +1,210 @@ - - -body { - background: #222222; -} - -.logo { - color: #ffffff; -} - -.logo path { - fill: #ff4c4d; -} - -.login-block { - background: #3f3f3f; - border-top: 5px solid #ff4c4d; -} - -.colorgrab { - color:#ff4c4d; -} - -.login-block h1 { - color: #fff; -} - -.login-block input { - border: 1px solid #8A8A8A; -} - -.login-block input:active, .login-block input:focus { - border: 1px solid #ff656c; -} - -.login-block button { - background: #ff656c; - border: 1px solid #e15960; - color: #fff; -} - -.login-block button:hover { - background: #ff7b81; -} - -iframe { - background-color: #000; -} - -.modal-title { - color: #f1f3f2; -} - -.cd-tabs nav { - box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); -} - -.cd-tabs-navigation a { - color: #818181; -} - -.cd-tabs-navigation a:hover { - color: #f1f3f2; /* Hover text colour */ - background-color: rgba(233, 230, 202, 0.3); -} - -.cd-tabs-navigation a.selected { - background-color: #3f3f3f !important; /* Selected tab colour */ - color: #f1f3f2; /* Selected text colour */ -} - -@media only screen and (min-width: 0px) { - .cd-tabs-navigation { - background-color: #222222; /* Main nav colour */ - box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); - } - - - .cd-tabs-navigation a.selected { - box-shadow: inset 0 5px 0 #36363b; /* Selected tab marker colour */ - } - -} - -.cd-tabs-content { - background: #36363b; /* Content background colour */ -} - -.cd-tabs-content li p { - color: #8493bf; -} - -.main-nav, .drop-nav { - background: #222222; - box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); -} - - -.main-nav > li:hover { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); -} - - -.main-nav a { - color: #818181; -} - -.dd a:hover { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); -} - -.navbtn a:hover { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); -} -.or-active { - background-color: rgba(233, 230, 202, 0.3); -} - -.or-active > span { - color: #ffffff; /* Hover text colour */ -} - -.drop-nav { - -webkit-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); - box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); -} - -.drop-nav li { - border-bottom: 1px solid rgba(255, 255, 255, .2); -} - -.drop-nav > li:hover, .drop-nav > li:hover a { - color: #f1f3f2; - background-color: rgba(233, 230, 202, 0.3); - -} - - - -input[type='text'], select { - color: #000; -} - -input[type="text"][disabled] { - color: #696969; -} - -input[disabled]:hover { - background-color: #8b0000; - color: #fff; -} - -input[type='button'] { - color: #FFF; - background: #8b0000; -} - -input[type='button']:hover { - background: #003147; -} - -.modal-body { - background: #222222; -} - -.modal-header, .modal-footer { - background: #3f3f3f; -} - -.applicationContainer { - background: #f5f6f7; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; - -webkit-box-shadow: 5px 5px 5px 1px #000; - box-shadow: 5px 5px 5px 1px #000; - color: #000; -} - -#updateContainer { - background-color: #222222; - color: #f1f3f2; -} - -.close { - color: #f1f3f2; -} - -.close:hover, -.close:focus { - color: #fff; -} - -form input { - background-color: #fff; - color: #000; + + +body { + background: #222222; +} + +.logo { + color: #ffffff; +} + +.logo path { + fill: #ff4c4d; +} + +.login-block { + background: #3f3f3f; + border-top: 5px solid #ff4c4d; +} + +.colorgrab { + color:#ff4c4d; +} + +.login-block h1 { + color: #fff; +} + +.login-block input { + border: 1px solid #8A8A8A; +} + +.login-block input:active, .login-block input:focus { + border: 1px solid #ff656c; +} + +.login-block button { + background: #ff656c; + border: 1px solid #e15960; + color: #fff; +} + +.login-block button:hover { + background: #ff7b81; +} + +iframe { + background-color: #000; +} + +.modal-title { + color: #f1f3f2; +} + +.cd-tabs nav { + box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); +} + +.cd-tabs-navigation a { + color: #818181; +} + +.cd-tabs-navigation a:hover { + color: #f1f3f2; /* Hover text colour */ + background-color: rgba(233, 230, 202, 0.3); +} + +.cd-tabs-navigation a.selected { + background-color: #3f3f3f !important; /* Selected tab colour */ + color: #f1f3f2; /* Selected text colour */ +} + +@media only screen and (min-width: 0px) { + .cd-tabs-navigation { + background-color: #222222; /* Main nav colour */ + box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); + } + + + .cd-tabs-navigation a.selected { + box-shadow: inset 0 5px 0 #36363b; /* Selected tab marker colour */ + } + +} + +.cd-tabs-content { + background: #36363b; /* Content background colour */ +} + +.cd-tabs-content li p { + color: #8493bf; +} + +.main-nav, .drop-nav { + background: #222222; + box-shadow: inset 0 -2px 3px rgba(203, 196, 130, 0.06); +} + + +.main-nav > li:hover { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); +} + + +.main-nav a { + color: #818181; +} + +.dd a:hover { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); +} + +.navbtn a:hover { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); +} +.or-active { + background-color: rgba(233, 230, 202, 0.3); +} + +.or-active > span { + color: #ffffff; /* Hover text colour */ +} + +.drop-nav { + -webkit-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); + -moz-box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); + box-shadow: -9px 10px 13px -2px rgba(0, 0, 0, 0.3); +} + +.drop-nav li { + border-bottom: 1px solid rgba(255, 255, 255, .2); +} + +.drop-nav > li:hover, .drop-nav > li:hover a { + color: #f1f3f2; + background-color: rgba(233, 230, 202, 0.3); + +} + +input[type='text'], select { + color: #000; +} + +input[type="text"][disabled] { + color: #696969; +} + +input[disabled]:hover { + background-color: #8b0000; + color: #fff; +} + +input[type='button'] { + color: #FFF; + background: #8b0000; +} + +input[type='button']:hover { + background: #003147; +} + +.modal-body { + background: #222222; +} + +.modal-header, .modal-footer { + background: #3f3f3f; +} + +.redLine { + color: #ff0000; +} + +.greenLine { + color: #00b300; +} + +.blackLine { + color: #000000; +} + +.applicationContainer { + background: #f5f6f7; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + -webkit-box-shadow: 5px 5px 5px 1px #000; + box-shadow: 5px 5px 5px 1px #000; + color: #000; +} + +#updateContainer { + background-color: #222222; + color: #f1f3f2; +} + +.close { + color: #f1f3f2; +} + +.close:hover, +.close:focus { + color: #fff; +} + +form input { + background-color: #fff; + color: #000; } \ No newline at end of file diff --git a/index.php b/index.php index e774436..b5c7e37 100644 --- a/index.php +++ b/index.php @@ -167,6 +167,25 @@
    +
    diff --git a/js/functions.js b/js/functions.js index 782e128..a57b9a0 100644 --- a/js/functions.js +++ b/js/functions.js @@ -414,6 +414,18 @@ function downloadUpdate($sha) { } } +function write_log($text,$lvl) { + + $.ajax({ + async: true, + url: "muximux.php", + type: 'GET', + data: {action: "writeLog", secret: secret, msg: $text,lvl: $lvl}, + }); + +} + + function setStatus($message) { $('#updateContainer').hide(); $('#updateContainer').html("" + diff --git a/login.php b/login.php index d828d63..73e97ab 100644 --- a/login.php +++ b/login.php @@ -1,58 +1,62 @@ -get('general', 'password', '0'); -$title = $config->get('general', 'title', '0'); -$username = $config->get('general', 'userNameInput', '0'); -if(isset($_GET['logout'])) { - $_SESSION['username'] = ''; - if (!is_session_started()) session_start(); - session_destroy(); - header('Location: ' . $_SERVER['PHP_SELF']); -} -if(isset($_POST['username'])) { - if ($_POST['username'] == $username && password_verify($_POST['password'],$hash)) { - $_SESSION['username'] = $_POST['username']; - header('Location: ' . $_SERVER['PHP_SELF']); - exit(); - } -} -echo ' - - - - - - - - - - - - - - Login to '.getTitle().' - - - -
    - - -
    - -'; -exit; +get('general', 'password', '0'); +$title = $config->get('general', 'title', '0'); +$username = $config->get('general', 'userNameInput', '0'); +if(isset($_GET['logout'])) { + $_SESSION['username'] = ''; + write_log('Successfully logged out.'); + if (!is_session_started()) session_start(); + session_destroy(); + header('Location: ' . $_SERVER['PHP_SELF']); +} +if(isset($_POST['username'])) { + if ($_POST['username'] == $username && password_verify($_POST['password'],$hash)) { + $_SESSION['username'] = $_POST['username']; + header('Location: ' . $_SERVER['PHP_SELF']); + write_log('Successfully logged in.'); + exit(); + } else { + write_log('Error logging in.','E'); + } +} +echo ' + + + + + + + + + + + + + + Login to '.getTitle().' + + + +
    + + +
    + +'; +exit; ?> \ No newline at end of file diff --git a/muximux.php b/muximux.php index b61528e..c269762 100644 --- a/muximux.php +++ b/muximux.php @@ -11,12 +11,14 @@ copy('config.ini.php', 'backup.ini.php'); unlink('config.ini.php'); $upgrade = true; + write_log('Converting configuration file from previous Muximux installation.'); } else { $upgrade = false; } function openFile($file, $mode) { if ((file_exists($file) && (!is_writable(dirname($file)) || !is_writable($file))) || !is_writable(dirname($file))) { // If file exists, check both file and directory writeable, else check that the directory is writeable. printf('Either the file %s and/or it\'s parent directory is not writable by the PHP process. Check the permissions & ownership and try again.', $file); + write_log('Error writing to file ' . $file); if (PHP_SHLIB_SUFFIX === "so") { //Check for POSIX systems. printf("
    Current permission mode of %s: %d", $file, decoct(fileperms($file) & 0777)); printf("
    Current owner of %s: %s", $file, posix_getpwuid(fileowner($file))['name']); @@ -64,6 +66,7 @@ function write_ini() $value = "true"; if ($splitParameter[1] == "password") { if ($value != $oldHash) { + write_log('Successfully updated password.'); $value = password_hash($value, PASSWORD_BCRYPT); $terminate = true; } @@ -88,7 +91,8 @@ function write_ini() $config->save(); } catch (Config_Lite_Exception $e) { echo "\n" . 'Exception Message: ' . $e->getMessage(); - } + write_log('Error saving configuration.','E'); + } rewrite_config_header(); if ($terminate) { session_start(); @@ -366,7 +370,13 @@ function menuItems() { " . $section["name"] . " - "; + +
  • + + Log + +
    • + "; } else if ($enabledropdown && $dropdown && $enabled) { $dropdownmenu .= "
  • @@ -433,6 +443,11 @@ function menuItems() {
    • +
  • + + + +
  • @@ -479,6 +494,11 @@ function fetchBranches($skip) { $config = new Config_Lite(CONFIG); $last = $config->get('settings', 'last_check', "0"); if ((time() >= $last + 3600) || $skip) { // Check to make sure we haven't checked in an hour or so, to avoid making GitHub mad + if (time() >= $last + 3600) { + write_log('Refreshing branches from github - automatically triggered.'); + } else { + write_log('Refreshing branches from github - manually triggered.'); + } $url = 'https://api.github.com/repos/mescon/Muximux/branches'; $options = array( 'http'=>array( @@ -491,6 +511,7 @@ function fetchBranches($skip) { $context = stream_context_create($options); $json = file_get_contents($url,false,$context); if ($json == false) { + write_log('Error fetching JSON from Github.','E'); $result = false; } else { $array = json_decode($json,true); @@ -738,6 +759,17 @@ function exec_enabled() { echo $results; die(); } + + if(isset($_GET['action']) && $_GET['action'] == "writeLog") { + $msg = $_GET['msg']; + if(isset($_GET['lvl'])) { + $lvl = $_GET['lvl']; + write_log($msg,$lvl); + } else { + write_log($msg); + } + die(); + } } // End protected get-calls if(empty($_GET)) { @@ -772,6 +804,7 @@ function downloadUpdate($sha) { rewrite_config_header(); } } + write_log('Update ' . (($result === true) ? 'succeeded.' : 'failed.')); return $result; } @@ -850,3 +883,61 @@ function parseCSS($file,$searchSelector,$searchAttribute){ } return $result; } + +// Appends lines to file and makes sure the file doesn't grow too much +// You can supply a level, which should be a one-letter code (E for error, D for debug) +// If a level is not supplied, it will be assumed to be Informative. + +function write_log($text,$level=null) { + if ($level === null) { + $level = 'I'; + } + $filename = 'muximux.log'; + $text = $level .'/'. date(DATE_RFC2822) . ': ' . $text . PHP_EOL; + if (!file_exists($filename)) { touch($filename); chmod($filename, 0666); } + if (filesize($filename) > 2*1024*1024) { + $filename2 = "$filename.old"; + if (file_exists($filename2)) unlink($filename2); + rename($filename, $filename2); + touch($filename); chmod($filename,0666); + } + if (!is_writable($filename)) die("

    \nCannot open log file ($filename)"); + if (!$handle = fopen($filename, 'a')) die("

    \nCannot open file ($filename)"); + if (fwrite($handle, $text) === FALSE) die("

    \nCannot write to file ($filename)"); + fclose($handle); +} + +function log_contents() { + $out = '

      + '; + $filename = 'muximux.log'; + $handle = fopen($filename, "r"); + if ($handle) { + while (($line = fgets($handle)) !== false) { + $lvl = substr($line,0,1); + if ($lvl === 'E') { + $color = 'redLine'; + } + if ($lvl === 'D') { + $color = 'greenLine'; + } + if ($lvl === 'I') { + $color = 'blackLine'; + } + $out .=' +
    • '. + substr($line,2).' +
      • '; + + } + fclose($handle); + } + $out .= '
    + '; + return $out; +} + +function begins_with($haystack, $needle) { + return substr($haystack, 0, 1) === $needle; +} + From 505e31e70eae3d2e41495ceb90354d61534db093 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Tue, 13 Dec 2016 23:05:53 -0600 Subject: [PATCH 080/170] Minor code cleanup, implement combine method Throw in a method to combine returns for linked style sheets and scripts. Need to work on script implementation and testing to make sure css calls aren't breaking .map files. --- combineify.php | 170 ++++++++++++++++++++++++++++++++++++++++++++++++ index.php | 11 +--- js/functions.js | 11 +++- js/main.js | 12 +--- 4 files changed, 183 insertions(+), 21 deletions(-) create mode 100644 combineify.php diff --git a/combineify.php b/combineify.php new file mode 100644 index 0000000..86851da --- /dev/null +++ b/combineify.php @@ -0,0 +1,170 @@ + - - - - - - - - - + + <?php echo getTitle(); ?> diff --git a/js/functions.js b/js/functions.js index a57b9a0..9e2e97a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -469,10 +469,17 @@ function changeFavicon(src) { document.head.appendChild(link); } - // Wrap a html-encoded string in a div (in-memory) and read it back, unencoded. function htmlDecode(value) { return $('
    ').html(value).text(); } - +// This fetches the browser-appropriate box-shadow value so we can set it + function getsupportedprop(proparray) { + var root = document.documentElement //reference root element of document + for (var i = 0; i < proparray.length; i++) { //loop through possible properties + if (proparray[i] in root.style) { //if property exists on element (value will be string, empty string if not set) + return proparray[i] //return that string + } + } + } \ No newline at end of file diff --git a/js/main.js b/js/main.js index 4b45de3..4c296ee 100644 --- a/js/main.js +++ b/js/main.js @@ -80,15 +80,7 @@ jQuery(document).ready(function($) { $('li.dd').on('click', function() { toggleClasses(); }); - // This fetches the broweser-appropriate box-shadow value so we can set it - function getsupportedprop(proparray) { - var root = document.documentElement //reference root element of document - for (var i = 0; i < proparray.length; i++) { //loop through possible properties - if (proparray[i] in root.style) { //if property exists on element (value will be string, empty string if not set) - return proparray[i] //return that string - } - } - } + $('#reload').on('click', function() { $('.fa-refresh').addClass('fa-spin'); setTimeout(function() { @@ -187,7 +179,7 @@ jQuery(document).ready(function($) { }); -window + $(window).load(function() { if ($('#popupdate').attr('data') == 'true') { var updateCheck = setInterval(updateBox(false), 1000 * 60 * 10); From 69d4a4b1e42e5a2ee8ddb655f3610a479303ac5b Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 12:15:30 -0600 Subject: [PATCH 081/170] Compress JS Using Closure Compiler Service Re-compile JS to optimized yet human-readable form. Also fixes title change on log modal closure. --- js/functions.js | 692 +++++++++++++++++------------------------------- js/login.js | 61 ++--- js/main.js | 427 +++++++++++------------------- 3 files changed, 423 insertions(+), 757 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9e2e97a..0e80e5a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1,485 +1,265 @@ -var branch = $("#branch-data").attr('data'); -var commitURL = "https://api.github.com/repos/mescon/Muximux/commits?sha=" + branch; -var localversion = $("#sha-data").attr('data'); -var cwd = $("#cwd-data").attr('data'); -var phpini = $("#phpini-data").attr('data'); -var gitdir = $("#gitdirectory-data").attr('data'); -var title = $("#title-data").attr('data'); -var branch = $("#branch-data").attr('data'); -var secret = $("#secret").attr('data'); -var difference = 0; -var differenceDays; -var json; - - -function checkScrolling(tabs) { - var totalTabWidth = parseInt(tabs.children('.cd-tabs-navigation').width()), - tabsViewport = parseInt(tabs.width()); - if (tabs.scrollLeft() >= totalTabWidth - tabsViewport) { - tabs.parent('.cd-tabs').addClass('is-ended'); - } else { - tabs.parent('.cd-tabs').removeClass('is-ended'); - } +var branch = $("#branch-data").attr("data"), commitURL = "https://api.github.com/repos/mescon/Muximux/commits?sha=" + branch, localversion = $("#sha-data").attr("data"), cwd = $("#cwd-data").attr("data"), phpini = $("#phpini-data").attr("data"), gitdir = $("#gitdirectory-data").attr("data"), title = $("#title-data").attr("data"), branch = $("#branch-data").attr("data"), secret = $("#secret").attr("data"), difference = 0, differenceDays, json; +function checkScrolling(b) { + var c = parseInt(b.children(".cd-tabs-navigation").width()), a = parseInt(b.width()); + b.scrollLeft() >= c - a ? b.parent(".cd-tabs").addClass("is-ended") : b.parent(".cd-tabs").removeClass("is-ended"); } -// Measure viewport and subtract the height the navigation tabs, then resize the iframes. -// drawer is just a boolean value as to whether or not we have the drawer. -// If we do, then we need to make the iframe taller than bar height. -function resizeIframe(drawer, isMobile) { - if (drawer && !isMobile) { - var newSize = $(window).height() - 5; - $('iframe').css({ - 'height': newSize + 'px' - }); - } else { - var newSize = $(window).height() - $('.cd-tabs-navigation').height(); - $('iframe').css({ - 'height': newSize + 'px' - }); - } +function resizeIframe(b, c) { + var a = b && !c ? $(window).height() - 5 : $(window).height() - $(".cd-tabs-navigation").height(); + $("iframe").css({height:a + "px"}); } -// From https://css-tricks.com/snippets/javascript/htmlentities-for-javascript/ - don't render tags retrieved from Github -function htmlEntities(str) { - return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); +function htmlEntities(b) { + return String(b).replace(/&/g, "&").replace(//g, ">").replace(/"/g, """); } - -function dropDownFixPosition(button, dropdown) { - var dropDownTop = button.offset().top + button.outerHeight(); - dropdown.css('top', dropDownTop + "px"); - dropdown.css('left', $(window).width() - $('.drop-nav').width() - button.offset().left + "px"); +function dropDownFixPosition(b, c) { + var a = b.offset().top + b.outerHeight(); + c.css("top", a + "px"); + c.css("left", $(window).width() - $(".drop-nav").width() - b.offset().left + "px"); } - function settingsEventHandlers() { - $('#sortable').sortable(); - // Anytime a radio box for default is changed it unchecks the others - $('input[type=radio]').change(function() { - $('input[type=radio]:checked').not(this).prop('checked', false); - }); - // Event Handler for show/hide instructions - $('#showInstructions').click(function() { - $('#instructionsContainer').slideToggle(1000); - if ($(this).html() == " Show Guide") $(this).html(' Hide Guide'); - else $(this).html(' Show Guide'); - }); - // Event Handler for show/hide changelog - $('#showChangelog').click(function() { - $('#changelogContainer').slideToggle(1000); - if ($(this).html() == " Show Updates") { - $(this).html(' Hide Updates'); - viewChangelog(); - } - else $(this).html(' Show Updates'); - }); - // Event Handler for backup.ini show/hide button - if ($('#backupContents').text() != "") { - $('#topButtons').append(' Show Backup INI') - $('#topButtons').css('width', '425px') - $('#showBackup').click(function() { - $('#backupiniContainer').slideToggle(1000); - if ($(this).html() == " Show Backup INI") $(this).html(' Hide Backup INI'); - else $(this).html(' Show Backup INI'); - }); - } - // Remove all event handler - $('#removeAll').click(function() { - if (confirm('Are you sure?')) { - var selectedEffect = "drop"; - var options = {}; - var time = 150; - $(this).parents('form').children('#sortable').children().reverse().each(function() { - var that = $(this); - setTimeout(function() { - that.effect(selectedEffect, options, 150, removeCallback(that)) - }, time); - time = time + 150; - }); - $('#addApplication').click(); - } - }); - // Remove sortable item button handler - $('form').on('click', '.removeButton', function() { - if (confirm('Are you sure?')) { - var selectedEffect = "drop"; - var options = {}; - $($(this).parents('.applicationContainer')).effect(selectedEffect, options, 500, removeCallback($(this).parents('.applicationContainer'))); - } - }); - $('#removeBackup').click(function() { - var secret = $("#secret").data()['data']; - $.ajax({ - async: true, - url: "muximux.php", - type: 'GET', - data: { - remove: "backup", - secret: secret - }, - success: function(data) { - if (data == "deleted"); - $('#backupiniContainer').toggle(1000); - $('#showBackup').remove(); - $('#topButtons').css('width', '280px') - } - }); - }); - - function removeCallback(selectedElement) { - setTimeout(function() { - $(selectedElement).remove(); - }, 1000); - }; - // Fix for iconpicker. For some reason the arrow doesn't get disabled when it hits the minimum/maximum page number. This disables the button, so that it doesnt go into the negatives or pages above its max. - $('body').on('click', '.btn-arrow', function(event) { - event.preventDefault(); - if ($(this).hasClass('disabled')) $(this).attr('disabled', 'disabled'); - else $('.btn-arrow').removeAttr('disabled'); - }); - // Add new application button handler - $('#addApplication').click(function() { - // Generating a random number here. So that if the user adds more than one new application at a time the ids/classes and names don't match. - var rand = Math.floor((Math.random() * 999999) + 1); - $('#sortable').append('
    ' + '

    ' + '

    ' + '

    ' + '
    ' + '
    ' + '

    ' + '
    ' + '
    ' + '
    '); - initIconPicker('.' + rand + 'newApplication_-_value[name=' + rand + 'newApplication_-_icon]'); - }); - // App Name Change/Addition handler - $('form').on('focusout', '.appName', function() { - if ($(this).val() != "") { - $(this).parents('.applicationContainer').removeClass('newApp'); - var section = $(this).attr('was'); - if (section == undefined) { - section = $(this).parents('.applicationContainer').children('.newAppRand').attr('value') + "newApplication"; - $(this).parents('applicationContainer').children('.newAppRand').remove(); - } - var newSection = $(this).val().split(' ').join('_'); - $(this).attr('was', newSection); - $('.' + section + '-value').each(function() { - var split = $(this).attr('name').split('-'); - $(this).removeAttr('name').prop('name', newSection + "-" + split[1]).addClass(newSection + '-value').removeClass(section + '-value'); - }); - $('input[name="' + section + '-icon"]').prop('name', newSection + "-icon"); - $(this).parents('div.applicationContainer').attr('id', newSection); - } - }); - //On Submit handler - var options = { - url: 'muximux.php', - type: 'post', - success: showResponse - }; - $('#settingsSubmit').click(function(event) { - event.preventDefault(); - $('.newApp').remove(); //Remove any new app that isn't filled out. - $('.checkbox,.radio').each(function() { - if (!$(this).prop('checked')) { - var name = $(this).attr('name'); - $('').appendTo($(this)); - } - }); - $('.appName').removeAttr('disabled'); - $("form").ajaxSubmit(options); - }); - $('#tabcolorCheckbox').click(function(event) { - if ($(this).prop('checked')) { - $('.appsColor').toggle('slide', {direction: 'left'}, 200); - $('.generalColor').toggle('slide', {direction: 'left'}, 200); - } else { - $('.appsColor').toggle('slide', {direction: 'left'}, 200); - $('.generalColor').toggle('slide', {direction: 'left'}, 200); - } - - }); + function b(a) { + setTimeout(function() { + $(a).remove(); + }, 1E3); + } + $("#sortable").sortable(); + $("input[type=radio]").change(function() { + $("input[type=radio]:checked").not(this).prop("checked", !1); + }); + $("#showInstructions").click(function() { + $("#instructionsContainer").slideToggle(1E3); + ' Show Guide' == $(this).html() ? $(this).html(' Hide Guide') : $(this).html(' Show Guide'); + }); + $("#showChangelog").click(function() { + $("#changelogContainer").slideToggle(1E3); + ' Show Updates' == $(this).html() ? ($(this).html(' Hide Updates'), viewChangelog()) : $(this).html(' Show Updates'); + }); + "" != $("#backupContents").text() && ($("#topButtons").append(' Show Backup INI'), $("#topButtons").css("width", "425px"), $("#showBackup").click(function() { + $("#backupiniContainer").slideToggle(1E3); + ' Show Backup INI' == $(this).html() ? $(this).html(' Hide Backup INI') : $(this).html(' Show Backup INI'); + })); + $("#removeAll").click(function() { + if (confirm("Are you sure?")) { + var a = {}, c = 150; + $(this).parents("form").children("#sortable").children().reverse().each(function() { + var d = $(this); + setTimeout(function() { + d.effect("drop", a, 150, b(d)); + }, c); + c += 150; + }); + $("#addApplication").click(); + } + }); + $("form").on("click", ".removeButton", function() { + confirm("Are you sure?") && $($(this).parents(".applicationContainer")).effect("drop", {}, 500, b($(this).parents(".applicationContainer"))); + }); + $("#removeBackup").click(function() { + var a = $("#secret").data().data; + $.ajax({async:!0, url:"muximux.php", type:"GET", data:{remove:"backup", secret:a}, success:function(a) { + "deleted" == a && ($("#backupiniContainer").toggle(1E3), $("#showBackup").remove(), $("#topButtons").css("width", "280px")); + }}); + }); + $("body").on("click", ".btn-arrow", function(a) { + a.preventDefault(); + $(this).hasClass("disabled") ? $(this).attr("disabled", "disabled") : $(".btn-arrow").removeAttr("disabled"); + }); + $("#addApplication").click(function() { + var a = Math.floor(999999 * Math.random() + 1); + $("#sortable").append('




    '); + initIconPicker("." + a + "newApplication_-_value[name=" + a + "newApplication_-_icon]"); + }); + $("form").on("focusout", ".appName", function() { + if ("" != $(this).val()) { + $(this).parents(".applicationContainer").removeClass("newApp"); + var a = $(this).attr("was"); + void 0 == a && (a = $(this).parents(".applicationContainer").children(".newAppRand").attr("value") + "newApplication", $(this).parents("applicationContainer").children(".newAppRand").remove()); + var b = $(this).val().split(" ").join("_"); + $(this).attr("was", b); + $("." + a + "-value").each(function() { + var c = $(this).attr("name").split("-"); + $(this).removeAttr("name").prop("name", b + "-" + c[1]).addClass(b + "-value").removeClass(a + "-value"); + }); + $('input[name="' + a + '-icon"]').prop("name", b + "-icon"); + $(this).parents("div.applicationContainer").attr("id", b); + } + }); + var c = {url:"muximux.php", type:"post", success:showResponse}; + $("#settingsSubmit").click(function(a) { + a.preventDefault(); + $(".newApp").remove(); + $(".checkbox,.radio").each(function() { + if (!$(this).prop("checked")) { + var a = $(this).attr("name"); + $('').appendTo($(this)); + } + }); + $(".appName").removeAttr("disabled"); + $("form").ajaxSubmit(c); + }); + $("#tabcolorCheckbox").click(function(a) { + $(this).prop("checked"); + $(".appsColor").toggle("slide", {direction:"left"}, 200); + $(".generalColor").toggle("slide", {direction:"left"}, 200); + }); } -// Takes all the data we have to generate our changelog function viewChangelog() { - $('#changelog').html(""); - if (!sessionStorage.getItem('JSONData')) { - updateJson(); - } - json = JSON.parse(sessionStorage.getItem('JSONData')); - $.getJSON(commitURL, function(result) { - json = result; - var compareURL = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; - difference = 0; - for (var i in json) { - if (json[i].sha == localversion) { - difference = i; - } - } - differenceDays = datediff(json[0].commit.author.date.substring(0, 10)); - - - var status = "up to date!"; - if (difference > 0) { - status = "" + difference + " commits behind!"; - } - output = "

    Your install is currently " + status + "
    "; - if (difference > 0) { - output += "The changes from your version to the latest version can be read here.

    "; - } - output += "

    Updates to your version of Muximux were uploaded to Github " + (differenceDays == 0 ? 'today' : differenceDays + (differenceDays == 1 ? ' day ago' : ' days ago') ) + ".

    "; - output += "
    "; - if (difference > 0) { - output +=" Install Now"; - } - output +=" Refresh Updates" + - "
    "; - if (difference > 0) { - - output += "

    Or you can manually download the latest zip here.

    "; - output += "

    Changelog (" + branch + ")

      "; - var i=0; - do { - var shortCommitID = json[i].sha.substring(0, 7); - var shortComments = htmlEntities(json[i].commit.message.substring(0, 550).replace(/$/, "") + "..."); - var shortDate = json[i].commit.author.date.substring(0, 10); - output += "
    • " + shortDate + " " + shortCommitID + ":  " + shortComments + "
      • "; - i++; - } while (i != difference); - output += "
    "; - } - $('#changelog').html(output); - $('#downloadUpdate').click(function(){ - downloadUpdate(json[0].sha); - }); - $('#refreshUpdate').click(function(){ - refreshBranches(); - updateBox(true); - }); - - - }); + $("#changelog").html(""); + sessionStorage.getItem("JSONData") || updateJson(); + json = JSON.parse(sessionStorage.getItem("JSONData")); + $.getJSON(commitURL, function(b) { + json = b; + b = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; + difference = 0; + for (var c in json) { + json[c].sha == localversion && (difference = c); + } + differenceDays = datediff(json[0].commit.author.date.substring(0, 10)); + c = "up to date!"; + 0 < difference && (c = "" + difference + " commits behind!"); + output = "

    Your install is currently " + c + "
    "; + 0 < difference && (output += 'The changes from your version to the latest version can be read here.

    '); + output += "

    Updates to your version of Muximux were uploaded to Github " + (0 == differenceDays ? "today" : differenceDays + (1 == differenceDays ? " day ago" : " days ago")) + ".

    "; + output += "
    "; + 0 < difference && (output += " Install Now"); + output += " Refresh Updates
    "; + if (0 < difference) { + output += "

    Or you can manually download the latest zip here.

    "; + output += "

    Changelog (" + branch + ")

      "; + c = 0; + do { + b = json[c].sha.substring(0, 7); + var a = htmlEntities(json[c].commit.message.substring(0, 550).replace(/$/, "") + "..."), d = json[c].commit.author.date.substring(0, 10); + output += "
    • " + d + ' ' + b + ":  " + a + "
      • "; + c++; + } while (c != difference); + output += "
    "; + } + $("#changelog").html(output); + $("#downloadUpdate").click(function() { + downloadUpdate(json[0].sha); + }); + $("#refreshUpdate").click(function() { + refreshBranches(); + updateBox(!0); + }); + }); } - function refreshBranches() { - $.ajax({ - async: true, - url: "muximux.php", - type: 'GET', - data: {action: "branches", secret: secret }, - success: function (data) { - viewChangelog(); - } - - }); + $.ajax({async:!0, url:"muximux.php", type:"GET", data:{action:"branches", secret:secret}, success:function(b) { + viewChangelog(); + }}); } - -//Init iconpickers -function initIconPicker(selectedItem) { - $(selectedItem).iconpicker({ - align: 'center', // Only in div tag - arrowClass: 'btn-danger', - arrowPrevIconClass: 'glyphicon glyphicon-chevron-left', - arrowNextIconClass: 'glyphicon glyphicon-chevron-right', - cols: 10, - footer: true, - header: true, - iconset: 'fontawesome', - labelHeader: '{0} of {1} pages', - labelFooter: '{0} - {1} of {2} icons', - placement: 'bottom', // Only in button tag - rows: 5, - search: true, - searchText: 'Search', - selectedClass: 'btn-success', - unselectedClass: '' - }); +function initIconPicker(b) { + $(b).iconpicker({align:"center", arrowClass:"btn-danger", arrowPrevIconClass:"glyphicon glyphicon-chevron-left", arrowNextIconClass:"glyphicon glyphicon-chevron-right", cols:10, footer:!0, header:!0, iconset:"fontawesome", labelHeader:"{0} of {1} pages", labelFooter:"{0} - {1} of {2} icons", placement:"bottom", rows:5, search:!0, searchText:"Search", selectedClass:"btn-success", unselectedClass:""}); } -// post-submit callback function -function showResponse(responseText, statusText) { - if (responseText == 1 || statusText == "success") location.pathname = location.pathname; - else alert("Error!!!-" + responseText); +function showResponse(b, c) { + 1 == b || "success" == c ? location.pathname = location.pathname : alert("Error!!!-" + b); } -// Calculates the amount of days since an update was commited on Github. -function datediff(latestDate) { - var githubDate_ms = new Date(latestDate).getTime(); - var localDate_ms = new Date().getTime(); - var difference_ms = localDate_ms - githubDate_ms; - return Math.round(difference_ms / 86400000); +function datediff(b) { + b = (new Date(b)).getTime(); + var c = (new Date).getTime(); + return Math.round((c - b) / 864E5); } -// Gets the secret key that was generated on load. This AJAX call can not be async - other functions rely on this property to be set first. function getSecret() { - $.ajax({ - async: true, - dataType: 'text', - url: "muximux.php?get=secret", - type: 'GET', - success: function(data) { - $('#secret').data({ - data: data - }); - } - }); + $.ajax({async:!0, dataType:"text", url:"muximux.php?get=secret", type:"GET", success:function(b) { + $("#secret").data({data:b}); + }}); } - - -function setCookie(cname, cvalue, exdays) { - var d = new Date(); - d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000)); - var expires = "expires=" + d.toUTCString(); - document.cookie = cname + "=" + cvalue + "; " + expires; +function setCookie(b, c, a) { + var d = new Date; + d.setTime(d.getTime() + 864E5 * a); + a = "expires=" + d.toUTCString(); + document.cookie = b + "=" + c + "; " + a; } - -function getCookie(cname) { - var name = cname + "="; - var ca = document.cookie.split(';'); - for (var i = 0; i < ca.length; i++) { - var c = ca[i]; - while (c.charAt(0) == ' ') c = c.substring(1); - if (c.indexOf(name) == 0) return c.substring(name.length, c.length); - } - return ""; +function getCookie(b) { + b += "="; + for (var c = document.cookie.split(";"), a = 0;a < c.length;a++) { + for (var d = c[a];" " == d.charAt(0);) { + d = d.substring(1); + } + if (0 == d.indexOf(b)) { + return d.substring(b.length, d.length); + } + } + return ""; } -// Set document title including title of the page as configured in settings.ini.php -function setTitle(title) { - $(document).attr("title", title + " - " + $('#maintitle').attr('data')); +function setTitle(b) { + $(document).attr("title", b + " - " + $("#maintitle").attr("data")); } -// Idea and implementation graciously borrowed from PlexPy (https://github.com/drzoidberg33/plexpy) -function updateBox($force) { - if ((!sessionStorage.getItem('JSONData')) || ($force === true)) { - updateJson(); - } - json = JSON.parse(sessionStorage.getItem('JSONData')); - var compareURL = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; - var difference = 0; - for (var i in json) { - if (json[i].sha == localversion) { - difference = i; - } - } - var differenceDays = datediff(json[0].commit.author.date.substring(0, 10)); - var updateCheck; - if (difference) { - clearInterval(updateCheck); - if (difference > 0) { - - if (!getCookie('updateDismiss')) { - $('#updateContainer').html("" + - "You are currently " + difference + " "+ ((difference > 1) ? 'commits' : 'commit')+" behind!
    " + - "See changelog or
    click here
    to install now.    "); - $('#updateContainer').fadeIn("slow"); - $('#downloadModal').click(function(){ - downloadUpdate(json[0].sha); - }); - } - } - $('#updateDismiss').click(function() { - $('#updateContainer').fadeOut('slow'); - // Set cookie to remember dismiss decision for 1 hour. - setCookie('updateDismiss', 'true', 1 / 24); - }); - } +function updateBox(b) { + sessionStorage.getItem("JSONData") && !0 !== b || updateJson(); + json = JSON.parse(sessionStorage.getItem("JSONData")); + b = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; + var c = 0, a; + for (a in json) { + json[a].sha == localversion && (c = a); + } + datediff(json[0].commit.author.date.substring(0, 10)); + c && (clearInterval(void 0), 0 < c && !getCookie("updateDismiss") && ($("#updateContainer").html("You are currently " + c + " " + (1 < c ? "commits" : "commit") + " behind!
    See changelog or
    click here
    to install now.    "), $("#updateContainer").fadeIn("slow"), $("#downloadModal").click(function() { + downloadUpdate(json[0].sha); + })), $("#updateDismiss").click(function() { + $("#updateContainer").fadeOut("slow"); + setCookie("updateDismiss", "true", 1 / 24); + })); } - function updateJson() { - $.getJSON(commitURL, function(result) { - jsonString = JSON.stringify(result); - sessionStorage.setItem('JSONData',jsonString,0.00694444); - }); + $.getJSON(commitURL, function(b) { + jsonString = JSON.stringify(b); + sessionStorage.setItem("JSONData", jsonString, .00694444); + }); } - -function scaleContent(content, scale) { - var newWidth = $(window).width() / scale; - var newHeight = (($(window).height() / scale) - ($('nav').height() / scale)); - $('.cd-tabs-content').find('li[data-content="' + content + '"]').children('iframe').css({ - '-ms-transform': 'scale(' + scale + ')', - '-moz-transform': 'scale(' + scale + ')', - '-o-transform': 'scale(' + scale + ')', - '-webkit-transform': 'scale(' + scale + ')', - 'transform': 'scale(' + scale + ')', - 'height': '' + newHeight + 'px', - 'width': '' + newWidth + 'px', - }); +function scaleContent(b, c) { + var a = $(window).width() / c, d = $(window).height() / c - $("nav").height() / c; + $(".cd-tabs-content").find('li[data-content="' + b + '"]').children("iframe").css({"-ms-transform":"scale(" + c + ")", "-moz-transform":"scale(" + c + ")", "-o-transform":"scale(" + c + ")", "-webkit-transform":"scale(" + c + ")", transform:"scale(" + c + ")", height:"" + d + "px", width:"" + a + "px"}); } - -function downloadUpdate($sha) { - if (confirm('Would you like to download and install updates now?')) { - - $.ajax({ - async: true, - url: "muximux.php", - type: 'GET', - data: {action: "update", secret: secret, sha: $sha}, - success: function (data) { - console.log('DownloadResult: ' + data); - if(data) { - setStatus('Update installed successfully!'); - } else { - setStatus('An error has occurred. Please reload and try again.'); - } - - } - - }); - } else { - console.log('Update cancelled.'); - } +function downloadUpdate(b) { + confirm("Would you like to download and install updates now?") ? $.ajax({async:!0, url:"muximux.php", type:"GET", data:{action:"update", secret:secret, sha:b}, success:function(b) { + console.log("DownloadResult: " + b); + b ? setStatus("Update installed successfully!") : setStatus("An error has occurred. Please reload and try again."); + }}) : console.log("Update cancelled."); } - -function write_log($text,$lvl) { - - $.ajax({ - async: true, - url: "muximux.php", - type: 'GET', - data: {action: "writeLog", secret: secret, msg: $text,lvl: $lvl}, - }); - +function write_log(b, c) { + $.ajax({async:!0, url:"muximux.php", type:"GET", data:{action:"writeLog", secret:secret, msg:b, lvl:c}}); } - - -function setStatus($message) { - $('#updateContainer').hide(); - $('#updateContainer').html("" + - "" + $message + "
    " + - "
    Click to reload
    "); - $('#updateContainer').fadeIn("slow"); - $('#reloadModal').click(function() { - location.reload(); - }); - $('#updateDismiss').click(function() { - $('#updateContainer').fadeOut('slow'); - }); +function setStatus(b) { + $("#updateContainer").hide(); + $("#updateContainer").html('' + b + "
    Click to reload
    "); + $("#updateContainer").fadeIn("slow"); + $("#reloadModal").click(function() { + location.reload(); + }); + $("#updateDismiss").click(function() { + $("#updateContainer").fadeOut("slow"); + }); } - - -// Find apps with a scale setting that is more or less than 100%, then re-scale it to the desired setting using scaleContent(selector, scale) function scaleFrames() { - $('.cd-tabs-content').find('li').each(function(value) { - content = $(this).attr('data-content'); - scale = $(this).attr('data-scale'); - // Mark the scale we are currently using, on the settings modal - $('#' + content + '-scale option[value="' + scale + '"]').attr('selected', 'selected'); - // If scale is set to something other than 1, rescale it to what's stored in settings. - if (scale !== "1") { - scaleContent(content, scale); - } - }) + $(".cd-tabs-content").find("li").each(function(b) { + content = $(this).attr("data-content"); + scale = $(this).attr("data-scale"); + $("#" + content + '-scale option[value="' + scale + '"]').attr("selected", "selected"); + "1" !== scale && scaleContent(content, scale); + }); } -// Like the name implies, it changes the favicon to whatever -// url is passed to it -function changeFavicon(src) { - document.head = document.head || document.getElementsByTagName('head')[0]; - var link = document.createElement('link'), - oldLink = document.getElementById('dynamic-favicon'); - link.id = 'dynamic-favicon'; - link.rel = 'shortcut icon'; - link.href = src; - if (oldLink) { - document.head.removeChild(oldLink); - } - document.head.appendChild(link); +function changeFavicon(b) { + document.head = document.head || document.getElementsByTagName("head")[0]; + var c = document.createElement("link"), a = document.getElementById("dynamic-favicon"); + c.id = "dynamic-favicon"; + c.rel = "shortcut icon"; + c.href = b; + a && document.head.removeChild(a); + document.head.appendChild(c); } - -// Wrap a html-encoded string in a div (in-memory) and read it back, unencoded. -function htmlDecode(value) { - return $('
    ').html(value).text(); +function htmlDecode(b) { + return $("
    ").html(b).text(); } - -// This fetches the browser-appropriate box-shadow value so we can set it - function getsupportedprop(proparray) { - var root = document.documentElement //reference root element of document - for (var i = 0; i < proparray.length; i++) { //loop through possible properties - if (proparray[i] in root.style) { //if property exists on element (value will be string, empty string if not set) - return proparray[i] //return that string - } - } - } \ No newline at end of file +function getsupportedprop(b) { + for (var c = document.documentElement, a = 0;a < b.length;a++) { + if (b[a] in c.style) { + return b[a]; + } + } +} +; \ No newline at end of file diff --git a/js/login.js b/js/login.js index 62bc478..9c1e798 100644 --- a/js/login.js +++ b/js/login.js @@ -1,34 +1,27 @@ -$(document).ready(function() { - $('.wrapper').animate({ - top: "10%" - }, 300, 'easeInOutElastic', function() { - $('.logo').delay(1200).slideDown(400, 'easeInOutElastic'); - $('.login0').delay(1000).slideDown(400, 'easeInOutElastic'); - $('.login1').delay(1100).slideDown(400, 'easeInOutElastic'); - $('.login2').delay(1200).slideDown(400, 'easeInOutElastic'); - $('.login3').delay(1300).slideDown(400, 'easeInOutElastic'); - // Animation complete. - }); -}); - - -function setBarColors() { - var color = rgb2hex($('.logo path').css("fill")); - $('.droidtheme').replaceWith(''); - $('.mstheme').replaceWith(''); - $('.iostheme').replaceWith(''); -}setTimeout(setBarColors, 1650); - - -function rgb2hex(rgb) { - if ( rgb.search("rgb") == -1 ) { - return rgb; - } else { - rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/); - function hex(x) { - return ("0" + parseInt(x).toString(16)).slice(-2); - } - return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]); - } -} - +$(document).ready(function() { + $(".wrapper").animate({top:"10%"}, 300, "easeInOutElastic", function() { + $(".logo").delay(1200).slideDown(400, "easeInOutElastic"); + $(".login0").delay(1E3).slideDown(400, "easeInOutElastic"); + $(".login1").delay(1100).slideDown(400, "easeInOutElastic"); + $(".login2").delay(1200).slideDown(400, "easeInOutElastic"); + $(".login3").delay(1300).slideDown(400, "easeInOutElastic"); + }); +}); +function setBarColors() { + var a = rgb2hex($(".logo path").css("fill")); + $(".droidtheme").replaceWith(''); + $(".mstheme").replaceWith(''); + $(".iostheme").replaceWith(''); +} +setTimeout(setBarColors, 1650); +function rgb2hex(a) { + if (-1 == a.search("rgb")) { + return a; + } + var b = function(a) { + return ("0" + parseInt(a).toString(16)).slice(-2); + }; + a = a.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/); + return "#" + b(a[1]) + b(a[2]) + b(a[3]); +} +; \ No newline at end of file diff --git a/js/main.js b/js/main.js index 4c296ee..4ab3b52 100644 --- a/js/main.js +++ b/js/main.js @@ -1,283 +1,176 @@ var boxshadowprop, branch, tabColor, isMobile, overrideMobile, hasDrawer, color, themeColor, tabs, activeTitle; -jQuery(document).ready(function($) { - // Custom function to do case-insensitive selector matching - $.extend($.expr[":"], { - "containsInsensitive": function(elem, i, match, array) { - return (elem.textContent || elem.innerText || "").toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0; - } - }); - branch = $("#branch-data").attr('data'); - hasDrawer = ($('#drawer').attr('data') == 'true'); - tabColor = ($("#tabcolor").attr('data') == 'true'); - themeColor = $('#themeColor-data').attr("data"); - authentication = $('#authentication-data').attr("data"); - tabs = $('.cd-tabs'); - activeTitle = $('li .selected').attr("data-title"); - getSecret(); - muximuxMobileResize(); - $('#override').css('display', (isMobile ? 'block' : 'none')); - $('.inputdiv').css('display',(authentication ? 'block' : 'none')); - overrideMobile = false; - setTitle(activeTitle); - //get appropriate CSS3 box-shadow property - boxshadowprop = getsupportedprop(['boxShadow', 'MozBoxShadow', 'WebkitBoxShadow']) - //Hide the nav to start - $('.drop-nav').toggleClass('hide-nav'); - tabs.each(function() { - var tab = $(this), - tabItems = tab.find('ul.cd-tabs-navigation, .main-nav'), - tabContentWrapper = tab.children('ul.cd-tabs-content'), - tabNavigation = tab.find('nav'); - tabItems.on('click', 'a:not(#reload, #hamburger, #override, #logout)', function(event) { - // Set up menu for desktip view - if (!isMobile) { - $('.drop-nav').addClass('hide-nav'); - $('.drop-nav').removeClass('show-nav'); - } - resizeIframe(hasDrawer, isMobile); // Call resizeIframe when document is ready - event.preventDefault(); - var selectedItem = $(this); - if (tabColor) { - color = selectedItem.attr("data-color"); - } else { - color = themeColor; - } - if (!selectedItem.hasClass('selected')) { - var selectedTab = selectedItem.data('content'), - selectedContent = tabContentWrapper.find('li[data-content="' + selectedTab + '"]'), - selectedContentHeight = selectedContent.innerHeight(); - selectedItem.dblclick(function() { - selectedContent.children('iframe').attr('src', selectedContent.children('iframe').attr('src')); - }); - var sifsrc = selectedContent.children('iframe').attr('src'); - var srcUrl = selectedContent.children('iframe').data('src'); - if (sifsrc === undefined || sifsrc === "") { - selectedContent.children('iframe').attr('src', srcUrl); - } - // Fix issue with color not resetting on settings close - if (!(selectedItem.attr("data-title") == "Settings")) { - clearColors(); - tabItems.find('a.selected').removeClass('selected'); - selectedItem.addClass('selected'); - setSelectedColor(); - // Change window title after class "selected" has been added to item - var activeTitle = selectedItem.attr("data-title"); - setTitle(activeTitle); - selectedContent.addClass('selected').siblings('li').removeClass('selected'); - // animate tabContentWrapper height when content changes - tabContentWrapper.animate({ - 'height': selectedContentHeight - }, 200); - } - } - }); - // hide the .cd-tabs::after element when tabbed navigation has scrolled to the end (mobile version) - checkScrolling(tabNavigation); - tabNavigation.on('scroll', function() { - checkScrolling($(this)); - }); - }); - $('li.dd').on('click', function() { - toggleClasses(); - }); - - $('#reload').on('click', function() { - $('.fa-refresh').addClass('fa-spin'); - setTimeout(function() { - $('.fa-refresh').removeClass('fa-spin'); - }, 3900); - var selectedFrame = $('.cd-tabs-content').find('.selected').children('iframe'); - selectedFrame.attr('src', selectedFrame.attr('src')); - }); - // Detect click on override button, fire resize - $('#override').on('click', function() { - overrideMobile = !overrideMobile; - muximuxMobileResize(); - if (overrideMobile && isMobile) { - $('#override').addClass('or-active'); - } else { - $('#override').removeClass('or-active'); - } - }); - $("#authenticationCheckbox").click(function() { - // this function will get executed every time the #home element is clicked (or tab-spacebar changed) - if ($(this).is(":checked")) // "this" refers to the element that fired the event - { - $('.inputdiv').slideDown('fast'); - } else { - $('.inputdiv').slideUp('fast'); - } - }); - $("#logout").click(function() { - window.location.href = '?logout'; - }); - // When settings modal is open, set title to "Settings" - $('#settingsModal').on('show.bs.modal', function() { - setTitle("Settings"); - }); - // When settings modal closes, set title to the previous title used - $('#settingsModal').on('hidden.bs.modal', function() { - var activeTitle = $('.cd-tabs-content').find('.selected').children('iframe').attr("data-title"); - setTitle(activeTitle); - }); - $(window).on('resize', function() { - tabs.each(function() { - var tab = $(this); - checkScrolling(tab.find('nav')); - tab.find('.cd-tabs-content').css('height', 'auto'); - }); - resizeIframe(hasDrawer, isMobile); // Resize iframes when window is resized. - scaleFrames(); // Scale frames when window is resized. - }); - $('.dd').click(function() { - dropDownFixPosition($('.dd'), $('.drop-nav')); - }); - $('#autohideCheckbox').click(function() { - $('#mobileoverrideCheckbox').prop('checked', false); - }); - $('#mobileoverrideCheckbox').click(function() { - $('#autohideCheckbox').prop('checked', false); - }); - // This triggers a menu close when mouse has left the drop nav. - $('.dd').mouseleave(function() { - if (!($('.drop-nav:hover').length != 0 || $('.dd:hover').length != 0)) { - timeoutId = setTimeout(function() { - $('.drop-nav').addClass('hide-nav'); - $('.drop-nav').removeClass('show-nav'); - }, 500); - } - }); - jQuery.fn.reverse = [].reverse; - $('.drawerItem').mouseleave(function() { - $('.drawerItem').removeClass('full'); - }); - $('.drawerItem').mouseenter(function() { - $('.drawerItem').addClass('full'); - }); - // Move items to the dropdown on mobile devices - settingsEventHandlers(); - scaleFrames(); - resizeIframe(hasDrawer, isMobile); // Call resizeIframe when document is ready - initIconPicker('.iconpicker'); - // Load the menu item that is set in URL, for example http://site.com/#plexpy - if ($(location).attr('hash')) { - var bookmarkHash = $(location).attr('hash').substr(1).replace("%20", " ").replace("_", " "); - var menuItem = $(document).find('a:containsInsensitive("' + bookmarkHash + '")'); - menuItem.trigger("click"); - } - if ($('#tabcolorCheckbox').prop('checked')) { - $('.appsColor').show(); - $('.generalColor').hide(); - } else { - $('.appsColor').hide(); - $('.generalColor').show(); - } - - $('#settingsLogo').click(function(){ - window.open('https://github.com/mescon/Muximux', '_blank'); - }); - - +jQuery(document).ready(function(a) { + a.extend(a.expr[":"], {containsInsensitive:function(a, c, e, k) { + return 0 <= (a.textContent || a.innerText || "").toLowerCase().indexOf((e[3] || "").toLowerCase()); + }}); + branch = a("#branch-data").attr("data"); + hasDrawer = "true" == a("#drawer").attr("data"); + tabColor = "true" == a("#tabcolor").attr("data"); + themeColor = a("#themeColor-data").attr("data"); + authentication = a("#authentication-data").attr("data"); + tabs = a(".cd-tabs"); + activeTitle = a("li .selected").attr("data-title"); + getSecret(); + muximuxMobileResize(); + a("#override").css("display", isMobile ? "block" : "none"); + a(".inputdiv").css("display", authentication ? "block" : "none"); + overrideMobile = !1; + setTitle(activeTitle); + boxshadowprop = getsupportedprop(["boxShadow", "MozBoxShadow", "WebkitBoxShadow"]); + a(".drop-nav").toggleClass("hide-nav"); + tabs.each(function() { + var b = a(this), c = b.find("ul.cd-tabs-navigation, .main-nav"), e = b.children("ul.cd-tabs-content"), b = b.find("nav"); + c.on("click", "a:not(#reload, #hamburger, #override, #logout,#log)", function(b) { + isMobile || (a(".drop-nav").addClass("hide-nav"), a(".drop-nav").removeClass("show-nav")); + resizeIframe(hasDrawer, isMobile); + b.preventDefault(); + b = a(this); + color = tabColor ? b.attr("data-color") : themeColor; + if (!b.hasClass("selected")) { + var f = b.data("content"), d = e.find('li[data-content="' + f + '"]'), f = d.innerHeight(); + b.dblclick(function() { + d.children("iframe").attr("src", d.children("iframe").attr("src")); + }); + var g = d.children("iframe").attr("src"), h = d.children("iframe").data("src"); + void 0 !== g && "" !== g || d.children("iframe").attr("src", h); + "Settings" != b.attr("data-title") && (clearColors(), c.find("a.selected").removeClass("selected"), b.addClass("selected"), setSelectedColor(), b = b.attr("data-title"), setTitle(b), d.addClass("selected").siblings("li").removeClass("selected"), e.animate({height:f}, 200)); + } + }); + checkScrolling(b); + b.on("scroll", function() { + checkScrolling(a(this)); + }); + }); + a("li.dd").on("click", function() { + toggleClasses(); + }); + a("#reload").on("click", function() { + a(".fa-refresh").addClass("fa-spin"); + setTimeout(function() { + a(".fa-refresh").removeClass("fa-spin"); + }, 3900); + var b = a(".cd-tabs-content").find(".selected").children("iframe"); + b.attr("src", b.attr("src")); + }); + a("#override").on("click", function() { + overrideMobile = !overrideMobile; + muximuxMobileResize(); + overrideMobile && isMobile ? a("#override").addClass("or-active") : a("#override").removeClass("or-active"); + }); + a("#authenticationCheckbox").click(function() { + a(this).is(":checked") ? a(".inputdiv").slideDown("fast") : a(".inputdiv").slideUp("fast"); + }); + a("#logout").click(function() { + window.location.href = "?logout"; + }); + a("#settingsModal").on("show.bs.modal", function() { + setTitle("Settings"); + }); + a("#settingsModal").on("hidden.bs.modal", function() { + var b = a(".cd-tabs-content").find(".selected").children("iframe").attr("data-title"); + setTitle(b); + }); + a("#logModal").on("hidden.bs.modal", function() { + var b = a(".cd-tabs-content").find(".selected").children("iframe").attr("data-title"); + setTitle(b); + }); + a(window).on("resize", function() { + tabs.each(function() { + var b = a(this); + checkScrolling(b.find("nav")); + b.find(".cd-tabs-content").css("height", "auto"); + }); + resizeIframe(hasDrawer, isMobile); + scaleFrames(); + }); + a(".dd").click(function() { + dropDownFixPosition(a(".dd"), a(".drop-nav")); + }); + a("#autohideCheckbox").click(function() { + a("#mobileoverrideCheckbox").prop("checked", !1); + }); + a("#mobileoverrideCheckbox").click(function() { + a("#autohideCheckbox").prop("checked", !1); + }); + a(".dd").mouseleave(function() { + 0 == a(".drop-nav:hover").length && 0 == a(".dd:hover").length && (timeoutId = setTimeout(function() { + a(".drop-nav").addClass("hide-nav"); + a(".drop-nav").removeClass("show-nav"); + }, 500)); + }); + jQuery.fn.reverse = [].reverse; + a(".drawerItem").mouseleave(function() { + a(".drawerItem").removeClass("full"); + }); + a(".drawerItem").mouseenter(function() { + a(".drawerItem").addClass("full"); + }); + settingsEventHandlers(); + scaleFrames(); + resizeIframe(hasDrawer, isMobile); + initIconPicker(".iconpicker"); + if (a(location).attr("hash")) { + var c = a(location).attr("hash").substr(1).replace("%20", " ").replace("_", " "); + a(document).find('a:containsInsensitive("' + c + '")').trigger("click"); + } + a("#tabcolorCheckbox").prop("checked") ? (a(".appsColor").show(), a(".generalColor").hide()) : (a(".appsColor").hide(), a(".generalColor").show()); + a("#settingsLogo").click(function() { + window.open("https://github.com/mescon/Muximux", "_blank"); + }); }); - $(window).load(function() { - if ($('#popupdate').attr('data') == 'true') { - var updateCheck = setInterval(updateBox(false), 1000 * 60 * 10); - } + "true" == $("#popupdate").attr("data") && setInterval(updateBox(!1), 6E5); }); -// Close modal on escape key -$("html").on("keyup", function(e) { - if(e.keyCode === 27 && !($('#modal-dialog').hasClass("no-display"))) - $('.close').trigger("click"); +$("html").on("keyup", function(a) { + 27 !== a.keyCode || $("#modal-dialog").hasClass("no-display") || $(".close").trigger("click"); }); -// When user closes the page, create new unique ID in secret.txt so that the token is no longer valid if used after page load. $(window).unload(function() { - var secret = $("#secret").attr('data'); - $.ajax({ - async: true, - dataType: 'text', - url: "muximux.php?secret=" + secret + "&set=secret", - type: 'GET' - }); + var a = $("#secret").attr("data"); + $.ajax({async:!0, dataType:"text", url:"muximux.php?secret=" + a + "&set=secret", type:"GET"}); }); $(window).resize(muximuxMobileResize); - function muximuxMobileResize() { - isMobile = ($(window).width() < 800); - $('#override').css('display', (isMobile ? 'block' : 'none')); - if (isMobile && !overrideMobile) { - $('.cd-tabs-navigation nav').children().appendTo(".drop-nav"); - var menuHeight = $(window).height() * .80; - $('.drop-nav').css('max-height', menuHeight + 'px'); - } else { - $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); - $('.drop-nav').css('max-height', ''); - var listWidth = 0; - $('.cd-tab').each(function() { - var myIndex = $(this).attr('data-index'); - var myWidth = $(this).width(); - if (myWidth + listWidth > $(window).width() - $(".main-nav").width()) { - $(".drop-nav").insertAt(myIndex,this); - } else { - $('.cd-tabs-navigation nav').insertAt(myIndex,this); - } - listWidth = listWidth + $(this).width(); - }); - } - clearColors(); - setSelectedColor(); -} - -// Insert an element at a specific point in a div. -jQuery.fn.insertAt = function(index, element) { - var lastIndex = this.children().size() - if (index < 0) { - index = Math.max(0, lastIndex + 1 + index) - } - this.append(element) - if (index < lastIndex) { - this.children().eq(index).before(this.children().last()) + isMobile = 800 > $(window).width(); + $("#override").css("display", isMobile ? "block" : "none"); + if (isMobile && !overrideMobile) { + $(".cd-tabs-navigation nav").children().appendTo(".drop-nav"); + var a = .8 * $(window).height(); + $(".drop-nav").css("max-height", a + "px"); + } else { + $(".drop-nav").children(".cd-tab").appendTo(".cd-tabs-navigation nav"); + $(".drop-nav").css("max-height", ""); + var c = 0; + $(".cd-tab").each(function() { + var a = $(this).attr("data-index"); + $(this).width() + c > $(window).width() - $(".main-nav").width() ? $(".drop-nav").insertAt(a, this) : $(".cd-tabs-navigation nav").insertAt(a, this); + c += $(this).width(); + }); } - return this; + clearColors(); + setSelectedColor(); } - -// Simple method to toggle show/hide classes in navigation +jQuery.fn.insertAt = function(a, c) { + var b = this.children().size(); + 0 > a && (a = Math.max(0, b + 1 + a)); + this.append(c); + a < b && this.children().eq(a).before(this.children().last()); + return this; +}; function toggleClasses() { - $('.drop-nav').toggleClass('hide-nav'); - $('.drop-nav').toggleClass('show-nav'); + $(".drop-nav").toggleClass("hide-nav"); + $(".drop-nav").toggleClass("show-nav"); } -// Clear color values from tabs function clearColors() { - $(".selected").children("span").css("color", ""); - $(".selected").css("color", ""); - $(".selected").css("Box-Shadow", ""); + $(".selected").children("span").css("color", ""); + $(".selected").css("color", ""); + $(".selected").css("Box-Shadow", ""); } -// Add relevant color value to tabs -// Refactor to a more appropriate name function setSelectedColor() { - color = (tabColor ? $('li .selected').attr("data-color") : themeColor); - $('.droidtheme').replaceWith(''); - $('.mstheme').replaceWith(''); - $('.iostheme').replaceWith(''); - - if (isMobile && !overrideMobile) { - $(".cd-tabs-bar").removeClass("drawer"); - $('.cd-tab').removeClass('drawerItem'); - $('.navbtn').removeClass('drawerItem'); - $('.cd-tabs-bar').removeClass('drawerItem'); - $(".selected").children("span").css("color", "" + color + ""); - $(".selected").css("color", "" + color + ""); - } else { - $(".selected").css("Box-Shadow", "inset 0 5px 0 " + color + ""); - // Super hacky, but we're refrencing a placeholder div to quickly see if we have a drawer - if (hasDrawer) { - $('.cd-tab').addClass('drawerItem'); - $('.navbtn').addClass('drawerItem'); - $('.cd-tabs-bar').addClass('drawerItem'); - } else { - $('.cd-tab').removeClass('drawerItem'); - $('.navbtn').removeClass('drawerItem'); - $('.cd-tabs-bar').removeClass('drawerItem'); - } - } -} \ No newline at end of file + color = tabColor ? $("li .selected").attr("data-color") : themeColor; + $(".droidtheme").replaceWith(''); + $(".mstheme").replaceWith(''); + $(".iostheme").replaceWith(''); + isMobile && !overrideMobile ? ($(".cd-tabs-bar").removeClass("drawer"), $(".cd-tab").removeClass("drawerItem"), $(".navbtn").removeClass("drawerItem"), $(".cd-tabs-bar").removeClass("drawerItem"), $(".selected").children("span").css("color", "" + color + ""), $(".selected").css("color", "" + color + "")) : ($(".selected").css("Box-Shadow", "inset 0 5px 0 " + color + ""), hasDrawer ? ($(".cd-tab").addClass("drawerItem"), $(".navbtn").addClass("drawerItem"), $(".cd-tabs-bar").addClass("drawerItem")) : + ($(".cd-tab").removeClass("drawerItem"), $(".navbtn").removeClass("drawerItem"), $(".cd-tabs-bar").removeClass("drawerItem"))); +} +; \ No newline at end of file From e587771b47a8541326acc6ffca80642370170961 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 12:17:27 -0600 Subject: [PATCH 082/170] Add auto combine/minify to code Reduces requests to CSS and Javascript from index.php to TWO calls. These calls fire combineify.php, which takes inputted file paths, merges them into one file, minifies the merged code, caches it, and returns the new megaminned code. Makes initial page load take a lot longer, but subsequent loads are much faster. --- .gitignore | 32 +- combineify.php | 75 +- composer.json | 4 +- css/style.css | 52 +- index.php | 19 +- vendor/autoload.php | 2 +- vendor/bin/minifycss | 45 ++ vendor/bin/minifyjs | 45 ++ vendor/composer/ClassLoader.php | 12 +- vendor/composer/LICENSE | 2 +- vendor/composer/autoload_psr4.php | 2 + vendor/composer/autoload_real.php | 33 +- vendor/composer/autoload_static.php | 45 ++ vendor/composer/installed.json | 110 +++ vendor/matthiasmullie/minify/CONTRIBUTING.md | 59 ++ vendor/matthiasmullie/minify/LICENSE | 18 + vendor/matthiasmullie/minify/bin/minifycss | 45 ++ vendor/matthiasmullie/minify/bin/minifyjs | 45 ++ vendor/matthiasmullie/minify/composer.json | 35 + .../minify/data/js/keywords_after.txt | 7 + .../minify/data/js/keywords_before.txt | 27 + .../minify/data/js/keywords_reserved.txt | 63 ++ .../minify/data/js/operators.txt | 46 ++ .../minify/data/js/operators_after.txt | 44 ++ .../minify/data/js/operators_before.txt | 43 ++ vendor/matthiasmullie/minify/src/CSS.php | 674 ++++++++++++++++++ .../matthiasmullie/minify/src/Exception.php | 12 + .../minify/src/Exceptions/BasicException.php | 12 + .../src/Exceptions/FileImportException.php | 10 + .../minify/src/Exceptions/IOException.php | 10 + vendor/matthiasmullie/minify/src/JS.php | 515 +++++++++++++ vendor/matthiasmullie/minify/src/Minify.php | 430 +++++++++++ vendor/matthiasmullie/path-converter/LICENSE | 18 + .../path-converter/composer.json | 28 + .../path-converter/src/Converter.php | 195 +++++ 35 files changed, 2680 insertions(+), 134 deletions(-) create mode 100644 vendor/bin/minifycss create mode 100644 vendor/bin/minifyjs create mode 100644 vendor/composer/autoload_static.php create mode 100644 vendor/matthiasmullie/minify/CONTRIBUTING.md create mode 100644 vendor/matthiasmullie/minify/LICENSE create mode 100644 vendor/matthiasmullie/minify/bin/minifycss create mode 100644 vendor/matthiasmullie/minify/bin/minifyjs create mode 100644 vendor/matthiasmullie/minify/composer.json create mode 100644 vendor/matthiasmullie/minify/data/js/keywords_after.txt create mode 100644 vendor/matthiasmullie/minify/data/js/keywords_before.txt create mode 100644 vendor/matthiasmullie/minify/data/js/keywords_reserved.txt create mode 100644 vendor/matthiasmullie/minify/data/js/operators.txt create mode 100644 vendor/matthiasmullie/minify/data/js/operators_after.txt create mode 100644 vendor/matthiasmullie/minify/data/js/operators_before.txt create mode 100644 vendor/matthiasmullie/minify/src/CSS.php create mode 100644 vendor/matthiasmullie/minify/src/Exception.php create mode 100644 vendor/matthiasmullie/minify/src/Exceptions/BasicException.php create mode 100644 vendor/matthiasmullie/minify/src/Exceptions/FileImportException.php create mode 100644 vendor/matthiasmullie/minify/src/Exceptions/IOException.php create mode 100644 vendor/matthiasmullie/minify/src/JS.php create mode 100644 vendor/matthiasmullie/minify/src/Minify.php create mode 100644 vendor/matthiasmullie/path-converter/LICENSE create mode 100644 vendor/matthiasmullie/path-converter/composer.json create mode 100644 vendor/matthiasmullie/path-converter/src/Converter.php diff --git a/.gitignore b/.gitignore index 77f155d..80e2934 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,17 @@ -# Do not submit or pull configuration settings when interacting with GitHub. -config.ini.php -settings.ini.php -backup.ini.php -test.php -secret.txt -tmp/ -pydio/ -phpmyadmin/ -*.idea -.vscode/ -plexredirect/ -recent/ -keeweb/ -api/ \ No newline at end of file +# Do not submit or pull configuration settings when interacting with GitHub. +config.ini.php +settings.ini.php +backup.ini.php +muximux.log +test.php +secret.txt +tmp/ +pydio/ +phpmyadmin/ +*.idea +.vscode/ +plexredirect/ +recent/ +keeweb/ +api/ +cache/ \ No newline at end of file diff --git a/combineify.php b/combineify.php index 86851da..cf5dce7 100644 --- a/combineify.php +++ b/combineify.php @@ -1,48 +1,18 @@ add($path); } + + $contents = $minifier->minify(); // Send Content-Type @@ -157,14 +135,3 @@ } } - -/** - * ======================================================= - * CSS MINIFIER - * ======================================================= - * -- CODE: ---------------------------------------------- - * - * echo minify_css(file_get_contents('test.css')); - * - * ------------------------------------------------------- - */ diff --git a/composer.json b/composer.json index 55ff6b4..991bc8c 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,8 @@ } ], "require": { - "pear-pear.php.net/config_lite": "*" + "pear-pear.php.net/config_lite": "*", + "matthiasmullie/minify": "^1.3" + } } diff --git a/css/style.css b/css/style.css index 5eb9eaa..4e644c3 100644 --- a/css/style.css +++ b/css/style.css @@ -37,36 +37,6 @@ p { margin: 0 0 10px; } -iframe { - width: 100%; - height: 926px; - border: 0; - padding: 0; - margin: 0; - margin-top: 0px; - filter: none; - -webkit-filter: blur(0px); - -moz-filter': blur(0px); - -ms-filter: blur(0px); - -o-filter: blur(0px); - filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='0'); - - -webkit-transform: translate3d(0,0,0); - -webkit-perspective: 1000; - - -ms-transform-origin: 0 0; - -moz-transform-origin: 0 0; - -o-transform-origin: 0 0; - -webkit-transform-origin: 0 0; - transform-origin: 0 0; - -} - -/* -------------------------------- - -Main components - --------------------------------- */ .constrain { overflow: hidden; } @@ -551,4 +521,26 @@ input[type='button'] { opacity: 1; } +iframe { + width: 100%; + height: 926px; + border: 0; + padding: 0; + margin: 0; + margin-top: 0px; + filter: none; + -webkit-filter: blur(0px); + -moz-filter': blur(0px); + -ms-filter: blur(0px); + -o-filter: blur(0px); + filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='0'); + -webkit-transform: translate3d(0,0,0); + -webkit-perspective: 1000; + -ms-transform-origin: 0 0; + -moz-transform-origin: 0 0; + -o-transform-origin: 0 0; + -webkit-transform-origin: 0 0; + transform-origin: 0 0; + +} diff --git a/index.php b/index.php index 575dc18..755a5e4 100644 --- a/index.php +++ b/index.php @@ -35,12 +35,8 @@ - - - - - - <?php echo getTitle(); ?> + + <?php echo getTitle(); ?> @@ -181,14 +177,9 @@
    - - - - - - - - + + + $('#upgradeModal').modal();"; ?> diff --git a/vendor/autoload.php b/vendor/autoload.php index 3330dfd..8fa710b 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -2,6 +2,6 @@ // autoload.php @generated by Composer -require_once __DIR__ . '/composer' . '/autoload_real.php'; +require_once __DIR__ . '/composer/autoload_real.php'; return ComposerAutoloaderInitaaa161de2c47514ec2f8a3b9623e8014::getLoader(); diff --git a/vendor/bin/minifycss b/vendor/bin/minifycss new file mode 100644 index 0000000..6a681a8 --- /dev/null +++ b/vendor/bin/minifycss @@ -0,0 +1,45 @@ +#!/usr/bin/env php +minify(); +} catch (Exception $e) { + fwrite(STDERR, $e->getMessage(), PHP_EOL); + exit(1); +} diff --git a/vendor/bin/minifyjs b/vendor/bin/minifyjs new file mode 100644 index 0000000..4cbe63f --- /dev/null +++ b/vendor/bin/minifyjs @@ -0,0 +1,45 @@ +#!/usr/bin/env php +minify(); +} catch (Exception $e) { + fwrite(STDERR, $e->getMessage(), PHP_EOL); + exit(1); +} diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index ff6ecfb..ac67d30 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -53,8 +53,8 @@ class ClassLoader private $useIncludePath = false; private $classMap = array(); - private $classMapAuthoritative = false; + private $missingClasses = array(); public function getPrefixes() { @@ -322,20 +322,20 @@ public function findFile($class) if (isset($this->classMap[$class])) { return $this->classMap[$class]; } - if ($this->classMapAuthoritative) { + if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { return false; } $file = $this->findFileWithExtension($class, '.php'); // Search for Hack files if we are running on HHVM - if ($file === null && defined('HHVM_VERSION')) { + if (false === $file && defined('HHVM_VERSION')) { $file = $this->findFileWithExtension($class, '.hh'); } - if ($file === null) { + if (false === $file) { // Remember that this class does not exist. - return $this->classMap[$class] = false; + $this->missingClasses[$class] = true; } return $file; @@ -399,6 +399,8 @@ private function findFileWithExtension($class, $ext) if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { return $file; } + + return false; } } diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index c8d57af..1a28124 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2015 Nils Adermann, Jordi Boggiano +Copyright (c) 2016 Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index b265c64..b7014d6 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,4 +6,6 @@ $baseDir = dirname($vendorDir); return array( + 'MatthiasMullie\\PathConverter\\' => array($vendorDir . '/matthiasmullie/path-converter/src'), + 'MatthiasMullie\\Minify\\' => array($vendorDir . '/matthiasmullie/minify/src'), ); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 2cd28e9..c347d2b 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -27,19 +27,26 @@ public static function getLoader() array_push($includePaths, get_include_path()); set_include_path(join(PATH_SEPARATOR, $includePaths)); - $map = require __DIR__ . '/autoload_namespaces.php'; - foreach ($map as $namespace => $path) { - $loader->set($namespace, $path); - } - - $map = require __DIR__ . '/autoload_psr4.php'; - foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); - } - - $classMap = require __DIR__ . '/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); + $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); + if ($useStaticLoader) { + require_once __DIR__ . '/autoload_static.php'; + + call_user_func(\Composer\Autoload\ComposerStaticInitaaa161de2c47514ec2f8a3b9623e8014::getInitializer($loader)); + } else { + $map = require __DIR__ . '/autoload_namespaces.php'; + foreach ($map as $namespace => $path) { + $loader->set($namespace, $path); + } + + $map = require __DIR__ . '/autoload_psr4.php'; + foreach ($map as $namespace => $path) { + $loader->setPsr4($namespace, $path); + } + + $classMap = require __DIR__ . '/autoload_classmap.php'; + if ($classMap) { + $loader->addClassMap($classMap); + } } $loader->register(true); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php new file mode 100644 index 0000000..2c8eb64 --- /dev/null +++ b/vendor/composer/autoload_static.php @@ -0,0 +1,45 @@ + + array ( + 'MatthiasMullie\\PathConverter\\' => 29, + 'MatthiasMullie\\Minify\\' => 22, + ), + ); + + public static $prefixDirsPsr4 = array ( + 'MatthiasMullie\\PathConverter\\' => + array ( + 0 => __DIR__ . '/..' . '/matthiasmullie/path-converter/src', + ), + 'MatthiasMullie\\Minify\\' => + array ( + 0 => __DIR__ . '/..' . '/matthiasmullie/minify/src', + ), + ); + + public static $classMap = array ( + 'Config_Lite' => __DIR__ . '/..' . '/pear-pear.php.net/Config_Lite/Config/Lite.php', + 'Config_Lite_Exception' => __DIR__ . '/..' . '/pear-pear.php.net/Config_Lite/Config/Lite/Exception.php', + 'Config_Lite_Exception_InvalidArgument' => __DIR__ . '/..' . '/pear-pear.php.net/Config_Lite/Config/Lite/Exception/InvalidArgument.php', + 'Config_Lite_Exception_Runtime' => __DIR__ . '/..' . '/pear-pear.php.net/Config_Lite/Config/Lite/Exception/Runtime.php', + 'Config_Lite_Exception_UnexpectedValue' => __DIR__ . '/..' . '/pear-pear.php.net/Config_Lite/Config/Lite/Exception/UnexpectedValue.php', + ); + + public static function getInitializer(ClassLoader $loader) + { + return \Closure::bind(function () use ($loader) { + $loader->prefixLengthsPsr4 = ComposerStaticInitaaa161de2c47514ec2f8a3b9623e8014::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitaaa161de2c47514ec2f8a3b9623e8014::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitaaa161de2c47514ec2f8a3b9623e8014::$classMap; + + }, null, ClassLoader::class); + } +} diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f938cbd..83f179e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -29,5 +29,115 @@ "PHP License" ], "description": "This package defines a class for config/settings text files in ini style.\n\t\tCurrently classes available are:\n\t\t* Config_Lite: a class with arrayaccess to handle ini style files\n\t\t* Config_Lite_Exception: Interface implemented by Exceptions" + }, + { + "name": "matthiasmullie/path-converter", + "version": "1.0.8", + "version_normalized": "1.0.8.0", + "source": { + "type": "git", + "url": "https://github.com/matthiasmullie/path-converter.git", + "reference": "7c36e5cafa95dd20008d19b153b506cffa8c2848" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/7c36e5cafa95dd20008d19b153b506cffa8c2848", + "reference": "7c36e5cafa95dd20008d19b153b506cffa8c2848", + "shasum": "" + }, + "require": { + "ext-pcre": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "time": "2016-04-27 10:38:05", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "MatthiasMullie\\PathConverter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthias Mullie", + "email": "pathconverter@mullie.eu", + "homepage": "http://www.mullie.eu", + "role": "Developer" + } + ], + "description": "Relative path converter", + "homepage": "http://github.com/matthiasmullie/path-converter", + "keywords": [ + "converter", + "path", + "paths", + "relative" + ] + }, + { + "name": "matthiasmullie/minify", + "version": "1.3.42", + "version_normalized": "1.3.42.0", + "source": { + "type": "git", + "url": "https://github.com/matthiasmullie/minify.git", + "reference": "b473affbb76ae6ec4e46d368b5081b5bfcdd3ed2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/b473affbb76ae6ec4e46d368b5081b5bfcdd3ed2", + "reference": "b473affbb76ae6ec4e46d368b5081b5bfcdd3ed2", + "shasum": "" + }, + "require": { + "ext-pcre": "*", + "matthiasmullie/path-converter": "~1.0", + "php": ">=5.3.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~1.0", + "matthiasmullie/scrapbook": "~1.0", + "phpunit/phpunit": "~4.8" + }, + "time": "2016-11-23 10:16:14", + "bin": [ + "bin/minifycss", + "bin/minifyjs" + ], + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "MatthiasMullie\\Minify\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthias Mullie", + "email": "minify@mullie.eu", + "homepage": "http://www.mullie.eu", + "role": "Developer" + } + ], + "description": "CSS & JS minifier", + "homepage": "http://www.minifier.org", + "keywords": [ + "JS", + "css", + "javascript", + "minifier", + "minify" + ] } ] diff --git a/vendor/matthiasmullie/minify/CONTRIBUTING.md b/vendor/matthiasmullie/minify/CONTRIBUTING.md new file mode 100644 index 0000000..226cf97 --- /dev/null +++ b/vendor/matthiasmullie/minify/CONTRIBUTING.md @@ -0,0 +1,59 @@ +# How to contribute + + +## Issues + +When [filing bugs](https://github.com/matthiasmullie/minify/issues/new), +try to be as thorough as possible: +* What version did you use? +* What did you try to do? ***Please post the relevant parts of your code.*** +* What went wrong? ***Please include error messages, if any.*** +* What was the expected result? + + +## Pull requests + +Bug fixes and general improvements to the existing codebase are always welcome. +New features are also welcome, but will be judged on an individual basis. If +you'd rather not risk wasting your time implementing a new feature only to see +it turned down, please start the discussion by +[opening an issue](https://github.com/matthiasmullie/minify/issues/new). + +Don't forget to add your changes to the [changelog](CHANGELOG.md). + + +### Testing + +Please include tests for every change or addition to the code. +To run the complete test suite: + +```sh +vendor/bin/phpunit +``` + +When submitting a new pull request, please make sure that that the test suite +passes (Travis CI will run it & report back on your pull request.) + +To run the tests on Windows, run `tests/convert_symlinks_to_windows_style.sh` +from the command line in order to convert Linux-style test symlinks to +Windows-style. + + +### Coding standards + +All code must follow [PSR-2](http://www.php-fig.org/psr/psr-2/). Just make sure +to run php-cs-fixer before submitting the code, it'll take care of the +formatting for you: + +```sh +vendor/bin/php-cs-fixer fix src +vendor/bin/php-cs-fixer fix tests +``` + +Document the code thoroughly! + + +## License + +Note that minify is MIT-licensed, which basically allows anyone to do +anything they like with it, without restriction. diff --git a/vendor/matthiasmullie/minify/LICENSE b/vendor/matthiasmullie/minify/LICENSE new file mode 100644 index 0000000..0c0d08a --- /dev/null +++ b/vendor/matthiasmullie/minify/LICENSE @@ -0,0 +1,18 @@ +Copyright (c) 2012 Matthias Mullie + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/matthiasmullie/minify/bin/minifycss b/vendor/matthiasmullie/minify/bin/minifycss new file mode 100644 index 0000000..6a681a8 --- /dev/null +++ b/vendor/matthiasmullie/minify/bin/minifycss @@ -0,0 +1,45 @@ +#!/usr/bin/env php +minify(); +} catch (Exception $e) { + fwrite(STDERR, $e->getMessage(), PHP_EOL); + exit(1); +} diff --git a/vendor/matthiasmullie/minify/bin/minifyjs b/vendor/matthiasmullie/minify/bin/minifyjs new file mode 100644 index 0000000..4cbe63f --- /dev/null +++ b/vendor/matthiasmullie/minify/bin/minifyjs @@ -0,0 +1,45 @@ +#!/usr/bin/env php +minify(); +} catch (Exception $e) { + fwrite(STDERR, $e->getMessage(), PHP_EOL); + exit(1); +} diff --git a/vendor/matthiasmullie/minify/composer.json b/vendor/matthiasmullie/minify/composer.json new file mode 100644 index 0000000..6f0b46b --- /dev/null +++ b/vendor/matthiasmullie/minify/composer.json @@ -0,0 +1,35 @@ +{ + "name": "matthiasmullie/minify", + "type": "library", + "description": "CSS & JS minifier", + "keywords": ["minify", "minifier", "css", "js", "javascript"], + "homepage": "http://www.minifier.org", + "license": "MIT", + "authors": [ + { + "name": "Matthias Mullie", + "homepage": "http://www.mullie.eu", + "email": "minify@mullie.eu", + "role": "Developer" + } + ], + "require": { + "php": ">=5.3.0", + "ext-pcre": "*", + "matthiasmullie/path-converter": "~1.0" + }, + "require-dev": { + "matthiasmullie/scrapbook": "~1.0", + "phpunit/phpunit": "~4.8", + "friendsofphp/php-cs-fixer": "~1.0" + }, + "autoload": { + "psr-4": { + "MatthiasMullie\\Minify\\": "src/" + } + }, + "bin": [ + "bin/minifycss", + "bin/minifyjs" + ] +} diff --git a/vendor/matthiasmullie/minify/data/js/keywords_after.txt b/vendor/matthiasmullie/minify/data/js/keywords_after.txt new file mode 100644 index 0000000..5c8cba7 --- /dev/null +++ b/vendor/matthiasmullie/minify/data/js/keywords_after.txt @@ -0,0 +1,7 @@ +in +public +extends +private +protected +implements +instanceof \ No newline at end of file diff --git a/vendor/matthiasmullie/minify/data/js/keywords_before.txt b/vendor/matthiasmullie/minify/data/js/keywords_before.txt new file mode 100644 index 0000000..40b4ec0 --- /dev/null +++ b/vendor/matthiasmullie/minify/data/js/keywords_before.txt @@ -0,0 +1,27 @@ +do +in +let +new +var +case +else +enum +void +with +class +const +yield +delete +export +import +public +static +typeof +extends +package +private +continue +function +protected +implements +instanceof \ No newline at end of file diff --git a/vendor/matthiasmullie/minify/data/js/keywords_reserved.txt b/vendor/matthiasmullie/minify/data/js/keywords_reserved.txt new file mode 100644 index 0000000..2a3ad3c --- /dev/null +++ b/vendor/matthiasmullie/minify/data/js/keywords_reserved.txt @@ -0,0 +1,63 @@ +do +if +in +for +let +new +try +var +case +else +enum +eval +null +this +true +void +with +break +catch +class +const +false +super +throw +while +yield +delete +export +import +public +return +static +switch +typeof +default +extends +finally +package +private +continue +debugger +function +arguments +interface +protected +implements +instanceof +abstract +boolean +byte +char +double +final +float +goto +int +long +native +short +synchronized +throws +transient +volatile \ No newline at end of file diff --git a/vendor/matthiasmullie/minify/data/js/operators.txt b/vendor/matthiasmullie/minify/data/js/operators.txt new file mode 100644 index 0000000..e66229a --- /dev/null +++ b/vendor/matthiasmullie/minify/data/js/operators.txt @@ -0,0 +1,46 @@ ++ +- +* +/ +% += ++= +-= +*= +/= +%= +<<= +>>= +>>>= +&= +^= +|= +& +| +^ +~ +<< +>> +>>> +== +=== +!= +!== +> +< +>= +<= +&& +|| +! +. +[ +] +? +: +, +; +( +) +{ +} \ No newline at end of file diff --git a/vendor/matthiasmullie/minify/data/js/operators_after.txt b/vendor/matthiasmullie/minify/data/js/operators_after.txt new file mode 100644 index 0000000..7592656 --- /dev/null +++ b/vendor/matthiasmullie/minify/data/js/operators_after.txt @@ -0,0 +1,44 @@ ++ +- +* +/ +% += ++= +-= +*= +/= +%= +<<= +>>= +>>>= +&= +^= +|= +& +| +^ +~ +<< +>> +>>> +== +=== +!= +!== +> +< +>= +<= +&& +|| +. +[ +] +? +: +, +; +( +) +} \ No newline at end of file diff --git a/vendor/matthiasmullie/minify/data/js/operators_before.txt b/vendor/matthiasmullie/minify/data/js/operators_before.txt new file mode 100644 index 0000000..ff50d87 --- /dev/null +++ b/vendor/matthiasmullie/minify/data/js/operators_before.txt @@ -0,0 +1,43 @@ ++ +- +* +/ +% += ++= +-= +*= +/= +%= +<<= +>>= +>>>= +&= +^= +|= +& +| +^ +~ +<< +>> +>>> +== +=== +!= +!== +> +< +>= +<= +&& +|| +! +. +[ +? +: +, +; +( +{ diff --git a/vendor/matthiasmullie/minify/src/CSS.php b/vendor/matthiasmullie/minify/src/CSS.php new file mode 100644 index 0000000..8336739 --- /dev/null +++ b/vendor/matthiasmullie/minify/src/CSS.php @@ -0,0 +1,674 @@ + + * @author Tijs Verkoyen + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +class CSS extends Minify +{ + /** + * @var int + */ + protected $maxImportSize = 5; + + /** + * @var string[] + */ + protected $importExtensions = array( + 'gif' => 'data:image/gif', + 'png' => 'data:image/png', + 'jpe' => 'data:image/jpeg', + 'jpg' => 'data:image/jpeg', + 'jpeg' => 'data:image/jpeg', + 'svg' => 'data:image/svg+xml', + 'woff' => 'data:application/x-font-woff', + 'tif' => 'image/tiff', + 'tiff' => 'image/tiff', + 'xbm' => 'image/x-xbitmap', + ); + + /** + * Set the maximum size if files to be imported. + * + * Files larger than this size (in kB) will not be imported into the CSS. + * Importing files into the CSS as data-uri will save you some connections, + * but we should only import relatively small decorative images so that our + * CSS file doesn't get too bulky. + * + * @param int $size Size in kB + */ + public function setMaxImportSize($size) + { + $this->maxImportSize = $size; + } + + /** + * Set the type of extensions to be imported into the CSS (to save network + * connections). + * Keys of the array should be the file extensions & respective values + * should be the data type. + * + * @param string[] $extensions Array of file extensions + */ + public function setImportExtensions(array $extensions) + { + $this->importExtensions = $extensions; + } + + /** + * Move any import statements to the top. + * + * @param string $content Nearly finished CSS content + * + * @return string + */ + protected function moveImportsToTop($content) + { + if (preg_match_all('/@import[^;]+;/', $content, $matches)) { + // remove from content + foreach ($matches[0] as $import) { + $content = str_replace($import, '', $content); + } + + // add to top + $content = implode('', $matches[0]).$content; + } + + return $content; + } + + /** + * Combine CSS from import statements. + * + * @import's will be loaded and their content merged into the original file, + * to save HTTP requests. + * + * @param string $source The file to combine imports for + * @param string $content The CSS content to combine imports for + * @param string[] $parents Parent paths, for circular reference checks + * + * @return string + * + * @throws FileImportException + */ + protected function combineImports($source, $content, $parents) + { + $importRegexes = array( + // @import url(xxx) + '/ + # import statement + @import + + # whitespace + \s+ + + # open url() + url\( + + # (optional) open path enclosure + (?P["\']?) + + # fetch path + (?P + + # do not fetch data uris or external sources + (?!( + ["\']? + (data|https?): + )) + + .+? + ) + + # (optional) close path enclosure + (?P=quotes) + + # close url() + \) + + # (optional) trailing whitespace + \s* + + # (optional) media statement(s) + (?P[^;]*) + + # (optional) trailing whitespace + \s* + + # (optional) closing semi-colon + ;? + + /ix', + + // @import 'xxx' + '/ + + # import statement + @import + + # whitespace + \s+ + + # open path enclosure + (?P["\']) + + # fetch path + (?P + + # do not fetch data uris or external sources + (?!( + ["\']? + (data|https?): + )) + + .+? + ) + + # close path enclosure + (?P=quotes) + + # (optional) trailing whitespace + \s* + + # (optional) media statement(s) + (?P[^;]*) + + # (optional) trailing whitespace + \s* + + # (optional) closing semi-colon + ;? + + /ix', + ); + + // find all relative imports in css + $matches = array(); + foreach ($importRegexes as $importRegex) { + if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) { + $matches = array_merge($matches, $regexMatches); + } + } + + $search = array(); + $replace = array(); + + // loop the matches + foreach ($matches as $match) { + // get the path for the file that will be imported + $importPath = dirname($source).'/'.$match['path']; + + // only replace the import with the content if we can grab the + // content of the file + if ($this->canImportFile($importPath)) { + // check if current file was not imported previously in the same + // import chain. + if (in_array($importPath, $parents)) { + throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.'); + } + + // grab referenced file & minify it (which may include importing + // yet other @import statements recursively) + $minifier = new static($importPath); + $importContent = $minifier->execute($source, $parents); + + // check if this is only valid for certain media + if (!empty($match['media'])) { + $importContent = '@media '.$match['media'].'{'.$importContent.'}'; + } + + // add to replacement array + $search[] = $match[0]; + $replace[] = $importContent; + } + } + + // replace the import statements + $content = str_replace($search, $replace, $content); + + return $content; + } + + /** + * Import files into the CSS, base64-ized. + * + * @url(image.jpg) images will be loaded and their content merged into the + * original file, to save HTTP requests. + * + * @param string $source The file to import files for + * @param string $content The CSS content to import files for + * + * @return string + */ + protected function importFiles($source, $content) + { + $extensions = array_keys($this->importExtensions); + $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i'; + if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) { + $search = array(); + $replace = array(); + + // loop the matches + foreach ($matches as $match) { + // get the path for the file that will be imported + $path = $match[2]; + $path = dirname($source).'/'.$path; + $extension = $match[3]; + + // only replace the import with the content if we're able to get + // the content of the file, and it's relatively small + if ($this->canImportFile($path) && $this->canImportBySize($path)) { + // grab content && base64-ize + $importContent = $this->load($path); + $importContent = base64_encode($importContent); + + // build replacement + $search[] = $match[0]; + $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')'; + } + } + + // replace the import statements + $content = str_replace($search, $replace, $content); + } + + return $content; + } + + /** + * Minify the data. + * Perform CSS optimizations. + * + * @param string[optional] $path Path to write the data to + * @param string[] $parents Parent paths, for circular reference checks + * + * @return string The minified data + */ + public function execute($path = null, $parents = array()) + { + $content = ''; + + // loop css data (raw data and files) + foreach ($this->data as $source => $css) { + /* + * Let's first take out strings & comments, since we can't just remove + * whitespace anywhere. If whitespace occurs inside a string, we should + * leave it alone. E.g.: + * p { content: "a test" } + */ + $this->extractStrings(); + $this->stripComments(); + $css = $this->replace($css); + + $css = $this->stripWhitespace($css); + $css = $this->shortenHex($css); + $css = $this->shortenZeroes($css); + $css = $this->shortenFontWeights($css); + $css = $this->stripEmptyTags($css); + + // restore the string we've extracted earlier + $css = $this->restoreExtractedData($css); + + $source = is_int($source) ? '' : $source; + $parents = $source ? array_merge($parents, array($source)) : $parents; + $css = $this->combineImports($source, $css, $parents); + $css = $this->importFiles($source, $css); + + /* + * If we'll save to a new path, we'll have to fix the relative paths + * to be relative no longer to the source file, but to the new path. + * If we don't write to a file, fall back to same path so no + * conversion happens (because we still want it to go through most + * of the move code...) + */ + $converter = new Converter($source, $path ?: $source); + $css = $this->move($converter, $css); + + // combine css + $content .= $css; + } + + $content = $this->moveImportsToTop($content); + + return $content; + } + + /** + * Moving a css file should update all relative urls. + * Relative references (e.g. ../images/image.gif) in a certain css file, + * will have to be updated when a file is being saved at another location + * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper). + * + * @param Converter $converter Relative path converter + * @param string $content The CSS content to update relative urls for + * + * @return string + */ + protected function move(Converter $converter, $content) + { + /* + * Relative path references will usually be enclosed by url(). @import + * is an exception, where url() is not necessary around the path (but is + * allowed). + * This *could* be 1 regular expression, where both regular expressions + * in this array are on different sides of a |. But we're using named + * patterns in both regexes, the same name on both regexes. This is only + * possible with a (?J) modifier, but that only works after a fairly + * recent PCRE version. That's why I'm doing 2 separate regular + * expressions & combining the matches after executing of both. + */ + $relativeRegexes = array( + // url(xxx) + '/ + # open url() + url\( + + \s* + + # open path enclosure + (?P["\'])? + + # fetch path + (?P + + # do not fetch data uris or external sources + (?!( + \s? + ["\']? + (data|https?): + )) + + .+? + ) + + # close path enclosure + (?(quotes)(?P=quotes)) + + \s* + + # close url() + \) + + /ix', + + // @import "xxx" + '/ + # import statement + @import + + # whitespace + \s+ + + # we don\'t have to check for @import url(), because the + # condition above will already catch these + + # open path enclosure + (?P["\']) + + # fetch path + (?P + + # do not fetch data uris or external sources + (?!( + ["\']? + (data|https?): + )) + + .+? + ) + + # close path enclosure + (?P=quotes) + + /ix', + ); + + // find all relative urls in css + $matches = array(); + foreach ($relativeRegexes as $relativeRegex) { + if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) { + $matches = array_merge($matches, $regexMatches); + } + } + + $search = array(); + $replace = array(); + + // loop all urls + foreach ($matches as $match) { + // determine if it's a url() or an @import match + $type = (strpos($match[0], '@import') === 0 ? 'import' : 'url'); + + // attempting to interpret GET-params makes no sense, so let's discard them for awhile + $params = strrchr($match['path'], '?'); + $url = $params ? substr($match['path'], 0, -strlen($params)) : $match['path']; + + // fix relative url + $url = $converter->convert($url); + + // now that the path has been converted, re-apply GET-params + $url .= $params; + + // build replacement + $search[] = $match[0]; + if ($type == 'url') { + $replace[] = 'url('.$url.')'; + } elseif ($type == 'import') { + $replace[] = '@import "'.$url.'"'; + } + } + + // replace urls + $content = str_replace($search, $replace, $content); + + return $content; + } + + /** + * Shorthand hex color codes. + * #FF0000 -> #F00. + * + * @param string $content The CSS content to shorten the hex color codes for + * + * @return string + */ + protected function shortenHex($content) + { + $content = preg_replace('/(?<=[: ])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?=[; }])/i', '#$1$2$3', $content); + + // we can shorten some even more by replacing them with their color name + $colors = array( + '#F0FFFF' => 'azure', + '#F5F5DC' => 'beige', + '#A52A2A' => 'brown', + '#FF7F50' => 'coral', + '#FFD700' => 'gold', + '#808080' => 'gray', + '#008000' => 'green', + '#4B0082' => 'indigo', + '#FFFFF0' => 'ivory', + '#F0E68C' => 'khaki', + '#FAF0E6' => 'linen', + '#800000' => 'maroon', + '#000080' => 'navy', + '#808000' => 'olive', + '#CD853F' => 'peru', + '#FFC0CB' => 'pink', + '#DDA0DD' => 'plum', + '#800080' => 'purple', + '#F00' => 'red', + '#FA8072' => 'salmon', + '#A0522D' => 'sienna', + '#C0C0C0' => 'silver', + '#FFFAFA' => 'snow', + '#D2B48C' => 'tan', + '#FF6347' => 'tomato', + '#EE82EE' => 'violet', + '#F5DEB3' => 'wheat', + ); + + return preg_replace_callback( + '/(?<=[: ])('.implode(array_keys($colors), '|').')(?=[; }])/i', + function ($match) use ($colors) { + return $colors[strtoupper($match[0])]; + }, + $content + ); + } + + /** + * Shorten CSS font weights. + * + * @param string $content The CSS content to shorten the font weights for + * + * @return string + */ + protected function shortenFontWeights($content) + { + $weights = array( + 'normal' => 400, + 'bold' => 700, + ); + + $callback = function ($match) use ($weights) { + return $match[1].$weights[$match[2]]; + }; + + return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content); + } + + /** + * Shorthand 0 values to plain 0, instead of e.g. -0em. + * + * @param string $content The CSS content to shorten the zero values for + * + * @return string + */ + protected function shortenZeroes($content) + { + // reusable bits of code throughout these regexes: + // before & after are used to make sure we don't match lose unintended + // 0-like values (e.g. in #000, or in http://url/1.0) + // units can be stripped from 0 values, or used to recognize non 0 + // values (where wa may be able to strip a .0 suffix) + $before = '(?<=[:(, ])'; + $after = '(?=[ ,);}])'; + $units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)'; + + // strip units after zeroes (0px -> 0) + // NOTE: it should be safe to remove all units for a 0 value, but in + // practice, Webkit (especially Safari) seems to stumble over at least + // 0%, potentially other units as well. Only stripping 'px' for now. + // @see https://github.com/matthiasmullie/minify/issues/60 + $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content); + + // strip 0-digits (.0 -> 0) + $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content); + // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px + $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content); + // strip trailing 0: 50.00 -> 50, 50.00px -> 50px + $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content); + // strip leading 0: 0.1 -> .1, 01.1 -> 1.1 + $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content); + + // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0) + $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content); + + // remove zeroes where they make no sense in calc: e.g. calc(100px - 0) + // the 0 doesn't have any effect, and this isn't even valid without unit + // strip all `+ 0` or `- 0` occurrences: calc(10% + 0) -> calc(10%) + // looped because there may be multiple 0s inside 1 group of parentheses + do { + $previous = $content; + $content = preg_replace('/\(([^\(\)]+)\s+[\+\-]\s+0(\s+[^\(\)]+)?\)/', '(\\1\\2)', $content); + } while ($content !== $previous); + // strip all `0 +` occurrences: calc(0 + 10%) -> calc(10%) + $content = preg_replace('/\(\s*0\s+\+\s+([^\(\)]+)\)/', '(\\1)', $content); + // strip all `0 -` occurrences: calc(0 - 10%) -> calc(-10%) + $content = preg_replace('/\(\s*0\s+\-\s+([^\(\)]+)\)/', '(-\\1)', $content); + // I'm not going to attempt to optimize away `x * 0` instances: + // it's dumb enough code already that it likely won't occur, and it's + // too complex to do right (order of operations would have to be + // respected etc) + // what I cared about most here was fixing incorrectly truncated units + + return $content; + } + + /** + * Strip comments from source code. + * + * @param string $content + * + * @return string + */ + protected function stripEmptyTags($content) + { + return preg_replace('/(^|\}|;)[^\{\};]+\{\s*\}/', '\\1', $content); + } + + /** + * Strip comments from source code. + */ + protected function stripComments() + { + $this->registerPattern('/\/\*.*?\*\//s', ''); + } + + /** + * Strip whitespace. + * + * @param string $content The CSS content to strip the whitespace for + * + * @return string + */ + protected function stripWhitespace($content) + { + // remove leading & trailing whitespace + $content = preg_replace('/^\s*/m', '', $content); + $content = preg_replace('/\s*$/m', '', $content); + + // replace newlines with a single space + $content = preg_replace('/\s+/', ' ', $content); + + // remove whitespace around meta characters + // inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex + $content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content); + $content = preg_replace('/([\[(:])\s+/', '$1', $content); + $content = preg_replace('/\s+([\]\)])/', '$1', $content); + $content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content); + + // whitespace around + and - can only be stripped in selectors, like + // :nth-child(3+2n), not in things like calc(3px + 2px) or shorthands + // like 3px -2px + $content = preg_replace('/\s*([+-])\s*(?=[^}]*{)/', '$1', $content); + + // remove semicolon/whitespace followed by closing bracket + $content = str_replace(';}', '}', $content); + + return trim($content); + } + + /** + * Check if file is small enough to be imported. + * + * @param string $path The path to the file + * + * @return bool + */ + protected function canImportBySize($path) + { + return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024; + } +} diff --git a/vendor/matthiasmullie/minify/src/Exception.php b/vendor/matthiasmullie/minify/src/Exception.php new file mode 100644 index 0000000..0cb3fab --- /dev/null +++ b/vendor/matthiasmullie/minify/src/Exception.php @@ -0,0 +1,12 @@ + + */ +abstract class Exception extends \Exception +{ +} diff --git a/vendor/matthiasmullie/minify/src/Exceptions/BasicException.php b/vendor/matthiasmullie/minify/src/Exceptions/BasicException.php new file mode 100644 index 0000000..a6328f4 --- /dev/null +++ b/vendor/matthiasmullie/minify/src/Exceptions/BasicException.php @@ -0,0 +1,12 @@ + + */ +abstract class BasicException extends Exception +{ +} diff --git a/vendor/matthiasmullie/minify/src/Exceptions/FileImportException.php b/vendor/matthiasmullie/minify/src/Exceptions/FileImportException.php new file mode 100644 index 0000000..98fc341 --- /dev/null +++ b/vendor/matthiasmullie/minify/src/Exceptions/FileImportException.php @@ -0,0 +1,10 @@ + + */ +class FileImportException extends BasicException +{ +} diff --git a/vendor/matthiasmullie/minify/src/Exceptions/IOException.php b/vendor/matthiasmullie/minify/src/Exceptions/IOException.php new file mode 100644 index 0000000..9b59074 --- /dev/null +++ b/vendor/matthiasmullie/minify/src/Exceptions/IOException.php @@ -0,0 +1,10 @@ + + */ +class IOException extends BasicException +{ +} diff --git a/vendor/matthiasmullie/minify/src/JS.php b/vendor/matthiasmullie/minify/src/JS.php new file mode 100644 index 0000000..0c1441c --- /dev/null +++ b/vendor/matthiasmullie/minify/src/JS.php @@ -0,0 +1,515 @@ + + * @author Tijs Verkoyen + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +class JS extends Minify +{ + /** + * Var-matching regex based on http://stackoverflow.com/a/9337047/802993. + * + * Note that regular expressions using that bit must have the PCRE_UTF8 + * pattern modifier (/u) set. + * + * @var string + */ + const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b'; + + /** + * Full list of JavaScript reserved words. + * Will be loaded from /data/js/keywords_reserved.txt. + * + * @see https://mathiasbynens.be/notes/reserved-keywords + * + * @var string[] + */ + protected $keywordsReserved = array(); + + /** + * List of JavaScript reserved words that accept a + * after them. Some end of lines are not the end of a statement, like with + * these keywords. + * + * E.g.: we shouldn't insert a ; after this else + * else + * console.log('this is quite fine') + * + * Will be loaded from /data/js/keywords_before.txt + * + * @var string[] + */ + protected $keywordsBefore = array(); + + /** + * List of JavaScript reserved words that accept a + * before them. Some end of lines are not the end of a statement, like when + * continued by one of these keywords on the newline. + * + * E.g.: we shouldn't insert a ; before this instanceof + * variable + * instanceof String + * + * Will be loaded from /data/js/keywords_after.txt + * + * @var string[] + */ + protected $keywordsAfter = array(); + + /** + * List of all JavaScript operators. + * + * Will be loaded from /data/js/operators.txt + * + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators + * + * @var string[] + */ + protected $operators = array(); + + /** + * List of JavaScript operators that accept a after + * them. Some end of lines are not the end of a statement, like with these + * operators. + * + * Note: Most operators are fine, we've only removed !, ++ and --. + * There can't be a newline separating ! and whatever it is negating. + * ++ & -- have to be joined with the value they're in-/decrementing. + * + * Will be loaded from /data/js/operators_before.txt + * + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators + * + * @var string[] + */ + protected $operatorsBefore = array(); + + /** + * List of JavaScript operators that accept a before + * them. Some end of lines are not the end of a statement, like when + * continued by one of these operators on the newline. + * + * Note: Most operators are fine, we've only removed ), ], ++ and --. + * ++ & -- have to be joined with the value they're in-/decrementing. + * ) & ] are "special" in that they have lots or usecases. () for example + * is used for function calls, for grouping, in if () and for (), ... + * + * Will be loaded from /data/js/operators_after.txt + * + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators + * + * @var string[] + */ + protected $operatorsAfter = array(); + + /** + * {@inheritdoc} + */ + public function __construct() + { + call_user_func_array(array('parent', '__construct'), func_get_args()); + + $dataDir = __DIR__.'/../data/js/'; + $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES; + $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options); + $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options); + $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options); + $this->operators = file($dataDir.'operators.txt', $options); + $this->operatorsBefore = file($dataDir.'operators_before.txt', $options); + $this->operatorsAfter = file($dataDir.'operators_after.txt', $options); + } + + /** + * Minify the data. + * Perform JS optimizations. + * + * @param string[optional] $path Path to write the data to + * + * @return string The minified data + */ + public function execute($path = null) + { + $content = ''; + + // loop files + foreach ($this->data as $source => $js) { + /* + * Combine js: separating the scripts by a ; + * I'm also adding a newline: it will be eaten when whitespace is + * stripped, but we need to make sure we're not just appending + * a new script right after a previous script that ended with a + * singe-line comment on the last line (in which case it would also + * be seen as part of that comment) + */ + $content .= $js."\n;"; + } + + /* + * Let's first take out strings, comments and regular expressions. + * All of these can contain JS code-like characters, and we should make + * sure any further magic ignores anything inside of these. + * + * Consider this example, where we should not strip any whitespace: + * var str = "a test"; + * + * Comments will be removed altogether, strings and regular expressions + * will be replaced by placeholder text, which we'll restore later. + */ + $this->extractStrings('\'"`'); + $this->stripComments(); + $this->extractRegex(); + $content = $this->replace($content); + + $content = $this->propertyNotation($content); + $content = $this->shortenBools($content); + $content = $this->stripWhitespace($content); + + /* + * Earlier, we extracted strings & regular expressions and replaced them + * with placeholder text. This will restore them. + */ + $content = $this->restoreExtractedData($content); + + return $content; + } + + /** + * Strip comments from source code. + */ + protected function stripComments() + { + // single-line comments + $this->registerPattern('/\/\/.*$/m', ''); + + // multi-line comments + $this->registerPattern('/\/\*.*?\*\//s', ''); + } + + /** + * JS can have /-delimited regular expressions, like: /ab+c/.match(string). + * + * The content inside the regex can contain characters that may be confused + * for JS code: e.g. it could contain whitespace it needs to match & we + * don't want to strip whitespace in there. + * + * The regex can be pretty simple: we don't have to care about comments, + * (which also use slashes) because stripComments() will have stripped those + * already. + * + * This method will replace all string content with simple REGEX# + * placeholder text, so we've rid all regular expressions from characters + * that may be misinterpreted. Original regex content will be saved in + * $this->extracted and after doing all other minifying, we can restore the + * original content via restoreRegex() + */ + protected function extractRegex() + { + // PHP only supports $this inside anonymous functions since 5.4 + $minifier = $this; + $callback = function ($match) use ($minifier) { + $count = count($minifier->extracted); + $placeholder = '/'.$count.'/'; + $minifier->extracted[$placeholder] = $match[0]; + + return $placeholder; + }; + + $pattern = '\/.+?(?registerPattern('/'.$pattern.'(?=\s*('.$after.'|'.$methods.'))/', $callback); + + // 1 more edge case: a regex can be followed by a lot more operators or + // keywords if there's a newline (ASI) in between, where the operator + // actually starts a new statement + // (https://github.com/matthiasmullie/minify/issues/56) + $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/'); + $operators += $this->getOperatorsForRegex($this->keywordsReserved, '/'); + $this->registerPattern('/'.$pattern.'\s*\n(?=\s*('.implode('|', $operators).'))/', $callback); + } + + /** + * Strip whitespace. + * + * We won't strip *all* whitespace, but as much as possible. The thing that + * we'll preserve are newlines we're unsure about. + * JavaScript doesn't require statements to be terminated with a semicolon. + * It will automatically fix missing semicolons with ASI (automatic semi- + * colon insertion) at the end of line causing errors (without semicolon.) + * + * Because it's sometimes hard to tell if a newline is part of a statement + * that should be terminated or not, we'll just leave some of them alone. + * + * @param string $content The content to strip the whitespace for + * + * @return string + */ + protected function stripWhitespace($content) + { + // uniform line endings, make them all line feed + $content = str_replace(array("\r\n", "\r"), "\n", $content); + + // collapse all non-line feed whitespace into a single space + $content = preg_replace('/[^\S\n]+/', ' ', $content); + + // strip leading & trailing whitespace + $content = str_replace(array(" \n", "\n "), "\n", $content); + + // collapse consecutive line feeds into just 1 + $content = preg_replace('/\n+/', "\n", $content); + + $operatorsBefore = $this->getOperatorsForRegex($this->operatorsBefore, '/'); + $operatorsAfter = $this->getOperatorsForRegex($this->operatorsAfter, '/'); + $operators = $this->getOperatorsForRegex($this->operators, '/'); + $keywordsBefore = $this->getKeywordsForRegex($this->keywordsBefore, '/'); + $keywordsAfter = $this->getKeywordsForRegex($this->keywordsAfter, '/'); + + // strip whitespace that ends in (or next line begin with) an operator + // that allows statements to be broken up over multiple lines + unset($operatorsBefore['+'], $operatorsBefore['-'], $operatorsAfter['+'], $operatorsAfter['-']); + $content = preg_replace( + array( + '/('.implode('|', $operatorsBefore).')\s+/', + '/\s+('.implode('|', $operatorsAfter).')/', + ), '\\1', $content + ); + + // make sure + and - can't be mistaken for, or joined into ++ and -- + $content = preg_replace( + array( + '/(?%&|'); + $operators['='] = '(?keywordsReserved; + $callback = function ($match) use ($minifier, $keywords) { + $property = trim($minifier->extracted[$match[1]], '\'"'); + + /* + * Check if the property is a reserved keyword. In this context (as + * property of an object literal/array) it shouldn't matter, but IE8 + * freaks out with "Expected identifier". + */ + if (in_array($property, $keywords)) { + return $match[0]; + } + + /* + * See if the property is in a variable-like format (e.g. + * array['key-here'] can't be replaced by array.key-here since '-' + * is not a valid character there. + */ + if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) { + return $match[0]; + } + + return '.'.$property; + }; + + /* + * Figure out if previous character is a variable name (of the array + * we want to use property notation on) - this is to make sure + * standalone ['value'] arrays aren't confused for keys-of-an-array. + * We can (and only have to) check the last character, because PHP's + * regex implementation doesn't allow unfixed-length look-behind + * assertions. + */ + preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar); + $previousChar = $previousChar[1]; + + /* + * Make sure word preceding the ['value'] is not a keyword, e.g. + * return['x']. Because -again- PHP's regex implementation doesn't allow + * unfixed-length look-behind assertions, I'm just going to do a lot of + * separate look-behind assertions, one for each keyword. + */ + $keywords = $this->getKeywordsForRegex($keywords); + $keywords = '(? + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +abstract class Minify +{ + /** + * The data to be minified. + * + * @var string[] + */ + protected $data = array(); + + /** + * Array of patterns to match. + * + * @var string[] + */ + protected $patterns = array(); + + /** + * This array will hold content of strings and regular expressions that have + * been extracted from the JS source code, so we can reliably match "code", + * without having to worry about potential "code-like" characters inside. + * + * @var string[] + */ + public $extracted = array(); + + /** + * Init the minify class - optionally, code may be passed along already. + */ + public function __construct(/* $data = null, ... */) + { + // it's possible to add the source through the constructor as well ;) + if (func_num_args()) { + call_user_func_array(array($this, 'add'), func_get_args()); + } + } + + /** + * Add a file or straight-up code to be minified. + * + * @param string|string[] $data + */ + public function add($data /* $data = null, ... */) + { + // bogus "usage" of parameter $data: scrutinizer warns this variable is + // not used (we're using func_get_args instead to support overloading), + // but it still needs to be defined because it makes no sense to have + // this function without argument :) + $args = array($data) + func_get_args(); + + // this method can be overloaded + foreach ($args as $data) { + if (is_array($data)) { + call_user_func_array(array($this, 'add'), $data); + continue; + } + + // redefine var + $data = (string) $data; + + // load data + $value = $this->load($data); + $key = ($data != $value) ? $data : count($this->data); + + // replace CR linefeeds etc. + // @see https://github.com/matthiasmullie/minify/pull/139 + $value = str_replace(array("\r\n", "\r"), "\n", $value); + + // store data + $this->data[$key] = $value; + } + } + + /** + * Minify the data & (optionally) saves it to a file. + * + * @param string[optional] $path Path to write the data to + * + * @return string The minified data + */ + public function minify($path = null) + { + $content = $this->execute($path); + + // save to path + if ($path !== null) { + $this->save($content, $path); + } + + return $content; + } + + /** + * Minify & gzip the data & (optionally) saves it to a file. + * + * @param string[optional] $path Path to write the data to + * @param int[optional] $level Compression level, from 0 to 9 + * + * @return string The minified & gzipped data + */ + public function gzip($path = null, $level = 9) + { + $content = $this->execute($path); + $content = gzencode($content, $level, FORCE_GZIP); + + // save to path + if ($path !== null) { + $this->save($content, $path); + } + + return $content; + } + + /** + * Minify the data & write it to a CacheItemInterface object. + * + * @param CacheItemInterface $item Cache item to write the data to + * + * @return CacheItemInterface Cache item with the minifier data + */ + public function cache(CacheItemInterface $item) + { + $content = $this->execute(); + $item->set($content); + + return $item; + } + + /** + * Minify the data. + * + * @param string[optional] $path Path to write the data to + * + * @return string The minified data + */ + abstract public function execute($path = null); + + /** + * Load data. + * + * @param string $data Either a path to a file or the content itself + * + * @return string + */ + protected function load($data) + { + // check if the data is a file + if ($this->canImportFile($data)) { + $data = file_get_contents($data); + + // strip BOM, if any + if (substr($data, 0, 3) == "\xef\xbb\xbf") { + $data = substr($data, 3); + } + } + + return $data; + } + + /** + * Save to file. + * + * @param string $content The minified data + * @param string $path The path to save the minified data to + * + * @throws IOException + */ + protected function save($content, $path) + { + $handler = $this->openFileForWriting($path); + + $this->writeToFile($handler, $content); + + @fclose($handler); + } + + /** + * Register a pattern to execute against the source content. + * + * @param string $pattern PCRE pattern + * @param string|callable $replacement Replacement value for matched pattern + */ + protected function registerPattern($pattern, $replacement = '') + { + // study the pattern, we'll execute it more than once + $pattern .= 'S'; + + $this->patterns[] = array($pattern, $replacement); + } + + /** + * We can't "just" run some regular expressions against JavaScript: it's a + * complex language. E.g. having an occurrence of // xyz would be a comment, + * unless it's used within a string. Of you could have something that looks + * like a 'string', but inside a comment. + * The only way to accurately replace these pieces is to traverse the JS one + * character at a time and try to find whatever starts first. + * + * @param string $content The content to replace patterns in + * + * @return string The (manipulated) content + */ + protected function replace($content) + { + $processed = ''; + $positions = array_fill(0, count($this->patterns), -1); + $matches = array(); + + while ($content) { + // find first match for all patterns + foreach ($this->patterns as $i => $pattern) { + list($pattern, $replacement) = $pattern; + + // no need to re-run matches that are still in the part of the + // content that hasn't been processed + if ($positions[$i] >= 0) { + continue; + } + + $match = null; + if (preg_match($pattern, $content, $match)) { + $matches[$i] = $match; + + // we'll store the match position as well; that way, we + // don't have to redo all preg_matches after changing only + // the first (we'll still know where those others are) + $positions[$i] = strpos($content, $match[0]); + } else { + // if the pattern couldn't be matched, there's no point in + // executing it again in later runs on this same content; + // ignore this one until we reach end of content + unset($matches[$i]); + $positions[$i] = strlen($content); + } + } + + // no more matches to find: everything's been processed, break out + if (!$matches) { + $processed .= $content; + break; + } + + // see which of the patterns actually found the first thing (we'll + // only want to execute that one, since we're unsure if what the + // other found was not inside what the first found) + $discardLength = min($positions); + $firstPattern = array_search($discardLength, $positions); + $match = $matches[$firstPattern][0]; + + // execute the pattern that matches earliest in the content string + list($pattern, $replacement) = $this->patterns[$firstPattern]; + $replacement = $this->replacePattern($pattern, $replacement, $content); + + // figure out which part of the string was unmatched; that's the + // part we'll execute the patterns on again next + $content = substr($content, $discardLength); + $unmatched = (string) substr($content, strpos($content, $match) + strlen($match)); + + // move the replaced part to $processed and prepare $content to + // again match batch of patterns against + $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched)); + $content = $unmatched; + + // first match has been replaced & that content is to be left alone, + // the next matches will start after this replacement, so we should + // fix their offsets + foreach ($positions as $i => $position) { + $positions[$i] -= $discardLength + strlen($match); + } + } + + return $processed; + } + + /** + * This is where a pattern is matched against $content and the matches + * are replaced by their respective value. + * This function will be called plenty of times, where $content will always + * move up 1 character. + * + * @param string $pattern Pattern to match + * @param string|callable $replacement Replacement value + * @param string $content Content to match pattern against + * + * @return string + */ + protected function replacePattern($pattern, $replacement, $content) + { + if (is_callable($replacement)) { + return preg_replace_callback($pattern, $replacement, $content, 1, $count); + } else { + return preg_replace($pattern, $replacement, $content, 1, $count); + } + } + + /** + * Strings are a pattern we need to match, in order to ignore potential + * code-like content inside them, but we just want all of the string + * content to remain untouched. + * + * This method will replace all string content with simple STRING# + * placeholder text, so we've rid all strings from characters that may be + * misinterpreted. Original string content will be saved in $this->extracted + * and after doing all other minifying, we can restore the original content + * via restoreStrings(). + * + * @param string[optional] $chars + */ + protected function extractStrings($chars = '\'"') + { + // PHP only supports $this inside anonymous functions since 5.4 + $minifier = $this; + $callback = function ($match) use ($minifier) { + // check the second index here, because the first always contains a quote + if ($match[2] === '') { + /* + * Empty strings need no placeholder; they can't be confused for + * anything else anyway. + * But we still needed to match them, for the extraction routine + * to skip over this particular string. + */ + return $match[0]; + } + + $count = count($minifier->extracted); + $placeholder = $match[1].$count.$match[1]; + $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; + + return $placeholder; + }; + + /* + * The \\ messiness explained: + * * Don't count ' or " as end-of-string if it's escaped (has backslash + * in front of it) + * * Unless... that backslash itself is escaped (another leading slash), + * in which case it's no longer escaping the ' or " + * * So there can be either no backslash, or an even number + * * multiply all of that times 4, to account for the escaping that has + * to be done to pass the backslash into the PHP string without it being + * considered as escape-char (times 2) and to get it in the regex, + * escaped (times 2) + */ + $this->registerPattern('/(['.$chars.'])(.*?(?extracted. + * + * @param string $content + * + * @return string + */ + protected function restoreExtractedData($content) + { + if (!$this->extracted) { + // nothing was extracted, nothing to restore + return $content; + } + + $content = strtr($content, $this->extracted); + + $this->extracted = array(); + + return $content; + } + + /** + * Check if the path is a regular file and can be read. + * + * @param string $path + * + * @return bool + */ + protected function canImportFile($path) + { + return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path); + } + + /** + * Attempts to open file specified by $path for writing. + * + * @param string $path The path to the file + * + * @return resource Specifier for the target file + * + * @throws IOException + */ + protected function openFileForWriting($path) + { + if (($handler = @fopen($path, 'w')) === false) { + throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.'); + } + + return $handler; + } + + /** + * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions. + * + * @param resource $handler The resource to write to + * @param string $content The content to write + * @param string $path The path to the file (for exception printing only) + * + * @throws IOException + */ + protected function writeToFile($handler, $content, $path = '') + { + if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) { + throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.'); + } + } +} diff --git a/vendor/matthiasmullie/path-converter/LICENSE b/vendor/matthiasmullie/path-converter/LICENSE new file mode 100644 index 0000000..491295a --- /dev/null +++ b/vendor/matthiasmullie/path-converter/LICENSE @@ -0,0 +1,18 @@ +Copyright (c) 2015 Matthias Mullie + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/matthiasmullie/path-converter/composer.json b/vendor/matthiasmullie/path-converter/composer.json new file mode 100644 index 0000000..1cb6a4c --- /dev/null +++ b/vendor/matthiasmullie/path-converter/composer.json @@ -0,0 +1,28 @@ +{ + "name": "matthiasmullie/path-converter", + "type": "library", + "description": "Relative path converter", + "keywords": ["relative", "path", "converter", "paths"], + "homepage": "http://github.com/matthiasmullie/path-converter", + "license": "MIT", + "authors": [ + { + "name": "Matthias Mullie", + "homepage": "http://www.mullie.eu", + "email": "pathconverter@mullie.eu", + "role": "Developer" + } + ], + "require": { + "php": ">=5.3.0", + "ext-pcre": "*" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "autoload": { + "psr-4": { + "MatthiasMullie\\PathConverter\\": "src/" + } + } +} diff --git a/vendor/matthiasmullie/path-converter/src/Converter.php b/vendor/matthiasmullie/path-converter/src/Converter.php new file mode 100644 index 0000000..f5ee3ae --- /dev/null +++ b/vendor/matthiasmullie/path-converter/src/Converter.php @@ -0,0 +1,195 @@ + + * @copyright Copyright (c) 2015, Matthias Mullie. All rights reserved. + * @license MIT License + */ +class Converter +{ + /** + * @var string + */ + protected $from; + + /** + * @var string + */ + protected $to; + + /** + * @param string $from The original base path (directory, not file!) + * @param string $to The new base path (directory, not file!) + */ + public function __construct($from, $to) + { + $shared = $this->shared($from, $to); + if ($shared === '') { + // when both paths have nothing in common, one of them is probably + // absolute while the other is relative + $cwd = getcwd(); + $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from; + $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to; + + // or traveling the tree via `..` + // attempt to resolve path, or assume it's fine if it doesn't exist + $from = realpath($from) ?: $from; + $to = realpath($to) ?: $to; + } + + $from = $this->dirname($from); + $to = $this->dirname($to); + + $from = $this->normalize($from); + $to = $this->normalize($to); + + $this->from = $from; + $this->to = $to; + } + + /** + * Normalize path. + * + * @param string $path + * + * @return string + */ + protected function normalize($path) + { + // deal with different operating systems' directory structure + $path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/'); + + /* + * Example: + * /home/forkcms/frontend/cache/compiled_templates/../../core/layout/css/../images/img.gif + * to + * /home/forkcms/frontend/core/layout/images/img.gif + */ + do { + $path = preg_replace('/[^\/]+(? $chunk) { + if (isset($path2[$i]) && $path1[$i] == $path2[$i]) { + $shared[] = $chunk; + } else { + break; + } + } + + return implode('/', $shared); + } + + /** + * Convert paths relative from 1 file to another. + * + * E.g. + * ../images/img.gif relative to /home/forkcms/frontend/core/layout/css + * should become: + * ../../core/layout/images/img.gif relative to + * /home/forkcms/frontend/cache/minified_css + * + * @param string $path The relative path that needs to be converted. + * + * @return string The new relative path. + */ + public function convert($path) + { + // quit early if conversion makes no sense + if ($this->from === $this->to) { + return $path; + } + + $path = $this->normalize($path); + // if we're not dealing with a relative path, just return absolute + if (strpos($path, '/') === 0) { + return $path; + } + + // normalize paths + $path = $this->normalize($this->from.'/'.$path); + + // strip shared ancestor paths + $shared = $this->shared($path, $this->to); + $path = mb_substr($path, mb_strlen($shared)); + $to = mb_substr($this->to, mb_strlen($shared)); + + // add .. for every directory that needs to be traversed to new path + $to = str_repeat('../', mb_substr_count($to, '/')); + + return $to.ltrim($path, '/'); + } + + /** + * Attempt to get the directory name from a path. + * + * @param string $path + * + * @return string + */ + public function dirname($path) + { + if (is_file($path)) { + return dirname($path); + } + + if (is_dir($path)) { + return rtrim($path, '/'); + } + + // no known file/dir, start making assumptions + + // ends in / = dir + if (mb_substr($path, -1) === '/') { + return rtrim($path, '/'); + } + + // has a dot in the name, likely a file + if (preg_match('/.*\..*$/', basename($path)) !== 0) { + return dirname($path); + } + + // you're on your own here! + return $path; + } +} From e6fb6b217c5ddc7206c5854adb6ef938707ae16a Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 12:26:40 -0600 Subject: [PATCH 083/170] Add far-future header to returned data Make ySlow happy. :D --- combineify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/combineify.php b/combineify.php index cf5dce7..97cb977 100644 --- a/combineify.php +++ b/combineify.php @@ -110,7 +110,7 @@ // Send Content-Type header ("Content-Type: text/" . $type); - + header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 360))); // 30 days if (isset($encoding) && $encoding != 'none') { // Send compressed contents From ac3294451c8d754c8f6540d8c1a938d549ce85ee Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 13:46:05 -0600 Subject: [PATCH 084/170] Revert "Compress JS Using Closure Compiler Service" This reverts commit 69d4a4b1e42e5a2ee8ddb655f3610a479303ac5b. --- js/functions.js | 692 +++++++++++++++++++++++++++++++----------------- js/login.js | 61 +++-- js/main.js | 427 +++++++++++++++++++----------- 3 files changed, 757 insertions(+), 423 deletions(-) diff --git a/js/functions.js b/js/functions.js index 0e80e5a..9e2e97a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1,265 +1,485 @@ -var branch = $("#branch-data").attr("data"), commitURL = "https://api.github.com/repos/mescon/Muximux/commits?sha=" + branch, localversion = $("#sha-data").attr("data"), cwd = $("#cwd-data").attr("data"), phpini = $("#phpini-data").attr("data"), gitdir = $("#gitdirectory-data").attr("data"), title = $("#title-data").attr("data"), branch = $("#branch-data").attr("data"), secret = $("#secret").attr("data"), difference = 0, differenceDays, json; -function checkScrolling(b) { - var c = parseInt(b.children(".cd-tabs-navigation").width()), a = parseInt(b.width()); - b.scrollLeft() >= c - a ? b.parent(".cd-tabs").addClass("is-ended") : b.parent(".cd-tabs").removeClass("is-ended"); +var branch = $("#branch-data").attr('data'); +var commitURL = "https://api.github.com/repos/mescon/Muximux/commits?sha=" + branch; +var localversion = $("#sha-data").attr('data'); +var cwd = $("#cwd-data").attr('data'); +var phpini = $("#phpini-data").attr('data'); +var gitdir = $("#gitdirectory-data").attr('data'); +var title = $("#title-data").attr('data'); +var branch = $("#branch-data").attr('data'); +var secret = $("#secret").attr('data'); +var difference = 0; +var differenceDays; +var json; + + +function checkScrolling(tabs) { + var totalTabWidth = parseInt(tabs.children('.cd-tabs-navigation').width()), + tabsViewport = parseInt(tabs.width()); + if (tabs.scrollLeft() >= totalTabWidth - tabsViewport) { + tabs.parent('.cd-tabs').addClass('is-ended'); + } else { + tabs.parent('.cd-tabs').removeClass('is-ended'); + } } -function resizeIframe(b, c) { - var a = b && !c ? $(window).height() - 5 : $(window).height() - $(".cd-tabs-navigation").height(); - $("iframe").css({height:a + "px"}); +// Measure viewport and subtract the height the navigation tabs, then resize the iframes. +// drawer is just a boolean value as to whether or not we have the drawer. +// If we do, then we need to make the iframe taller than bar height. +function resizeIframe(drawer, isMobile) { + if (drawer && !isMobile) { + var newSize = $(window).height() - 5; + $('iframe').css({ + 'height': newSize + 'px' + }); + } else { + var newSize = $(window).height() - $('.cd-tabs-navigation').height(); + $('iframe').css({ + 'height': newSize + 'px' + }); + } } -function htmlEntities(b) { - return String(b).replace(/&/g, "&").replace(//g, ">").replace(/"/g, """); +// From https://css-tricks.com/snippets/javascript/htmlentities-for-javascript/ - don't render tags retrieved from Github +function htmlEntities(str) { + return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); } -function dropDownFixPosition(b, c) { - var a = b.offset().top + b.outerHeight(); - c.css("top", a + "px"); - c.css("left", $(window).width() - $(".drop-nav").width() - b.offset().left + "px"); + +function dropDownFixPosition(button, dropdown) { + var dropDownTop = button.offset().top + button.outerHeight(); + dropdown.css('top', dropDownTop + "px"); + dropdown.css('left', $(window).width() - $('.drop-nav').width() - button.offset().left + "px"); } + function settingsEventHandlers() { - function b(a) { - setTimeout(function() { - $(a).remove(); - }, 1E3); - } - $("#sortable").sortable(); - $("input[type=radio]").change(function() { - $("input[type=radio]:checked").not(this).prop("checked", !1); - }); - $("#showInstructions").click(function() { - $("#instructionsContainer").slideToggle(1E3); - ' Show Guide' == $(this).html() ? $(this).html(' Hide Guide') : $(this).html(' Show Guide'); - }); - $("#showChangelog").click(function() { - $("#changelogContainer").slideToggle(1E3); - ' Show Updates' == $(this).html() ? ($(this).html(' Hide Updates'), viewChangelog()) : $(this).html(' Show Updates'); - }); - "" != $("#backupContents").text() && ($("#topButtons").append(' Show Backup INI'), $("#topButtons").css("width", "425px"), $("#showBackup").click(function() { - $("#backupiniContainer").slideToggle(1E3); - ' Show Backup INI' == $(this).html() ? $(this).html(' Hide Backup INI') : $(this).html(' Show Backup INI'); - })); - $("#removeAll").click(function() { - if (confirm("Are you sure?")) { - var a = {}, c = 150; - $(this).parents("form").children("#sortable").children().reverse().each(function() { - var d = $(this); - setTimeout(function() { - d.effect("drop", a, 150, b(d)); - }, c); - c += 150; - }); - $("#addApplication").click(); - } - }); - $("form").on("click", ".removeButton", function() { - confirm("Are you sure?") && $($(this).parents(".applicationContainer")).effect("drop", {}, 500, b($(this).parents(".applicationContainer"))); - }); - $("#removeBackup").click(function() { - var a = $("#secret").data().data; - $.ajax({async:!0, url:"muximux.php", type:"GET", data:{remove:"backup", secret:a}, success:function(a) { - "deleted" == a && ($("#backupiniContainer").toggle(1E3), $("#showBackup").remove(), $("#topButtons").css("width", "280px")); - }}); - }); - $("body").on("click", ".btn-arrow", function(a) { - a.preventDefault(); - $(this).hasClass("disabled") ? $(this).attr("disabled", "disabled") : $(".btn-arrow").removeAttr("disabled"); - }); - $("#addApplication").click(function() { - var a = Math.floor(999999 * Math.random() + 1); - $("#sortable").append('




    '); - initIconPicker("." + a + "newApplication_-_value[name=" + a + "newApplication_-_icon]"); - }); - $("form").on("focusout", ".appName", function() { - if ("" != $(this).val()) { - $(this).parents(".applicationContainer").removeClass("newApp"); - var a = $(this).attr("was"); - void 0 == a && (a = $(this).parents(".applicationContainer").children(".newAppRand").attr("value") + "newApplication", $(this).parents("applicationContainer").children(".newAppRand").remove()); - var b = $(this).val().split(" ").join("_"); - $(this).attr("was", b); - $("." + a + "-value").each(function() { - var c = $(this).attr("name").split("-"); - $(this).removeAttr("name").prop("name", b + "-" + c[1]).addClass(b + "-value").removeClass(a + "-value"); - }); - $('input[name="' + a + '-icon"]').prop("name", b + "-icon"); - $(this).parents("div.applicationContainer").attr("id", b); - } - }); - var c = {url:"muximux.php", type:"post", success:showResponse}; - $("#settingsSubmit").click(function(a) { - a.preventDefault(); - $(".newApp").remove(); - $(".checkbox,.radio").each(function() { - if (!$(this).prop("checked")) { - var a = $(this).attr("name"); - $('').appendTo($(this)); - } - }); - $(".appName").removeAttr("disabled"); - $("form").ajaxSubmit(c); - }); - $("#tabcolorCheckbox").click(function(a) { - $(this).prop("checked"); - $(".appsColor").toggle("slide", {direction:"left"}, 200); - $(".generalColor").toggle("slide", {direction:"left"}, 200); - }); + $('#sortable').sortable(); + // Anytime a radio box for default is changed it unchecks the others + $('input[type=radio]').change(function() { + $('input[type=radio]:checked').not(this).prop('checked', false); + }); + // Event Handler for show/hide instructions + $('#showInstructions').click(function() { + $('#instructionsContainer').slideToggle(1000); + if ($(this).html() == " Show Guide") $(this).html(' Hide Guide'); + else $(this).html(' Show Guide'); + }); + // Event Handler for show/hide changelog + $('#showChangelog').click(function() { + $('#changelogContainer').slideToggle(1000); + if ($(this).html() == " Show Updates") { + $(this).html(' Hide Updates'); + viewChangelog(); + } + else $(this).html(' Show Updates'); + }); + // Event Handler for backup.ini show/hide button + if ($('#backupContents').text() != "") { + $('#topButtons').append(' Show Backup INI') + $('#topButtons').css('width', '425px') + $('#showBackup').click(function() { + $('#backupiniContainer').slideToggle(1000); + if ($(this).html() == " Show Backup INI") $(this).html(' Hide Backup INI'); + else $(this).html(' Show Backup INI'); + }); + } + // Remove all event handler + $('#removeAll').click(function() { + if (confirm('Are you sure?')) { + var selectedEffect = "drop"; + var options = {}; + var time = 150; + $(this).parents('form').children('#sortable').children().reverse().each(function() { + var that = $(this); + setTimeout(function() { + that.effect(selectedEffect, options, 150, removeCallback(that)) + }, time); + time = time + 150; + }); + $('#addApplication').click(); + } + }); + // Remove sortable item button handler + $('form').on('click', '.removeButton', function() { + if (confirm('Are you sure?')) { + var selectedEffect = "drop"; + var options = {}; + $($(this).parents('.applicationContainer')).effect(selectedEffect, options, 500, removeCallback($(this).parents('.applicationContainer'))); + } + }); + $('#removeBackup').click(function() { + var secret = $("#secret").data()['data']; + $.ajax({ + async: true, + url: "muximux.php", + type: 'GET', + data: { + remove: "backup", + secret: secret + }, + success: function(data) { + if (data == "deleted"); + $('#backupiniContainer').toggle(1000); + $('#showBackup').remove(); + $('#topButtons').css('width', '280px') + } + }); + }); + + function removeCallback(selectedElement) { + setTimeout(function() { + $(selectedElement).remove(); + }, 1000); + }; + // Fix for iconpicker. For some reason the arrow doesn't get disabled when it hits the minimum/maximum page number. This disables the button, so that it doesnt go into the negatives or pages above its max. + $('body').on('click', '.btn-arrow', function(event) { + event.preventDefault(); + if ($(this).hasClass('disabled')) $(this).attr('disabled', 'disabled'); + else $('.btn-arrow').removeAttr('disabled'); + }); + // Add new application button handler + $('#addApplication').click(function() { + // Generating a random number here. So that if the user adds more than one new application at a time the ids/classes and names don't match. + var rand = Math.floor((Math.random() * 999999) + 1); + $('#sortable').append('
    ' + '

    ' + '

    ' + '

    ' + '
    ' + '
    ' + '

    ' + '
    ' + '
    ' + '
    '); + initIconPicker('.' + rand + 'newApplication_-_value[name=' + rand + 'newApplication_-_icon]'); + }); + // App Name Change/Addition handler + $('form').on('focusout', '.appName', function() { + if ($(this).val() != "") { + $(this).parents('.applicationContainer').removeClass('newApp'); + var section = $(this).attr('was'); + if (section == undefined) { + section = $(this).parents('.applicationContainer').children('.newAppRand').attr('value') + "newApplication"; + $(this).parents('applicationContainer').children('.newAppRand').remove(); + } + var newSection = $(this).val().split(' ').join('_'); + $(this).attr('was', newSection); + $('.' + section + '-value').each(function() { + var split = $(this).attr('name').split('-'); + $(this).removeAttr('name').prop('name', newSection + "-" + split[1]).addClass(newSection + '-value').removeClass(section + '-value'); + }); + $('input[name="' + section + '-icon"]').prop('name', newSection + "-icon"); + $(this).parents('div.applicationContainer').attr('id', newSection); + } + }); + //On Submit handler + var options = { + url: 'muximux.php', + type: 'post', + success: showResponse + }; + $('#settingsSubmit').click(function(event) { + event.preventDefault(); + $('.newApp').remove(); //Remove any new app that isn't filled out. + $('.checkbox,.radio').each(function() { + if (!$(this).prop('checked')) { + var name = $(this).attr('name'); + $('').appendTo($(this)); + } + }); + $('.appName').removeAttr('disabled'); + $("form").ajaxSubmit(options); + }); + $('#tabcolorCheckbox').click(function(event) { + if ($(this).prop('checked')) { + $('.appsColor').toggle('slide', {direction: 'left'}, 200); + $('.generalColor').toggle('slide', {direction: 'left'}, 200); + } else { + $('.appsColor').toggle('slide', {direction: 'left'}, 200); + $('.generalColor').toggle('slide', {direction: 'left'}, 200); + } + + }); } +// Takes all the data we have to generate our changelog function viewChangelog() { - $("#changelog").html(""); - sessionStorage.getItem("JSONData") || updateJson(); - json = JSON.parse(sessionStorage.getItem("JSONData")); - $.getJSON(commitURL, function(b) { - json = b; - b = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; - difference = 0; - for (var c in json) { - json[c].sha == localversion && (difference = c); - } - differenceDays = datediff(json[0].commit.author.date.substring(0, 10)); - c = "up to date!"; - 0 < difference && (c = "" + difference + " commits behind!"); - output = "

    Your install is currently " + c + "
    "; - 0 < difference && (output += 'The changes from your version to the latest version can be read here.

    '); - output += "

    Updates to your version of Muximux were uploaded to Github " + (0 == differenceDays ? "today" : differenceDays + (1 == differenceDays ? " day ago" : " days ago")) + ".

    "; - output += "
    "; - 0 < difference && (output += " Install Now"); - output += " Refresh Updates
    "; - if (0 < difference) { - output += "

    Or you can manually download the latest zip here.

    "; - output += "

    Changelog (" + branch + ")

      "; - c = 0; - do { - b = json[c].sha.substring(0, 7); - var a = htmlEntities(json[c].commit.message.substring(0, 550).replace(/$/, "") + "..."), d = json[c].commit.author.date.substring(0, 10); - output += "
    • " + d + ' ' + b + ":  " + a + "
      • "; - c++; - } while (c != difference); - output += "
    "; - } - $("#changelog").html(output); - $("#downloadUpdate").click(function() { - downloadUpdate(json[0].sha); - }); - $("#refreshUpdate").click(function() { - refreshBranches(); - updateBox(!0); - }); - }); + $('#changelog').html(""); + if (!sessionStorage.getItem('JSONData')) { + updateJson(); + } + json = JSON.parse(sessionStorage.getItem('JSONData')); + $.getJSON(commitURL, function(result) { + json = result; + var compareURL = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; + difference = 0; + for (var i in json) { + if (json[i].sha == localversion) { + difference = i; + } + } + differenceDays = datediff(json[0].commit.author.date.substring(0, 10)); + + + var status = "up to date!"; + if (difference > 0) { + status = "" + difference + " commits behind!"; + } + output = "

    Your install is currently " + status + "
    "; + if (difference > 0) { + output += "The changes from your version to the latest version can be read here.

    "; + } + output += "

    Updates to your version of Muximux were uploaded to Github " + (differenceDays == 0 ? 'today' : differenceDays + (differenceDays == 1 ? ' day ago' : ' days ago') ) + ".

    "; + output += "
    "; + if (difference > 0) { + output +=" Install Now"; + } + output +=" Refresh Updates" + + "
    "; + if (difference > 0) { + + output += "

    Or you can manually download the latest zip here.

    "; + output += "

    Changelog (" + branch + ")

      "; + var i=0; + do { + var shortCommitID = json[i].sha.substring(0, 7); + var shortComments = htmlEntities(json[i].commit.message.substring(0, 550).replace(/$/, "") + "..."); + var shortDate = json[i].commit.author.date.substring(0, 10); + output += "
    • " + shortDate + " " + shortCommitID + ":  " + shortComments + "
      • "; + i++; + } while (i != difference); + output += "
    "; + } + $('#changelog').html(output); + $('#downloadUpdate').click(function(){ + downloadUpdate(json[0].sha); + }); + $('#refreshUpdate').click(function(){ + refreshBranches(); + updateBox(true); + }); + + + }); } + function refreshBranches() { - $.ajax({async:!0, url:"muximux.php", type:"GET", data:{action:"branches", secret:secret}, success:function(b) { - viewChangelog(); - }}); + $.ajax({ + async: true, + url: "muximux.php", + type: 'GET', + data: {action: "branches", secret: secret }, + success: function (data) { + viewChangelog(); + } + + }); } -function initIconPicker(b) { - $(b).iconpicker({align:"center", arrowClass:"btn-danger", arrowPrevIconClass:"glyphicon glyphicon-chevron-left", arrowNextIconClass:"glyphicon glyphicon-chevron-right", cols:10, footer:!0, header:!0, iconset:"fontawesome", labelHeader:"{0} of {1} pages", labelFooter:"{0} - {1} of {2} icons", placement:"bottom", rows:5, search:!0, searchText:"Search", selectedClass:"btn-success", unselectedClass:""}); + +//Init iconpickers +function initIconPicker(selectedItem) { + $(selectedItem).iconpicker({ + align: 'center', // Only in div tag + arrowClass: 'btn-danger', + arrowPrevIconClass: 'glyphicon glyphicon-chevron-left', + arrowNextIconClass: 'glyphicon glyphicon-chevron-right', + cols: 10, + footer: true, + header: true, + iconset: 'fontawesome', + labelHeader: '{0} of {1} pages', + labelFooter: '{0} - {1} of {2} icons', + placement: 'bottom', // Only in button tag + rows: 5, + search: true, + searchText: 'Search', + selectedClass: 'btn-success', + unselectedClass: '' + }); } -function showResponse(b, c) { - 1 == b || "success" == c ? location.pathname = location.pathname : alert("Error!!!-" + b); +// post-submit callback function +function showResponse(responseText, statusText) { + if (responseText == 1 || statusText == "success") location.pathname = location.pathname; + else alert("Error!!!-" + responseText); } -function datediff(b) { - b = (new Date(b)).getTime(); - var c = (new Date).getTime(); - return Math.round((c - b) / 864E5); +// Calculates the amount of days since an update was commited on Github. +function datediff(latestDate) { + var githubDate_ms = new Date(latestDate).getTime(); + var localDate_ms = new Date().getTime(); + var difference_ms = localDate_ms - githubDate_ms; + return Math.round(difference_ms / 86400000); } +// Gets the secret key that was generated on load. This AJAX call can not be async - other functions rely on this property to be set first. function getSecret() { - $.ajax({async:!0, dataType:"text", url:"muximux.php?get=secret", type:"GET", success:function(b) { - $("#secret").data({data:b}); - }}); + $.ajax({ + async: true, + dataType: 'text', + url: "muximux.php?get=secret", + type: 'GET', + success: function(data) { + $('#secret').data({ + data: data + }); + } + }); } -function setCookie(b, c, a) { - var d = new Date; - d.setTime(d.getTime() + 864E5 * a); - a = "expires=" + d.toUTCString(); - document.cookie = b + "=" + c + "; " + a; + + +function setCookie(cname, cvalue, exdays) { + var d = new Date(); + d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000)); + var expires = "expires=" + d.toUTCString(); + document.cookie = cname + "=" + cvalue + "; " + expires; } -function getCookie(b) { - b += "="; - for (var c = document.cookie.split(";"), a = 0;a < c.length;a++) { - for (var d = c[a];" " == d.charAt(0);) { - d = d.substring(1); - } - if (0 == d.indexOf(b)) { - return d.substring(b.length, d.length); - } - } - return ""; + +function getCookie(cname) { + var name = cname + "="; + var ca = document.cookie.split(';'); + for (var i = 0; i < ca.length; i++) { + var c = ca[i]; + while (c.charAt(0) == ' ') c = c.substring(1); + if (c.indexOf(name) == 0) return c.substring(name.length, c.length); + } + return ""; } -function setTitle(b) { - $(document).attr("title", b + " - " + $("#maintitle").attr("data")); +// Set document title including title of the page as configured in settings.ini.php +function setTitle(title) { + $(document).attr("title", title + " - " + $('#maintitle').attr('data')); } -function updateBox(b) { - sessionStorage.getItem("JSONData") && !0 !== b || updateJson(); - json = JSON.parse(sessionStorage.getItem("JSONData")); - b = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; - var c = 0, a; - for (a in json) { - json[a].sha == localversion && (c = a); - } - datediff(json[0].commit.author.date.substring(0, 10)); - c && (clearInterval(void 0), 0 < c && !getCookie("updateDismiss") && ($("#updateContainer").html("You are currently " + c + " " + (1 < c ? "commits" : "commit") + " behind!
    See changelog or
    click here
    to install now.    "), $("#updateContainer").fadeIn("slow"), $("#downloadModal").click(function() { - downloadUpdate(json[0].sha); - })), $("#updateDismiss").click(function() { - $("#updateContainer").fadeOut("slow"); - setCookie("updateDismiss", "true", 1 / 24); - })); +// Idea and implementation graciously borrowed from PlexPy (https://github.com/drzoidberg33/plexpy) +function updateBox($force) { + if ((!sessionStorage.getItem('JSONData')) || ($force === true)) { + updateJson(); + } + json = JSON.parse(sessionStorage.getItem('JSONData')); + var compareURL = "https://github.com/mescon/Muximux/compare/" + localversion + "..." + json[0].sha; + var difference = 0; + for (var i in json) { + if (json[i].sha == localversion) { + difference = i; + } + } + var differenceDays = datediff(json[0].commit.author.date.substring(0, 10)); + var updateCheck; + if (difference) { + clearInterval(updateCheck); + if (difference > 0) { + + if (!getCookie('updateDismiss')) { + $('#updateContainer').html("" + + "You are currently " + difference + " "+ ((difference > 1) ? 'commits' : 'commit')+" behind!
    " + + "See changelog or
    click here
    to install now.    "); + $('#updateContainer').fadeIn("slow"); + $('#downloadModal').click(function(){ + downloadUpdate(json[0].sha); + }); + } + } + $('#updateDismiss').click(function() { + $('#updateContainer').fadeOut('slow'); + // Set cookie to remember dismiss decision for 1 hour. + setCookie('updateDismiss', 'true', 1 / 24); + }); + } } + function updateJson() { - $.getJSON(commitURL, function(b) { - jsonString = JSON.stringify(b); - sessionStorage.setItem("JSONData", jsonString, .00694444); - }); + $.getJSON(commitURL, function(result) { + jsonString = JSON.stringify(result); + sessionStorage.setItem('JSONData',jsonString,0.00694444); + }); } -function scaleContent(b, c) { - var a = $(window).width() / c, d = $(window).height() / c - $("nav").height() / c; - $(".cd-tabs-content").find('li[data-content="' + b + '"]').children("iframe").css({"-ms-transform":"scale(" + c + ")", "-moz-transform":"scale(" + c + ")", "-o-transform":"scale(" + c + ")", "-webkit-transform":"scale(" + c + ")", transform:"scale(" + c + ")", height:"" + d + "px", width:"" + a + "px"}); + +function scaleContent(content, scale) { + var newWidth = $(window).width() / scale; + var newHeight = (($(window).height() / scale) - ($('nav').height() / scale)); + $('.cd-tabs-content').find('li[data-content="' + content + '"]').children('iframe').css({ + '-ms-transform': 'scale(' + scale + ')', + '-moz-transform': 'scale(' + scale + ')', + '-o-transform': 'scale(' + scale + ')', + '-webkit-transform': 'scale(' + scale + ')', + 'transform': 'scale(' + scale + ')', + 'height': '' + newHeight + 'px', + 'width': '' + newWidth + 'px', + }); } -function downloadUpdate(b) { - confirm("Would you like to download and install updates now?") ? $.ajax({async:!0, url:"muximux.php", type:"GET", data:{action:"update", secret:secret, sha:b}, success:function(b) { - console.log("DownloadResult: " + b); - b ? setStatus("Update installed successfully!") : setStatus("An error has occurred. Please reload and try again."); - }}) : console.log("Update cancelled."); + +function downloadUpdate($sha) { + if (confirm('Would you like to download and install updates now?')) { + + $.ajax({ + async: true, + url: "muximux.php", + type: 'GET', + data: {action: "update", secret: secret, sha: $sha}, + success: function (data) { + console.log('DownloadResult: ' + data); + if(data) { + setStatus('Update installed successfully!'); + } else { + setStatus('An error has occurred. Please reload and try again.'); + } + + } + + }); + } else { + console.log('Update cancelled.'); + } } -function write_log(b, c) { - $.ajax({async:!0, url:"muximux.php", type:"GET", data:{action:"writeLog", secret:secret, msg:b, lvl:c}}); + +function write_log($text,$lvl) { + + $.ajax({ + async: true, + url: "muximux.php", + type: 'GET', + data: {action: "writeLog", secret: secret, msg: $text,lvl: $lvl}, + }); + } -function setStatus(b) { - $("#updateContainer").hide(); - $("#updateContainer").html('' + b + "
    Click to reload
    "); - $("#updateContainer").fadeIn("slow"); - $("#reloadModal").click(function() { - location.reload(); - }); - $("#updateDismiss").click(function() { - $("#updateContainer").fadeOut("slow"); - }); + + +function setStatus($message) { + $('#updateContainer').hide(); + $('#updateContainer').html("" + + "" + $message + "
    " + + "
    Click to reload
    "); + $('#updateContainer').fadeIn("slow"); + $('#reloadModal').click(function() { + location.reload(); + }); + $('#updateDismiss').click(function() { + $('#updateContainer').fadeOut('slow'); + }); } + + +// Find apps with a scale setting that is more or less than 100%, then re-scale it to the desired setting using scaleContent(selector, scale) function scaleFrames() { - $(".cd-tabs-content").find("li").each(function(b) { - content = $(this).attr("data-content"); - scale = $(this).attr("data-scale"); - $("#" + content + '-scale option[value="' + scale + '"]').attr("selected", "selected"); - "1" !== scale && scaleContent(content, scale); - }); + $('.cd-tabs-content').find('li').each(function(value) { + content = $(this).attr('data-content'); + scale = $(this).attr('data-scale'); + // Mark the scale we are currently using, on the settings modal + $('#' + content + '-scale option[value="' + scale + '"]').attr('selected', 'selected'); + // If scale is set to something other than 1, rescale it to what's stored in settings. + if (scale !== "1") { + scaleContent(content, scale); + } + }) } -function changeFavicon(b) { - document.head = document.head || document.getElementsByTagName("head")[0]; - var c = document.createElement("link"), a = document.getElementById("dynamic-favicon"); - c.id = "dynamic-favicon"; - c.rel = "shortcut icon"; - c.href = b; - a && document.head.removeChild(a); - document.head.appendChild(c); +// Like the name implies, it changes the favicon to whatever +// url is passed to it +function changeFavicon(src) { + document.head = document.head || document.getElementsByTagName('head')[0]; + var link = document.createElement('link'), + oldLink = document.getElementById('dynamic-favicon'); + link.id = 'dynamic-favicon'; + link.rel = 'shortcut icon'; + link.href = src; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); } -function htmlDecode(b) { - return $("
    ").html(b).text(); + +// Wrap a html-encoded string in a div (in-memory) and read it back, unencoded. +function htmlDecode(value) { + return $('
    ').html(value).text(); } -function getsupportedprop(b) { - for (var c = document.documentElement, a = 0;a < b.length;a++) { - if (b[a] in c.style) { - return b[a]; - } - } -} -; \ No newline at end of file + +// This fetches the browser-appropriate box-shadow value so we can set it + function getsupportedprop(proparray) { + var root = document.documentElement //reference root element of document + for (var i = 0; i < proparray.length; i++) { //loop through possible properties + if (proparray[i] in root.style) { //if property exists on element (value will be string, empty string if not set) + return proparray[i] //return that string + } + } + } \ No newline at end of file diff --git a/js/login.js b/js/login.js index 9c1e798..62bc478 100644 --- a/js/login.js +++ b/js/login.js @@ -1,27 +1,34 @@ -$(document).ready(function() { - $(".wrapper").animate({top:"10%"}, 300, "easeInOutElastic", function() { - $(".logo").delay(1200).slideDown(400, "easeInOutElastic"); - $(".login0").delay(1E3).slideDown(400, "easeInOutElastic"); - $(".login1").delay(1100).slideDown(400, "easeInOutElastic"); - $(".login2").delay(1200).slideDown(400, "easeInOutElastic"); - $(".login3").delay(1300).slideDown(400, "easeInOutElastic"); - }); -}); -function setBarColors() { - var a = rgb2hex($(".logo path").css("fill")); - $(".droidtheme").replaceWith(''); - $(".mstheme").replaceWith(''); - $(".iostheme").replaceWith(''); -} -setTimeout(setBarColors, 1650); -function rgb2hex(a) { - if (-1 == a.search("rgb")) { - return a; - } - var b = function(a) { - return ("0" + parseInt(a).toString(16)).slice(-2); - }; - a = a.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/); - return "#" + b(a[1]) + b(a[2]) + b(a[3]); -} -; \ No newline at end of file +$(document).ready(function() { + $('.wrapper').animate({ + top: "10%" + }, 300, 'easeInOutElastic', function() { + $('.logo').delay(1200).slideDown(400, 'easeInOutElastic'); + $('.login0').delay(1000).slideDown(400, 'easeInOutElastic'); + $('.login1').delay(1100).slideDown(400, 'easeInOutElastic'); + $('.login2').delay(1200).slideDown(400, 'easeInOutElastic'); + $('.login3').delay(1300).slideDown(400, 'easeInOutElastic'); + // Animation complete. + }); +}); + + +function setBarColors() { + var color = rgb2hex($('.logo path').css("fill")); + $('.droidtheme').replaceWith(''); + $('.mstheme').replaceWith(''); + $('.iostheme').replaceWith(''); +}setTimeout(setBarColors, 1650); + + +function rgb2hex(rgb) { + if ( rgb.search("rgb") == -1 ) { + return rgb; + } else { + rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/); + function hex(x) { + return ("0" + parseInt(x).toString(16)).slice(-2); + } + return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]); + } +} + diff --git a/js/main.js b/js/main.js index 4ab3b52..4c296ee 100644 --- a/js/main.js +++ b/js/main.js @@ -1,176 +1,283 @@ var boxshadowprop, branch, tabColor, isMobile, overrideMobile, hasDrawer, color, themeColor, tabs, activeTitle; -jQuery(document).ready(function(a) { - a.extend(a.expr[":"], {containsInsensitive:function(a, c, e, k) { - return 0 <= (a.textContent || a.innerText || "").toLowerCase().indexOf((e[3] || "").toLowerCase()); - }}); - branch = a("#branch-data").attr("data"); - hasDrawer = "true" == a("#drawer").attr("data"); - tabColor = "true" == a("#tabcolor").attr("data"); - themeColor = a("#themeColor-data").attr("data"); - authentication = a("#authentication-data").attr("data"); - tabs = a(".cd-tabs"); - activeTitle = a("li .selected").attr("data-title"); - getSecret(); - muximuxMobileResize(); - a("#override").css("display", isMobile ? "block" : "none"); - a(".inputdiv").css("display", authentication ? "block" : "none"); - overrideMobile = !1; - setTitle(activeTitle); - boxshadowprop = getsupportedprop(["boxShadow", "MozBoxShadow", "WebkitBoxShadow"]); - a(".drop-nav").toggleClass("hide-nav"); - tabs.each(function() { - var b = a(this), c = b.find("ul.cd-tabs-navigation, .main-nav"), e = b.children("ul.cd-tabs-content"), b = b.find("nav"); - c.on("click", "a:not(#reload, #hamburger, #override, #logout,#log)", function(b) { - isMobile || (a(".drop-nav").addClass("hide-nav"), a(".drop-nav").removeClass("show-nav")); - resizeIframe(hasDrawer, isMobile); - b.preventDefault(); - b = a(this); - color = tabColor ? b.attr("data-color") : themeColor; - if (!b.hasClass("selected")) { - var f = b.data("content"), d = e.find('li[data-content="' + f + '"]'), f = d.innerHeight(); - b.dblclick(function() { - d.children("iframe").attr("src", d.children("iframe").attr("src")); - }); - var g = d.children("iframe").attr("src"), h = d.children("iframe").data("src"); - void 0 !== g && "" !== g || d.children("iframe").attr("src", h); - "Settings" != b.attr("data-title") && (clearColors(), c.find("a.selected").removeClass("selected"), b.addClass("selected"), setSelectedColor(), b = b.attr("data-title"), setTitle(b), d.addClass("selected").siblings("li").removeClass("selected"), e.animate({height:f}, 200)); - } - }); - checkScrolling(b); - b.on("scroll", function() { - checkScrolling(a(this)); - }); - }); - a("li.dd").on("click", function() { - toggleClasses(); - }); - a("#reload").on("click", function() { - a(".fa-refresh").addClass("fa-spin"); - setTimeout(function() { - a(".fa-refresh").removeClass("fa-spin"); - }, 3900); - var b = a(".cd-tabs-content").find(".selected").children("iframe"); - b.attr("src", b.attr("src")); - }); - a("#override").on("click", function() { - overrideMobile = !overrideMobile; - muximuxMobileResize(); - overrideMobile && isMobile ? a("#override").addClass("or-active") : a("#override").removeClass("or-active"); - }); - a("#authenticationCheckbox").click(function() { - a(this).is(":checked") ? a(".inputdiv").slideDown("fast") : a(".inputdiv").slideUp("fast"); - }); - a("#logout").click(function() { - window.location.href = "?logout"; - }); - a("#settingsModal").on("show.bs.modal", function() { - setTitle("Settings"); - }); - a("#settingsModal").on("hidden.bs.modal", function() { - var b = a(".cd-tabs-content").find(".selected").children("iframe").attr("data-title"); - setTitle(b); - }); - a("#logModal").on("hidden.bs.modal", function() { - var b = a(".cd-tabs-content").find(".selected").children("iframe").attr("data-title"); - setTitle(b); - }); - a(window).on("resize", function() { - tabs.each(function() { - var b = a(this); - checkScrolling(b.find("nav")); - b.find(".cd-tabs-content").css("height", "auto"); - }); - resizeIframe(hasDrawer, isMobile); - scaleFrames(); - }); - a(".dd").click(function() { - dropDownFixPosition(a(".dd"), a(".drop-nav")); - }); - a("#autohideCheckbox").click(function() { - a("#mobileoverrideCheckbox").prop("checked", !1); - }); - a("#mobileoverrideCheckbox").click(function() { - a("#autohideCheckbox").prop("checked", !1); - }); - a(".dd").mouseleave(function() { - 0 == a(".drop-nav:hover").length && 0 == a(".dd:hover").length && (timeoutId = setTimeout(function() { - a(".drop-nav").addClass("hide-nav"); - a(".drop-nav").removeClass("show-nav"); - }, 500)); - }); - jQuery.fn.reverse = [].reverse; - a(".drawerItem").mouseleave(function() { - a(".drawerItem").removeClass("full"); - }); - a(".drawerItem").mouseenter(function() { - a(".drawerItem").addClass("full"); - }); - settingsEventHandlers(); - scaleFrames(); - resizeIframe(hasDrawer, isMobile); - initIconPicker(".iconpicker"); - if (a(location).attr("hash")) { - var c = a(location).attr("hash").substr(1).replace("%20", " ").replace("_", " "); - a(document).find('a:containsInsensitive("' + c + '")').trigger("click"); - } - a("#tabcolorCheckbox").prop("checked") ? (a(".appsColor").show(), a(".generalColor").hide()) : (a(".appsColor").hide(), a(".generalColor").show()); - a("#settingsLogo").click(function() { - window.open("https://github.com/mescon/Muximux", "_blank"); - }); +jQuery(document).ready(function($) { + // Custom function to do case-insensitive selector matching + $.extend($.expr[":"], { + "containsInsensitive": function(elem, i, match, array) { + return (elem.textContent || elem.innerText || "").toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0; + } + }); + branch = $("#branch-data").attr('data'); + hasDrawer = ($('#drawer').attr('data') == 'true'); + tabColor = ($("#tabcolor").attr('data') == 'true'); + themeColor = $('#themeColor-data').attr("data"); + authentication = $('#authentication-data').attr("data"); + tabs = $('.cd-tabs'); + activeTitle = $('li .selected').attr("data-title"); + getSecret(); + muximuxMobileResize(); + $('#override').css('display', (isMobile ? 'block' : 'none')); + $('.inputdiv').css('display',(authentication ? 'block' : 'none')); + overrideMobile = false; + setTitle(activeTitle); + //get appropriate CSS3 box-shadow property + boxshadowprop = getsupportedprop(['boxShadow', 'MozBoxShadow', 'WebkitBoxShadow']) + //Hide the nav to start + $('.drop-nav').toggleClass('hide-nav'); + tabs.each(function() { + var tab = $(this), + tabItems = tab.find('ul.cd-tabs-navigation, .main-nav'), + tabContentWrapper = tab.children('ul.cd-tabs-content'), + tabNavigation = tab.find('nav'); + tabItems.on('click', 'a:not(#reload, #hamburger, #override, #logout)', function(event) { + // Set up menu for desktip view + if (!isMobile) { + $('.drop-nav').addClass('hide-nav'); + $('.drop-nav').removeClass('show-nav'); + } + resizeIframe(hasDrawer, isMobile); // Call resizeIframe when document is ready + event.preventDefault(); + var selectedItem = $(this); + if (tabColor) { + color = selectedItem.attr("data-color"); + } else { + color = themeColor; + } + if (!selectedItem.hasClass('selected')) { + var selectedTab = selectedItem.data('content'), + selectedContent = tabContentWrapper.find('li[data-content="' + selectedTab + '"]'), + selectedContentHeight = selectedContent.innerHeight(); + selectedItem.dblclick(function() { + selectedContent.children('iframe').attr('src', selectedContent.children('iframe').attr('src')); + }); + var sifsrc = selectedContent.children('iframe').attr('src'); + var srcUrl = selectedContent.children('iframe').data('src'); + if (sifsrc === undefined || sifsrc === "") { + selectedContent.children('iframe').attr('src', srcUrl); + } + // Fix issue with color not resetting on settings close + if (!(selectedItem.attr("data-title") == "Settings")) { + clearColors(); + tabItems.find('a.selected').removeClass('selected'); + selectedItem.addClass('selected'); + setSelectedColor(); + // Change window title after class "selected" has been added to item + var activeTitle = selectedItem.attr("data-title"); + setTitle(activeTitle); + selectedContent.addClass('selected').siblings('li').removeClass('selected'); + // animate tabContentWrapper height when content changes + tabContentWrapper.animate({ + 'height': selectedContentHeight + }, 200); + } + } + }); + // hide the .cd-tabs::after element when tabbed navigation has scrolled to the end (mobile version) + checkScrolling(tabNavigation); + tabNavigation.on('scroll', function() { + checkScrolling($(this)); + }); + }); + $('li.dd').on('click', function() { + toggleClasses(); + }); + + $('#reload').on('click', function() { + $('.fa-refresh').addClass('fa-spin'); + setTimeout(function() { + $('.fa-refresh').removeClass('fa-spin'); + }, 3900); + var selectedFrame = $('.cd-tabs-content').find('.selected').children('iframe'); + selectedFrame.attr('src', selectedFrame.attr('src')); + }); + // Detect click on override button, fire resize + $('#override').on('click', function() { + overrideMobile = !overrideMobile; + muximuxMobileResize(); + if (overrideMobile && isMobile) { + $('#override').addClass('or-active'); + } else { + $('#override').removeClass('or-active'); + } + }); + $("#authenticationCheckbox").click(function() { + // this function will get executed every time the #home element is clicked (or tab-spacebar changed) + if ($(this).is(":checked")) // "this" refers to the element that fired the event + { + $('.inputdiv').slideDown('fast'); + } else { + $('.inputdiv').slideUp('fast'); + } + }); + $("#logout").click(function() { + window.location.href = '?logout'; + }); + // When settings modal is open, set title to "Settings" + $('#settingsModal').on('show.bs.modal', function() { + setTitle("Settings"); + }); + // When settings modal closes, set title to the previous title used + $('#settingsModal').on('hidden.bs.modal', function() { + var activeTitle = $('.cd-tabs-content').find('.selected').children('iframe').attr("data-title"); + setTitle(activeTitle); + }); + $(window).on('resize', function() { + tabs.each(function() { + var tab = $(this); + checkScrolling(tab.find('nav')); + tab.find('.cd-tabs-content').css('height', 'auto'); + }); + resizeIframe(hasDrawer, isMobile); // Resize iframes when window is resized. + scaleFrames(); // Scale frames when window is resized. + }); + $('.dd').click(function() { + dropDownFixPosition($('.dd'), $('.drop-nav')); + }); + $('#autohideCheckbox').click(function() { + $('#mobileoverrideCheckbox').prop('checked', false); + }); + $('#mobileoverrideCheckbox').click(function() { + $('#autohideCheckbox').prop('checked', false); + }); + // This triggers a menu close when mouse has left the drop nav. + $('.dd').mouseleave(function() { + if (!($('.drop-nav:hover').length != 0 || $('.dd:hover').length != 0)) { + timeoutId = setTimeout(function() { + $('.drop-nav').addClass('hide-nav'); + $('.drop-nav').removeClass('show-nav'); + }, 500); + } + }); + jQuery.fn.reverse = [].reverse; + $('.drawerItem').mouseleave(function() { + $('.drawerItem').removeClass('full'); + }); + $('.drawerItem').mouseenter(function() { + $('.drawerItem').addClass('full'); + }); + // Move items to the dropdown on mobile devices + settingsEventHandlers(); + scaleFrames(); + resizeIframe(hasDrawer, isMobile); // Call resizeIframe when document is ready + initIconPicker('.iconpicker'); + // Load the menu item that is set in URL, for example http://site.com/#plexpy + if ($(location).attr('hash')) { + var bookmarkHash = $(location).attr('hash').substr(1).replace("%20", " ").replace("_", " "); + var menuItem = $(document).find('a:containsInsensitive("' + bookmarkHash + '")'); + menuItem.trigger("click"); + } + if ($('#tabcolorCheckbox').prop('checked')) { + $('.appsColor').show(); + $('.generalColor').hide(); + } else { + $('.appsColor').hide(); + $('.generalColor').show(); + } + + $('#settingsLogo').click(function(){ + window.open('https://github.com/mescon/Muximux', '_blank'); + }); + + }); + $(window).load(function() { - "true" == $("#popupdate").attr("data") && setInterval(updateBox(!1), 6E5); + if ($('#popupdate').attr('data') == 'true') { + var updateCheck = setInterval(updateBox(false), 1000 * 60 * 10); + } }); -$("html").on("keyup", function(a) { - 27 !== a.keyCode || $("#modal-dialog").hasClass("no-display") || $(".close").trigger("click"); +// Close modal on escape key +$("html").on("keyup", function(e) { + if(e.keyCode === 27 && !($('#modal-dialog').hasClass("no-display"))) + $('.close').trigger("click"); }); +// When user closes the page, create new unique ID in secret.txt so that the token is no longer valid if used after page load. $(window).unload(function() { - var a = $("#secret").attr("data"); - $.ajax({async:!0, dataType:"text", url:"muximux.php?secret=" + a + "&set=secret", type:"GET"}); + var secret = $("#secret").attr('data'); + $.ajax({ + async: true, + dataType: 'text', + url: "muximux.php?secret=" + secret + "&set=secret", + type: 'GET' + }); }); $(window).resize(muximuxMobileResize); + function muximuxMobileResize() { - isMobile = 800 > $(window).width(); - $("#override").css("display", isMobile ? "block" : "none"); - if (isMobile && !overrideMobile) { - $(".cd-tabs-navigation nav").children().appendTo(".drop-nav"); - var a = .8 * $(window).height(); - $(".drop-nav").css("max-height", a + "px"); - } else { - $(".drop-nav").children(".cd-tab").appendTo(".cd-tabs-navigation nav"); - $(".drop-nav").css("max-height", ""); - var c = 0; - $(".cd-tab").each(function() { - var a = $(this).attr("data-index"); - $(this).width() + c > $(window).width() - $(".main-nav").width() ? $(".drop-nav").insertAt(a, this) : $(".cd-tabs-navigation nav").insertAt(a, this); - c += $(this).width(); - }); - } - clearColors(); - setSelectedColor(); + isMobile = ($(window).width() < 800); + $('#override').css('display', (isMobile ? 'block' : 'none')); + if (isMobile && !overrideMobile) { + $('.cd-tabs-navigation nav').children().appendTo(".drop-nav"); + var menuHeight = $(window).height() * .80; + $('.drop-nav').css('max-height', menuHeight + 'px'); + } else { + $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); + $('.drop-nav').css('max-height', ''); + var listWidth = 0; + $('.cd-tab').each(function() { + var myIndex = $(this).attr('data-index'); + var myWidth = $(this).width(); + if (myWidth + listWidth > $(window).width() - $(".main-nav").width()) { + $(".drop-nav").insertAt(myIndex,this); + } else { + $('.cd-tabs-navigation nav').insertAt(myIndex,this); + } + listWidth = listWidth + $(this).width(); + }); + } + clearColors(); + setSelectedColor(); } -jQuery.fn.insertAt = function(a, c) { - var b = this.children().size(); - 0 > a && (a = Math.max(0, b + 1 + a)); - this.append(c); - a < b && this.children().eq(a).before(this.children().last()); + +// Insert an element at a specific point in a div. +jQuery.fn.insertAt = function(index, element) { + var lastIndex = this.children().size() + if (index < 0) { + index = Math.max(0, lastIndex + 1 + index) + } + this.append(element) + if (index < lastIndex) { + this.children().eq(index).before(this.children().last()) + } return this; -}; +} + +// Simple method to toggle show/hide classes in navigation function toggleClasses() { - $(".drop-nav").toggleClass("hide-nav"); - $(".drop-nav").toggleClass("show-nav"); + $('.drop-nav').toggleClass('hide-nav'); + $('.drop-nav').toggleClass('show-nav'); } +// Clear color values from tabs function clearColors() { - $(".selected").children("span").css("color", ""); - $(".selected").css("color", ""); - $(".selected").css("Box-Shadow", ""); + $(".selected").children("span").css("color", ""); + $(".selected").css("color", ""); + $(".selected").css("Box-Shadow", ""); } +// Add relevant color value to tabs +// Refactor to a more appropriate name function setSelectedColor() { - color = tabColor ? $("li .selected").attr("data-color") : themeColor; - $(".droidtheme").replaceWith(''); - $(".mstheme").replaceWith(''); - $(".iostheme").replaceWith(''); - isMobile && !overrideMobile ? ($(".cd-tabs-bar").removeClass("drawer"), $(".cd-tab").removeClass("drawerItem"), $(".navbtn").removeClass("drawerItem"), $(".cd-tabs-bar").removeClass("drawerItem"), $(".selected").children("span").css("color", "" + color + ""), $(".selected").css("color", "" + color + "")) : ($(".selected").css("Box-Shadow", "inset 0 5px 0 " + color + ""), hasDrawer ? ($(".cd-tab").addClass("drawerItem"), $(".navbtn").addClass("drawerItem"), $(".cd-tabs-bar").addClass("drawerItem")) : - ($(".cd-tab").removeClass("drawerItem"), $(".navbtn").removeClass("drawerItem"), $(".cd-tabs-bar").removeClass("drawerItem"))); -} -; \ No newline at end of file + color = (tabColor ? $('li .selected').attr("data-color") : themeColor); + $('.droidtheme').replaceWith(''); + $('.mstheme').replaceWith(''); + $('.iostheme').replaceWith(''); + + if (isMobile && !overrideMobile) { + $(".cd-tabs-bar").removeClass("drawer"); + $('.cd-tab').removeClass('drawerItem'); + $('.navbtn').removeClass('drawerItem'); + $('.cd-tabs-bar').removeClass('drawerItem'); + $(".selected").children("span").css("color", "" + color + ""); + $(".selected").css("color", "" + color + ""); + } else { + $(".selected").css("Box-Shadow", "inset 0 5px 0 " + color + ""); + // Super hacky, but we're refrencing a placeholder div to quickly see if we have a drawer + if (hasDrawer) { + $('.cd-tab').addClass('drawerItem'); + $('.navbtn').addClass('drawerItem'); + $('.cd-tabs-bar').addClass('drawerItem'); + } else { + $('.cd-tab').removeClass('drawerItem'); + $('.navbtn').removeClass('drawerItem'); + $('.cd-tabs-bar').removeClass('drawerItem'); + } + } +} \ No newline at end of file From db8ef6b6b8f1bebf3a97c761ae829357c609cc4a Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 13:49:32 -0600 Subject: [PATCH 085/170] Reset page title on ALL modal close Works for settings and log modal now. --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index 4c296ee..a6f3577 100644 --- a/js/main.js +++ b/js/main.js @@ -116,7 +116,7 @@ jQuery(document).ready(function($) { setTitle("Settings"); }); // When settings modal closes, set title to the previous title used - $('#settingsModal').on('hidden.bs.modal', function() { + $('.modal').on('hidden.bs.modal', function() { var activeTitle = $('.cd-tabs-content').find('.selected').children('iframe').attr("data-title"); setTitle(activeTitle); }); From 46cbde48f34bef313d09a5ffed47466471f71d9f Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 14:17:32 -0600 Subject: [PATCH 086/170] Fix Session Storage Update Frequency Session storage doesn't expire. So, the third variable we're sending in setItem is totally useless. We will set data to storage, set a cookie to indicate as such, and make IT expire. Check for that expired cookie to update JSON and session storage. --- js/functions.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9e2e97a..b6a5410 100644 --- a/js/functions.js +++ b/js/functions.js @@ -334,7 +334,8 @@ function setTitle(title) { } // Idea and implementation graciously borrowed from PlexPy (https://github.com/drzoidberg33/plexpy) function updateBox($force) { - if ((!sessionStorage.getItem('JSONData')) || ($force === true)) { + if ((!getCookie('hasJSON')) || ($force === true)) { + updateJson(); } json = JSON.parse(sessionStorage.getItem('JSONData')); @@ -372,7 +373,8 @@ function updateBox($force) { function updateJson() { $.getJSON(commitURL, function(result) { jsonString = JSON.stringify(result); - sessionStorage.setItem('JSONData',jsonString,0.00694444); + sessionStorage.setItem('JSONData',jsonString); + setCookie('hasJSON', 'true', 0.00694444); }); } From f1d01f45e96a4b0901f850033856b0ddec4b9f7e Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 15:04:09 -0600 Subject: [PATCH 087/170] Fixes, Refresh Log when opened, add manual Refresh button Always call combineify as a .php file. Add refresh button to log. Refresh log when opened. --- css/style.css | 2 +- index.php | 7 ++++--- js/functions.js | 18 +++++++++++++++++- js/main.js | 10 ++++++++++ login.php | 2 +- muximux.php | 9 ++++++++- 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/css/style.css b/css/style.css index 4e644c3..bbe538a 100644 --- a/css/style.css +++ b/css/style.css @@ -376,7 +376,7 @@ input[type='button'] { text-align: left; font-size: 16px; font-size: 1.6rem; - display: block; + display: none; } .logLine { diff --git a/index.php b/index.php index 755a5e4..6a50603 100644 --- a/index.php +++ b/index.php @@ -35,7 +35,7 @@ - + <?php echo getTitle(); ?> @@ -166,18 +166,19 @@
    - +
    +
    - + +
    '; $filename = 'muximux.log'; $handle = fopen($filename, "r"); @@ -932,7 +938,8 @@ function log_contents() { } fclose($handle); } - $out .= ' + $out .= '
    + '; return $out; } From f97b79f260bb78067a95df0bc0c8d68c3ebfb015 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 15:36:53 -0600 Subject: [PATCH 088/170] Fix Nav Buttons not hovering right with dropdown enabled Still don't know what to do if the user is mobile and they don't want the dropdown. I guess they get a big bar then. --- js/main.js | 30 +++++++++++++++++------------- muximux.php | 2 ++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/js/main.js b/js/main.js index 038b351..37365ef 100644 --- a/js/main.js +++ b/js/main.js @@ -9,6 +9,7 @@ jQuery(document).ready(function($) { branch = $("#branch-data").attr('data'); hasDrawer = ($('#drawer').attr('data') == 'true'); tabColor = ($("#tabcolor").attr('data') == 'true'); + dropDown = ($("#dropdown-data").attr('data') == 'true'); themeColor = $('#themeColor-data').attr("data"); authentication = $('#authentication-data').attr("data"); tabs = $('.cd-tabs'); @@ -220,19 +221,22 @@ function muximuxMobileResize() { var menuHeight = $(window).height() * .80; $('.drop-nav').css('max-height', menuHeight + 'px'); } else { - $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); - $('.drop-nav').css('max-height', ''); - var listWidth = 0; - $('.cd-tab').each(function() { - var myIndex = $(this).attr('data-index'); - var myWidth = $(this).width(); - if (myWidth + listWidth > $(window).width() - $(".main-nav").width()) { - $(".drop-nav").insertAt(myIndex,this); - } else { - $('.cd-tabs-navigation nav').insertAt(myIndex,this); - } - listWidth = listWidth + $(this).width(); - }); + if (dropDown) { + $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); + $(".cd-tabs-navigation nav").children('.navbtn').appendTo('.main-nav'); + $('.drop-nav').css('max-height', ''); + var listWidth = 0; + $('.cd-tab').each(function() { + var myIndex = $(this).attr('data-index'); + var myWidth = $(this).width(); + if (myWidth + listWidth > $(window).width() - $(".main-nav").width()) { + $(".drop-nav").insertAt(myIndex,this); + } else { + $('.cd-tabs-navigation nav').insertAt(myIndex,this); + } + listWidth = listWidth + $(this).width(); + }); + } } clearColors(); setSelectedColor(); diff --git a/muximux.php b/muximux.php index 0ca7c69..c253acd 100644 --- a/muximux.php +++ b/muximux.php @@ -614,6 +614,7 @@ function metaTags() { $branch = $config->get('general', 'branch', 'master'); $branchUrl = "https://api.github.com/repos/mescon/Muximux/commits?sha=" . $branch; $popupdate = var_export($config->getBool('general', 'updatepopup', true),true); + $enabledropdown = var_export($config->getBool('general', 'enabledropdown', true),true); $maintitle = $config->get('general', 'title', 'Muximux'); $tabcolor = var_export($config->getBool('general', 'tabcolor', false),true); $css = './css/theme/' . getTheme() . '.css'; @@ -629,6 +630,7 @@ function metaTags() { $branchChanged = (checkBranchChanged() ? 'true' : 'false'); $secret = file_get_contents(SECRET); $tags = " + From c9a7e0964927e8a67846248748a7577535946c1a Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 15:52:45 -0600 Subject: [PATCH 089/170] Make "Enable Dropdown" a Hidden Setting Remove UI element to enable/disable dropdown menu. If desired, it can be enabled by manually editing settings.ini.php and adding 'enabledropdown = "true"' to the Settings section. --- muximux.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/muximux.php b/muximux.php index c253acd..27c59e4 100644 --- a/muximux.php +++ b/muximux.php @@ -168,9 +168,6 @@ function parse_ini()
    - -
    @@ -347,7 +344,7 @@ function menuItems() { foreach ($config as $keyname => $section) { if (($keyname == "general")) { $autohide = $config->getBool('general', 'autohide', true); - $enabledropdown = $config->getBool('general', 'enabledropdown', false); + $enabledropdown = $config->getBool('settings', 'enabledropdown', true); $mobileoverride = $config->getBool('general', 'mobileoverride', false); $authentication = $config->getBool('general', 'authentication', false); } else { @@ -377,7 +374,7 @@ function menuItems() {
    • "; - } else if ($enabledropdown && $dropdown && $enabled) { + } else if ($dropdown && $enabled) { $dropdownmenu .= "
  • @@ -614,7 +611,7 @@ function metaTags() { $branch = $config->get('general', 'branch', 'master'); $branchUrl = "https://api.github.com/repos/mescon/Muximux/commits?sha=" . $branch; $popupdate = var_export($config->getBool('general', 'updatepopup', true),true); - $enabledropdown = var_export($config->getBool('general', 'enabledropdown', true),true); + $enabledropdown = var_export($config->getBool('settings', 'enabledropdown', true),true); $maintitle = $config->get('general', 'title', 'Muximux'); $tabcolor = var_export($config->getBool('general', 'tabcolor', false),true); $css = './css/theme/' . getTheme() . '.css'; From e0384c6e5e6e79b4b0a56156cbfff510ad1acaba Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 14 Dec 2016 16:11:30 -0600 Subject: [PATCH 090/170] Fix Landing Page Yeah, that was kind of a glaring issue. --- muximux.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/muximux.php b/muximux.php index 27c59e4..3f588a4 100644 --- a/muximux.php +++ b/muximux.php @@ -445,11 +445,6 @@ function menuItems() {
    • -
  • - - - -
    "; - + $splashScreen = $config->getBool('general', 'splashscreen', false); + $moButton = "
    • - + + +
      • +
    • + +
    • - +
    • - +
      • From 748b16307f8553a9938fe93e221a1fac3d537be1 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sat, 31 Dec 2016 15:43:34 -0600 Subject: [PATCH 147/170] Fix settings hide/show Forgot to check what it does when the setting isn't enabled by default. --- js/main.js | 9 +++++---- muximux.php | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/js/main.js b/js/main.js index 1007be6..468f153 100644 --- a/js/main.js +++ b/js/main.js @@ -36,6 +36,7 @@ jQuery(document).ready(function($) { if (showSplash) { if (!authentication) {$('#splashLogout').addClass('hidden');} if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssGroup').addClass('hidden');} + if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssUrlGroup').addClass('hidden');} if (!($("#rssCheckbox").is(":checked"))) {$('.rssUrlGroup').addClass('hidden');} $('#splashModal').modal('show'); @@ -160,9 +161,9 @@ jQuery(document).ready(function($) { // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { - $('.rssGroup').slideDown('fast'); + $('.rssGroup').removeClass('hidden'); } else { - $('.rssGroup').slideUp('fast'); + $('.rssGroup').addClass('hidden'); } }); @@ -170,9 +171,9 @@ jQuery(document).ready(function($) { // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { - $('.rssUrlGroup').slideDown('fast'); + $('.rssUrlGroup').removeClass('hidden'); } else { - $('.rssUrlGroup').slideUp('fast'); + $('.rssUrlGroup').addClass('hidden'); } }); diff --git a/muximux.php b/muximux.php index 0614633..3066dde 100644 --- a/muximux.php +++ b/muximux.php @@ -209,12 +209,12 @@ function parse_ini() -
      +
      -
      +
      From f9129fb60f2920b596f87777fb91b893f2d8a725 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sat, 31 Dec 2016 16:46:07 -0600 Subject: [PATCH 148/170] Use native Bootstrap call to show splash modal. It is a modal, after all. --- js/main.js | 6 ------ muximux.php | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/js/main.js b/js/main.js index 468f153..6f059f9 100644 --- a/js/main.js +++ b/js/main.js @@ -140,12 +140,6 @@ jQuery(document).ready(function($) { } else { $('#override').removeClass('or-active'); } - }); - - $('#showSplash').on('click', function() { - $('#splashModal').modal('show'); - - }); $("#authenticationCheckbox").click(function() { diff --git a/muximux.php b/muximux.php index 3066dde..ef3f489 100644 --- a/muximux.php +++ b/muximux.php @@ -571,8 +571,8 @@ function menuItems() {
    • - - + +
      • From 1e2024c119ac07efcc87737b00ad78c5abad6f0c Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Sun, 1 Jan 2017 12:09:02 -0600 Subject: [PATCH 149/170] Checkbox logic is hard... If this is unchecked, then do that, but only if that is checked... --- js/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/main.js b/js/main.js index 6f059f9..c8d0722 100644 --- a/js/main.js +++ b/js/main.js @@ -157,7 +157,10 @@ jQuery(document).ready(function($) { { $('.rssGroup').removeClass('hidden'); } else { + $('#rssCheckbox').attr('checked', false); $('.rssGroup').addClass('hidden'); + $('.rssUrlGroup').addClass('hidden'); + } }); From 76da1e44c2d4a535e504ecaa5277936d0e9f059d Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 2 Jan 2017 10:58:05 -0600 Subject: [PATCH 150/170] Add Mobile Bar and RSS Ticker to Splash When in Mobile mode, display a bar on the splash screen with the mobile nav buttons. Convert RSS div to UL that can be leveraged by jquery webticker. Make the whole thing responsive (that was fun). --- css/style.css | 78 +++++++++++++++++++++++++++++++++++++- index.php | 10 ++--- js/functions.js | 61 +++++++++++++++++++---------- js/jquery.webticker.min.js | 1 + js/main.js | 57 +++++++++++++++++++++------- muximux.php | 4 +- 6 files changed, 170 insertions(+), 41 deletions(-) create mode 100644 js/jquery.webticker.min.js diff --git a/css/style.css b/css/style.css index fb04c39..8200ccc 100644 --- a/css/style.css +++ b/css/style.css @@ -531,12 +531,86 @@ input[type='button'] { @media screen and (max-width: 800px) { .splashHeader { - height: 100%; + width: 100%; + border-radius: 5px; + height: 40px; + padding: 0px; + position: absolute; + } + + .feedWrapper { + padding: 0px; + height: 40px; + + } + + .TickerNews { + width: 100%; + height: 50px; + line-height: 48px; + } + + .ti_wrapper { + width: 100%; + float: left; + height: 40px; + position: relative; + overflow: hidden; + } + + .ti_slide{ + width: 100%; + position: relative; + left: 0; + top: 0; + } + + .ti_content{ + width: 8000px; + position: relative; + float:left; + height: 40px; + + } + + .splashHeader .logo { display: none; } + #splashContainer { - padding: 30px 10px 30px 10px; + padding: 42px 10px 30px 10px; + } + + .TickerNews { + width: 70%; + } + + #splashNav { + position: relative; + display: inline-block; + margin: 0; + width: auto; + bottom: 40px; + float: right; + } + + .btn-lg { + padding: 6px 12px !important; + } + +} + +@keyframes slide { + 0% { + margin-left: 0px; + } + 50% { + margin-left: -100px; + } + 100% { + margin-left: -200px; + } } .splashDialog { diff --git a/index.php b/index.php index 8a26333..eac8045 100644 --- a/index.php +++ b/index.php @@ -37,8 +37,7 @@ - - <?php echo getTitle(); ?> + <?php echo getTitle(); ?> @@ -299,8 +298,9 @@ -
      -
      +
      +
      +
      @@ -321,7 +321,7 @@
      - + ').html(value).text(); } - // This fetches the browser-appropriate box-shadow value so we can set it function getsupportedprop(proparray) { var root = document.documentElement //reference root element of document @@ -587,24 +586,48 @@ function getsupportedprop(proparray) { // Shhh, we just won't mention this is here for now -function setupFeed(url) { +function setupFeed(url, isMobile) { + $('#feed').rssfeed(url, { + ssl: true, + limit: 20, + showerror: true, + errormsg: '', + tags: true, + date: true, + dateformat: 'spellmonth', + titletag: 'h4', + content: (isMobile ? false : true), + image: (isMobile ? false : true), + snippet: true, + snippetlimit: 120, + linktarget: '_blank' + }, function () { + isMobile = ($(window).width() < 800); + if (isMobile) { + setupMobileTicker(); + } else { + $('#webTicker').removeAttr('style'); + $('.ti_wrapper').removeAttr('style'); + } + + }); -$('#feed').rssfeed(url, { - ssl: true, - limit: 20, - showerror: true, - errormsg: '', - tags: true, - date: true, - dateformat: 'spellmonth', - titletag: 'h4', - content: true, - image: true, - snippet: true, - snippetlimit: 120, - linktarget: '_blank' -}, function () { - // optional callback function -}); +} +// Convert the classes created by our RSS plugin to be usable by the ticker plugin +function setupMobileTicker() { + $('.entryWrapper').addClass('ti_news'); + $('#feed').addClass('ti_content'); + //$('#feed .entryTitle').contents().unwrap(); + $('#feed .entryWrapper').wrap('
    • ').contents().unwrap(); + $('#feed').wrap('
        ').contents().unwrap(); + var adjustWidth = $(window).width() - $('#splashNav').width(); + $('#webTicker').width(adjustWidth); + $('.ti_wrapper').width(adjustWidth); + $('#webTicker').webTicker({ + height:'40px', + duplicate:true, + rssfrequency:0, + startEmpty:true + }); } \ No newline at end of file diff --git a/js/jquery.webticker.min.js b/js/jquery.webticker.min.js new file mode 100644 index 0000000..fdb81e1 --- /dev/null +++ b/js/jquery.webticker.min.js @@ -0,0 +1 @@ +!function(i){function t(t){var e=0;return t.children("li").each(function(){e+=i(this).outerWidth(!0)}),e}function e(t){return Math.max.apply(Math,t.children().map(function(){return i(this).width()}).get())}function s(i){var t=i.data("settings")||{direction:"left",speed:50},e=i.children().first(),s=Math.abs(-i.css(t.direction).replace("px","").replace("auto","0")-e.outerWidth(!0)),n=1e3*s/t.speed,r={};return r[t.direction]=i.css(t.direction).replace("px","").replace("auto","0")-s,{css:r,time:n}}function n(i){var t=i.data("settings")||{direction:"left"};i.css("transition-duration","0s").css(t.direction,"0");var e=i.children().first();e.hasClass("webticker-init")?e.remove():i.children().last().after(e)}function r(i,t){var e=i.data("settings")||{direction:"left"};"undefined"==typeof t&&(t=!1),t&&n(i);var a=s(i);i.animate(a.css,a.time,"linear",function(){i.css(e.direction,"0"),r(i,!0)})}function a(i,t){"undefined"==typeof t&&(t=!1),t&&n(i);var e=s(i),r=e.time/1e3;r+="s",i.css(e.css).css("transition-duration",r)}function c(t,e,s){var n=[];i.get(t,function(t){var r=i(t);r.find("item").each(function(){var t=i(this),e={title:t.find("title").text(),link:t.find("link").text()},s='
      • '+e.title+"
        • ";n+=s}),s.webTicker("update",n,e)})}function l(s,n){if(s.children("li").length<1)return window.console,!1;var r=s.data("settings");r.duplicateLoops=r.duplicateLoops||0,s.width("auto");var a=0;s.children("li").each(function(){a+=i(this).outerWidth(!0)});var c,l=s.find("li:first").height();if(r.duplicate){c=e(s);for(var o=0;a-c0?s.find(".ticker-spacer").width(h):s.append('
      • ')}r.startEmpty&&n&&s.prepend('
      • '),a=0,a=t(s),s.width(a+200);var f=0;for(f=t(s);f>=s.width();)s.width(s.width()+200),f=0,f=t(s);return!0}var o=function(){var i=document.createElement("p").style,t=["ms","O","Moz","Webkit"];if(""===i.transition)return!0;for(;t.length;)if(t.pop()+"Transition"in i)return!0;return!1}(),d={init:function(t){return t=jQuery.extend({speed:50,direction:"left",moving:!0,startEmpty:!0,duplicate:!1,rssurl:!1,hoverpause:!0,rssfrequency:0,updatetype:"reset",transition:"linear",height:"30px",maskleft:"",maskright:"",maskwidth:0},t),this.each(function(){jQuery(this).data("settings",t);var e=jQuery(this),s=e.wrap('
        ');s.after('  ');var n,d=e.parent().wrap('
        ');if(i(window).resize(function(){clearTimeout(n),n=setTimeout(function(){console.log("window was resized"),l(e,!1)},500)}),e.children("li").css("white-space","nowrap"),e.children("li").css("float",t.direction),e.children("li").css("padding","0 7px"),e.children("li").css("line-height",t.height),s.css("position","relative"),s.css("overflow","hidden"),e.closest(".tickercontainer").css("height",t.height),e.closest(".tickercontainer").css("overflow","hidden"),e.css("float",t.direction),e.css("position","relative"),e.css("font","bold 10px Verdana"),e.css("list-style-type","none"),e.css("margin","0"),e.css("padding","0"),""!==t.maskleft&&""!==t.maskright){var h='url("'+t.maskleft+'")';d.find(".tickeroverlay-left").css("background-image",h),d.find(".tickeroverlay-left").css("display","block"),d.find(".tickeroverlay-left").css("pointer-events","none"),d.find(".tickeroverlay-left").css("position","absolute"),d.find(".tickeroverlay-left").css("z-index","30"),d.find(".tickeroverlay-left").css("height",t.height),d.find(".tickeroverlay-left").css("width",t.maskwidth),d.find(".tickeroverlay-left").css("top","0"),d.find(".tickeroverlay-left").css("left","-2px"),h='url("'+t.maskright+'")',d.find(".tickeroverlay-right").css("background-image",h),d.find(".tickeroverlay-right").css("display","block"),d.find(".tickeroverlay-right").css("pointer-events","none"),d.find(".tickeroverlay-right").css("position","absolute"),d.find(".tickeroverlay-right").css("z-index","30"),d.find(".tickeroverlay-right").css("height",t.height),d.find(".tickeroverlay-right").css("width",t.maskwidth),d.find(".tickeroverlay-right").css("top","0"),d.find(".tickeroverlay-right").css("right","-2px")}else d.find(".tickeroverlay-left").css("display","none"),d.find(".tickeroverlay-right").css("display","none");e.children("li").last().addClass("last");var f=l(e,!0);t.rssurl&&(c(t.rssurl,t.type,e),t.rssfrequency>0&&window.setInterval(function(){c(t.rssurl,t.type,e)},1e3*t.rssfrequency*60)),o?(e.css("transition-timing-function",t.transition),e.css("transition-duration","0s").css(t.direction,"0"),f&&a(e,!1),e.on("transitionend webkitTransitionEnd oTransitionEnd otransitionend",function(t){return!!e.is(t.target)&&void a(i(this),!0)})):f&&r(i(this)),t.hoverpause&&e.hover(function(){if(o){var e=i(this).css(t.direction);i(this).css("transition-duration","0s").css(t.direction,e)}else jQuery(this).stop()},function(){jQuery(this).data("settings").moving&&(o?a(i(this),!1):r(e))})})},stop:function(){var t=i(this).data("settings");if(t.moving)return t.moving=!1,this.each(function(){if(o){var e=i(this).css(t.direction);i(this).css("transition-duration","0s").css(t.direction,e)}else i(this).stop()})},cont:function(){var t=i(this).data("settings");if(!t.moving)return t.moving=!0,this.each(function(){o?a(i(this),!1):r(i(this))})},transition:function(t){var e=i(this);o&&e.css("transition-timing-function",t)},update:function(e,s,n,r){s=s||"reset","undefined"==typeof n&&(n=!0),"undefined"==typeof r&&(r=!1),"string"==typeof e&&(e=i(e));var a=i(this);a.webTicker("stop");var c=i(this).data("settings");if("reset"===s)a.html(e),l(a,!0);else if("swap"===s){var o,d,h,f;if(window.console,a.children("li").length<1)a.html(e),a.css(c.direction,"0"),l(a,!0);else if(c.duplicate===!0){a.children("li").addClass("old");for(var p=e.length-1;p>=0;p--)o=i(e[p]).data("update"),d=a.find('[data-update="'+o+'"]'),d.length<1?n&&(0===a.find(".ticker-spacer:first-child").length&&a.find(".ticker-spacer").length>0?a.children("li.ticker-spacer").before(e[p]):(h=i(e[p]),p===e.length-1&&h.addClass("last"),a.find("last").after(h),a.find("last").removeClass("last"))):a.find('[data-update="'+o+'"]').replaceWith(e[p]);a.children("li.webticker-init, li.ticker-spacer").removeClass("old"),r&&a.children("li").remove(".old"),f=0,f=t(a),a.width(f+200),a.find("li.webticker-init").length<1&&(c.startEmpty=!1),a.html(e),a.children("li").css("white-space","nowrap"),a.children("li").css("float",c.direction),a.children("li").css("padding","0 7px"),a.children("li").css("line-height",c.height),l(a,!0)}else{a.children("li").addClass("old");for(var u=0;u0?a.children("li.ticker-spacer").before(e[u]):(h=i(e[u]),u===e.length-1&&h.addClass("last"),a.find(".old.last").after(h),a.find(".old.last").removeClass("last"))):a.find('[data-update="'+o+'"]').replaceWith(e[u]);a.children("li.webticker-init, li.ticker-spacer").removeClass("old"),a.children("li").css("white-space","nowrap"),a.children("li").css("float",c.direction),a.children("li").css("padding","0 7px"),a.children("li").css("line-height",c.height),r&&a.children("li").remove(".old"),f=0,f=t(a),a.width(f+200)}}a.webTicker("cont")}};i.fn.webTicker=function(t){return d[t]?d[t].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof t&&t?void i.error("Method "+t+" does not exist on jQuery.webTicker"):d.init.apply(this,arguments)}}(jQuery); \ No newline at end of file diff --git a/js/main.js b/js/main.js index c8d0722..1eb535a 100644 --- a/js/main.js +++ b/js/main.js @@ -20,11 +20,7 @@ jQuery(document).ready(function($) { dropDown = ($("#dropdown-data").attr('data') == 'true'); themeColor = $('#themeColor-data').attr("data"); authentication = ($('#authentication-data').attr("data") == 'true'); - rss = ($('#rss-data').attr("data") == 'true'); - if (rss) { - rssUrl = $('#rssUrl-data').attr("data"); - setupFeed(rssUrl); - } + splashNavBtnColor = $('.splashNavBtn').css('background'); overrideMobile = false; @@ -33,20 +29,27 @@ jQuery(document).ready(function($) { activeTitle = $('li .selected').attr("data-title"); getSecret(); $('.logo').find('path').css('fill',themeColor); - if (showSplash) { - if (!authentication) {$('#splashLogout').addClass('hidden');} - if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssGroup').addClass('hidden');} - if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssUrlGroup').addClass('hidden');} - if (!($("#rssCheckbox").is(":checked"))) {$('.rssUrlGroup').addClass('hidden');} - - $('#splashModal').modal('show'); - } + if (tabColor) { $('.colorDiv').show(); } else { $('.colorDiv').hide(); } muximuxMobileResize(); + if (showSplash) { + if (!authentication) {$('#splashLogout').addClass('hidden');} + if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssGroup').addClass('hidden');} + if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssUrlGroup').addClass('hidden');} + if (!($("#rssCheckbox").is(":checked"))) {$('.rssUrlGroup').addClass('hidden');} + $('#splashModal').modal('show'); + rss = ($('#rss-data').attr("data") == 'true'); + if (rss) { + rssUrl = $('#rssUrl-data').attr("data"); + setupFeed(rssUrl, isMobile); + + } + } + $('#override').css('display', (isMobile ? 'block' : 'none')); $('.inputdiv').css('display',(authentication ? 'block' : 'none')); setTitle(activeTitle); @@ -184,6 +187,24 @@ jQuery(document).ready(function($) { $("#splashLog").click(function() { $('#logModal').modal('show'); }); + + $('#splashModal').on('show.bs.modal', function () { + rss = ($('#rss-data').attr("data") == 'true'); + if (rss) { + rssUrl = $('#rssUrl-data').attr("data"); + setupFeed(rssUrl, isMobile); + } + }); + + $('#splashModal').on('hidden.bs.modal', function () { + rss = ($('#rss-data').attr("data") == 'true'); + if (rss) { + $('.tickercontainer').wrap('
        ').contents().unwrap(); + $('#feed').empty(); + + } + }); + $("#splashSettings").click(function() { setTimeout(function () { $('#settingsModal').modal('show'); @@ -299,15 +320,25 @@ $(window).unload(function() { type: 'GET' }); }); + $(window).resize(muximuxMobileResize); function muximuxMobileResize() { isMobile = ($(window).width() < 800); + rss = ($('#rss-data').attr("data") == 'true'); + if (rss) { + $('.tickercontainer').wrap('
        ').contents().unwrap(); + $('#feed').empty(); + rssUrl = $('#rssUrl-data').attr("data"); + setupFeed(rssUrl, isMobile); + } + $('#override').css('display', (isMobile ? 'block' : 'none')); if (isMobile && !overrideMobile) { $('.cd-tabs-navigation nav').children().appendTo(".drop-nav"); var menuHeight = $(window).height() * .80; $('.drop-nav').css('max-height', menuHeight + 'px'); + } else { if (dropDown) { $(".drop-nav").children('.cd-tab').appendTo('.cd-tabs-navigation nav'); diff --git a/muximux.php b/muximux.php index ef3f489..4c11fb0 100644 --- a/muximux.php +++ b/muximux.php @@ -571,8 +571,8 @@ function menuItems() {
      • - - + +
        • From ec0bb565c19ccb91094b5a9dbe75498d3d390f34 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 2 Jan 2017 11:09:25 -0600 Subject: [PATCH 151/170] Adjust the ticker's width after creation Make sure we have something to scale before scaling it. --- js/functions.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index d79019c..ad0c67c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -621,13 +621,13 @@ function setupMobileTicker() { //$('#feed .entryTitle').contents().unwrap(); $('#feed .entryWrapper').wrap('
      • ').contents().unwrap(); $('#feed').wrap('
          ').contents().unwrap(); - var adjustWidth = $(window).width() - $('#splashNav').width(); - $('#webTicker').width(adjustWidth); - $('.ti_wrapper').width(adjustWidth); $('#webTicker').webTicker({ height:'40px', duplicate:true, rssfrequency:0, startEmpty:true - }); + }); + var adjustWidth = $(window).width() - $('#splashNav').width(); + $('#webTicker').width(adjustWidth); + $('.ti_wrapper').width(adjustWidth); } \ No newline at end of file From b901acb80e46442d1177d6ea197df45748623854 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 2 Jan 2017 11:21:18 -0600 Subject: [PATCH 152/170] Create/Destroy RSS at the same time Destroying it on modal close doesn't seem to be 100% reliable. Calling it right before we set it up should work better. --- js/functions.js | 7 ++++--- js/main.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/js/functions.js b/js/functions.js index ad0c67c..63ac1e1 100644 --- a/js/functions.js +++ b/js/functions.js @@ -621,13 +621,14 @@ function setupMobileTicker() { //$('#feed .entryTitle').contents().unwrap(); $('#feed .entryWrapper').wrap('
        • ').contents().unwrap(); $('#feed').wrap('
            ').contents().unwrap(); + var adjustWidth = $(window).width() - $('#splashNav').width(); + $('#webTicker').width(adjustWidth); + $('.ti_wrapper').width(adjustWidth); $('#webTicker').webTicker({ height:'40px', duplicate:true, rssfrequency:0, startEmpty:true }); - var adjustWidth = $(window).width() - $('#splashNav').width(); - $('#webTicker').width(adjustWidth); - $('.ti_wrapper').width(adjustWidth); + } \ No newline at end of file diff --git a/js/main.js b/js/main.js index 1eb535a..560136d 100644 --- a/js/main.js +++ b/js/main.js @@ -192,15 +192,16 @@ jQuery(document).ready(function($) { rss = ($('#rss-data').attr("data") == 'true'); if (rss) { rssUrl = $('#rssUrl-data').attr("data"); - setupFeed(rssUrl, isMobile); + $('.tickercontainer').wrap('
            ').contents().unwrap(); + $('#feed').empty(); + setupFeed(rssUrl, isMobile); } }); $('#splashModal').on('hidden.bs.modal', function () { rss = ($('#rss-data').attr("data") == 'true'); if (rss) { - $('.tickercontainer').wrap('
            ').contents().unwrap(); - $('#feed').empty(); + } }); From 0da3d094d2187a15c3767fbbb0b3dfe00a48aa4f Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 2 Jan 2017 11:35:20 -0600 Subject: [PATCH 153/170] Fix spin animation for refresh button Needed to change the class name because it's now a muximux icon. --- js/main.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/js/main.js b/js/main.js index 560136d..3d5c3a7 100644 --- a/js/main.js +++ b/js/main.js @@ -127,9 +127,9 @@ jQuery(document).ready(function($) { }); $('#reload').on('click', function() { - $('.fa-refresh').addClass('fa-spin'); + $('.muximux-refresh').addClass('fa-spin'); setTimeout(function() { - $('.fa-refresh').removeClass('fa-spin'); + $('.muximux-refresh').removeClass('fa-spin'); }, 3900); var selectedFrame = $('.cd-tabs-content').find('.selected').children('iframe'); selectedFrame.attr('src', selectedFrame.attr('src')); @@ -198,13 +198,7 @@ jQuery(document).ready(function($) { } }); - $('#splashModal').on('hidden.bs.modal', function () { - rss = ($('#rss-data').attr("data") == 'true'); - if (rss) { - - - } - }); + $("#splashSettings").click(function() { setTimeout(function () { From 2275941c72c3bd96b4658cee6c2288fb19bc7308 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 2 Jan 2017 13:18:41 -0600 Subject: [PATCH 154/170] Unify Show/Hide of Settings Items Use slide animations for all show/hides. --- js/functions.js | 4 ++-- js/main.js | 19 ++++++++++++------- muximux.php | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/js/functions.js b/js/functions.js index 63ac1e1..3d15254 100644 --- a/js/functions.js +++ b/js/functions.js @@ -250,9 +250,9 @@ function settingsEventHandlers() { }); $('#tabcolorCheckbox').click(function(event) { if ($(this).prop('checked')) { - $('.colorDiv').toggle('slide', {direction: 'right'}, 200); + $('.colorDiv').slideDown('fast'); } else { - $('.colorDiv').toggle('slide', {direction: 'right'}, 200); + $('.colorDiv').slideUp('fast'); } }); diff --git a/js/main.js b/js/main.js index 3d5c3a7..b8064b7 100644 --- a/js/main.js +++ b/js/main.js @@ -37,6 +37,7 @@ jQuery(document).ready(function($) { } muximuxMobileResize(); if (showSplash) { + $('.rssGroup').show(); if (!authentication) {$('#splashLogout').addClass('hidden');} if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssGroup').addClass('hidden');} if (!($("#splashscreenCheckbox").is(":checked"))) {$('.rssUrlGroup').addClass('hidden');} @@ -46,9 +47,13 @@ jQuery(document).ready(function($) { if (rss) { rssUrl = $('#rssUrl-data').attr("data"); setupFeed(rssUrl, isMobile); - + $('.rssUrlGroup').show(); + } else { + $('.rssUrlGroup').hide(); } - } + } else { + $('.rssGroup').hide(); + } $('#override').css('display', (isMobile ? 'block' : 'none')); $('.inputdiv').css('display',(authentication ? 'block' : 'none')); @@ -158,11 +163,11 @@ jQuery(document).ready(function($) { // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { - $('.rssGroup').removeClass('hidden'); + $('.rssGroup').slideDown('fast'); } else { $('#rssCheckbox').attr('checked', false); - $('.rssGroup').addClass('hidden'); - $('.rssUrlGroup').addClass('hidden'); + $('.rssGroup').slideUp('fast'); + $('.rssUrlGroup').slideUp('fast'); } }); @@ -171,9 +176,9 @@ jQuery(document).ready(function($) { // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { - $('.rssUrlGroup').removeClass('hidden'); + $('.rssUrlGroup').slideDown('fast'); } else { - $('.rssUrlGroup').addClass('hidden'); + $('.rssUrlGroup').slideUp('fast'); } }); diff --git a/muximux.php b/muximux.php index 4c11fb0..965b4f8 100644 --- a/muximux.php +++ b/muximux.php @@ -209,12 +209,12 @@ function parse_ini()
            -
            +
            -
            +
            From 484a7e1fa413a624eac3523a6e6d31e7eda0d599 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Mon, 2 Jan 2017 14:08:10 -0600 Subject: [PATCH 155/170] Update Default Settings File --- settings.ini.php-example | 126 ++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 74 deletions(-) diff --git a/settings.ini.php-example b/settings.ini.php-example index f35da15..189b97f 100644 --- a/settings.ini.php-example +++ b/settings.ini.php-example @@ -2,170 +2,148 @@ [general] title = "Muximux - Application Management Console" branch = "master" -enabledropdown = "true" -updatepopup = "false" +theme = "classic" +color = "#31ac63" splashscreen = "true" -mobileoverride = "false" -autohide = "false" -authentication = "false" +tabcolor = "true" +autohide = "true" +rss = "true" +rssUrl = "https://www.wired.com/feed/" userNameInput = "admin" password = "muximux" -theme= "Classic" [settings] +branch_changed = "" enabled = "true" default = "false" name = "Settings" -url = "settings.php" +url = "muximux.php" landingpage = "false" -icon = "fa fa-cog" +icon = "muximux-cog" dd = "true" [Plex] name = "Plex" url = "https://www.plex.tv/" -icon = "fa-play-circle" +scale = 1 +icon = "muximux-plex" color = "#f9be03" enabled = "true" default = "true" -landingpage = "false" -dd = "false" [Couchpotato] name = "CouchPotato" url = "https://couchpota.to/" -icon = "fa-film" +scale = 1 +icon = "muximux-couchpotato" color = "#f85c22" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [Sonarr] name = "Sonarr" url = "https://sonarr.tv/" -icon = "fa-calendar" +scale = 1 +icon = "muximux-sonarr" color = "#35c5f4" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [Sickbeard] name = "SickBeard" url = "http://sickbeard.com/" -icon = "fa-calendar" +scale = 1 +icon = "muximux-sickbeard" color = "#b6f000" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [Diskstation] name = "Diskstation" url = "http://localhost:5000" -icon = "fa-hdd-o" -color="#3d6fae" +scale = 1 +icon = "muximux-synology" +color = "#3d6fae" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [RuTorrent] name = "RuTorrent" url = "https://github.com/Novik/ruTorrent" -icon = "fa-globe" -color="#1a1bfe" +scale = 1 +icon = "muximux-rutorrent" +color = "#1a1bfe" enabled = "true" -default = "false" -landingpage = "false" dd = "true" [NZBGet] name = "NZBGet" url = "https://nzbget.net/" -icon = "fa-download" -color="#3f8927" +scale = 1 +icon = "muximux-download" +color = "#3f8927" enabled = "true" -default = "false" -landingpage = "false" dd = "true" [SABnzbd] name = "SABnzbd" url = "https://sabnzbd.org/" -icon = "fa-download" +scale = 1 +icon = "muximux-arrow-down" +color = "#f5b907" enabled = "true" -default = "false" -landingpage = "false" dd = "true" [pydio] name = "Pydio" url = "https://pydio.com/" -icon = "fa-cloud" -color = "#FF796B" +scale = 1 +icon = "muximux-cloud" +color = "#cc6156" enabled = "true" -default = "false" -landingpage = "false" dd = "true" [Headphones] name = "Headphones" url = "https://github.com/rembo10/headphones" -icon = "fa-headphones" -color = "#444444" +scale = 1 +icon = "muximux-headphones" +color = "#000000" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" -[Plexrequests] -name = "PlexRequests" -url = "https://github.com/lokenx/plexrequests-meteor" -icon = "fa-bullhorn" +[Ombi] +name = "Ombi" +url = "http://www.ombi.io/" +scale = 1 +icon = "muximux-plex" color = "#df691a" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [PlexPy] name = "PlexPy" -url = "https://github.com/drzoidberg33/plexpy" -icon = "fa-list" -color = "#ba8e36" +url = "https://jonnywong16.github.io/plexpy/" +scale = 1 +icon = "muximux-plexivity" +color = "#cc7b19" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [Glances] name = "Glances" -url = "https://github.com/nicolargo/glances" -icon = "fa-eye" +url = "https://nicolargo.github.io/glances/" +scale = 1 +icon = "muximux-eye" color = "#59D16C" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [nzbhydra] name = "NZB Hydra" url = "https://github.com/theotherp/nzbhydra" -icon = "fa-search" +scale = 1 +icon = "muximux-nzbhydra" color = "#108f34" enabled = "true" -default = "false" -landingpage = "false" -dd = "false" [deluge] name = "Deluge" url = "http://deluge-torrent.org/" -icon = "fa-tint" -color = "#D1DAE5" +scale = 1 +icon = "muximux-deluge" +color = "#304663" enabled = "true" -default = "false" -landingpage = "false" dd = "true" From acfcb26c7322f35fb42361dc94ec81c3e6206ce4 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 4 Jan 2017 09:10:39 -0600 Subject: [PATCH 156/170] Fix "Landing Page causes Muximux Loop" Accidentally removed the PHP handler for landing page...re-add it. --- muximux.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/muximux.php b/muximux.php index 965b4f8..28c2111 100644 --- a/muximux.php +++ b/muximux.php @@ -881,6 +881,13 @@ function exec_enabled() { return !in_array('exec', $disabled); } +// URL parameters +if (isset($_GET['landing'])) { + $keyname = $_GET['landing']; + echo landingPage($keyname); + die(); +} + // This is where the JavaScript reads the contents of the secret file. This gets re-generated on each page load. if (isset($_GET['get']) && $_GET['get'] == 'secret') { $secret = file_get_contents(SECRET) or die("Unable to open " . SECRET); From 14cd905aabfb4014413a599153446b55e2ca2a1e Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 4 Jan 2017 09:16:26 -0600 Subject: [PATCH 157/170] Add better "branch change" handling, minor fixes Add methods to detect branch change and prompt the user to update the currently installed version. Add method to change branch using git. Remove autohide from default settings. Adjust z-index of update modal to be above all other modals. --- css/style.css | 2 +- js/main.js | 15 ++++++-- muximux.php | 74 +++++++++++++++++++++++++++------------- settings.ini.php-example | 1 - 4 files changed, 64 insertions(+), 28 deletions(-) diff --git a/css/style.css b/css/style.css index 8200ccc..70bc3f0 100644 --- a/css/style.css +++ b/css/style.css @@ -763,7 +763,7 @@ checkbox, radio { bottom: 10px; min-height: 44px; width: 340px; - z-index: 1048; + z-index: 1051; -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; } diff --git a/js/main.js b/js/main.js index b8064b7..78f8f5c 100644 --- a/js/main.js +++ b/js/main.js @@ -151,7 +151,6 @@ jQuery(document).ready(function($) { }); $("#authenticationCheckbox").click(function() { - // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { $('.inputdiv').slideDown('fast'); @@ -160,7 +159,6 @@ jQuery(document).ready(function($) { } }); $("#splashscreenCheckbox").click(function() { - // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { $('.rssGroup').slideDown('fast'); @@ -173,7 +171,6 @@ jQuery(document).ready(function($) { }); $("#rssCheckbox").click(function() { - // this function will get executed every time the #home element is clicked (or tab-spacebar changed) if ($(this).is(":checked")) // "this" refers to the element that fired the event { $('.rssUrlGroup').slideDown('fast'); @@ -296,6 +293,18 @@ jQuery(document).ready(function($) { $('.sp-replacer').addClass(' form-control'); $('.sp-replacer').addClass('form-control-sm'); + if ($('#branch-changed').attr('data') == 'true') { + $('#updateContainer').html("" + + "Branch changed detected. Would you like to install the latest version now?" + + "
            Click here
            to install.            "); + $('#updateContainer').fadeIn("slow"); + $('#downloadModal').click(function(){ + branch = $("#branch-data").attr('data'); + downloadUpdate(branch); + $('#updateDismiss').click(function(){ + $('#updateContainer').fadeOut("slow"); + }); + } }); diff --git a/muximux.php b/muximux.php index 28c2111..713bc3d 100644 --- a/muximux.php +++ b/muximux.php @@ -428,9 +428,8 @@ function log_contents() { function checkBranchChanged() { $config = new Config_Lite(CONFIG); if ($config->getBool('settings', 'branch_changed', false)) { - $config->set("settings","sha","0"); - $config->set("settings","branch_changed",false); saveConfig($config); + checksetSHA(); return true; } else { return false; @@ -721,7 +720,7 @@ function checksetSHA() { $shaOut = exec('git rev-parse HEAD'); $branchOut = exec('git rev-parse --abbrev-ref HEAD'); } else { - if (shaIn == '0') { + if (shaIn == '0') { $branchArray = getBranches(); $branchOut = $branchIn(); foreach ($branchArray as $branchName => $shaVal) { @@ -970,29 +969,58 @@ function exec_enabled() { function downloadUpdate($sha) { $git = can_git(); if ($git !== false) { - $resultshort = exec('git status'); - $result = (preg_match('/working directory clean/',$resultshort)); - if ($result !== true) { - $resultmsg = shell_exec('git status'); - $result ='Install Failed! Local instance has files that will interfer with git pull - please manually stash changes and try again. Result message: "' . $resultmsg.'"'; - write_log($result ,'E'); - $result ='Install Failed! Local instance has files that will interfer with git pull - please manually stash changes and try again. See log for details.'; - return $result; - } - $result = exec('git pull'); - write_log('Updating via git, command result is ' . $result,'D'); - $result = (preg_match('/Updating/',$result)); - if ($result) { - $mySha = exec('git rev-parse HEAD'); - $config = new Config_Lite(CONFIG); - if (!preg_match('/about a specific subcommand/',$mySha)) { // Something went wrong with the command to get our SHA, fall back to using the passed value. - $config->set('settings','sha',$mySha); + $branch = getBranch(); + if ($sha == $branch) { + $resultshort = exec('git status'); + $result = (preg_match('/clean/',$resultshort)); + if ($result !== true) { + $resultmsg = shell_exec('git status'); + $result ='Install Failed! Local instance has files that will interfer with branch change - please manually stash changes and try again. Result message: "' . $resultshort.'"'; + write_log($result ,'E'); + $result ='Install Failed! Local instance has files that will interfer with branch changed - please manually stash changes and try again. See log for details.'; + return $result; + } + $result = exec('git checkout '. $branch); + write_log('Changing git branch, command result is ' . $result,'D'); + $result = (preg_match('/up-to-date/',$result)); + if ($result) { + $mySha = exec('git rev-parse HEAD'); + $config = new Config_Lite(CONFIG); + if (!preg_match('/about a specific subcommand/',$mySha)) { // Something went wrong with the command to get our SHA, fall back to using the passed value. + $config->set('settings','sha',$mySha); + $config->set("settings","branch_changed",false); + saveConfig($config); + } else { + $config->set('settings','sha',$sha); + } + saveConfig($config); } else { - $config->set('settings','sha',$sha); + $result = 'Branch change failed! An unknown error occurred attempting to update. Please manually check git status and fix.'; } - saveConfig($config); } else { - $result = 'Install Failed! An unknown error occurred attempting to update. Please manually check git status and fix.'; + $resultshort = exec('git status'); + $result = (preg_match('/clean/',$resultshort)); + if ($result !== true) { + $result ='Install Failed! Local instance has files that will interfer with git pull - please manually stash changes and try again. Result message: "' . $resultshort.'"'; + write_log($result ,'E'); + $result ='Install Failed! Local instance has files that will interfer with git pull - please manually stash changes and try again. See log for details.'; + return $result; + } + $result = exec('git pull'); + write_log('Updating via git, command result is ' . $result,'D'); + $result = (preg_match('/Updating/',$result)); + if ($result) { + $mySha = exec('git rev-parse HEAD'); + $config = new Config_Lite(CONFIG); + if (!preg_match('/about a specific subcommand/',$mySha)) { // Something went wrong with the command to get our SHA, fall back to using the passed value. + $config->set('settings','sha',$mySha); + } else { + $config->set('settings','sha',$sha); + } + saveConfig($config); + } else { + $result = 'Install Failed! An unknown error occurred attempting to update. Please manually check git status and fix.'; + } } } else { $result = false; diff --git a/settings.ini.php-example b/settings.ini.php-example index 189b97f..c808d1e 100644 --- a/settings.ini.php-example +++ b/settings.ini.php-example @@ -6,7 +6,6 @@ theme = "classic" color = "#31ac63" splashscreen = "true" tabcolor = "true" -autohide = "true" rss = "true" rssUrl = "https://www.wired.com/feed/" userNameInput = "admin" From ae5cea7aea173215a66d7bf8554d1b2a6718668e Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 4 Jan 2017 09:21:24 -0600 Subject: [PATCH 158/170] Need that Should probably close out our functions. --- js/main.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/main.js b/js/main.js index 78f8f5c..33cdc23 100644 --- a/js/main.js +++ b/js/main.js @@ -301,9 +301,10 @@ jQuery(document).ready(function($) { $('#downloadModal').click(function(){ branch = $("#branch-data").attr('data'); downloadUpdate(branch); - $('#updateDismiss').click(function(){ - $('#updateContainer').fadeOut("slow"); - }); + }); + $('#updateDismiss').click(function(){ + $('#updateContainer').fadeOut("slow"); + }); } }); From 085a84a36e60c0c67639cd568d62eae3d745d1a2 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Wed, 4 Jan 2017 09:37:43 -0600 Subject: [PATCH 159/170] Increase Max execution time for combineify Make sure we don't hit a system limit while caching our scripts. --- combineify.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/combineify.php b/combineify.php index f70c4bc..0f64cf7 100644 --- a/combineify.php +++ b/combineify.php @@ -8,6 +8,9 @@ */ + if (ini_get('max_execution_time')) { + ini_set('max_execution_time', '300'); + } $cache = true; $cachedir = dirname(__FILE__) . '/cache'; if ((!file_exists($cachedir)) && $cache) { From 591b3aed43a79eb26b217927fce218c29b231ea0 Mon Sep 17 00:00:00 2001 From: mescon <2rqridDJ6badb3c0> Date: Thu, 5 Jan 2017 07:59:54 +0100 Subject: [PATCH 160/170] Update .gitignore. --- test/.gitattributes | 2 ++ test/.gitignore | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 test/.gitattributes create mode 100644 test/.gitignore diff --git a/test/.gitattributes b/test/.gitattributes new file mode 100644 index 0000000..1641fe4 --- /dev/null +++ b/test/.gitattributes @@ -0,0 +1,2 @@ +* -text +*.txt ident diff --git a/test/.gitignore b/test/.gitignore new file mode 100644 index 0000000..4a719c0 --- /dev/null +++ b/test/.gitignore @@ -0,0 +1,24 @@ +# Do not submit or pull configuration settings when interacting with GitHub. +config.ini.php +settings.ini.php +backup.ini.php +muximux.log +stage/ +.stage/ +css/theme/ +js/iconset-muximux.js +!css/theme/Modern.css +!css/theme/Classic.css +test.php +secret.txt +tmp/ +pydio/ +phpmyadmin/ +*.idea +.vscode/ +plexredirect/ +recent/ +keeweb/ +api/ +cache/ +test/ \ No newline at end of file From 82fb240492986cac8344a80c84e5e06bfd1ddca6 Mon Sep 17 00:00:00 2001 From: mescon <2rqridDJ6badb3c0> Date: Thu, 5 Jan 2017 08:02:34 +0100 Subject: [PATCH 161/170] Make unimportant change to see if update function works as expected. --- .gitignore | 1 + unimportant_change.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 unimportant_change.txt diff --git a/.gitignore b/.gitignore index f86cad5..4a719c0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ recent/ keeweb/ api/ cache/ +test/ \ No newline at end of file diff --git a/unimportant_change.txt b/unimportant_change.txt new file mode 100644 index 0000000..9cb241c --- /dev/null +++ b/unimportant_change.txt @@ -0,0 +1 @@ +Making an unimportant change to see wether or not the update function will work as expected. \ No newline at end of file From 2f3751bbf628ee813713086ca8b6d2b14b9475f2 Mon Sep 17 00:00:00 2001 From: d8ahazard Date: Thu, 5 Jan 2017 08:32:32 -0600 Subject: [PATCH 162/170] Where in the heck did this even come from? I must have been really tired... --- js/functions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index 3d15254..15a12d9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -261,7 +261,6 @@ function settingsEventHandlers() { function viewChangelog() { $('#changelog').html(""); if ((!getCookie('hasJSON')) || (!sessionStorage['JSONData'])) { - write_log('Refreshing commit data from github - ' + ($force ? "automatically triggered." : "manually triggered.")); updateJson(); } json = JSON.parse(sessionStorage.getItem('JSONData')); From 84a4e3a962083d7f37a256a3c965b4088869de9e Mon Sep 17 00:00:00 2001 From: mescon <2rqridDJ6badb3c0> Date: Thu, 5 Jan 2017 21:47:13 +0100 Subject: [PATCH 163/170] Remove unimportant change and see if the updater handles the update. --- unimportant_change.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 unimportant_change.txt diff --git a/unimportant_change.txt b/unimportant_change.txt deleted file mode 100644 index 9cb241c..0000000 --- a/unimportant_change.txt +++ /dev/null @@ -1 +0,0 @@ -Making an unimportant change to see wether or not the update function will work as expected. \ No newline at end of file From ff893366bf6bab722a4cabddafba6e28f19463ae Mon Sep 17 00:00:00 2001 From: mescon <2rqridDJ6badb3c0> Date: Thu, 5 Jan 2017 21:51:05 +0100 Subject: [PATCH 164/170] Make another unimportant change to see if updater behaves as expected. --- unimportant_change.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 unimportant_change.txt diff --git a/unimportant_change.txt b/unimportant_change.txt new file mode 100644 index 0000000..f68694a --- /dev/null +++ b/unimportant_change.txt @@ -0,0 +1 @@ +Making an unimportant change to see wether or not the update function will work as expected. 2 \ No newline at end of file From 05d256d92de8cafcb6f340644fbd1fbfd7bdbde0 Mon Sep 17 00:00:00 2001 From: mescon <2rqridDJ6badb3c0> Date: Fri, 6 Jan 2017 18:23:18 +0100 Subject: [PATCH 165/170] Update favicon for web, android, iphone and metro. --- browserconfig.xml | 12 - favicon.ico | Bin 1150 -> 15086 bytes images/favicon/android-chrome-192x192.png | Bin 0 -> 11859 bytes images/favicon/android-chrome-256x256.png | Bin 0 -> 17169 bytes images/favicon/apple-touch-icon.png | Bin 0 -> 3622 bytes images/favicon/browserconfig.xml | 9 + images/favicon/favicon-16x16.png | Bin 0 -> 806 bytes images/favicon/favicon-32x32.png | Bin 0 -> 1425 bytes images/favicon/favicon.ico | Bin 0 -> 15086 bytes images/favicon/manifest.json | 17 ++ images/favicon/mstile-150x150.png | Bin 0 -> 3620 bytes images/favicon/safari-pinned-tab.svg | 44 ++++ images/tile-wide.png | Bin 1854 -> 0 bytes images/tile.png | Bin 3482 -> 0 bytes index.php | 274 +++++++++++----------- 15 files changed, 210 insertions(+), 146 deletions(-) delete mode 100644 browserconfig.xml create mode 100644 images/favicon/android-chrome-192x192.png create mode 100644 images/favicon/android-chrome-256x256.png create mode 100644 images/favicon/apple-touch-icon.png create mode 100644 images/favicon/browserconfig.xml create mode 100644 images/favicon/favicon-16x16.png create mode 100644 images/favicon/favicon-32x32.png create mode 100644 images/favicon/favicon.ico create mode 100644 images/favicon/manifest.json create mode 100644 images/favicon/mstile-150x150.png create mode 100644 images/favicon/safari-pinned-tab.svg delete mode 100644 images/tile-wide.png delete mode 100644 images/tile.png diff --git a/browserconfig.xml b/browserconfig.xml deleted file mode 100644 index 967fa21..0000000 --- a/browserconfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/favicon.ico b/favicon.ico index 5a584177659d555396c702d74a91d868c99f6dbb..9828c1f2e76c5c1f8ca88d7937a2d2b10c266338 100644 GIT binary patch literal 15086 zcmeI33y_s%8GwH-iYUu2D5e3rx`>&|LJ){rP$;PZ5^{+IA_4QV2)15wD#UPD)R7g` z1P#cv5HC@VSq;j1DacE+WsEwG$|YSO6a+CWq0{r6{l4{ZhH+Uq%rxVFW}bb&>-)an z`@i4+|NHIPBx#nkNV<1Vkfq53CnQPlBuPq3L%k$P-lVMrY5yfHlVm0XKF1iQB;&#M z?59h;NPnggNF$I&AdNs8fiwbX1kwn6dLuC5;U3*#CQOFba5l_>sn7-n!A&s2C?Q)w zZ@31g!8vef=qsUI3CPSe;q4zaC)JA5B5()_xfN*TVCstP?OVU`$UNT|B`a_-~C{}{R# zpx9SPiC**IP0)^**X_W3iEZZ8C}_<8-1slenZK6u7YgZj)P>$7VO5T;D*LGS1#`$X zm`C16_tyVOjE(ufiLyF=0j;CmLP>NMgE7}e_MRF1H-~FNyZ4y>(3t;+F{TT=4C-3| zu4MARM?x#Pa>1wNM?cOUF2|INGE;Qi}0I0e-I5IE0! z+0jvdAtd^ICiR4K;gnpR)XlAdFaX-ZNiZ0?#c`A`1$}e>c7T517@oxk1IrJyWXTnRM z&Ywd|xFpmI;lKH}3fyz^;2ntmdtKr_dW^Ey-Wck$dD#l4f_rZ@92erP&l}+*cpYMY zdFap0|NV`BG5VhaeSRy*H;_I*wCj6IG5nc$22VK@IndpFwGgZf-=XWRWyE~NkF<8L6w z>OIQF^jz4H(_T&4y|=gie~+=oUA^03WWDzV_up%MU$CRCr@`l__wm0$T-OZB!=O?B z8B-3c!&vi59p1A#7CQbx-(A6mcCO2blQEC}UqksD@JargGY5h98RxnF3nA{S9|wB{ zyZ;1z@fp7fTfK7p{~Go9F0aj@p#LvJZvJnjZk$hr3&1%a!gqrH8z{RT?`J+^3wHkx z`i?WUhJ0%-)&2&556BalWQjX)ZK|Bnb{vY#Y5@N!wrN446Sb5xIN%9JKJU9lxhl3jLwsds=*#EB&MqNF$I&ps5ky zcX-dBI>O=LS$k=ao7A#p zgFdc;<&cd}Q+!~KvHKl(_Pqtxg7!Rj^ek*CtbkVFInDbpKpV*0L4P;Jwx-w)I=uc% zf}T3$W$1JvIF zoHGy32zB?R*J1*go7wB1Z);C=#*P8=`YJH5Hh{j`HXI%S&+Xm6o537E23CRl@LOQ} z&EOfV>u-vE*QC$xanEIUz+b^Vb0z3gC6vNT@L;$GV<~G(+qKXUz77rfzo+%)w=w=J zV2+w!uIHIh-iS1ZjKeT6?oWcbWUduK4dmwKVCqe^|3&5)U-e7`ZCd^Zd>8D?x34ed zuo@gYAI!f&&{X^8o%go4pbMziy4U;LkZ=ES+SF`c_zwsYBL{E`mvoD6Q}IoWf&?QfN4*;D621Pva5b{@xpW z4;lwUp+8K4li&jIy>Jj@zps_Ak@iX8`{-I&4iCVsFb$@{Utmc7yjZ7i4EX-F5MG2u z;Je367!9w1|1OyQQ1&?%@!g>xd>>ASTfp}$-^1pB_FcLB%?b==duJiZcIxmLFa3}cQ zW=v-7KC`|?yYI=}pgXwEGvQS5y~1}EuirrU(w^pjn%nBnHa*|`n4Nr6W#`G%rzFX9 MFr&Pl+%d8IKg7MAq5uE@ literal 1150 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 TvVy6|DF77(4f$$W%kcjJY*ggK literal 0 HcmV?d00001 diff --git a/images/favicon/apple-touch-icon.png b/images/favicon/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e13052b37c5dd985309edef650afce425cdc0c90 GIT binary patch literal 3622 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 literal 0 HcmV?d00001 diff --git a/images/favicon/browserconfig.xml b/images/favicon/browserconfig.xml new file mode 100644 index 0000000..99a01d7 --- /dev/null +++ b/images/favicon/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #2b5797 + + + diff --git a/images/favicon/favicon-16x16.png b/images/favicon/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..28463a4893b572b5e456323df179bcdf1316c5b8 GIT binary patch literal 806 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ET614BbI1H;e%K>8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)m{zo32_C|hHH|C6Z-%E zf6S{L(}5myD+%%g29mX&fuD`8vzLRLZQtDaJKEB6r|yaAnDTIUZTvo;PNtlR#SPOO zOY2$LnC&a9x(f^PBd^Rm<9jRh#){s$vu2@j0h+;?NMQuIvvP*@Of%GKFr&0fkyTT^vIsE+;1_h#NRD%s6@E z%%M}q&K*2?^enSj;*+P3#RWu!!~{i!+c`Wuyu3U;PIsI>b+VaNM5J=+l+ci?Ay-U~ zn2MT6N=j_qvSmwY$=5Hu5mR}3dn6UhI%dw8^>H@0RP+W1R-LsfscUm{c;7}WWctR} z=NIF4PH$ZiSB75mj$RiAh7(CV=BK``Jppu&YKdz^NlIc#s#S7PDv)9@GB7mPH89jQ zFbgrXurf5WGBMCLFtjo-ShKSRm~fCZ8f};Gi z%$!t(lFEWqh0KDIWCn(cIgdZ_a1@4VXq@stea7=?5CgL^w_Y;0u(GiCWD#az1(ybs x!zs+ln?n>%-?(z($eANDN7zp{cr5VJV|XPlSn|oqbSlsa22WQ%mvv4FO#tMZ8_)m% literal 0 HcmV?d00001 diff --git a/images/favicon/favicon-32x32.png b/images/favicon/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..ab16230c6fd7c4623de6b211dedd465245278ab2 GIT binary patch literal 1425 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^+km7#f-x7=Hc-(k~epN(~qoUL`OvSj}Ky5YL|!f7FeEf$?R4Plzi}kKvl+Q8c_m z;Q#;swP*RAfswtiB*-tAfq_YYi-(_0kXMM6LuT(J&Ux!SjyTVnYQ=$F2#O& zcV0TC zaq8H)gXd11Jay>k*%PM@9zJ-sBjCX4O0rpIoLbeJv7|^K7(iD!dFhpk6YE2DX^x!@_NRttFtyhB;vNtmaWkl`EMA4 z9-Mf&<-*L1tgel#XYX!bK7D)t`uX(@e8~v`1s*H(x|$5y3+{J#w6DkrefnU=4U5}9 z9<&@$NMRNFQ{;J4bEVgwlbP#Y3B8njH8b*N9$QZjPmjWZ0}TqrlPV>PKc{@=)`@M7 z;p&d)Qtp$mnC#@%!ruMD-_4JtN)U?p96vHFnC9RNX9qcvvbU9kEO&JzMYx1cXQhLnX7HYk52SiD7*LH z-mRZ?ZdUG;*!f&PA!UAichd0=Hip8jQ7gOBJ68jvN43N?q9i4;B-JXpC>2OC7#SFv z>lzs98kmI`T38vHS(zAW8yH#{7;v2{Z$Z(Jo1c=IR*73f_2lywKn>wlArU1(iRB6f zMfqu&IjIUIl?AB^nFS@u3=9=>9)IHDC=AokIOTu(jOWuJ24-b$y<~1-Wnu5hBFw@H zE)6D!Q<#-EhbWxBaRr!Ej>sHgKi%N5z)O$emAGKZCnwXXKr0wLUHx3vIVCg!085}p AzW@LL literal 0 HcmV?d00001 diff --git a/images/favicon/favicon.ico b/images/favicon/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9828c1f2e76c5c1f8ca88d7937a2d2b10c266338 GIT binary patch literal 15086 zcmeI33y_s%8GwH-iYUu2D5e3rx`>&|LJ){rP$;PZ5^{+IA_4QV2)15wD#UPD)R7g` z1P#cv5HC@VSq;j1DacE+WsEwG$|YSO6a+CWq0{r6{l4{ZhH+Uq%rxVFW}bb&>-)an z`@i4+|NHIPBx#nkNV<1Vkfq53CnQPlBuPq3L%k$P-lVMrY5yfHlVm0XKF1iQB;&#M z?59h;NPnggNF$I&AdNs8fiwbX1kwn6dLuC5;U3*#CQOFba5l_>sn7-n!A&s2C?Q)w zZ@31g!8vef=qsUI3CPSe;q4zaC)JA5B5()_xfN*TVCstP?OVU`$UNT|B`a_-~C{}{R# zpx9SPiC**IP0)^**X_W3iEZZ8C}_<8-1slenZK6u7YgZj)P>$7VO5T;D*LGS1#`$X zm`C16_tyVOjE(ufiLyF=0j;CmLP>NMgE7}e_MRF1H-~FNyZ4y>(3t;+F{TT=4C-3| zu4MARM?x#Pa>1wNM?cOUF2|INGE;Qi}0I0e-I5IE0! z+0jvdAtd^ICiR4K;gnpR)XlAdFaX-ZNiZ0?#c`A`1$}e>c7T517@oxk1IrJyWXTnRM z&Ywd|xFpmI;lKH}3fyz^;2ntmdtKr_dW^Ey-Wck$dD#l4f_rZ@92erP&l}+*cpYMY zdFap0|NV`BG5VhaeSRy*H;_I*wCj6IG5nc$22VK@IndpFwGgZf-=XWRWyE~NkF<8L6w z>OIQF^jz4H(_T&4y|=gie~+=oUA^03WWDzV_up%MU$CRCr@`l__wm0$T-OZB!=O?B z8B-3c!&vi59p1A#7CQbx-(A6mcCO2blQEC}UqksD@JargGY5h98RxnF3nA{S9|wB{ zyZ;1z@fp7fTfK7p{~Go9F0aj@p#LvJZvJnjZk$hr3&1%a!gqrH8z{RT?`J+^3wHkx z`i?WUhJ0%-)&2&556BalWQjX)ZK|Bnb{vY#Y5@N!wrN446Sb5xIN%9JKJU9lxhl3jLwsds=*#EB&MqNF$I&ps5ky zcX-dBI>O=LS$k=ao7A#p zgFdc;<&cd}Q+!~KvHKl(_Pqtxg7!Rj^ek*CtbkVFInDbpKpV*0L4P;Jwx-w)I=uc% zf}T3$W$1JvIF zoHGy32zB?R*J1*go7wB1Z);C=#*P8=`YJH5Hh{j`HXI%S&+Xm6o537E23CRl@LOQ} z&EOfV>u-vE*QC$xanEIUz+b^Vb0z3gC6vNT@L;$GV<~G(+qKXUz77rfzo+%)w=w=J zV2+w!uIHIh-iS1ZjKeT6?oWcbWUduK4dmwKVCqe^|3&5)U-e7`ZCd^Zd>8D?x34ed zuo@gYAI!f&&{X^8o%go4pbMziy4U;LkZ=ES+SF`c_zwsYBL{E`mvoD6Q}IoWf&?QfN4*;D621Pva5b{@xpW z4;lwUp+8K4li&jIy>Jj@zps_Ak@iX8`{-I&4iCVsFb$@{Utmc7yjZ7i4EX-F5MG2u z;Je367!9w1|1OyQQ1&?%@!g>xd>>ASTfp}$-^1pB_FcLB%?b==duJiZcIxmLFa3}cQ zW=v-7KC`|?yYI=}pgXwEGvQS5y~1}EuirrU(w^pjn%nBnHa*|`n4Nr6W#`G%rzFX9 MFr&Pl+%d8IKg7MAq5uE@ literal 0 HcmV?d00001 diff --git a/images/favicon/manifest.json b/images/favicon/manifest.json new file mode 100644 index 0000000..f6ae08a --- /dev/null +++ b/images/favicon/manifest.json @@ -0,0 +1,17 @@ +{ + "name": "Muximux", + "icons": [ + { + "src": "images\/favicon\/android-chrome-192x192.png?v=ngGoyLXN9n", + "sizes": "192x192", + "type": "image\/png" + }, + { + "src": "images\/favicon\/android-chrome-256x256.png?v=ngGoyLXN9n", + "sizes": "256x256", + "type": "image\/png" + } + ], + "theme_color": "#ffffff", + "display": "standalone" +} diff --git a/images/favicon/mstile-150x150.png b/images/favicon/mstile-150x150.png new file mode 100644 index 0000000000000000000000000000000000000000..6496bccb8484c887cae2f75deff5519fbb1882a2 GIT binary patch literal 3620 zcmeHKX)qgV7mljhuDzwz5ap_^mb8S#R$FZqYb~h?VhN=oLd32Yp{=NjJ*XvuYE`XO zN{OY>;#xktYBjdn*J_K;{rCO3Gxzs5_nq_3nRDiOX5ROib7sy-vVt4)aEWpO0016S z6GIySfQ9$3%fWh*vBYp@p19NAdKP*BKy?cDFE_T6SOR5YV*vn!T?PPR;sAgjC#jf4 z03cWe09bYf0AN`FfJgwP$yy5lIJIbX)6VDw0Io#+YyT?nf2_dq@v*e)yP}g?-^1C! zZ2`Y2UA@B2smLWP!X_(sP5#_@UFPog7nuJ1CpF(4?7O}HNb@|MGrF~$;)An@WFf9$ zjzSr;m(@SN7Nw6V+zWI3C1@IT_#-I%=Yc=LW8HZ3;uKi5G3ivYt7S3w%KZ<09Jx-m zPtK5Tnki3=3=Okpk<${~-_wBb+O^}uO(JqhaE{WI^1z6n8 zjScsoO@-~B1nf9d3nTW=EN2Ay<;2e|^#A}I!={FMcA*oilXo4@j$UBjD0UNY1{*rD zai7zhV{>}UMWyq%#l(iP{8_0tFd%;^DZR@|vXdhzP~c&v$%yMckrdgF4i2}!J$Snis9SKuc5nfG zsv6h&$~4O5;6R^@Ah9A5q(6SvVM{)Ju7yK$a?*jk1lendaNq0Bq{PIYw=J& z!MuAZL1%X<`!CJ>s^L&BblCU=PQSlz^C40`x24#KMR8_w!e{n9zqH0V6FoJgSIxnE z+mc&`T=zpQHh;`e@8+`~9~qaA9yLY+#q<@5n1ND@3Q}r~=ql0zK_@H&B4FuM3S^S4 zC>pd(RQ9U0r_fc0F_%)(VSlp?tbq5NoCoXb@O#^xmbw0_!Y&54y<9g-QkA&Kn_84- zYNH{0yF7vL#ww5CRRIdY55ikZx6$nw1|9P()C=LCiUm?}UWwXO6&HHFiN47rT1Rsp!nv7IV%fR{F+z8mWbL@Ctqy^c7hcAjSsg;s z!3&Af47X#kk?T4fTnBffzrW(=9&Fi8ZpSxS_KZ%(^+2`tn$0)XeO$K$c@;ve$FeZ- zShCp4X6TecJ>w&O`d$jnyJCuwVvC?IdjuiP546|D?sNHzMIZSe*jid5vPFquU&mJO zz0!w9a55X;sTTwL6ilsOAuyH_!96k;!dnK*toU-B5YX@2W$55gm3Y(e4{*Bruc|J5 zaB%1GJ8JOh6?+)GdEsm~Jn!+vb>#ffc~iyigs+mGF~okzDrjIs@uU&IT>P`&CTDa< z{hau($1tVW^mrIG5TyK#Zj68y5wKM==ecM`?(?8K$fX88Xx(V&>n)k*C}GR7KKp0P z#=TB#;=|g#G?!aC9A74@i1@5LV#?{!P1P0DZvSn^_kq;NHf*E2&-|0!R9kYT{kmvY zUP2YHplzuN+O_#ag```}vN#(_(N+a8Z ziy6gtqJ@=qg`=5BotB2_)CyAgQw ze7P}L+G}CfV9%wgV&g#dat0(qmk=8Wh0j+o6AOGocy&CAGrNWBJ>_y+{cWSxkT<>K z2}oIX<&C<`m$o`Xtv8}u-9rT53SAfZkYk4!@wO2YEhr&2;2+Edkyrb)#7!|}UQvCq z+s>sfq#ehHSJpf`7L&iVq(skZ`#9(65#f|FZK_``=xJ=-&aC_bsCg0{m7D;&Esa#w zoc4tWe#V0|@8DcgC&-yPe&AuJjw_y z3&c)B6v&rpGIgXJrgq?)J=Vr|*P#z~t)?!!s*@5b+S(i;_rq->!C76C2WeV_Ih^=y zvb7FNd7)#_yU*|qJctawZ=c@jkUM{?c8E7hJ80pfWD+L9f7~}jT<3`;K0JR+hA~ns zz0lM{8#m6?DhO4-*`x>3F2@}b3+zf6s~4KdK@PcjiI|OE)HI9xFgGO-MIM9q2jN#! zy}uY^e>xQBu4k1WgM1@tQ)^#?0xXE*N#AdO-Vk^py`+Djjt2b+x2hO0?{c zLP+Z>(C9(up64$L)sIaKIu6drig2D9890#;Ok*nu@*U(@9TIE2|b;%waT5&>9@mye&P1db5kDd7`|U7w literal 0 HcmV?d00001 diff --git a/images/favicon/safari-pinned-tab.svg b/images/favicon/safari-pinned-tab.svg new file mode 100644 index 0000000..1c3b044 --- /dev/null +++ b/images/favicon/safari-pinned-tab.svg @@ -0,0 +1,44 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + + + + + + diff --git a/images/tile-wide.png b/images/tile-wide.png deleted file mode 100644 index ccd739c7da5f47f6f36c9de6163cab77b534da6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1854 zcmZ`)X;{+P9!4}nOoMyJ1;#}FD2-joEyO(_Br$T!oJSlK#qEMinxiFZ%2lJ(a$HhV z(~P>gj^wgz*#KsaL{dN)HT+y> z945;bC}d*rW`HmhG>^mF!U@z zU0jzNJN`H|kCHgI@e__1b!V>cz2rNe|~K!jU7}>hz&fJTy-ISoHarB)dMH;p#;gYZTJz ziUP;y60>d2h}OZ35EM9VBr5KpN|nnD8YGA=;6XsRNf_&2iLY1&U}APjK;&F`@F69V z&1WKm5(pbJdoB<2Di;RZUAdRtzo*B^_+2WNHo$GE=OIl&ac*)nsI^zFjg5d`PD^eT zoJiBkJ+q~KFH<)b(scW0=w*;5E;y+fZGYm}J-uPz8_ZL~mU;%GinAJ^o9oS$_n^DU z*|ut977ixgU>48_@zM!U1pK(DN(^YL*c=#Qd6<9JA565s(}%jRTSm0@ihi}allXp1 z8;dQ@MX`xfs~Z5?>tLabX_#8g9ISceZ^B*J%1bzD^?bCz78NUu zPI91_b$(ETz)y0>lspJLEbu3RuBj>sphRRt;A~Bj1RWeXf&H2+(D#RUzp-wgp7cM1 zLj$hcd%SBGfg*ckP_qata%^YW9--vm)ULp~3`rb>zpeM*t4AlXM1c|jt%{%b8c2u& zh-Bf!^D%N>vN7c`+p+i)`T1DSxR~yQo;3RU`SoCKhJeSG$M{{_a1~rg_gY$L@@9@= z*qR<4?SAs4?SK{-!#g!zu+!gUGv#IyHL7W)>3%DT&WT zM)|7XIvix)7_4+R=tqBLiSRl{2Olg+X{6psqiu%eg7+?S1NTk#?AB9TzIgt)0bVu& z#xkb{dYk%%oiSrh8YS^XuMHDQpxn@+M@A4A4ou#X$+9u1rtB|W$-UFBxjeM2Pjp3?Ko7h9f1 z=S!-1pNr5Fvz;~7vje?C-X?;;e5xZv*;)s%B~dY5f!Jw!o zT@c~<>rcX|19q33zxQoET;i+Mxo-qgkpg(<7IW_WdS7JX>;jC!js#?PQj< zDDtc^%BMj=y(~Uj?v6Y=ibEziO>q|Ymm^B!|6SbGPuLkRs>^PG+pket6*^b{Jl8^H zH{BvIQ7>TA1GHR04&59g^rvNjP3Vp)nvE1$c{8N;K(1V>{uRBkvUnC#DAM~)w8dJ>;*v{dWy>0RzDuqWKHdltkfKQj= zdsGx{KS&dEM!n)uy5mmJ&Ks0|6Pu;$@XaGm(v_dKHmU+HZyfT)3^q9Xg6KM8=L># zG_mH$>VP2hZ2yOJTCI?n%*r<~KkG6A=?7ksXbcm*JnBW%U;jAD%C1V-O&(spc;(if NjOOA_X(Y4w{{!#vJbVBE diff --git a/images/tile.png b/images/tile.png deleted file mode 100644 index f820f61a0b95dd42dca6cbd06ca08ed4e1ef098a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3482 zcma)9i$BwQA9pv*We(X|_1JH6Try*!+vBokhNCQ=BWtS}rd;-zvtyD(Sj)Cp$Srk_ zQOZf_W=QE^jcAc`kV_n$j+I0?sT@4tJ?9U2p5N>Bd+oc==ktAEKHtmh^*bH9C&1Kr zy|I>-mT4e`v`1ifi&3DpLm;k zzrNqU@7i8hoer{%N5Rx0OBnUkzazkxC7jwger#(S3_kAB@`i)nUc{sFyPt{L3)`xL z3$(JMZi!Ma+3-C|mG8047v?*c&RS~24g9vf-W8LPz2x&#Yoz~IEMBy%sUZ8AfVwvY#>95ieJ#RdN#ut&>9`MZ?dh7T$J^H7Xy)3RTIt2R zwa_T?zb=;!aghS*9#@oG`jZZ|e!u_T%v>!y8|%xZTnA8;^-Lt?c(>haM8^wS*k)>YA^&M zA}l%GO`MXho`NpAG5<+6(N^M&FPGMvUWzKVcnZjT6_lYkI0|?3VXp=%8o6071}-~) z(4BSr@4P^ip#X*6(fEPBPhw0o@^^v&ZnM2@5tO(4?{T#jP|FR`D7CS+DQheG&t$0v z+LUby456@$i*A3{5!(&q6c}Ek1R-1Lp)+fo^^&QNB@z&=!;39-;4)fF-1QRdem7$IuX0OF*4k)WOkAwI{3pw9vw_ zu-I`1z#m(8RJBXz(AvW1M-wBq&8Ktx!aZS_)v47}*f?%NFiH0ZOF2G$&7e%zY*fJZU^OfG~%cWbexI2g6KbD_RT~4 zCClX1o+wuFbP>3%@c(^}1s)kIe7{dTnju(91W()7CT3|*9{Wx>12NZM+Bul&H z_dH_Tc~k_(PM76Kx*ewg#18YL;XH8<8!Wbdtm$uElGgrwA)1FIc!2B|Gm*r*Np-*ST!GkM*xwSmmLE_=NBU&ZPU4+Ls z%@7-dGR`Z=nB@X9!~$|fpzb37)*gCyUQJzN$z0<}xuW~Bv^!F7d<>n?^W6%L^pV*2 z3$b>2g3S0B6r!jdI36+kYUJHu4Bct`T^#x1N}xno$9qtPdNT`VlWOY|7lS0iH1UOt zs9TYmz)l~+ld!P6q3S0p@rS{U5hl0_$JDOu<}iR|O^E(@?u_{Hi??O2seh;~`mZ@L zqGY?mcwRm7@D>((vHa3*lGhqxBIj*{r= z+c@^8p-#0!>K`yOPN@3oy8!Rs)sqG#4P_`oBG7cWQ?|Ha;vqnHBN(UfkJo`oGmVHt zVoEwlw@&p6C7O`K%!aZ00qd@Yb_UFek7$wb%@J4Sk9y0ZuwnL(#mi`aRWGG>=ibEczq#p}+StFHK4`@`<4(J5r|LZ% zm~eqxbpmS#OpRaSxxQ45jmFjfR^wScuyM>}_4>sm2Q-`PH2ztPewAs(z5(V-jb!TS zTdF@YQ(h;0#bnnERIwY*mA^nZt#8#d#W`qHyxeuZkeomM!41WxFYJ8rubSbu?`qNY z@BFtq*GwE{_clsR^O6)*m={x=55r2quRErnOb$ihd&nN1?ol^Xaw4T;MZ>xfqOc~$ zV+qrNb*Vid%CA6O;Te{2^9sk9hh|wa)5E>?P#|Z4_KMV4nN~Y$wPQLSW4)pvL<=OI zanA|U#u&-y^Sa=FvpfAmnte&=10w@JCza!HNHwBAk>sDdcZV&llKx-tU+ zn^R@N6VS?MXT=GJ9*T#R!uTe!GYrkqF(t?l9e$_?*p>ZX*PLYy3DSHO9#@#WM(1Q( z#{#ANW2Nuz#>#!Q=%#LUS|euD}Q~+ZA!WGm@=nt2?Wd zPaL^j=#W}e$BRxl&kbpvi63H>1~oaJQOR3Q_II(`$qA0&mTBgjIDQ!fhXx%yDn`$m zs0WVsqri^kQ(VBBxDhI-HD|dld4r*|98%@#^etBPaENT6N=#@N72N!s_NJ$?->H)n z<5! zWlES<6qoh@^CMTm%(vewLe}D`mA-fSG>2@2JvM3fgwL_09MPpx=822{aYhP%k?Bj}r_jcJTocS8JCXEq%Jwie$p=cuBuEjTAC2XvZ$ zyH9Qu`5^xdo9u9n(7-pMF4lvggwPNyrk?PrPST6$k<%z`PJn3A9Tj16n#JE<`dEH4 z&>Gw}bQjm+KHtXH4LM>oeLy^CaxqInX`ZOv3wi$5{&H?tE~i{#dp?q6U??c3THq?U z`afP8W{~A0zf_ySyBciA)bR*I@+d4r6EPR(NoHp6?esd@Rw=1_o5Ih0Us2AzsQcB} zW@SP?V_COo`AwNzK~@;r%ble|!^-*gmlF)}Jq7t&5HZ1+i4PbVzPjqIN?dZE3`cfxg@yD|l z_{+v37XNd0_q$Ico4V%QiOKv<{xB?)$IN77C)+bPSS=M-Tl3Yjw0CE+uMQa4&aA!3 f%uUgJM*Yvn*9&Gm!=vgXXetB!_mCQh%#;5C+C3NM diff --git a/index.php b/index.php index eac8045..6dce53a 100644 --- a/index.php +++ b/index.php @@ -31,24 +31,30 @@ - - - - + + + + + + + + + + <?php echo getTitle(); ?> - +
            -
            -
            -
            -
            -
            -
            +
            +
            +
            +
            +
            +

            Muximux is loading...

            @@ -81,13 +87,13 @@
            - -

            Settings

            -
            + +

            Settings

            +
            @@ -102,95 +108,95 @@

            The order that you put these blocks in determine in what order they will be listed in the menu.
            Enable or disable each block and edit the URL to point to your desired location.

            -

            General Settings (What does all this stuff do?)

            -
            -

            -

            Git Branch

            - Select the branch to track on Github for updates. -

            -

            -

            -

            Theme

            - Select from one of two pre-defined themes, or create your own. To create a custom theme, make a copy of either Modern.css or Classic.css in the /css/theme/ directory. Use a one-word theme name (no spaces) for the new file name. Modify the colors in the new theme file as you like, and then select it in settings. -

            -

            -

            -

            Color (General settings)

            - Select the primary default color used on login, splash screen, and for various other ui elements. -

            -

            -

            -

            Update Alerts

            - When enabled, you will receive a pop-up notification when new updates are available. -

            -

            -

            -

            Splash Screen

            - When enabled, Muximux will start with a splash page where you can select which application to view. -

            -

            -

            -

            Dropdown Override

            - When enabled, a button will appear in the main Muximux bar that will allow overriding the placement of applications in the dropdown menu when viewed on a display detected as being on a mobile device. Intended for users who have tablets with a smaller display. -

            -

            -

            -

            Application Colors

            - Set an individual color for each application. This will be used in the splash screen and for the tab's selected indicator. If disabled, the color selected in the general section of settings will be used. -

            -

            -

            -

            Auto-hide Navbar

            - When enabled, the navigation bar will collapse itself into a small strip, and expand on hover. This is disabled by default for mobile displays. -

            -

            -

            -

            Use Authentication

            - When enabled, you can set a username and password which will be required to log into Muximux. Password is hashed, salted, and stored in settings, so your password is never stored in plain text. -

            -

            -

            Applications Settings (What does the rest of this stuff do?)

            -
            -

            -

            URL

            - Enter the address of the page you want to load. See below for instructions when serving Muximux over HTTPS. Url should be fully formatted: 'http://www.address.com'. -

            -

            -

            -

            Zoom

            - Change the default zoom level for the application. This value is used to scale the iframe contents in regards to the overall screen size. -

            -

            -

            -

            Icon

            - Select from over 2100 different glyph icons to represent your application. -

            -

            -

            -

            Color

            - Not available if "Application colors" is disabled in General settings. This color will be used for the application icon in the splash screen, as well as for the "selected" indicator when the application is selected. -

            -

            +

            General Settings (What does all this stuff do?)

            +
            +

            +

            Git Branch

            + Select the branch to track on Github for updates. +

            +

            +

            +

            Theme

            + Select from one of two pre-defined themes, or create your own. To create a custom theme, make a copy of either Modern.css or Classic.css in the /css/theme/ directory. Use a one-word theme name (no spaces) for the new file name. Modify the colors in the new theme file as you like, and then select it in settings. +

            +

            +

            +

            Color (General settings)

            + Select the primary default color used on login, splash screen, and for various other ui elements. +

            +

            +

            +

            Update Alerts

            + When enabled, you will receive a pop-up notification when new updates are available. +

            +

            +

            +

            Splash Screen

            + When enabled, Muximux will start with a splash page where you can select which application to view. +

            +

            +

            +

            Dropdown Override

            + When enabled, a button will appear in the main Muximux bar that will allow overriding the placement of applications in the dropdown menu when viewed on a display detected as being on a mobile device. Intended for users who have tablets with a smaller display. +

            +

            +

            +

            Application Colors

            + Set an individual color for each application. This will be used in the splash screen and for the tab's selected indicator. If disabled, the color selected in the general section of settings will be used. +

            +

            +

            +

            Auto-hide Navbar

            + When enabled, the navigation bar will collapse itself into a small strip, and expand on hover. This is disabled by default for mobile displays. +

            +

            +

            +

            Use Authentication

            + When enabled, you can set a username and password which will be required to log into Muximux. Password is hashed, salted, and stored in settings, so your password is never stored in plain text. +

            +

            +

            Applications Settings (What does the rest of this stuff do?)

            +
            +

            +

            URL

            + Enter the address of the page you want to load. See below for instructions when serving Muximux over HTTPS. Url should be fully formatted: 'http://www.address.com'. +

            +

            +

            +

            Zoom

            + Change the default zoom level for the application. This value is used to scale the iframe contents in regards to the overall screen size. +

            +

            +

            +

            Icon

            + Select from over 2100 different glyph icons to represent your application. +

            +

            +

            +

            Color

            + Not available if "Application colors" is disabled in General settings. This color will be used for the application icon in the splash screen, as well as for the "selected" indicator when the application is selected. +

            +

            +

            +

            Enabled

            + Uncheck to hide the application from the main menu without removing it. +

            +

            +

            +

            Landing

            + Do not immediately load the page when selected, but instead start at a default landing page for faster loading. +

            +

            +

            +

            Dropdown

            + Remove the application from the main menu and force it into the dropdown menu. Applications will be automatically moved to the dropdown menu to accomodate for screen width regardless of this setting. +

            +

            -

            Enabled

            - Uncheck to hide the application from the main menu without removing it. -

            -

            -

            -

            Landing

            - Do not immediately load the page when selected, but instead start at a default landing page for faster loading. -

            -

            -

            -

            Dropdown

            - Remove the application from the main menu and force it into the dropdown menu. Applications will be automatically moved to the dropdown menu to accomodate for screen width regardless of this setting. -

            -

            -

            -

            Default

            - Enable this button to make the application the deafult selected item when Muximux is loaded. -

            -

            +

            Default

            + Enable this button to make the application the deafult selected item when Muximux is loaded. +

            +

            Bookmarking apps contained within Muximux

            If you want to go directly to a specific app within Muximux you can use hashes (#) in the URL. For instance, if you have an app called "My app" you could use:
            @@ -238,10 +244,10 @@

            -
            - - -
            +
            + + +
            @@ -284,42 +290,42 @@
            -
            +
            - -
            + +
        • - -
        +
        From 0d8f52ddf5546de081eb1f6b102df88faf54b7af Mon Sep 17 00:00:00 2001 From: mescon <2rqridDJ6badb3c0> Date: Fri, 6 Jan 2017 18:26:48 +0100 Subject: [PATCH 166/170] Duplicate the browserconfig.xml and manifest.json files so that they are present both in root (default location searched) and in images/favicon/ specified by index.php. --- browserconfig.xml | 9 +++++++++ manifest.json | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 browserconfig.xml create mode 100644 manifest.json diff --git a/browserconfig.xml b/browserconfig.xml new file mode 100644 index 0000000..99a01d7 --- /dev/null +++ b/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #2b5797 + + + diff --git a/manifest.json b/manifest.json new file mode 100644 index 0000000..f6ae08a --- /dev/null +++ b/manifest.json @@ -0,0 +1,17 @@ +{ + "name": "Muximux", + "icons": [ + { + "src": "images\/favicon\/android-chrome-192x192.png?v=ngGoyLXN9n", + "sizes": "192x192", + "type": "image\/png" + }, + { + "src": "images\/favicon\/android-chrome-256x256.png?v=ngGoyLXN9n", + "sizes": "256x256", + "type": "image\/png" + } + ], + "theme_color": "#ffffff", + "display": "standalone" +} From a9dfd308c77722600198a9db41e06e00a32122a8 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Mon, 23 Jan 2017 16:51:35 +0100 Subject: [PATCH 167/170] Support for relative urls with custom ports --- js/functions.js | 16 ++++++++++++++++ js/main.js | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index 15a12d9..0b4a950 100644 --- a/js/functions.js +++ b/js/functions.js @@ -630,4 +630,20 @@ function setupMobileTicker() { startEmpty:true }); +} + +// Parses passed url and looks for the form 'https://:34343/something'. If after double slash after protocol there is no host present, a local host is assumed and is placed before port part. +// The url from the example will be transformed into 'https://somehost:34343/something', where somehost is the host at which the muximux was accessed. +function parseRelativeUrlWithPortIfPresent(url) { + var parts = /^(http|https|ftp):\/\/:(\d+)(.*)$/.exec(url), + fullUrl; + if(parts) { + var protocol = parts[1], + port = parts[2], + relativePath = parts[3]; + fullUrl = protocol + '://' + window.location.hostname + ':' + port + relativePath; + } else { + fullUrl = url; + } + return fullUrl; } \ No newline at end of file diff --git a/js/main.js b/js/main.js index 33cdc23..b3f930c 100644 --- a/js/main.js +++ b/js/main.js @@ -100,7 +100,7 @@ jQuery(document).ready(function($) { selectedContent.children('iframe').attr('src', selectedContent.children('iframe').attr('src')); }); var sifsrc = selectedContent.children('iframe').attr('src'); - var srcUrl = selectedContent.children('iframe').data('src'); + var srcUrl = parseRelativeUrlWithPortIfPresent(selectedContent.children('iframe').data('src')); if (sifsrc === undefined || sifsrc === "") { selectedContent.children('iframe').attr('src', srcUrl); } From 09cc6e71cd791fe1f51b404cbdf6f465507ee592 Mon Sep 17 00:00:00 2001 From: mescon <2rqridDJ6badb3c0> Date: Wed, 25 Jan 2017 13:47:27 +0100 Subject: [PATCH 168/170] Update path to font files, since when using combineify.php, the relative path to the font files are not in ../fonts/ (above combineify.php), but in fonts/ --- css/font-awesome.min.css | 2 +- css/font-muximux.css | 10 +++++----- css/font-pt_sans.css | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index d0603cb..acce2ef 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -1,4 +1,4 @@ /*! * Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.5.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.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(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"} + */@font-face{font-family:'FontAwesome';src:url('fonts/fontawesome-webfont.eot?v=4.5.0');src:url('fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'),url('fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'),url('fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'),url('fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'),url('fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.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(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"} diff --git a/css/font-muximux.css b/css/font-muximux.css index 8e7649f..bc688da 100644 --- a/css/font-muximux.css +++ b/css/font-muximux.css @@ -1,10 +1,10 @@ @font-face { font-family: 'muximuxfonts'; - src: url('../fonts/muximuxfonts.eot?wczx5m'); - src: url('../fonts/muximuxfonts.eot?wczx5m#iefix') format('embedded-opentype'), - url('../fonts/muximuxfonts.ttf?wczx5m') format('truetype'), - url('../fonts/muximuxfonts.woff?wczx5m') format('woff'), - url('../fonts/muximuxfonts.svg?wczx5m#muximuxfonts') format('svg'); + src: url('fonts/muximuxfonts.eot?wczx5m'); + src: url('fonts/muximuxfonts.eot?wczx5m#iefix') format('embedded-opentype'), + url('fonts/muximuxfonts.ttf?wczx5m') format('truetype'), + url('fonts/muximuxfonts.woff?wczx5m') format('woff'), + url('fonts/muximuxfonts.svg?wczx5m#muximuxfonts') format('svg'); font-weight: normal; font-style: normal; } diff --git a/css/font-pt_sans.css b/css/font-pt_sans.css index 559ab25..b14f6be 100644 --- a/css/font-pt_sans.css +++ b/css/font-pt_sans.css @@ -3,11 +3,11 @@ font-family: 'PT Sans'; font-style: normal; font-weight: 400; - src: url('../fonts/PT_Sans-Web-Regular.eot'); /* IE9 Compat Modes */ + src: url('fonts/PT_Sans-Web-Regular.eot'); /* IE9 Compat Modes */ src: local('PT Sans'), local('PTSans-Regular'), - url('../fonts/PT_Sans-Web-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/PT_Sans-400-latin.woff2') format('woff2'), /* Modern browsers */ - url('../fonts/PT_Sans-400-latin.woff') format('woff'), /* Older browsers */ - url('../fonts/PT_Sans-Web-Regular.ttf') format('truetype'); /* Safari, Android, iOS */ + url('fonts/PT_Sans-Web-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('fonts/PT_Sans-400-latin.woff2') format('woff2'), /* Modern browsers */ + url('fonts/PT_Sans-400-latin.woff') format('woff'), /* Older browsers */ + url('fonts/PT_Sans-Web-Regular.ttf') format('truetype'); /* Safari, Android, iOS */ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } From b2d38ac9ae0b5dc2181fa14479c906b2139e66d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Ga=C5=82a=C5=BCyn?= Date: Thu, 26 Jan 2017 16:37:59 +0100 Subject: [PATCH 169/170] Added support for credentials in relative urls with ports --- js/functions.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/js/functions.js b/js/functions.js index 0b4a950..0b6ce5a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -634,16 +634,18 @@ function setupMobileTicker() { // Parses passed url and looks for the form 'https://:34343/something'. If after double slash after protocol there is no host present, a local host is assumed and is placed before port part. // The url from the example will be transformed into 'https://somehost:34343/something', where somehost is the host at which the muximux was accessed. -function parseRelativeUrlWithPortIfPresent(url) { - var parts = /^(http|https|ftp):\/\/:(\d+)(.*)$/.exec(url), +// User is able also to add credentials to the custom port form i.e. 'ftp://login:password@:2525/path' and it will be transformed into 'ftp://login:password@somehost:2525/path'. +var parseRelativeUrlWithPortIfPresent = function(url) { + var parts = /^([a-z][a-z0-9+\-.]*):\/\/(.*?:.*?@)?:(\d+)(.*)$/.exec(url), fullUrl; if(parts) { var protocol = parts[1], - port = parts[2], - relativePath = parts[3]; - fullUrl = protocol + '://' + window.location.hostname + ':' + port + relativePath; + credentials = parts[2] ? parts[2] : '', + port = parts[3], + relativePath = parts[4]; + fullUrl = protocol + '://' + credentials + window.location.hostname + ':' + port + relativePath; } else { fullUrl = url; } return fullUrl; -} \ No newline at end of file +} From 8e1fad36d7eda1ab1210a28ff66a2600958cbc5a Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Fri, 27 Jan 2017 00:38:17 +0100 Subject: [PATCH 170/170] Fix for loading default page with relative url --- js/main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index b3f930c..eeb653a 100644 --- a/js/main.js +++ b/js/main.js @@ -78,6 +78,10 @@ jQuery(document).ready(function($) { tabItems = tab.find('ul.cd-tabs-navigation, .main-nav'), tabContentWrapper = tab.children('ul.cd-tabs-content'), tabNavigation = tab.find('nav'); + $(tab).find('iframe').each(function(i, iframe) { + // pre-process each src in iframe, in case of default tab + $(iframe).attr('src', parseRelativeUrlWithPortIfPresent($(iframe).attr('src'))); + }); tabItems.on('click', 'a:not(#reload, #hamburger, #override, #logout, #logModalBtn, #showSplash)', function(event) { // Set up menu for desktip view if (!isMobile) { @@ -443,4 +447,4 @@ function setSelectedColor() { $('.drawerItem').addClass('full'); }); } -} \ No newline at end of file +}