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

Merge pull request #64 from bergware/master

Browse Source 
rc5 based modifications
This commit is contained in:
tom mortensen
2016-08-30 15:17:16 -07:00
committed by GitHub
parent 3c62e2ebc4 b3bd5e78d9
commit f7d8ebca4d
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dynamix/SecuritySMB.page
View File

@@ -176,6 +176,6 @@ function cloneUser() {
copied = true;
}
});
if (copied) swal('Clone complete','User access settings are cloned to the selected shares','success');
if (copied) swal({title:'Clone complete',text:'User access settings are cloned to the selected shares',type:'success'},function(){refresh();});
}
</script>

2
plugins/dynamix/ShareEdit.page
View File

@@ -153,7 +153,7 @@ function cloneShare() {
copied = true;
}
});
if (copied) swal('Clone complete','Share settings are cloned to the selected shares','success');
if (copied) swal({title:'Clone complete',text:'Share settings are cloned to the selected shares',type:'success'},function(){refresh();});
}
<?endif;?>
</script>

11
plugins/dynamix/include/DeviceList.php
View File

@@ -65,11 +65,16 @@ function device_browse(&$disk) {
return "<a href='$path/Browse?dir=$dir'><img src='/webGui/images/explore.png' title='Browse $dir'></a>";
}
}
function device_id($id) {
$len = strlen($id);
$wwn = substr($id,-18);
return (substr($wwn,0,2)!='_3' || preg_match('/.[_-]/',$wwn)) ? $id : substr($id,0,$len-18);
}
function device_desc(&$disk) {
global $var;
$size = my_scale($disk['size']*1024,$unit);
$log = $var['fsState']=='Started' ? "<a href=\"#\" title=\"Disk Log Information\" onclick=\"openBox('/webGui/scripts/disk_log&arg1={$disk['device']}','Disk Log Information',600,900,false);return false\"><i class=\"fa fa-hdd-o icon\"></i></a>" : "";
return "$log{$disk['id']} - $size $unit ({$disk['device']})";
return $log.device_id($disk['id'])." - $size $unit ({$disk['device']})";
}
function assignment(&$disk) {
global $var, $devs;
@@ -77,11 +82,11 @@ function assignment(&$disk) {
$out .= "<select class=\"slot\" name=\"slotId.{$disk['idx']}\" onChange=\"{$disk['name']}Form.submit()\">";
$empty = ($disk['idSb']!='' ? 'no device' : 'unassigned');
if ($disk['id']!='') {
$out .= "<option value=\"{$disk['id']}\" selected>".device_desc($disk)."</option>";
$out .= "<option value=\"".device_id($disk['id'])."\" selected>".device_desc($disk)."</option>";
$out .= "<option value=''>$empty</option>";
} else
$out .= "<option value='' selected>$empty</option>";
foreach ($devs as $dev) {$out .= "<option value=\"{$dev['id']}\">".device_desc($dev)."</option>";}
foreach ($devs as $dev) {$out .= "<option value=\"".device_id($dev['id'])."\">".device_desc($dev)."</option>";}
return "$out</select></form>";
}
function fs_info(&$disk) {

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

@@ -32,6 +32,7 @@ select[name=enter_share]{padding:0;float:right;}
select option{background-color:#000000;}
select.narrow{min-width:69px;}
select.auto{min-width:auto;}
select.slot{min-width:400px;max-width:400px;}
input.narrow{width:132px;}
input.trim{width:50px;}
#header{height:90px;}

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

@@ -31,6 +31,7 @@ select[name=enter_view]{padding:0;float:right;}
select[name=enter_share]{padding:0;float:right;}
select.narrow{min-width:69px;}
select.auto{min-width:auto;}
select.slot{min-width:400px;max-width:400px;}
input.narrow{width:132px;}
input.trim{width:50px;}
#header{height:90px;}