mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-04 00:39:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1032 from bergware/master

Browse Source 
Bug fixes
This commit is contained in:
tom mortensen
2022-02-26 07:02:45 -08:00
committed by GitHub
parent 625ebe1b3f 32e5b89ce9
commit b57ed30610
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.vm.manager/include/VMedit.php
+5 -2
View File
@@ -94,8 +94,9 @@ body{-webkit-overflow-scrolling:touch}
#vmform table{margin-top:0}
#vmform div#title + table{margin-top:0}
#vmform table tr{vertical-align:top;line-height:40px}
#vmform table tr td:nth-child(odd){width:220px;text-align:right;padding-right:10px}
#vmform table tr td:nth-child(even){width:100px}
#vmform table tr td:nth-child(odd){width:300px;text-align:right;padding-right:10px}
#vmform table tr td:nth-child(even){width:110px}
#vmform table tr td:first-child{padding-right:30px}
#vmform table tr td:last-child{width:inherit}
#vmform .multiple{position:relative}
#vmform .sectionbutton{position:absolute;left:2px;cursor:pointer;opacity:0.4;font-size:1.4rem;line-height:17px;z-index:10;transition-property:opacity,left;transition-duration:0.1s;transition-timing-function:linear}
@@ -132,6 +133,8 @@ span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
#vmform .disk{display:none}
#vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
span#dropbox{border:1px solid <?=$border?>;background:<?=$bgcolor?>;padding:28px 12px;line-height:72px;margin-right:16px;}
i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
input[type=checkbox]{margin-left:0}
</style>
<span class="status advancedview_panel" style="margin-top:<?=$top?>px"><input type="checkbox" class="advancedview"></span>
plugins/dynamix/ArrayOperation.page
+1 -2
View File
@@ -275,8 +275,7 @@ devices.on('message', function(msg,meta) {
<?if ($var['fsState']=='Started'):?>
setTimeout(refresh,0);
<?else:?>
devices.stop();
arraymonitor.start();
if (!timers.stopped) timers.stopped = setTimeout(function(){devices.stop(); arraymonitor.start();},1000);
<?endif;?>
}
break;
plugins/dynamix/DeviceInfo.page
+4 -2
View File
@@ -296,11 +296,13 @@ $(function() {
$('div[id=title]:first').append(ctrl);
<?endif;?>
<?endif;?>
<?if (strpos($disk['status'],'_NP')===false):?>
var form = document.smart_settings;
<?if (!isset($disk['smType'])):?>
form.smType.selectedIndex = 0;
<?endif;?>
setGlue(form,false);
<?endif;?>
if (!$('#shareEnabled').prop('disabled')) freeSpace($('#shareEnabled').val());
var btrfs = false;
if ($.cookie('btrfs-balance-<?=$tag?>')) btrfs = btrfsBalance($.cookie('btrfs-balance-<?=$tag?>'));
@@ -461,7 +463,7 @@ _(Critical disk utilization threshold)_ (%):
<input type="button" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
<?endif;?>
<?if ($var['fsState']=="Stopped" && in_array($name,$pools)):?>
<?$empty = $disks[$name]['devices']==0?>
<?$empty = $disk['devices']==0?>
<input type="button" value="_(Delete Pool)_" onclick="deletePool()"<?=$empty?'':' disabled'?>><?if (!$empty):?>_(Unassign **ALL** devices to delete this pool)_<?endif;?>
<?endif;?>
</form>
@@ -688,7 +690,7 @@ _(xfs_repair status)_:
</form>
<?endif;?>
<?if (strpos($disks[$name]['status'],'_NP')===false):?>
<?if (strpos($disk['status'],'_NP')===false):?>
<div id="title"><span class="left"><i class="title fa fa-plus-square"></i>_(SMART Settings)_</span></div>
<form markdown="1" name="smart_settings" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareDeviceInfo(this)">