mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-14 15:01:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139 from bergware/6.4-wip

Browse Source 
Added "shared" option to container path creation
This commit is contained in:
tom mortensen
2017-06-30 00:13:00 -07:00
committed by GitHub
parent 54550ef6c1 501c28ed7f
commit 7e1f676e1f
6 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dynamix.docker.manager/include/CreateDocker.php
View File

@@ -1078,7 +1078,7 @@ $showAdditionalInfo = '';
$(el).prop('disabled',disabled);
switch ($(el)[0].selectedIndex) {
case 0: // Path
mode.html("<dt>Access Mode:</dt><dd><select name='Mode' class='narrow'><option value='rw'>Read/Write</option><option value='rw,slave'>RW/Slave</option><option value='ro'>Read Only</option><option value='ro,slave'>RO/Slave</option></select></dd>");
mode.html("<dt>Access Mode:</dt><dd><select name='Mode' class='narrow'><option value='rw'>Read/Write</option><option value='rw,slave'>RW/Slave</option><option value='rw,shared'>RW/Shared</option><option value='ro'>Read Only</option><option value='ro,slave'>RO/Slave</option><option value='ro,shared'>RO/Shared</option></select></dd>");
value.bind("click", function(){openFileBrowser(this,$(this).val(), 'sh', true, false);});
targetDiv.find('#dt1').text('Container Path:');
valueDiv.find('#dt2').text('Host Path:');

7
plugins/dynamix.docker.manager/scripts/dockerupdate.php
View File

@@ -1,7 +1,7 @@
#!/usr/bin/php
<?PHP
/* Copyright 2005-2016, Lime Technology
* Copyright 2014-2016, Guilherme Jardim, Eric Schultz, Jon Panozzo.
/* Copyright 2005-2017, Lime Technology
* Copyright 2014-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
*/
?>
<?
$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
exec("pgrep docker", $pid);
if (count($pid) == 1) exit(0);
@@ -38,6 +38,7 @@ if (!isset($check)) {
require_once "$docroot/webGui/include/Wrappers.php";
$notify = "$docroot/webGui/scripts/notify";
$unraid = parse_plugin_cfg("dynamix",true);
$var = parse_ini_file("/var/local/emhttp/var.ini");
$server = strtoupper($var['NAME']);
$output = $unraid['notify']['docker_notify'];

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

@@ -177,7 +177,6 @@ table.share_status.dash{float:left;width:35%;margin-top:36px;margin-right:6px;bo
table.share_status.dash thead tr:first-child td{line-height:30px}
table.share_status.dash thead tr:last-child>td{border-bottom:1px solid #606E7F;text-align:left;color:#606E7F}
table.share_status.dash tbody td.blue{color:#606E7F}
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.dash.line tbody tr.wide{height:40px;line-height:40px}
table.share_status.dash.line tbody td{padding:3px 4px 3px 10px}
table.share_status.dash.line tr>td{width:25%}
@@ -187,10 +186,20 @@ table.share_status.dash.line tr>td[colspan='4']{width:100%}
table.share_status.dash.line tr>td:last-child{white-space:normal}
table.share_status.dash tr.h48{height:48px}
table.share_status.dash td:first-child{width:25%}
@media (max-width:1440px){
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.m36{width:49%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:49%;margin-left:0;margin-right:0}
table.share_status.m0 tr>td+td+td{width:12%}
}
@media (min-width:1441px){
table.share_status.dash.line{width:33%;margin-right:7px;table-layout:fixed}
table.share_status.m36{width:33%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:33%;margin-left:0;margin-right:7px}
table.share_status.m0 tr>td+td+td{width:12%}
}
tr.alert{color:#F0000C;background-color:#FF9E9E}
tr.warn{color:#E68A00;background-color:#FEEFB3}
tr.past{color:#D63301;background-color:#FFDDD1}

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

@@ -161,7 +161,6 @@ table.share_status.table tr>td{width:50%}
table.share_status.dash{float:left;width:35%;margin-top:36px;border:1px solid #202020}
table.share_status.dash thead tr:last-child>td{font-weight:bold;border-bottom:1px solid #202020}
table.share_status.dash tbody td.blue{color:#3B5998}
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.dash.line tbody tr:nth-child(even){background-color:#000000}
table.share_status.dash.line tbody tr.wide{height:40px;line-height:40px}
table.share_status.dash.line tbody td{border:1px solid #202020;padding:3px 4px 3px 10px}
@@ -172,11 +171,20 @@ table.share_status.dash.line tr>td[colspan="4"]{width:100%}
table.share_status.dash.line tr>td:last-child{white-space:normal}
table.share_status.dash tr.h48{height:48px}
table.share_status.dash td:first-child{width:25%}
@media (max-width:1440px){
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.m36{width:49%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:14%}
table.share_status.m36 tr>td+td+td+td{width:8%;text-align:center}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:49%;margin-left:0;margin-right:0}
table.share_status.m0 tr>td+td+td{width:12%;text-align:center}
table.share_status.m0 tr>td+td+td{width:12%}
}
@media (min-width:1441px){
table.share_status.dash.line{width:33%;margin-right:7px;table-layout:fixed}
table.share_status.m36{width:33%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:33%;margin-left:0;margin-right:7px}
table.share_status.m0 tr>td+td+td{width:12%}
}
[name=arrayOps]{margin-top:12px}
span.error{color:#F0000C;background-color:#FF9E9E;display:block;width:100%}
span.warn{color:#E68A00;background-color:#FEEFB3;display:block;width:100%}

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

@@ -177,7 +177,6 @@ table.share_status.dash{float:left;width:35%;margin-top:36px;margin-right:6px;bo
table.share_status.dash thead tr:first-child td{line-height:30px}
table.share_status.dash thead tr:last-child>td{border-bottom:1px solid #606E7F;text-align:left;color:#606E7F}
table.share_status.dash tbody td.blue{color:#606E7F}
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.dash.line tbody tr.wide{height:40px;line-height:40px}
table.share_status.dash.line tbody td{padding:3px 4px 3px 10px}
table.share_status.dash.line tr>td{width:25%}
@@ -187,10 +186,20 @@ table.share_status.dash.line tr>td[colspan='4']{width:100%}
table.share_status.dash.line tr>td:last-child{white-space:normal}
table.share_status.dash tr.h48{height:48px}
table.share_status.dash td:first-child{width:25%}
@media (max-width:1440px){
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.m36{width:49%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:49%;margin-left:0;margin-right:0}
table.share_status.m0 tr>td+td+td{width:12%}
}
@media (min-width:1441px){
table.share_status.dash.line{width:33%;margin-right:7px;table-layout:fixed}
table.share_status.m36{width:33%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:33%;margin-left:0;margin-right:7px}
table.share_status.m0 tr>td+td+td{width:12%}
}
tr.alert{color:#F0000C;background-color:#FF9E9E}
tr.warn{color:#E68A00;background-color:#FEEFB3}
tr.past{color:#D63301;background-color:#FFDDD1}

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

@@ -161,7 +161,6 @@ table.share_status.table tr>td{width:50%}
table.share_status.dash{float:left;width:35%;margin-top:36px;border:1px solid #D0D0D0}
table.share_status.dash thead tr:last-child>td{font-weight:bold;border-bottom:1px solid #D0D0D0}
table.share_status.dash tbody td.blue{color:#3B5998}
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.dash.line tbody tr:nth-child(even){background-color:#FFFFFF}
table.share_status.dash.line tbody tr.wide{height:40px;line-height:40px}
table.share_status.dash.line tbody td{border:1px solid #D0D0D0;padding:3px 4px 3px 10px}
@@ -172,11 +171,20 @@ table.share_status.dash.line tr>td[colspan="4"]{width:100%}
table.share_status.dash.line tr>td:last-child{white-space:normal}
table.share_status.dash tr.h48{height:48px}
table.share_status.dash td:first-child{width:25%}
@media (max-width:1440px){
table.share_status.dash.line{width:49%;margin-right:2%;table-layout:fixed}
table.share_status.m36{width:49%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:14%}
table.share_status.m36 tr>td+td+td+td{width:8%;text-align:center}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:49%;margin-left:0;margin-right:0}
table.share_status.m0 tr>td+td+td{width:12%;text-align:center}
table.share_status.m0 tr>td+td+td{width:12%}
}
@media (min-width:1441px){
table.share_status.dash.line{width:33%;margin-right:7px;table-layout:fixed}
table.share_status.m36{width:33%;margin-left:0;margin-right:0}
table.share_status.m36 tr>td+td+td{width:12%}
table.share_status.m0{width:33%;margin-left:0;margin-right:7px}
table.share_status.m0 tr>td+td+td{width:12%}
}
[name=arrayOps]{margin-top:12px}
span.error{color:#F0000C;background-color:#FF9E9E;display:block;width:100%}
span.warn{color:#E68A00;background-color:#FEEFB3;display:block;width:100%}