mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-07 10:30:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #366 from bergware/master

Browse Source 
Fixed: missing spinner on user shares and disk shares compute
This commit is contained in:
tom mortensen
2018-08-25 10:29:14 -07:00
committed by GitHub
parent 8a1df59cda 45ccc62889
commit e5417bf70a
9 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dynamix.plugin.manager/Plugins.page
View File

@@ -27,7 +27,7 @@ $check = $notify['version'] ? 0 : 1;
<style>
#plugin_tree{width:33%;height:200px;overflow-y:scroll}
<?if (strstr('white,black',$display['theme'])):?>
span.vhshift{margin-top:30px!important;margin-right:-20px!important}
span.vhshift{margin-top:22px!important;margin-right:-20px!important}
<?endif;?>
</style>
<script src="<?autov('/webGui/javascript/jquery.filetree.js')?>"></script>

4
plugins/dynamix.vm.manager/VMMachines.page
View File

@@ -29,12 +29,12 @@ function showCPUs($uuid) {
foreach ($cpus as $pair) {
unset($cpu1,$cpu2);
list($cpu1, $cpu2) = preg_split('/[,-]/',$pair);
$check = in_array($cpu1, $vcpu) ? 'fa-check-square-o':'fa-square-o';
$check = in_array($cpu1, $vcpu) ? 'fa-circle orange-text':'fa-circle-o';
if (!$cpu2) {
echo "<label><i class='$check'></i>&nbsp;&nbsp;cpu $cpu1</label>";
} else {
echo "<label class='cpu1'><i class='fa fa-fw $check'></i>&nbsp;&nbsp;cpu $cpu1 / $cpu2</label>";
$check = in_array($cpu2, $vcpu) ? 'fa-check-square-o':'fa-square-o';
$check = in_array($cpu2, $vcpu) ? 'fa-circle orange-text':'fa-circle-o';
echo "<label class='cpu2'><i class='fa fa-fw $check'></i></label>";
}
}

2
plugins/dynamix/CPUset.page
View File

@@ -183,7 +183,7 @@ $(function(){
<?if ($dockerd):?>
<form name="ct">
<input type="hidden" name="names" id="names-ct" value="">
<table class='tablesorter' style='width:auto'>
<table class='tablesorter <?=$libvirtd?'':'shift'?>' style='width:auto'>
<thead><tr><th><i class="fa fa-list"></i> Container</th><?create()?></tr></thead>
<tbody id="table-ct"><?=$spinner?></tbody>
</table>

1
plugins/dynamix/DiskList.page
View File

@@ -20,6 +20,7 @@ function displayDisks(all) {
if (all == 'yes') {
$.cookie('ssz','ssz',{path:'/'});
$('#disk_list').html("<tr><td colspan='8'><div class='spinner'></div></td></tr>");
$('div.spinner').html(unraid_logo);
}
$.get('/webGui/include/DiskList.php',{compute:all,path:'<?=$path?>',scale:'<?=$display['scale']?>',number:'<?=$display['number']?>',fill:$.cookie('ssz')},function(data){
$.removeCookie('ssz',{path:'/'})

1
plugins/dynamix/ShareList.page
View File

@@ -20,6 +20,7 @@ function displayShares(all) {
if (all == 'yes') {
$.cookie('ssz','ssz',{path:'/'});
$('#share_list').html("<tr><td colspan='8'><div class='spinner'></div></td></tr>");
$('div.spinner').html(unraid_logo);
}
$.get('/webGui/include/ShareList.php',{compute:all,path:'<?=addslashes(htmlspecialchars($path))?>',scale:'<?=$display['scale']?>',number:'<?=$display['number']?>',fill:$.cookie('ssz')},function(data){
$.removeCookie('ssz',{path:'/'})

5
plugins/dynamix/styles/default-azure.css
View File

@@ -264,10 +264,7 @@ blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1p
blockquote.ontop{margin-top:0;margin-bottom:46px}
label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
label.checkbox input{position:absolute;opacity:0;cursor:pointer}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#D4D2D4}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#D4D2D4;border-radius:100%}
label.checkbox:hover input ~ .checkmark{background-color:#A4A2A4}
label.checkbox input:checked ~ .checkmark {background-color:#ff8c2f}
label.checkbox input:disabled ~ .checkmark {opacity:0.5}
span.checkmark:after{content:'';position:absolute;display:none}
label.checkbox input:checked ~ .checkmark:after{display:block}
label.checkbox .checkmark:after{left:4px;top:0;width:3px;height:8px;border:solid white;border-width:0 3px 3px 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}

5
plugins/dynamix/styles/default-black.css
View File

@@ -253,10 +253,7 @@ blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-to
blockquote.ontop{margin-top:-20px;margin-bottom:46px}
label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
label.checkbox input{position:absolute;opacity:0;cursor:pointer}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2b2b2b}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2b2b2b;border-radius:100%}
label.checkbox:hover input ~ .checkmark{background-color:#5b5b5b}
label.checkbox input:checked ~ .checkmark {background-color:#ff8c2f}
label.checkbox input:disabled ~ .checkmark {opacity:0.5}
span.checkmark:after{content:'';position:absolute;display:none}
label.checkbox input:checked ~ .checkmark:after{display:block}
label.checkbox .checkmark:after{left:4px;top:0;width:3px;height:8px;border:solid white;border-width:0 3px 3px 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}

5
plugins/dynamix/styles/default-gray.css
View File

@@ -265,10 +265,7 @@ blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border:1p
blockquote.ontop{margin-top:0;margin-bottom:46px}
label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
label.checkbox input{position:absolute;opacity:0;cursor:pointer}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2B2D2B}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#2B2D2B;border-radius:100%}
label.checkbox:hover input ~ .checkmark{background-color:#5B5D5B}
label.checkbox input:checked ~ .checkmark {background-color:#ff8c2f}
label.checkbox input:disabled ~ .checkmark {opacity:0.5}
span.checkmark:after{content:'';position:absolute;display:none}
label.checkbox input:checked ~ .checkmark:after{display:block}
label.checkbox .checkmark:after{left:4px;top:0;width:3px;height:8px;border:solid white;border-width:0 3px 3px 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}

5
plugins/dynamix/styles/default-white.css
View File

@@ -253,10 +253,7 @@ blockquote{width:90%;margin:10px auto;text-align:left;padding:4px 20px;border-to
blockquote.ontop{margin-top:-20px;margin-bottom:46px}
label.checkbox{display:block;position:relative;padding-left:28px;margin:3px 0;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
label.checkbox input{position:absolute;opacity:0;cursor:pointer}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#e3e3e3}
span.checkmark{position:absolute;top:0;left:6px;height:14px;width:14px;background-color:#e3e3e3;border-radius:100%}
label.checkbox:hover input ~ .checkmark{background-color:#b3b3b3}
label.checkbox input:checked ~ .checkmark {background-color:#ff8c2f}
label.checkbox input:disabled ~ .checkmark {opacity:0.5}
span.checkmark:after{content:'';position:absolute;display:none}
label.checkbox input:checked ~ .checkmark:after{display:block}
label.checkbox .checkmark:after{left:4px;top:0;width:3px;height:8px;border:solid white;border-width:0 3px 3px 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}