From a970b201a53bdf2bf6344694a0f3150ea5a5478f Mon Sep 17 00:00:00 2001 From: bergware Date: Wed, 22 Aug 2018 15:08:48 +0200 Subject: [PATCH] Replaced blue circle animation with unraid wave --- .../DockerContainers.page | 1 - .../javascript/docker.js | 2 +- plugins/dynamix.plugin.manager/Plugins.page | 5 ++--- plugins/dynamix.vm.manager/VMMachines.page | 2 -- plugins/dynamix/include/DefaultPageLayout.php | 4 ++++ plugins/dynamix/styles/default-azure.css | 22 +++++++++---------- plugins/dynamix/styles/default-black.css | 22 +++++++++---------- plugins/dynamix/styles/default-gray.css | 22 +++++++++---------- plugins/dynamix/styles/default-white.css | 22 +++++++++---------- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index 97c01cac1..ced18388d 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -45,7 +45,6 @@ input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;bac - diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js index 2396886ab..fc99c3eb4 100644 --- a/plugins/dynamix.docker.manager/javascript/docker.js +++ b/plugins/dynamix.docker.manager/javascript/docker.js @@ -190,7 +190,7 @@ function checkAll() { } function updateAll() { $('input[type=button]').prop('disabled',true); - $('div.spinner').show('slow'); + $('div.spinner').addClass('fixed').show('slow'); var list = ''; for (var i=0,ct; ct=docker[i]; i++) if (ct.update=='false') list += '&ct[]='+encodeURI(ct.name); var address = '/plugins/dynamix.docker.manager/include/CreateDocker.php?updateContainer=true'+list; diff --git a/plugins/dynamix.plugin.manager/Plugins.page b/plugins/dynamix.plugin.manager/Plugins.page index 0e8d70641..4774078b6 100644 --- a/plugins/dynamix.plugin.manager/Plugins.page +++ b/plugins/dynamix.plugin.manager/Plugins.page @@ -73,13 +73,12 @@ function loadlist(id) { $(function() { loadlist(); $('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);}); - $('.tabs').append(""); + $('.tabs').append(""); - $('.tabs').append(""); + $('.tabs').append(""); }); -
ApplicationVersionNetworkPort Mappings (App to Host)Volume Mappings (App to Host)CPU loadMemory loadAutostartLog
diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 00be71bbc..8593654c7 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -111,7 +111,6 @@ div.PanelText{display:none;} th.five{width:6%} tbody > tr.sortable:hover{cursor:move} -
PluginAuthorVersionStatusUninstall
@@ -151,7 +150,6 @@ var sortableHelper = function(e,i){ function loadlist() { $.get('/plugins/dynamix.vm.manager/include/VMMachines.php',{show:$.cookie('vmshow')},function(d) { var data = d.split(/\0/); - $('div.spinner').hide('slow'); $('#kvm_list').html(data[0]).sortable({helper:sortableHelper,items:'tr.sortable',opacity:0.4,update:function(e,i){ $('#kvm_list').find('tr.sortable').each(function(){ var parent = $(this).attr('parent-id'); diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index e24d18e35..dd111b290 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -483,6 +483,9 @@ $('.back_to_top').click(function(event) { return false; }); $(function() { + // unraid animated logo + var unraid_logo = ''; + if ($("div#nav-right").css('float').toLowerCase() == 'right') { var origNavRightWidth = $('div#nav-right').width(); var adjustMenuSize = function() { @@ -572,6 +575,7 @@ $(function() { }); } $('form').append($('').attr({type:'hidden', name:'csrf_token', value:''})); + $('div.spinner').each(function(){$(this).html(unraid_logo);}); watchdog.start(); }); diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index 12229f955..c723ace32 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -240,17 +240,17 @@ div.vmtemplate:hover{background-color:#EDEAEF} div.vmtemplate{height:120px;width:120px;border:1px solid #F3F0F4} div.vmtemplate img{margin-top:20px} div.up{margin-top:-20px;border:1px solid #F3F0F4;padding:4px 6px;overflow:auto} -div.spinner{height:32px;width:32px;margin:24px auto; --webkit-animation: fa-spin .6s infinite linear; --moz-animation: fa-spin .6s infinite linear; --o-animation: fa-spin .6s infinite linear; -animation: fa-spin .6s infinite linear; -border-left:6px solid rgba(0,174,239,.15); -border-right:6px solid rgba(0,174,239,.15); -border-bottom:6px solid rgba(0,174,239,.15); -border-top:6px solid rgba(0,174,239,.8); -border-radius:100%;} -div.spinner.fixed{display:none;position:absolute;left:47%;top:40px} +div.spinner{margin:48px auto;text-align:center} +div.spinner.fixed{display:none;position:absolute;left:46%;top:96px;margin:0} +div.spinner .unraid_mark{height:64px} +div.spinner .unraid_mark_2,div .unraid_mark_4{animation:mark_2 1.5s ease infinite} +div.spinner .unraid_mark_3{animation:mark_3 1.5s ease infinite} +div.spinner .unraid_mark_6,div .unraid_mark_8{animation:mark_6 1.5s ease infinite} +div.spinner .unraid_mark_7{animation:mark_7 1.5s ease infinite} +@keyframes mark_2{50% {transform:translateY(-40px)} 100% {transform:translateY(0px)}} +@keyframes mark_3{50% {transform:translateY(-62px)} 100% {transform:translateY(0px)}} +@keyframes mark_6{50% {transform:translateY(40px)} 100% {transform:translateY(0px)}} +@keyframes mark_7{50% {transform:translateY(62px)} 100% {transform: translateY(0px)}} pre.up{margin-top:0} pre{border:1px solid #F3F0F4;font-family:bitstream;font-size:12px;padding:0;overflow:auto;margin-bottom:10px;padding:10px} iframe#progressFrame{position:fixed;bottom:32px;left:60px;margin:0;padding:8px 8px 0 8px;width:100%;height:12px;line-height:12px;border-style:none;overflow:hidden;font-family:bitstream;font-size:12px;color:#808080;white-space:nowrap;z-index:-2} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index d7792593f..447d38000 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -229,17 +229,17 @@ div.Panel i.PanelIcon{font-size:48px} div.user-list{float:left;padding:10px;margin-right:10px;margin-bottom:24px;border:1px solid #2f2f2f;border-radius:5px;line-height:20px;height:100px;width:100px;background:#262626} div.user-list img{width:auto;max-width:48px;height:48px;margin-bottom:16px} div.up{margin-top:-20px;border:1px solid #2b2b2b;padding:4px 6px;overflow:auto} -div.spinner{height:32px;width:32px;margin:24px auto; --webkit-animation: fa-spin .6s infinite linear; --moz-animation: fa-spin .6s infinite linear; --o-animation: fa-spin .6s infinite linear; -animation: fa-spin .6s infinite linear; -border-left:6px solid rgba(0,174,239,.15); -border-right:6px solid rgba(0,174,239,.15); -border-bottom:6px solid rgba(0,174,239,.15); -border-top:6px solid rgba(0,174,239,.8); -border-radius:100%;} -div.spinner.fixed{display:none;position:absolute;left:47%;top:12px} +div.spinner{margin:48px auto;text-align:center} +div.spinner.fixed{display:none;position:absolute;left:46%;top:96px;margin:0} +div.spinner .unraid_mark{height:64px} +div.spinner .unraid_mark_2,div .unraid_mark_4{animation:mark_2 1.5s ease infinite} +div.spinner .unraid_mark_3{animation:mark_3 1.5s ease infinite} +div.spinner .unraid_mark_6,div .unraid_mark_8{animation:mark_6 1.5s ease infinite} +div.spinner .unraid_mark_7{animation:mark_7 1.5s ease infinite} +@keyframes mark_2{50% {transform:translateY(-40px)} 100% {transform:translateY(0px)}} +@keyframes mark_3{50% {transform:translateY(-62px)} 100% {transform:translateY(0px)}} +@keyframes mark_6{50% {transform:translateY(40px)} 100% {transform:translateY(0px)}} +@keyframes mark_7{50% {transform:translateY(62px)} 100% {transform: translateY(0px)}} pre.up{margin-top:-30px} pre{border:1px solid #2b2b2b;font-family:bitstream;padding:4px 6px;overflow:auto} iframe#progressFrame{position:fixed;bottom:32px;left:0;margin:0;padding:8px 8px 0 8px;width:100%;height:12px;line-height:12px;border-style:none;overflow:hidden;font-family:bitstream;font-size:12px;color:#808080;white-space:nowrap;z-index:-10} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index b0a86ef73..c3f5a6485 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -241,17 +241,17 @@ div.vmtemplate:hover{background-color:#121510} div.vmtemplate{height:120px;width:120px;border:1px solid #0C0F0B} div.vmtemplate img{margin-top:20px} div.up{margin-top:-20px;border:1px solid #0C0F0B;padding:4px 6px;overflow:auto} -div.spinner{height:32px;width:32px;margin:24px auto; --webkit-animation: fa-spin .6s infinite linear; --moz-animation: fa-spin .6s infinite linear; --o-animation: fa-spin .6s infinite linear; -animation: fa-spin .6s infinite linear; -border-left:6px solid rgba(0,174,239,.15); -border-right:6px solid rgba(0,174,239,.15); -border-bottom:6px solid rgba(0,174,239,.15); -border-top:6px solid rgba(0,174,239,.8); -border-radius:100%;} -div.spinner.fixed{display:none;position:absolute;left:47%;top:40px} +div.spinner{margin:48px auto;text-align:center} +div.spinner.fixed{display:none;position:absolute;left:46%;top:66px;margin:0} +div.spinner .unraid_mark{height:64px} +div.spinner .unraid_mark_2,div .unraid_mark_4{animation:mark_2 1.5s ease infinite} +div.spinner .unraid_mark_3{animation:mark_3 1.5s ease infinite} +div.spinner .unraid_mark_6,div .unraid_mark_8{animation:mark_6 1.5s ease infinite} +div.spinner .unraid_mark_7{animation:mark_7 1.5s ease infinite} +@keyframes mark_2{50% {transform:translateY(-40px)} 100% {transform:translateY(0px)}} +@keyframes mark_3{50% {transform:translateY(-62px)} 100% {transform:translateY(0px)}} +@keyframes mark_6{50% {transform:translateY(40px)} 100% {transform:translateY(0px)}} +@keyframes mark_7{50% {transform:translateY(62px)} 100% {transform: translateY(0px)}} pre.up{margin-top:0} pre{border:1px solid #0C0F0B;font-family:bitstream;font-size:12px;padding:0;overflow:auto;margin-bottom:10px;padding:10px} iframe#progressFrame{position:fixed;bottom:32px;left:60px;margin:0;padding:8px 8px 0 8px;width:100%;height:12px;line-height:12px;border-style:none;overflow:hidden;font-family:bitstream;font-size:12px;color:#808080;white-space:nowrap;z-index:-2} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index 8f8cd5a04..e205cd515 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -229,17 +229,17 @@ div.Panel i.PanelIcon{font-size:48px} div.user-list{float:left;padding:10px;margin-right:10px;margin-bottom:24px;border:1px solid #dedede;border-radius:5px;line-height:20px;height:100px;width:100px;background:#e8e8e8} div.user-list img{width:auto;max-width:48px;height:48px;margin-bottom:16px} div.up{margin-top:-20px;border:1px solid #e3e3e3;padding:4px 6px;overflow:auto} -div.spinner{height:32px;width:32px;margin:24px auto; --webkit-animation: fa-spin .6s infinite linear; --moz-animation: fa-spin .6s infinite linear; --o-animation: fa-spin .6s infinite linear; -animation: fa-spin .6s infinite linear; -border-left:6px solid rgba(0,174,239,.15); -border-right:6px solid rgba(0,174,239,.15); -border-bottom:6px solid rgba(0,174,239,.15); -border-top:6px solid rgba(0,174,239,.8); -border-radius:100%;} -div.spinner.fixed{display:none;position:absolute;left:47%;top:12px} +div.spinner{margin:48px auto;text-align:center} +div.spinner.fixed{display:none;position:absolute;left:46%;top:96px;margin:0} +div.spinner .unraid_mark{height:64px} +div.spinner .unraid_mark_2,div .unraid_mark_4{animation:mark_2 1.5s ease infinite} +div.spinner .unraid_mark_3{animation:mark_3 1.5s ease infinite} +div.spinner .unraid_mark_6,div .unraid_mark_8{animation:mark_6 1.5s ease infinite} +div.spinner .unraid_mark_7{animation:mark_7 1.5s ease infinite} +@keyframes mark_2{50% {transform:translateY(-40px)} 100% {transform:translateY(0px)}} +@keyframes mark_3{50% {transform:translateY(-62px)} 100% {transform:translateY(0px)}} +@keyframes mark_6{50% {transform:translateY(40px)} 100% {transform:translateY(0px)}} +@keyframes mark_7{50% {transform:translateY(62px)} 100% {transform: translateY(0px)}} pre.up{margin-top:-30px} pre{border:1px solid #e3e3e3;font-family:bitstream;padding:4px 6px;overflow:auto} iframe#progressFrame{position:fixed;bottom:32px;left:0;margin:0;padding:8px 8px 0 8px;width:100%;height:12px;line-height:12px;border-style:none;overflow:hidden;font-family:bitstream;font-size:12px;color:#808080;white-space:nowrap;z-index:-10}
NameDescriptionCPUsMemoryvDisksGraphicsAutostart