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

Merge pull request #407 from bergware/master

Browse Source 
Docker: changed LOG file size reading to prevent HTTP time-outs
This commit is contained in:
tom mortensen
2018-10-31 09:21:34 -07:00
committed by GitHub
parent 7b6675b833 fba3bcc06f
commit ca3e32f34e
36 changed files with 136 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/dynamix.docker.manager/Docker.page
View File

@@ -4,8 +4,8 @@ Code="f100"
Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\")"
----
<?PHP
/* Copyright 2005-2017, Lime Technology
* Copyright 2014-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
/* Copyright 2005-2018, Lime Technology
* Copyright 2014-2018, 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,
@@ -16,12 +16,9 @@ Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\
*/
?>
<?
if ($var['fsState'] != "Started") {
echo "<p class='notice shift'>Array must be <span class='strong big'>started</span> to view Docker containers.</p>";
return;
}
if ( !is_file('/var/run/dockerd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/dockerd.pid'))) ) {
echo "<p class='notice shift'>Docker Service failed to start.</p>";
return;
if ($var['fsState'] != 'Started') {
echo "<div class='notice shift'>Array must be <span class='strong big'>started</span> to view Docker containers.</div>";
} elseif (!is_file('/var/run/dockerd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/dockerd.pid')))) {
echo "<div class='notice shift'>Docker Service failed to start.</div>";
}
?>

2
plugins/dynamix.docker.manager/DockerContainers.page
View File

@@ -1,7 +1,7 @@
Menu="Docker:1"
Title="Docker Containers"
Tag="cubes"
Cond="(pgrep('dockerd')!==false)"
Cond="is_file('/var/run/dockerd.pid')"
Markdown="false"
---
<?PHP

28
plugins/dynamix.docker.manager/DockerSettings.page
View File

@@ -109,7 +109,7 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
<style>
.errortext{color:#EF3D47;display:none}
.fileTree{background:<?=$bgcolor?>;width:305px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
.basic{display:block}
.advanced{display:none}
select.mask{min-width:0;margin:0 10px 0 4px}
@@ -140,7 +140,7 @@ span.disabled{color:#404040}
<input type="hidden" name="#cleanup" value="true">
<input type="hidden" name="DOCKER_CUSTOM_NETWORKS" value="<?=implode(' ',$unset)?> ">
Enable Docker:
: <select id="DOCKER_ENABLED" name="DOCKER_ENABLED" class="narrow">
: <select id="DOCKER_ENABLED" name="DOCKER_ENABLED">
<?=mk_option($dockercfg['DOCKER_ENABLED'], 'no', 'No')?>
<?=mk_option($dockercfg['DOCKER_ENABLED'], 'yes', 'Yes')?>
</select>
@@ -156,6 +156,13 @@ Enable Docker:
<?if ($DockerStopped):?>
Docker vDisk size:
: <input id="DOCKER_IMAGE_SIZE" type="number" name="DOCKER_IMAGE_SIZE" value="<?=$dockercfg['DOCKER_IMAGE_SIZE']?>" class="narrow" required>GB <span id="SIZE_ERROR" class="errortext"></span>
> If the system needs to create a new docker image file, this is the default size to use specified in GB.
>
> To resize an existing image file, specify the new size here. Next time the Docker service is started the file (and file system) will increased to the new size (but never decreased).
Docker vDisk location:
: <input id="DOCKER_IMAGE_FILE" type="text" name="DOCKER_IMAGE_FILE" value="<?=$dockercfg['DOCKER_IMAGE_FILE']?>" placeholder="e.g. /mnt/disk1/docker.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt/" data-pickfolders="true" required="required">
<?if (file_exists($dockercfg['DOCKER_IMAGE_FILE'])):?>
@@ -171,13 +178,6 @@ Docker vDisk location:
>
> It is recommended to create this image file outside the array, e.g. on the Cache pool. For best performance SSD devices are preferred.
Docker vDisk size:
: <input id="DOCKER_IMAGE_SIZE" type="number" name="DOCKER_IMAGE_SIZE" value="<?=$dockercfg['DOCKER_IMAGE_SIZE']?>" style="width:50px;" required="required">GB <span id="SIZE_ERROR" class="errortext"></span>
> If the system needs to create a new docker image file, this is the default size to use specified in GB.
>
> To resize an existing image file, specify the new size here. Next time the Docker service is started the file (and file system) will increased to the new size (but never decreased).
Default appdata storage location:
: <input id="DOCKER_APP_CONFIG_PATH" type="text" name="DOCKER_APP_CONFIG_PATH" value="<?=$dockercfg['DOCKER_APP_CONFIG_PATH']?>" placeholder="e.g. /mnt/user/appdata" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="<?=(is_dir('/mnt/user/') ? '/mnt/user/' : '/mnt/')?>" data-pickfolders="true">
<?if ($var['fsState'] != "Started"):?>
@@ -194,7 +194,7 @@ Default appdata storage location:
<div markdown="1" class="advanced">
Docker LOG rotation:
: <select name="DOCKER_LOG_ROTATION" class="narrow" onchange="showLogOptions(this.value)">
: <select name="DOCKER_LOG_ROTATION" onchange="showLogOptions(this.value)">
<?=mk_option($dockercfg['DOCKER_LOG_ROTATION'], 'no', 'Disabled')?>
<?=mk_option($dockercfg['DOCKER_LOG_ROTATION'], 'yes', 'Enabled')?>
</select>
@@ -205,7 +205,7 @@ Docker LOG rotation:
<div markdown="1" id="DOCKER_LOG_OPTIONS" style="display:none">
Docker LOG maximum file size:
: <select name="DOCKER_LOG_SIZE" class="narrow">
: <select name="DOCKER_LOG_SIZE">
<?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '10m', '10 MB')?>
<?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '20m', '20 MB')?>
<?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '50m', '50 MB')?>
@@ -217,7 +217,7 @@ Docker LOG maximum file size:
> Specifies the maximum LOG size. When exceeded LOG rotation will occur.
Docker LOG number of files:
: <select name="DOCKER_LOG_FILES" class="narrow">
: <select name="DOCKER_LOG_FILES">
<?=mk_option($dockercfg['DOCKER_LOG_FILES'], '1', '1')?>
<?=mk_option($dockercfg['DOCKER_LOG_FILES'], '2', '2')?>
<?=mk_option($dockercfg['DOCKER_LOG_FILES'], '3', '3')?>
@@ -228,7 +228,7 @@ Docker LOG number of files:
</div>
Template Authoring Mode:
: <select id="DOCKER_AUTHORING_MODE" name="DOCKER_AUTHORING_MODE" class="narrow">
: <select id="DOCKER_AUTHORING_MODE" name="DOCKER_AUTHORING_MODE">
<?=mk_option($dockercfg['DOCKER_AUTHORING_MODE'], 'no', 'No')?>
<?=mk_option($dockercfg['DOCKER_AUTHORING_MODE'], 'yes', 'Yes')?>
</select>
@@ -236,7 +236,7 @@ Template Authoring Mode:
> If set to **Yes**, when creating/editing containers the interface will be present with some extra fields related to template authoring.
Preserve user defined networks:
: <select name="DOCKER_USER_NETWORKS" class="narrow">
: <select name="DOCKER_USER_NETWORKS">
<?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', 'No')?>
<?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'preserve', 'Yes')?>
</select>

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

@@ -266,7 +266,6 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
<link rel="stylesheet" type="text/css" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
<style>
table{border-collapse:separate}
option.list{padding:0 0 0 7px}
optgroup.bold{font-weight:bold;margin-top:5px}
optgroup.title{background-color:#625D5D;color:#f2f2f2;text-align:center;margin-top:10px}
@@ -282,7 +281,9 @@ optgroup.title{background-color:#625D5D;color:#f2f2f2;text-align:center;margin-t
.switch-button-label.off{color:inherit;}
.selectVariable{width:320px}
.fa.button{color:maroon;font-size:2.4rem;position:relative;top:4px;cursor:pointer}
.spacer{padding:16px 0}
span.cpu,label.checkbox{display:inline-block;width:32px}
button[type=button]{margin:0 20px 0 0}
</style>
<script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
<script src="<?autov('/webGui/javascript/jquery.filetree.js')?>"></script>
@@ -587,13 +588,13 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
$(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='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>");
mode.html("<dt>Access Mode:</dt><dd><select name='Mode'><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:');
break;
case 1: // Port
mode.html("<dt>Connection Type:</dt><dd><select name='Mode' class='narrow'><option value='tcp'>TCP</option><option value='udp'>UDP</option></select></dd>");
mode.html("<dt>Connection Type:</dt><dd><select name='Mode'><option value='tcp'>TCP</option><option value='udp'>UDP</option></select></dd>");
value.addClass("numbersOnly");
if (network==0) {
if (target.val()) target.prop('disabled',<?=$disableEdit?>); else target.addClass("numbersOnly");
@@ -971,7 +972,7 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
<tr <?=$showAdditionalInfo?>>
<td>Network Type:</td>
<td>
<select name="contNetwork" class="narrow" onchange="showSubnet(this.value)">
<select name="contNetwork" onchange="showSubnet(this.value)">
<?=mk_option(1,'bridge','Bridge')?>
<?=mk_option(1,'host','Host')?>
<?=mk_option(1,'none','None')?>
@@ -997,15 +998,15 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
</tr>
<tr <?=$showAdditionalInfo?>>
<td>Console shell command:</td>
<td><select name="contShell" class="narrow">
<td><select name="contShell">
<?=mk_option(1,'sh','Shell')?>
<?=mk_option(1,'bash','Bash')?>
</select>
</td>
</tr>
<tr <?=$showAdditionalInfo?>>
<td>Privileged:</td>
<td><input type="checkbox" name="contPrivileged" class="switch-on-off"></td>
<td class="spacer">Privileged:</td>
<td class="spacer"><input type="checkbox" name="contPrivileged" class="switch-on-off"></td>
</tr>
<tr <?=$showAdditionalInfo?>>
<td colspan="2">
@@ -1016,8 +1017,8 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
</td>
</tr>
</table>
<div id="configLocation" style="margin-top:12px"></div>
<table class="settings" style="margin-top:12px">
<div id="configLocation"></div>
<table class="settings">
<tr>
<td></td>
<td id="readmore_toggle" class="readmore_collapsed"><a onclick="toggleReadmore()" style="cursor:pointer"><i class="fa fa-chevron-down"></i> Show more settings ...</a></td>
@@ -1063,7 +1064,7 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
<dl>
<dt>Config Type:</dt>
<dd>
<select name="Type" class="narrow" onchange="toggleMode(this,false);">
<select name="Type" onchange="toggleMode(this,false);">
<option value="Path">Path</option>
<option value="Port">Port</option>
<option value="Variable">Variable</option>
@@ -1093,7 +1094,7 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
<div class="advanced">
<dt>Display:</dt>
<dd>
<select name="Display" class="narrow">
<select name="Display">
<option value="always" selected>Always</option>
<option value="always-hide">Always - Hide Buttons</option>
<option value="advanced">Advanced</option>
@@ -1102,7 +1103,7 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
</dd>
<dt>Required:</dt>
<dd>
<select name="Required" class="narrow">
<select name="Required">
<option value="false" selected>No</option>
<option value="true">Yes</option>
</select>
@@ -1110,7 +1111,7 @@ span.cpu,label.checkbox{display:inline-block;width:32px}
<div id="Mask">
<dt>Password Mask:</dt>
<dd>
<select name="Mask" class="narrow">
<select name="Mask">
<option value="false" selected>No</option>
<option value="true">Yes</option>
</select>

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

@@ -40,7 +40,7 @@ foreach ($container as $ct) {
list($name,$size) = explode('|',$ct);
list($writable,$dummy,$total) = explode(' ',str_replace(['(',')'],'',$size));
list($value,$base) = explode(' ',gap($total));
$list[] = ['name' => $name, 'total' => $value*pow(1000,array_search($base,$unit)), 'writable' => $writable, 'log' => exec("docker logs $name 2>&1|wc -c")];
$list[] = ['name' => $name, 'total' => $value*pow(1000,array_search($base,$unit)), 'writable' => $writable, 'log' => exec("docker inspect --format='{{.LogPath}}' $name|xargs du -b|cut -f1")];
}
array_multisort(array_column($list,'total'),SORT_DESC,$list); // sort on container size
foreach ($list as $ct) echo align($ct['name'],-30).align(autoscale($ct['total'])).align($ct['writable']).align(autoscale($ct['log']))."\n";

6
plugins/dynamix.docker.manager/styles/style-azure.css
View File

@@ -1,3 +1,9 @@
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
}
.ui-dropdownchecklist .ui-state-default{
background:#f2f2f2;
border:none;

6
plugins/dynamix.docker.manager/styles/style-black.css
View File

@@ -1,3 +1,9 @@
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
}
.ui-dropdownchecklist .ui-state-default{
background:#1c1c1c;
border:none;

6
plugins/dynamix.docker.manager/styles/style-gray.css
View File

@@ -1,3 +1,9 @@
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
}
.ui-dropdownchecklist .ui-state-default{
background:#1c1c1c;
border:none;

6
plugins/dynamix.docker.manager/styles/style-white.css
View File

@@ -1,3 +1,9 @@
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
}
.ui-dropdownchecklist .ui-state-default{
background:#f2f2f2;
border:none;

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

@@ -1,7 +1,7 @@
Menu="VMs:1"
Title="Virtual Machines"
Tag="columns"
Cond="(pgrep('libvirtd')!==false)"
Cond="is_file('/var/run/libvirt/libvirtd.pid')"
Markdown="false"
---
<?PHP
@@ -99,7 +99,7 @@ if (empty($vms)) {
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
<style type="text/css">
body{-webkit-overflow-scrolling:touch;}
.fileTree{width:305px;max-height:150px;overflow-y:scroll;position:absolute;z-index:100;display:none;}
.fileTree{width:300px;max-height:150px;overflow-y:scroll;position:absolute;z-index:100;display:none;}
div.four{font-size:1.1rem;width:300px}
div.four label{float:left;display:table-cell;width:25%}
div.four label:nth-child(4n+4){float:none;clear:both}

14
plugins/dynamix.vm.manager/VMSettings.page
View File

@@ -64,7 +64,7 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1
<style>
body{-webkit-overflow-scrolling:touch}
.errortext{color:#EF3D47;display:none}
.fileTree{background:<?=$bgcolor?>;width:305px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
.basic{display:block}
.advanced{display:none}
#winvirtio{display:none}
@@ -82,7 +82,7 @@ body{-webkit-overflow-scrolling:touch}
<input type="hidden" name="#file" value="<?=htmlspecialchars($domain_cfgfile)?>">
<input type="hidden" name="#command" value="/plugins/dynamix/scripts/emhttpd_update">
Enable VMs:
: <select id="SERVICE" name="SERVICE" class="narrow">
: <select id="SERVICE" name="SERVICE">
<?= mk_option($libvirt_service, 'disable', 'No'); ?>
<?= mk_option($libvirt_service, 'enable', 'Yes'); ?>
</select>
@@ -134,7 +134,7 @@ Default ISO storage path:
</div>
Default Windows VirtIO driver ISO <span style="font-weight: normal">(optional)</span>:
: <select id="winvirtio_select" class="narrow">
: <select id="winvirtio_select">
<?$iso_dir = $domain_cfg['MEDIADIR'];
if (empty($iso_dir) || !is_dir($iso_dir)) {
$iso_dir = '/mnt/user/isos/';
@@ -165,7 +165,7 @@ Default Windows VirtIO driver ISO <span style="font-weight: normal">(optional)</
<div class="advanced" markdown="1">
Default network bridge:
: <select id="bridge" name="BRNAME" class="narrow">
: <select id="bridge" name="BRNAME">
<?foreach ($arrValidBridges as $strBridge) echo mk_option($domain_cfg['BRNAME'], $strBridge, $strBridge);?>
</select>
@@ -177,7 +177,7 @@ Default network bridge:
> NOTE: You can also specify a network bridge on a per-VM basis.
Upon host shutdown:
: <select id="hostshutdown" name="HOSTSHUTDOWN" class="narrow">
: <select id="hostshutdown" name="HOSTSHUTDOWN">
<?echo mk_option($domain_cfg['HOSTSHUTDOWN'], 'shutdown', 'Shutdown VMs');
echo mk_option($domain_cfg['HOSTSHUTDOWN'], 'hibernate', 'Hibernate VMs');
?>
@@ -196,7 +196,7 @@ VM shutdown time-out:
> NOTE: It's recommended to shut down guest VMs from within the VM.
PCIe ACS override:
: <select id="pcie_acs_override" class="narrow"<?=$safemode?' disabled':''?>>
: <select id="pcie_acs_override"<?=$safemode?' disabled':''?>>
<?= mk_option($pcie_acs_override, '', 'Disabled'); ?>
<?= mk_option($pcie_acs_override, 'downstream', 'Downstream'); ?>
<?= mk_option($pcie_acs_override, 'multifunction', 'Multifunction'); ?>
@@ -207,7 +207,7 @@ PCIe ACS override:
> A reboot will be required for changes to this setting to take affect.
VFIO allow unsafe interrupts:
: <select id="vfio_allow_unsafe" class="narrow"<?=$safemode?' disabled':''?>>
: <select id="vfio_allow_unsafe"<?=$safemode?' disabled':''?>>
<?= mk_option($vfio_allow_unsafe, '', 'No'); ?>
<?= mk_option($vfio_allow_unsafe, '1', 'Yes'); ?>
</select><?if($safemode):?><span>*Setting disabled in **safe mode***</span><?endif;?>

14
plugins/dynamix.vm.manager/VMs.page
View File

@@ -4,8 +4,8 @@ Code="f108"
Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")"
---
<?PHP
/* Copyright 2005-2017, Lime Technology
* Copyright 2015-2017, Derek Macias, Eric Schultz, Jon Panozzo.
/* Copyright 2005-2018, Lime Technology
* Copyright 2015-2018, Derek Macias, 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,
@@ -17,13 +17,9 @@ Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")"
?>
<?
if ($var['fsState'] != "Started") {
echo "<p class='notice shift'>Array must be <span class='strong big'>started</span> to view Virtual Machines.</p>";
return;
echo "<div class='notice shift'>Array must be <span class='strong big'>started</span> to view Virtual Machines.</div>";
} elseif (!is_file('/var/run/libvirt/libvirtd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/libvirt/libvirtd.pid')))) {
echo "<div class='notice shift'>Libvirt Service failed to start.</div>";
}
if (!is_file('/var/run/libvirt/libvirtd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/libvirt/libvirtd.pid')))) {
echo "<p class='notice shift'>Libvirt Service failed to start.</p>";
return;
}
if (count($pages)==2) $tabbed = false;
?>

4
plugins/dynamix.vm.manager/include/VMedit.php
View File

@@ -85,7 +85,7 @@ if (!empty($_GET['uuid'])) {
<style>
body{-webkit-overflow-scrolling:touch}
.fileTree{background:<?=$bgcolor?>;width:305px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
#vmform table{margin-top:0}
#vmform div#title + table{margin-top:0}
#vmform table tr{vertical-align:top;line-height:40px}
@@ -118,7 +118,7 @@ span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:<?=$bgcolor?>;z-index:10}
#form_content{display:none}
#vmform .four{overflow:auto}
#vmform .four{overflow:hidden}
#vmform .four label{float:left;display:table-cell;width:15%;}
#vmform .four label:nth-child(4n+4){}
#vmform .four label.cpu1{width:28%;height:16px;line-height:16px}

2
plugins/dynamix/Eth0.page
View File

@@ -22,7 +22,7 @@ $template = "$docroot/webGui/EthX.page";
$ini = '/var/local/emhttp/network.ini';
$validIP4 = '((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
$validIP6 = '((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}';
$width = [166,305];
$width = [166,300];
// get available ethernet ports (excluding eth0)
exec("ls --indicator-style=none /sys/class/net|grep -P '^eth[1-9][0-9]*$'",$ports);

2
plugins/dynamix/NewConfig.page
View File

@@ -17,7 +17,7 @@ Tag="hand-paper-o"
<?
$newarray = $var['mdState']=='NEW_ARRAY';
$disabled = $var['fsState']=="Started";
$width = [166,305];
$width = [166,300];
if ($newarray) {
@unlink('/boot/config/smart-one.cfg');
@unlink('/boot/config/smart-all.cfg');

2
plugins/dynamix/NewPerms.page
View File

@@ -15,7 +15,7 @@ Tag="hand-paper-o"
*/
?>
<?
$width = [166,305];
$width = [166,300];
function data_disks($disk) {
return ($disk['type']=='Data' && $disk['status']=='DISK_OK');

2
plugins/dynamix/NotificationAgents.page
View File

@@ -20,7 +20,7 @@ var enabledAgents = new Object();
var disabledAgents = new Object();
var openPage = true;
<?$width = [166,305]?>
<?$width = [166,300]?>
<?if ($tabbed):?>
$('#tab3').bind({click:function(){initDropdown();}});
$(function(){if ($('#tab3').is(':checked')) initDropdown();});

2
plugins/dynamix/ParityCheck.page
View File

@@ -18,7 +18,7 @@ Tag="calendar"
if ($disks['parity']['status']=='DISK_NP_DSBL' && $disks['parity2']['status']=='DISK_NP_DSBL') {
echo "<p class='notice'>No Parity disk present!</p>";
}
$width = [166,305];
$width = [166,300];
$mode = ['Disabled','Daily','Weekly','Monthly','Yearly','Custom'];
$days = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
$months = ['January','February','March','April','May','June','July','August','September','October','November','December'];

2
plugins/dynamix/SecurityAFP.page
View File

@@ -16,7 +16,7 @@ Cond="(($var['shareAFPEnabled']!='no') && (isset($name)?array_key_exists($name,$
*/
?>
<?
$width = [123,305];
$width = [123,300];
?>
> This section is used to configure the security settings for the share when accessed using AFP and
> appears only when AFP is enabled on the Network Services page.

2
plugins/dynamix/SecurityNFS.page
View File

@@ -16,7 +16,7 @@ Cond="(($var['shareNFSEnabled']!='no') && (isset($name)?array_key_exists($name,$
*/
?>
<?
$width = [123,305];
$width = [123,300];
?>
> *Read settings from* is used to preset the NFS security settings of the current selected share with the settings of an existing share.
>

2
plugins/dynamix/SecuritySMB.page
View File

@@ -16,7 +16,7 @@ Cond="(($var['shareSMBEnabled']!='no') && (isset($name)?array_key_exists($name,$
*/
?>
<?
$width = [123,305];
$width = [123,300];
?>
> *Read settings from* is used to preset the SMB security settings of the current selected share with the settings of an existing share.
>

2
plugins/dynamix/Share.page
View File

@@ -36,7 +36,7 @@ if ($name) {
<style>
div.clone1{position:absolute;right:0;margin-top:0}
div.clone2{position:absolute;right:0;margin-top:48px}
select.clone{min-width:144px;margin-right:0}
select.clone{min-width:132px;margin-right:0}
input.clone{margin-left:8px;margin-right:0}
span.clone,i.clone{margin-right:4px}
</style>

2
plugins/dynamix/ShareEdit.page
View File

@@ -15,7 +15,7 @@ Tag="share-alt-square"
*/
?>
<?
$width = [123,305];
$width = [123,300];
if ($name == "") {
/* default values when adding new share */

2
plugins/dynamix/ShareSettings.page
View File

@@ -19,7 +19,7 @@ Tag="share-alt-square"
<?
$disabled = $var['fsState']!='Stopped' ? 'disabled' : '';
$disks = array_filter($disks,'my_disks');
$width = [166,305];
$width = [166,300];
?>
<script>
$(function() {

7
plugins/dynamix/include/DefaultPageLayout.php
View File

@@ -17,6 +17,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=1280">
<meta name="robots" content="noindex, nofollow">
<link type="image/png" rel="shortcut icon" href="/webGui/images/<?=$var['mdColor']?>.png">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
@@ -495,6 +496,10 @@ $(window).scroll(function() {
} else {
$('.back_to_top').fadeOut(backtotopduration);
}
<?if (strstr('black,white',$display['theme'])):?>
var top = $('div#header').height() - 1; // header height has 1 extra pixel to cover overlap
$('div#menu').css($(this).scrollTop() > top ? {position:'fixed',top:'0'} : {position:'absolute',top:top+'px'});
<?endif;?>
});
$('.back_to_top').click(function(event) {
event.preventDefault();
@@ -522,7 +527,7 @@ $(function() {
<?if ($notify['entity'] & 1 == 1):?>
$.post('/webGui/include/Notify.php',{cmd:'init'},function(){timers.notifier = setTimeout(notifier,0);});
<?endif;?>
$('input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').attr('disabled','disabled');
$('input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').prop('disabled',true);
$('form').find('select,input[type=text],input[type=number],input[type=password],input[type=checkbox],input[type=file],textarea').each(function(){$(this).on('input change',function() {
var form = $(this).parentsUntil('form').parent();
form.find('input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').not('input.lock').prop('disabled',false);

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

@@ -18,6 +18,7 @@ $path = $_POST['path'];
$var = parse_ini_file('state/var.ini');
$devs = parse_ini_file('state/devs.ini',true);
$disks = parse_ini_file('state/disks.ini',true);
$sec = parse_ini_file('state/sec.ini',true);
$diskio= @parse_ini_file('state/diskload.ini');
$sum = ['count'=>0, 'temp'=>0, 'fsSize'=>0, 'fsUsed'=>0, 'fsFree'=>0, 'ioReads'=>0, 'ioWrites'=>0, 'numReads'=>0, 'numWrites'=>0, 'numErrors'=>0];
extract(parse_plugin_cfg('dynamix',true));
@@ -357,8 +358,11 @@ case 'flash':
$disk = &$disks['flash'];
$data = explode(' ',$diskio[$disk['device']] ?? '0 0');
$disk['fsUsed'] = $disk['fsSize']-$disk['fsFree'];
$flash = &$sec['flash']; $share = "";
if ($flash['export']=='e' && $flash['security']=='public')
$share = "<a class='info nohand' onclick='return false'><i class='fa fa-warning fa-fw orange-text'></i><span>Flash device is set as public share<br>Please change share SMB security</span></a>";
echo "<tr>";
echo "<td>".device_info($disk,true)."</td>";
echo "<td>".$share.device_info($disk,true)."</td>";
echo "<td>".device_desc($disk)."</td>";
echo "<td>*</td>";
echo "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number($disk['numReads'])."</span></td>";

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

@@ -22,7 +22,7 @@ pre ul{margin:0;padding-top:0;padding-bottom:0;padding-left:28px}
pre li{margin:0;padding-top:0;padding-bottom:0;padding-left:18px}
big{font-size:1.4rem;font-weight:bold;text-transform:uppercase}
hr{border:none;height:1px!important;color:#606e7f;background-color:#606e7f}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #606e7f;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606e7f}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #606e7f;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;border-radius:0;color:#606e7f}
input[type=button],input[type=reset],input[type=submit],button,button[type=button],a.button{font-family:clear-sans;font-size:1.2rem;border:1px solid #9F9180;border-radius:5px;margin:10px 20px 10px 0;padding:8px 12px;cursor:pointer;outline:none;color:#9F9180;background:#edeaef}
input[type=checkbox]{vertical-align:middle;margin-right:6px}
input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance:none}
@@ -32,7 +32,7 @@ input:hover[type=button],input:hover[type=reset],input:hover[type=submit],button
input:active[type=button],input:active[type=reset],input:active[type=submit],button:active,button:active[type=button],a.button:active{border-color:#0072C6;box-shadow:none}
input[disabled],button[disabled],input:hover[type=button][disabled],input:hover[type=reset][disabled],input:hover[type=submit][disabled],button:hover[disabled],button:hover[type=button][disabled],input:active[type=button][disabled],input:active[type=reset][disabled],input:active[type=submit][disabled],button:active[disabled],button:active[type=button][disabled],textarea[disabled]{color:#808080;border-color:#808080;background:#c7c5cb;opacity:0.5;cursor:default}
input::-webkit-input-placeholder{color:#00529b}
select{font-family:clear-sans;font-size:1.3rem;min-width:188px;max-width:326px;padding:6px 6px;margin:0 10px 0 0;border:#606e7f 1px solid;box-shadow:none;color:#606e7f;background:transparent;outline:none;display:inline-block;cursor:pointer}
select{font-family:clear-sans;font-size:1.3rem;min-width:188px;max-width:326px;padding:6px 6px;margin:0 10px 0 0;border:#606e7f 1px solid;box-shadow:none;border-radius:0;color:#606e7f;background:transparent;outline:none;display:inline-block;cursor:pointer}
select option{color:#606e7f;background-color:#edeaef}
select:focus{border-color:#0072C6}
select[disabled]{color:#808080;border-color:#808080;background:#c7c5cb;opacity:0.5;cursor:default}

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

@@ -20,31 +20,31 @@ i.spacing{margin-left:-6px}
i.icon{margin-right:4px}
i.title{margin-right:8px}
hr{border:none;height:1px!important;color:#2b2b2b;background-color:#2b2b2b}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #e5e5e5;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#f2f2f2}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:none;border-bottom:1px solid #e5e5e5;padding:5px 0;min-height:2rem;line-height:2rem;outline:none;width:300px;margin:0 20px 0 0;box-shadow:none;border-radius:0;color:#f2f2f2}
input[type=button],input[type=reset],input[type=submit],button,button[type=button],a.button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
input[type=checkbox]{vertical-align:middle;margin-right:6px}
input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance: none}
input[type=number]{-moz-appearance:textfield}
input:focus[type=text],input:focus[type=password],input:focus[type=number],input:focus[type=url],input:focus[type=email],input:focus[type=file],textarea:focus{background:#262626;border-color:#ff8c2f}
input:focus[type=text],input:focus[type=password],input:focus[type=number],input:focus[type=url],input:focus[type=email],input:focus[type=file],textarea:focus{background:#262626;outline:0}
input:hover[type=button],input:hover[type=reset],input:hover[type=submit],button:hover,button:hover[type=button],a.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
input[disabled],textarea[disabled]{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5;cursor:default}
input[disabled],textarea[disabled]{color:#f2f2f2;border-bottom-color:#6c6c6c;opacity:0.5;cursor:default}
input[type=button][disabled],input[type=reset][disabled],input[type=submit][disabled],button[disabled],button[type=button][disabled],a.button[disabled]
input:hover[type=button][disabled],input:hover[type=reset][disabled],input:hover[type=submit][disabled],button:hover[disabled],button:hover[type=button][disabled],a.button:hover[disabled]
input:active[type=button][disabled],input:active[type=reset][disabled],input:active[type=submit][disabled],button:active[disabled],button:active[type=button][disabled],a.button:active[disabled]
{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
input::-webkit-input-placeholder{color:#486dba}
select{font-family:clear-sans;font-size:1.3rem;min-width:188px;max-width:326px;padding:6px 6px;margin:0 10px 0 0;border:#e5e5e5 1px solid;box-shadow:none;color:#f2f2f2;background:transparent;outline:none;display:inline-block;cursor:pointer}
select{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;font-family:clear-sans;font-size:1.3rem;min-width:166px;max-width:300px;padding:6px 0;margin:0 10px 0 0;border:none;border-bottom:#e5e5e5 1px solid;box-shadow:none;border-radius:0;color:#f2f2f2;background:transparent;outline:none;display:inline-block;cursor:pointer}
select option{color:#f2f2f2;background-color:#262626}
select:focus{border-color:#ff8c2f}
select[disabled]{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5;cursor:default}
select:focus{outline:0}
select[disabled]{color:#f2f2f2;border-bottom-color:#6c6c6c;opacity:0.5;cursor:default}
select[name=enter_view]{padding:0;float:right}
select[name=enter_share]{padding:0;float:right}
select.narrow{min-width:87px}
select.narrow{min-width:64px}
select.auto{min-width:auto}
select.slot{min-width:44rem;max-width:44rem}
input.narrow{width:166px}
input.trim{width:50px}
#header{position:fixed;top:0;left:0;width:100%;height:91px;z-index:100;margin:0;color:#1c1b1b;background:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat}
#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:100;margin:0;color:#1c1b1b;background:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat}
#header .logo{float:left;margin-left:10px;color:#e22828;width:160px;text-align:center}
#header .logo svg{width:160px;display:block;margin:25px 50px 8px 0}
#header .block{margin:0;float:right;text-align:right;background-color:rgba(242,242,242,0.3);padding:10px 12px}
@@ -57,7 +57,7 @@ input.trim{width:50px}
#title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:right}
#title span img{padding-right:4px}
#title.shift{margin-top:-30px}
#menu{position:fixed;top:90px;left:0;width:100%;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background:#f2f2f2;z-index:101}
#menu{position:absolute;top:90px;left:0;width:100%;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background:#f2f2f2;z-index:101}
#nav-block{overflow:hidden;height:4rem;letter-spacing:2px}
#nav-left{float:left}
#nav-right{float:right}
@@ -126,7 +126,7 @@ table.array_status tr>td+td{padding-left:2px;width:20%}
table.array_status tr>td+td+td{width:auto}
table.array_status td.line{border-top:1px solid #2b2b2b}
table.array_status.noshift{margin-top:0}
table.settings{margin:0;padding:0px}
table.settings{margin:0;padding:0}
table.settings td:first-child{width:35%;padding-left:12px}
table.settings.shifted{padding:0;margin-left:0;margin-top:0}
table.settings.shifted td:first-child{padding-left:0}

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

@@ -22,7 +22,7 @@ pre ul{margin:0;padding-top:0;padding-bottom:0;padding-left:28px}
pre li{margin:0;padding-top:0;padding-bottom:0;padding-left:18px}
big{font-size:1.4rem;font-weight:bold;text-transform:uppercase}
hr{border:none;height:1px!important;color:#606e7f;background-color:#606e7f}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #606e7f;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606e7f}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #606e7f;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;border-radius:0;color:#606e7f}
input[type=button],input[type=reset],input[type=submit],button,button[type=button],a.button{font-family:clear-sans;font-size:1.2rem;border:1px solid #606e7f;border-radius:5px;margin:10px 20px 10px 0;padding:8px 12px;cursor:pointer;outline:none;color:#606e7f;background:#121510}
input[type=checkbox]{vertical-align:middle;margin-right:6px}
input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance:none}
@@ -32,7 +32,7 @@ input:hover[type=button],input:hover[type=reset],input:hover[type=submit],button
input:active[type=button],input:active[type=reset],input:active[type=submit],button:active,button:active[type=button],a.button:active{border-color:#0072c6;box-shadow:none}
input[disabled],button[disabled],input:hover[type=button][disabled],input:hover[type=reset][disabled],input:hover[type=submit][disabled],button:hover[disabled],button:hover[type=button][disabled],input:active[type=button][disabled],input:active[type=reset][disabled],input:active[type=submit][disabled],button:active[disabled],button:active[type=button][disabled],textarea[disabled]{color:#808080;border-color:#808080;background:#383a34;opacity:0.3;cursor:default}
input::-webkit-input-placeholder{color:#00529b}
select{font-family:clear-sans;font-size:1.3rem;min-width:188px;max-width:326px;padding:6px 6px;margin:0 10px 0 0;border:#606e7f 1px solid;box-shadow:none;color:#606e7f;background:transparent;outline:none;display:inline-block;cursor:pointer}
select{font-family:clear-sans;font-size:1.3rem;min-width:188px;max-width:326px;padding:6px 6px;margin:0 10px 0 0;border:#606e7f 1px solid;box-shadow:none;border-radius:0;color:#606e7f;background:transparent;outline:none;display:inline-block;cursor:pointer}
select option{color:#606e7f;background-color:#121510}
select:focus{border-color:#0072c6}
select[disabled]{color:#808080;border-color:#808080;background:#383a34;opacity:0.3;cursor:default}

2
plugins/dynamix/styles/default-popup.css
View File

@@ -1,6 +1,6 @@
html{font-family:clear-sans;font-size:62.5%;height:100%}
body{font-size:1.3rem;color:#1c1c1c;background:#f2f2f2;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #1c1c1c;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#1c1c1c}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #1c1c1c;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:300px;margin:0 20px 0 0;box-shadow:none;color:#1c1c1c}
input[type=button],input[type=reset],input[type=submit],button,button[type=button],a.button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
input:hover[type=button],input:hover[type=reset],input:hover[type=submit],button:hover,button:hover[type=button],a.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
input[type=button][disabled],input[type=reset][disabled],input[type=submit][disabled],button[disabled],button[type=button][disabled],a.button[disabled]

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

@@ -20,31 +20,31 @@ i.spacing{margin-left:-6px}
i.icon{margin-right:4px}
i.title{margin-right:8px}
hr{border:none;height:1px!important;color:#e3e3e3;background-color:#e3e3e3}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:1px solid #1c1c1c;padding:5px 10px;min-height:2rem;line-height:2rem;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#1c1c1c}
input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],input[type=file],textarea,.textarea{font-family:clear-sans;font-size:1.3rem;background:transparent;border:none;border-bottom:1px solid #1c1c1c;padding:5px 0;min-height:2rem;line-height:2rem;outline:none;width:300px;margin:0 20px 0 0;box-shadow:none;border-radius:0;color:#1c1c1c}
input[type=button],input[type=reset],input[type=submit],button,button[type=button],a.button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
input[type=checkbox]{vertical-align:middle;margin-right:6px}
input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance: none}
input[type=number]{-moz-appearance:textfield}
input:focus[type=text],input:focus[type=password],input:focus[type=number],input:focus[type=url],input:focus[type=email],input:focus[type=file],textarea:focus{background:#e8e8e8;border-color:#ff8c2f}
input:focus[type=text],input:focus[type=password],input:focus[type=number],input:focus[type=url],input:focus[type=email],input:focus[type=file],textarea:focus{background:#e8e8e8;outline:0}
input:hover[type=button],input:hover[type=reset],input:hover[type=submit],button:hover,button:hover[type=button],a.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
input[disabled],textarea[disabled]{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5;cursor:default}
input[disabled],textarea[disabled]{color:#1c1c1c;border-bottom-color:#a2a2a2;opacity:0.5;cursor:default}
input[type=button][disabled],input[type=reset][disabled],input[type=submit][disabled],button[disabled],button[type=button][disabled],a.button[disabled]
input:hover[type=button][disabled],input:hover[type=reset][disabled],input:hover[type=submit][disabled],button:hover[disabled],button:hover[type=button][disabled],a.button:hover[disabled]
input:active[type=button][disabled],input:active[type=reset][disabled],input:active[type=submit][disabled],button:active[disabled],button:active[type=button][disabled],a.button:active[disabled]
{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
input::-webkit-input-placeholder{color:#486dba}
select{font-family:clear-sans;font-size:1.3rem;min-width:188px;max-width:326px;padding:6px 6px;margin:0 10px 0 0;border:#1c1c1c 1px solid;box-shadow:none;color:#1c1c1c;background:transparent;outline:none;display:inline-block;cursor:pointer}
select{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;font-family:clear-sans;font-size:1.3rem;min-width:166px;max-width:300px;padding:6px 0;margin:0 10px 0 0;border:none;border-bottom:#1c1c1c 1px solid;box-shadow:none;border-radius:0;color:#1c1c1c;background:transparent;outline:none;display:inline-block;cursor:pointer}
select option{color:#1c1c1c;background-color:#e8e8e8}
select:focus{border-color:#ff8c2f}
select[disabled]{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5;cursor:default}
select:focus{outline:0}
select[disabled]{color:#1c1c1c;border-bottom-color:#a2a2a2;opacity:0.5;cursor:default}
select[name=enter_view]{padding:0;float:right}
select[name=enter_share]{padding:0;float:right}
select.narrow{min-width:87px}
select.narrow{min-width:64px}
select.auto{min-width:auto}
select.slot{min-width:44rem;max-width:44rem}
input.narrow{width:166px}
input.trim{width:50px}
#header{position:fixed;top:0;left:0;width:100%;height:91px;z-index:100;margin:0;color:#f2f2f2;background:#1c1b1b;background-size:100% 90px;background-repeat:no-repeat}
#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:100;margin:0;color:#f2f2f2;background:#1c1b1b;background-size:100% 90px;background-repeat:no-repeat}
#header .logo{float:left;margin-left:10px;color:#e22828;width:160px;text-align:center}
#header .logo svg{width:160px;display:block;margin:25px 50px 8px 0}
#header .block{margin:0;float:right;text-align:right;background-color:rgba(28,27,27,0.3);padding:10px 12px}
@@ -57,7 +57,7 @@ input.trim{width:50px}
#title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:right}
#title span img{padding-right:4px}
#title.shift{margin-top:-30px}
#menu{position:fixed;top:90px;left:0;width:100%;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background:#1c1b1b;z-index:101}
#menu{position:absolute;top:90px;left:0;width:100%;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background:#1c1b1b;z-index:101}
#nav-block{overflow:hidden;height:4rem;letter-spacing:2px}
#nav-left{float:left}
#nav-right{float:right}
@@ -126,7 +126,7 @@ table.array_status tr>td+td{padding-left:2px;width:20%}
table.array_status tr>td+td+td{width:auto}
table.array_status td.line{border-top:1px solid #e3e3e3}
table.array_status.noshift{margin-top:0}
table.settings{margin:0;padding:0px}
table.settings{margin:0;padding:0}
table.settings td:first-child{width:35%;padding-left:12px}
table.settings.shifted{padding:0;margin-left:0;margin-top:0}
table.settings.shifted td:first-child{padding-left:0}

2
plugins/dynamix/styles/dynamix-azure.css
View File

@@ -15,7 +15,7 @@ div.jGrowl div.jGrowl-notify div.jGrowl-close{float:right;cursor:pointer}
div.jGrowl div.jGrowl-closer{width:400px;color:#808080;background-color:#121510;opacity:0.96;border:2px solid #B0B0B0;margin:5px 0;padding:4px 0;cursor:pointer;font-weight:bold;text-align:center;border-radius:6px}
div.jGrowl div.jGrowl-closer.top{position:fixed;top:91px}
@media print{div.jGrowl{display:none}}
.ui-dropdownchecklist{background:transparent;border:none;box-shadow:0 1px 0 #606E7F;outline:none;height:2.4rem;line-height:2.4rem;cursor:pointer}
.ui-dropdownchecklist{background:transparent;border:none;box-shadow:0 1px 0 #606E7F;outline:none;height:3.2rem;line-height:3.2rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:1px solid #606E7F;display:inline-block;cursor:pointer;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}

10
plugins/dynamix/styles/dynamix-black.css
View File

@@ -16,12 +16,12 @@ div.jGrowl div.jGrowl-closer{width:400px;color:#808080;background-color:#121510;
div.jGrowl div.jGrowl-closer.top{position:fixed;top:130px}
@media print{div.jGrowl{display:none}}
.ui-dropdownchecklist{background:transparent;border:none;box-shadow:0 1px 0 #f2f2f2;outline:none;height:3.2rem;line-height:3.2rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:1px solid #f2f2f2;display:inline-block;cursor:pointer;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-selector{border:none;border-bottom:1px solid #f2f2f2;outline:none;display:inline-block;cursor:pointer;padding:1px 0}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 0}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
.ui-state-active{border-color:#ff8c2f;background:transparent}
.ui-dropdownchecklist-dropcontainer{color:#f2f2f2;background-color:#262626;border:#ff8c2f 1px solid}
.ui-state-disabled{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5;cursor:default}
.ui-state-active{background:transparent}
.ui-dropdownchecklist-dropcontainer{color:#f2f2f2;background-color:#262626}
.ui-state-disabled{color:#f2f2f2;border-bottom-coloer:#6c6c6c;opacity:0.5;cursor:default}
.ui-dropdownchecklist-indent{padding-left:7px}
.ui-dropdownchecklist-text{font-family:clear-sans;font-size:1.3rem;color:#f2f2f2}
.ui-dropdownchecklist-item{height:2.4rem;line-height:2.4rem}

2
plugins/dynamix/styles/dynamix-gray.css
View File

@@ -15,7 +15,7 @@ div.jGrowl div.jGrowl-notify div.jGrowl-close{float:right;cursor:pointer}
div.jGrowl div.jGrowl-closer{width:400px;color:#808080;background-color:#121510;opacity:0.96;border:2px solid #383A34;margin:5px 0;padding:4px 0;cursor:pointer;font-weight:bold;text-align:center;border-radius:6px}
div.jGrowl div.jGrowl-closer.top{position:fixed;top:91px}
@media print{div.jGrowl{display:none}}
.ui-dropdownchecklist{background:transparent;border:none;box-shadow:0 1px 0 #606E7F;outline:none;height:2.4rem;line-height:2.4rem;cursor:pointer}
.ui-dropdownchecklist{background:transparent;border:none;box-shadow:0 1px 0 #606E7F;outline:none;height:3.2rem;line-height:3.2rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:1px solid #606E7F;display:inline-block;cursor:pointer;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}

10
plugins/dynamix/styles/dynamix-white.css
View File

@@ -16,12 +16,12 @@ div.jGrowl div.jGrowl-closer{width:400px;color:#808080;background-color:#121510;
div.jGrowl div.jGrowl-closer.top{position:fixed;top:130px}
@media print{div.jGrowl{display:none}}
.ui-dropdownchecklist{background:transparent;border:none;box-shadow:0 1px 0 #1c1c1c;outline:none;height:3.2rem;line-height:3.2rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:1px solid #1c1c1c;display:inline-block;cursor:pointer;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 11px}
.ui-dropdownchecklist-selector{border:none;border-bottom:1px solid #1c1c1c;outline:none;display:inline-block;cursor:pointer;padding:1px 0}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 0}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
.ui-state-active{border-color:#ff8c2f;background:transparent}
.ui-dropdownchecklist-dropcontainer{color:#1c1c1c;background-color:#e8e8e8;border:#ff8c2f 1px solid}
.ui-state-disabled{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5;cursor:default}
.ui-state-active{background:transparent}
.ui-dropdownchecklist-dropcontainer{color:#1c1c1c;background-color:#e8e8e8}
.ui-state-disabled{color:#1c1c1c;border-bottom-color:#a2a2a2;opacity:0.5;cursor:default}
.ui-dropdownchecklist-indent{padding-left:7px}
.ui-dropdownchecklist-text{font-family:clear-sans;font-size:1.3rem;color:#1c1c1c}
.ui-dropdownchecklist-item{height:2.4rem;line-height:2.4rem}

4
plugins/dynamix/styles/jquery.ui.css
View File

File diff suppressed because one or more lines are too long