mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-04 07:59:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #539 from bergware/master

Browse Source 
Fixed: undo cleanup of disk.png
This commit is contained in:
tom mortensen
2019-10-27 10:18:24 -07:00
committed by GitHub
parent 2d2e52bc73 b56b781354
commit 4121baa273
13 changed files with 203 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/dynamix/DashStats.page
View File

@@ -237,7 +237,7 @@ form[name=boot]{display:none}
<i id='mycase' class='fa fa-hdd-o'></i><br>
<?endif;?>
</span>
<input type='button' value='Edit' onclick='openBox("/webGui/include/SelectCase.php?file=<?=$myfile?>&csrf=<?=$var['csrf_token']?>","Select Case Model",600,980,true,"setCase");return false'>
<input type='button' value='Edit' onclick='openBox("/webGui/include/SelectCase.php?file=<?=$myfile?>&csrf=<?=$var['csrf_token']?>","Select Case Model",700,980,true,"setCase");return false'>
</div>
</td><td></td></tr>
</tbody>
@@ -472,8 +472,20 @@ foreach ($users as $user) {
} else {
$write = 0; $read = 0;
foreach ($shares as $share) {
if (strpos($sec[$share['name']]['writeList'],$name)!==false) $write++;
if (strpos($sec[$share['name']]['readList'],$name)!==false) $read++;
$access = $sec[$share['name']];
if ($access['export']=='-') continue;
switch ($access['security']) {
case 'public':
$write++;
break;
case 'secure':
if (in_array($name,explode(',',$access['writeList']))) $write++; else $read++;
break;
case 'private':
if (in_array($name,explode(',',$access['writeList']))) $write++;
if (in_array($name,explode(',',$access['readList']))) $read++;
break;
}
}
}
if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
@@ -492,8 +504,20 @@ foreach ($users as $user) {
} else {
$write = 0; $read = 0;
foreach ($shares as $share) {
if (strpos($sec_afp[$share['name']]['writeList'],$name)!==false) $write++;
if (strpos($sec_afp[$share['name']]['readList'],$name)!==false) $read++;
$access = $sec_afp[$share['name']];
if ($access['export']=='-') continue;
switch ($access['security']) {
case 'public':
$write++;
break;
case 'secure':
if (in_array($name,explode(',',$access['writeList']))) $write++; else $read++;
break;
case 'private':
if (in_array($name,explode(',',$access['writeList']))) $write++;
if (in_array($name,explode(',',$access['readList']))) $read++;
break;
}
}
}
if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);

2
plugins/dynamix/ShareEdit.page
View File

@@ -224,7 +224,7 @@ Use cache (for new files/directories):
>
> **NOTE:** Mover will never move any files that are currently in use.
> Tnis means if you want to move files associated with system services such as Docker or VMs then you need to
> disable these services while nover is running.
> disable these services while mover is running.
Enable Copy-on-write:
: <select name="shareCOW" size="1"<?if ($name):?> disabled<?endif;?>>

BIN
plugins/dynamix/images/disk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

66
plugins/dynamix/styles/default-cases.css
View File

@@ -1,36 +1,46 @@
@font-face{font-family:cases;font-weight:normal;font-style:normal;
src:url('font-cases.eot?20190217');src:url('font-cases.eot?20190217#iefix') format('embedded-opentype'),url('font-cases.ttf?20190217') format('truetype'),url('font-cases.woff?20190217') format('woff'),url('font-cases.svg?20190217#cases') format('svg')}
src:url('font-cases.eot?20191026');src:url('font-cases.eot?20191026#iefix') format('embedded-opentype'),url('font-cases.ttf?20191026') format('truetype'),url('font-cases.woff?20191026') format('woff'),url('font-cases.svg?20191026#cases') format('svg')}
[class^='case-'],[class*=' case-']{font-family:cases!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none}
.case-1u-disks:before{content:'\e90d'}
.case-1u-vents:before{content:'\e90e'}
.case-2u-disks:before{content:'\e90b'}
.case-2u-poweredge:before{content:'\e91d'}
.case-2u-vents:before{content:'\e90c'}
.case-3u-disks:before{content:'\e90a'}
.case-3u-fans:before{content:'\e909'}
.case-3u-md1510:before{content:'\e91a'}
.case-4u-disks:before{content:'\e908'}
.case-4u-fans:before{content:'\e907'}
.case-4u-storinator:before{content:'\e91b'}
.case-a79:before{content:'\e902'}
.case-core-wp200:before{content:'\e911'}
.case-css-cs380:before{content:'\e913'}
.case-dark-base-700:before{content:'\e906'}
.case-define-r5:before{content:'\e900'}
.case-elite-110:before{content:'\e905'}
.case-1u-disks:before{content:'\e907'}
.case-1u-vents:before{content:'\e908'}
.case-2u-disks:before{content:'\e909'}
.case-2u-poweredge:before{content:'\e90a'}
.case-2u-vents:before{content:'\e90b'}
.case-3u-avs-10-4:before{content:'\e90c'}
.case-3u-disks:before{content:'\e90d'}
.case-3u-fans:before{content:'\e90e'}
.case-4u-disks:before{content:'\e91a'}
.case-4u-fans:before{content:'\e91b'}
.case-4u-norco-4116:before{content:'\e91d'}
.case-4u-norco-4220:before{content:'\e921'}
.case-4u-rsv-l4411:before{content:'\e924'}
.case-4u-storinator:before{content:'\e926'}
.case-4u-vents:before{content:'\e927'}
.case-the-tower-900:before{content:'\e92b'}
.case-zalman-ms800:before{content:'\e928'}
.case-lancool-k12:before{content:'\e92a'}
.case-node-202:before{content:'\e922'}
.case-obsidian-550d:before{content:'\e923'}
.case-vivopc:before{content:'\e925'}
.case-router:before{content:'\e91f'}
.case-vm:before{content:'\e920'}
.case-stormtrooper:before{content:'\e91e'}
.case-storinator-ws:before{content:'\e91c'}
.case-full-tower:before{content:'\e914'}
.case-h500:before{content:'\e901'}
.case-htpc:before{content:'\e915'}
.case-mercury-s8:before{content:'\e910'}
.case-mid-tower:before{content:'\e916'}
.case-mini-tower:before{content:'\e917'}
.case-nineteen-hundred:before{content:'\e903'}
.case-node-804:before{content:'\e904'}
.case-nova-x2m:before{content:'\e90f'}
.case-poweredge-t630:before{content:'\e912'}
.case-router:before{content:'\e91f'}
.case-sff:before{content:'\e918'}
.case-storinator-ws:before{content:'\e91c'}
.case-stormtrooper:before{content:'\e91e'}
.case-v350:before{content:'\e919'}
.case-vm:before{content:'\e920'}
.case-nova-x2m:before{content:'\e90f'}
.case-mercury-s8:before{content:'\e910'}
.case-core-wp200:before{content:'\e911'}
.case-poweredge-t630:before{content:'\e912'}
.case-css-cs380:before{content:'\e913'}
.case-define-r5:before{content:'\e900'}
.case-h500:before{content:'\e901'}
.case-a79:before{content:'\e902'}
.case-nineteen-hundred:before{content:'\e903'}
.case-dark-base-700:before{content:'\e906'}
.case-node-804:before{content:'\e904'}
.case-elite-110:before{content:'\e905'}

47
plugins/dynamix/styles/default-fonts.css
View File

@@ -1,23 +1,24 @@
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal;
src:url('clear-sans.eot?20190313');src:url('clear-sans.eot?20190313#iefix') format('embedded-opentype'),url('clear-sans.woff?20190313') format('woff'),url('clear-sans.ttf?20190313') format('truetype'),url('clear-sans.svg?20190313#clear-sans') format('svg')}
src:url('clear-sans.eot?20191026');src:url('clear-sans.eot?20191026#iefix') format('embedded-opentype'),url('clear-sans.woff?20191026') format('woff'),url('clear-sans.ttf?20191026') format('truetype'),url('clear-sans.svg?20191026#clear-sans') format('svg')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal;
src:url('clear-sans-bold.eot?20190313');src:url('clear-sans-bold.eot?20190313?#iefix') format('embedded-opentype'),url('clear-sans-bold.woff?20190313') format('woff'),url('clear-sans-bold.ttf?20190313') format('truetype'),url('clear-sans-bold.svg?20190313#clear-sans-bold') format('svg')}
src:url('clear-sans-bold.eot?20191026');src:url('clear-sans-bold.eot?20191026?#iefix') format('embedded-opentype'),url('clear-sans-bold.woff?20191026') format('woff'),url('clear-sans-bold.ttf?20191026') format('truetype'),url('clear-sans-bold.svg?20191026#clear-sans-bold') format('svg')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic;
src:url('clear-sans-italic.eot?20190313');src:url('clear-sans-italic.eot?20190313?#iefix') format('embedded-opentype'),url('clear-sans-italic.woff?20190313') format('woff'),url('clear-sans-italic.ttf?20190313') format('truetype'),url('clear-sans-italic.svg?20190313#clear-sans-italic') format('svg')}
src:url('clear-sans-italic.eot?20191026');src:url('clear-sans-italic.eot?20191026?#iefix') format('embedded-opentype'),url('clear-sans-italic.woff?20191026') format('woff'),url('clear-sans-italic.ttf?20191026') format('truetype'),url('clear-sans-italic.svg?20191026#clear-sans-italic') format('svg')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic;
src:url('clear-sans-bold-italic.eot?20190313');src:url('clear-sans-bold-italic.eot?20190313?#iefix') format('embedded-opentype'),url('clear-sans-bold-italic.woff?20190313') format('woff'),url('clear-sans-bold-italic.ttf?20190313') format('truetype'),url('clear-sans-bold-italic.svg?20190313#clear-sans-bold-italic') format('svg')}
src:url('clear-sans-bold-italic.eot?20191026');src:url('clear-sans-bold-italic.eot?20191026?#iefix') format('embedded-opentype'),url('clear-sans-bold-italic.woff?20191026') format('woff'),url('clear-sans-bold-italic.ttf?20191026') format('truetype'),url('clear-sans-bold-italic.svg?20191026#clear-sans-bold-italic') format('svg')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal;
src:url('bitstream.eot?20190313');src:url('bitstream.eot?20190313?#iefix') format('embedded-opentype'),url('bitstream.woff?20190313') format('woff'),url('bitstream.ttf?20190313') format('truetype'),url('bitstream.svg?20190313#bitstream') format('svg')}
src:url('bitstream.eot?20191026');src:url('bitstream.eot?20191026?#iefix') format('embedded-opentype'),url('bitstream.woff?20191026') format('woff'),url('bitstream.ttf?20191026') format('truetype'),url('bitstream.svg?20191026#bitstream') format('svg')}
@font-face{font-family:docker-icon;font-weight:normal;font-style:normal;
src:url('docker-icon.eot?20190313');src:url('docker-icon.eot?20190313?#iefix') format('embedded-opentype'),url('docker-icon.woff?20190313') format('woff'),url('docker-icon.ttf?20190313') format('truetype'),url('docker-icon.svg?20190313#docker-icon') format('svg')}
src:url('docker-icon.eot?20191026');src:url('docker-icon.eot?20191026?#iefix') format('embedded-opentype'),url('docker-icon.woff?20191026') format('woff'),url('docker-icon.ttf?20191026') format('truetype'),url('docker-icon.svg?20191026#docker-icon') format('svg')}
[data-icon]:before{content:attr(data-icon)}
[data-icon]:before,.fa-docker:before{font-family:docker-icon!important;content:'\f100'}
@font-face{font-family:unraid;font-weight:normal;font-style:normal;
src:url('font-unraid.eot?20190313');src:url('font-unraid.eot?20190313#iefix') format('embedded-opentype'),url('font-unraid.ttf?20190313') format('truetype'),url('font-unraid.woff?20190313') format('woff'),url('font-unraid.svg?20190313#unraid') format('svg')}
src:url('font-unraid.eot?20191026');src:url('font-unraid.eot?20191026#iefix') format('embedded-opentype'),url('font-unraid.ttf?20191026') format('truetype'),url('font-unraid.woff?20191026') format('woff'),url('font-unraid.svg?20191026#unraid') format('svg')}
[class^='icon-'],[class*=' icon-']{font-family:unraid!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none}
.icon-algorithm:before{content:'\e97b'}
.icon-app:before{content:'\e900'}
.icon-apple:before{content:'\e901'}
.icon-apps:before{content:'\e942'}
@@ -30,13 +31,16 @@ src:url('font-unraid.eot?20190313');src:url('font-unraid.eot?20190313#iefix') fo
.icon-cpu:before{content:'\e905'}
.icon-cpu-pinning:before{content:'\e904'}
.icon-credits:before{content:'\e91c'}
.icon-custom:before{content:'\e97a'}
.icon-dashboard:before{content:'\e943'}
.icon-diagnostics:before{content:'\e91d'}
.icon-disc:before{content:'\e979'}
.icon-disk:before{content:'\e907'}
.icon-disk-encrypted:before{content:'\e906'}
.icon-disks:before{content:'\e908'}
.icon-display:before{content:'\e90a'}
.icon-docker:before{content:'\e90b'}
.icon-energysaving:before{content:'\e977'}
.icon-ethernet:before{content:'\e90c'}
.icon-eula:before{content:'\e91e'}
.icon-fan:before{content:'\e90d'}
@@ -49,10 +53,13 @@ src:url('font-unraid.eot?20190313');src:url('font-unraid.eot?20190313#iefix') fo
.icon-linux:before{content:'\e910'}
.icon-log:before{content:'\e921'}
.icon-motherboard:before{content:'\e92c'}
.icon-move:before{content:'\e97c'}
.icon-network:before{content:'\e911'}
.icon-notifications:before{content:'\e912'}
.icon-nvme:before{content:'\e929'}
.icon-packages:before{content:'\e976'}
.icon-pagemap:before{content:'\e922'}
.icon-performance:before{content:'\e978'}
.icon-permissions:before{content:'\e923'}
.icon-picture:before{content:'\e94b'}
.icon-plugins:before{content:'\e944'}
@@ -63,9 +70,21 @@ src:url('font-unraid.eot?20190313');src:url('font-unraid.eot?20190313#iefix') fo
.icon-recycle:before{content:'\e946'}
.icon-registration:before{content:'\e925'}
.icon-remote-access:before{content:'\e94d'}
.icon-repeatable:before{content:'\e96e'}
.icon-scheduler:before{content:'\e914'}
.icon-security:before{content:'\e975'}
.icon-share:before{content:'\e915'}
.icon-sharing-protocol:before{content:'\e96f'}
.icon-shop:before{content:'\e970'}
.icon-snapshot:before{content:'\e971'}
.icon-temp:before{content:'\e926'}
.icon-template:before{content:'\e972'}
.icon-themes:before{content:'\e973'}
.icon-u-arrow-down:before{content:'\e95e'}
.icon-u-arrow-left:before{content:'\e95f'}
.icon-u-arrow-right:before{content:'\e960'}
.icon-u-arrow-up:before{content:'\e961'}
.icon-u-bell:before{content:'\e962'}
.icon-u-change:before{content:'\e947'}
.icon-u-chat:before{content:'\e93e'}
.icon-u-check:before{content:'\e94f'}
@@ -74,7 +93,9 @@ src:url('font-unraid.eot?20190313');src:url('font-unraid.eot?20190313#iefix') fo
.icon-u-delete:before{content:'\e92f'}
.icon-u-display:before{content:'\e930'}
.icon-u-download:before{content:'\e950'}
.icon-u-duplicate:before{content:'\e963'}
.icon-u-edit:before{content:'\e931'}
.icon-u-expand:before{content:'\e964'}
.icon-u-full:before{content:'\e932'}
.icon-u-globe:before{content:'\e951'}
.icon-u-half:before{content:'\e933'}
@@ -86,9 +107,13 @@ src:url('font-unraid.eot?20190313');src:url('font-unraid.eot?20190313#iefix') fo
.icon-u-lock-open:before{content:'\e954'}
.icon-u-log:before{content:'\e936'}
.icon-u-logout:before{content:'\e937'}
.icon-u-minimize:before{content:'\e965'}
.icon-u-minus:before{content:'\e967'}
.icon-u-move:before{content:'\e966'}
.icon-u-pause:before{content:'\e939'}
.icon-update:before{content:'\e927'}
.icon-u-play:before{content:'\e93a'}
.icon-u-plus-Copy-3:before{content:'\e968'}
.icon-u-polygon:before{content:'\e93b'}
.icon-ups:before{content:'\e916'}
.icon-u-restart:before{content:'\e93c'}
@@ -96,19 +121,25 @@ src:url('font-unraid.eot?20190313');src:url('font-unraid.eot?20190313#iefix') fo
.icon-u-search:before{content:'\e956'}
.icon-user:before{content:'\e917'}
.icon-users:before{content:'\e945'}
.icon-u-shutdown:before{content:'\e969'}
.icon-u-sort:before{content:'\e959'}
.icon-u-sort-down:before{content:'\e957'}
.icon-u-sort-up:before{content:'\e958'}
.icon-u-square:before{content:'\e93d'}
.icon-u-star:before{content:'\e95a'}
.icon-u-stop:before{content:'\e96d'}
.icon-u-tab:before{content:'\e938'}
.icon-u-tag:before{content:'\e95b'}
.icon-u-terminal:before{content:'\e93f'}
.icon-u-third:before{content:'\e940'}
.icon-u-thumbs-down:before{content:'\e96a'}
.icon-u-thumbs-up:before{content:'\e96b'}
.icon-u-triangle:before{content:'\e941'}
.icon-u-two-thirds:before{content:'\e96c'}
.icon-vars:before{content:'\e928'}
.icon-video:before{content:'\e94e'}
.icon-virtualization:before{content:'\e918'}
.icon-vpn:before{content:'\e95c'}
.icon-windows:before{content:'\e919'}
.icon-windows:before{content:'\e919'}
.icon-wireguard:before{content:'\e95d'}
.icon-zip:before{content:'\e974'}

BIN
plugins/dynamix/styles/font-cases.eot
View File

Binary file not shown.

82
plugins/dynamix/styles/font-cases.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 93 KiB

BIN
plugins/dynamix/styles/font-cases.ttf
View File

Binary file not shown.

BIN
plugins/dynamix/styles/font-cases.woff
View File

Binary file not shown.

BIN
plugins/dynamix/styles/font-unraid.eot
View File

Binary file not shown.

69
plugins/dynamix/styles/font-unraid.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 74 KiB

BIN
plugins/dynamix/styles/font-unraid.ttf
View File

Binary file not shown.

BIN
plugins/dynamix/styles/font-unraid.woff
View File

Binary file not shown.