diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php index 1c3de385d..7a1f71d5c 100644 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php @@ -252,7 +252,7 @@ function openWindow(cmd,title,height,width) { } function openTerminal(tag,name,more) { if (/MSIE|Edge/.test(navigator.userAgent)) { - swal({title:"_(Unsupported Feature)_",text:"_(Sorry, this feature is not supported by MSIE/Edge)_.
_(Please try a different browser)_",type:'error',html:true,confirmButtonText:"_(Ok)_"}); + swal({title:"_(Unsupported Feature)_",text:"_(Sorry, this feature is not supported by MSIE/Edge)_.
_(Please try a different browser)_",type:'error',html:true,animation:'none',confirmButtonText:"_(Ok)_"}); return; } // open terminal window (run in background) @@ -409,7 +409,7 @@ function openDone(data) { if (data == '_DONE_') { $('div.spinner.fixed').hide(); $('button.confirm').text("").prop('disabled',false).show(); - if ( typeof ca_done_override !== 'undefined' ) { + if (typeof ca_done_override !== 'undefined') { if (ca_done_override == true) { $("button.confirm").trigger("click"); ca_done_override = false; @@ -529,7 +529,7 @@ function hideUpgrade(set) { /** @note can likely be removed, not used in webgui } function confirmUpgrade(confirm) { if (confirm) { - swal({title:" Unraid OS",text:"?",type:'warning',html:true,showCancelButton:true,closeOnConfirm:false,confirmButtonText:"",cancelButtonText:""},function(){ + swal({title:" Unraid OS",text:"?",type:'warning',html:true,animation:'none',showCancelButton:true,closeOnConfirm:false,confirmButtonText:"",cancelButtonText:""},function(){ openPlugin("plugin update unRAIDServer.plg"," Unraid OS"); }); } else { @@ -654,6 +654,7 @@ $.ajaxPrefilter(function(s, orig, xhr){ + backtotopoffset) { - $('.back_to_top').fadeIn(backtotopduration); + if ($(this).scrollTop() > scrollOffset) { + $('.back_to_top').fadeIn(scrollDuration); } else { - $('.back_to_top').fadeOut(backtotopduration); + $('.back_to_top').fadeOut(scrollDuration); } var top = $('div#header').height()-1; // header height has 1 extra pixel to cover overlap @@ -1049,9 +1050,16 @@ $(window).scroll(function() { $('div.upgrade_notice').css($(this).scrollTop() > 24 ? {position:'fixed',top:'0'} : {position:'absolute',top:'24px'}); }); + +$('.move_to_end').click(function(event) { + event.preventDefault(); + $('html,body').animate({scrollTop:$(document).height()},scrollDuration); + return false; +}); + $('.back_to_top').click(function(event) { event.preventDefault(); - $('html,body').animate({scrollTop:0},backtotopduration); + $('html,body').animate({scrollTop:0},scrollDuration); return false; }); @@ -1128,6 +1136,7 @@ $(function() { }); } $('form').append($('').attr({type:'hidden', name:'csrf_token', value:csrf_token})); + setTimeout(function(){if ($(document).height() > $(window).height()) $('.move_to_end').fadeIn(scrollDuration);},2000); }); var gui_pages_available = []; @@ -1147,56 +1156,43 @@ function isValidURL(url) { } } -$('body').on("click","a,.ca_href", function(e) { - if ($(this).hasClass("ca_href") ) { +$('body').on('click','a,.ca_href', function(e) { + if ($(this).hasClass('ca_href') ) { var ca_href = true; - var href=$(this).attr("data-href"); - var target=$(this).attr("data-target"); + var href=$(this).attr('data-href'); + var target=$(this).attr('data-target'); } else { var ca_href = false; - var href = $(this).attr("href"); - var target = $(this).attr("target"); + var href = $(this).attr('href'); + var target = $(this).attr('target'); } - if ( href ) { + if (href) { href = href.trim(); - if ( href.match('https?://[^\.]*.(my)?unraid.net/') || href.indexOf("https://unraid.net/") == 0 || href == "https://unraid.net" || href.indexOf("http://lime-technology.com") == 0) { - if ( ca_href ) { - window.open(href,target); - } + if (href.match('https?://[^\.]*.(my)?unraid.net/') || href.indexOf('https://unraid.net/') == 0 || href == 'https://unraid.net' || href.indexOf('http://lime-technology.com') == 0) { + if (ca_href) window.open(href,target); return; } - - if (href !== "#" && href.indexOf("javascript") !== 0) { + if (href !== '#' && href.indexOf('javascript') !== 0) { var dom = isValidURL(href); - if ( dom == false ) { - if ( href.indexOf("/") == 0 ) { // all internal links start with "/" - return; + if (dom == false) { + if (href.indexOf('/') == 0) return; // all internal links start with "/" + var baseURLpage = href.split('/'); + if (gui_pages_available.includes(baseURLpage[0])) return; } - var baseURLpage = href.split("/"); - if ( gui_pages_available.includes(baseURLpage[0]) ) { - return; - } - } - if ( $(this).hasClass("localURL") ) { - return; - } - + if ($(this).hasClass('localURL')) return; try { - var domainsAllowed = JSON.parse($.cookie("allowedDomains")); + var domainsAllowed = JSON.parse($.cookie('allowedDomains')); } catch(e) { var domainsAllowed = new Object(); } - $.cookie("allowedDomains",JSON.stringify(domainsAllowed),{expires:3650}); // rewrite cookie to further extend expiration by 400 days - - if ( domainsAllowed[dom.hostname] ) { - return; - } - + $.cookie('allowedDomains',JSON.stringify(domainsAllowed),{expires:3650}); // rewrite cookie to further extend expiration by 400 days + if (domainsAllowed[dom.hostname]) return; e.preventDefault(); swal({ title: "", text: "

"+href+"

"+dom.hostname+"
", html: true, + animation: 'none', type: 'warning', showCancelButton: true, showConfirmButton: true, @@ -1204,16 +1200,14 @@ $('body').on("click","a,.ca_href", function(e) { confirmButtonText: "" },function(isConfirm) { if (isConfirm) { - if ( $("#Link_Always_Allow").is(":checked") ) { + if ($('#Link_Always_Allow').is(':checked')) { domainsAllowed[dom.hostname] = true; - $.cookie("allowedDomains",JSON.stringify(domainsAllowed),{expires:3650}); + $.cookie('allowedDomains',JSON.stringify(domainsAllowed),{expires:3650}); } var popupOpen = window.open(href,target); - if ( !popupOpen || popupOpen.closed || typeof popupOpen == "undefined" ) { - var popupWarning = addBannerWarning(""); - setTimeout(function() { - removeBannerWarning(popupWarning);} - ,10000); + if (!popupOpen || popupOpen.closed || typeof popupOpen == 'undefined') { + var popupWarning = addBannerWarning(""); + setTimeout(function(){removeBannerWarning(popupWarning);},10000); } } }); diff --git a/emhttp/plugins/dynamix/styles/defaultpagelayout.css b/emhttp/plugins/dynamix/styles/defaultpagelayout.css index 70548d17b..425744b1f 100644 --- a/emhttp/plugins/dynamix/styles/defaultpagelayout.css +++ b/emhttp/plugins/dynamix/styles/defaultpagelayout.css @@ -3,7 +3,8 @@ .upgrade_notice.done{color:#4f8a10;background-color:#dff2bf;border-color:#4f8a10} .upgrade_notice.alert{color:#f0000c;background-color:#ff9e9e;border-color:#f0000c} .upgrade_notice i{float:right;cursor:pointer} -.back_to_top{display:none;position:fixed;bottom:30px;right:12px;color:#e22828;font-size:2.5rem;z-index:999} +.move_to_end{display:none;position:fixed;bottom:24px;right:12px;color:#e22828;font-size:2.5rem;z-index:999} +.back_to_top{display:none;position:fixed;bottom:24px;right:40px;color:#e22828;font-size:2.5rem;z-index:999} span.big.blue-text{cursor:pointer} span.strong.tour{margin-left:5px;padding-left:0} i.abortOps{font-size:2rem;float:right;margin-right:20px;margin-top:8px;cursor:pointer}