Merge pull request #137 from bergware/6.4-wip

Changed popup windows to higher contrast and the same for all themes
This commit is contained in:
tom mortensen
2017-06-25 15:53:30 -07:00
committed by GitHub
15 changed files with 58 additions and 65 deletions
+2 -6
View File
@@ -10,12 +10,8 @@
*/
?>
<?
$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
$var = parse_ini_file('state/var.ini');
$unraid = parse_ini_file('/etc/unraid-version');
$webgui = parse_plugin_cfg('dynamix',true);
$keyfile = trim(base64_encode(@file_get_contents($var['regFILE'])));
if (array_key_exists('getdiagnostics', $_GET)) {
@@ -28,7 +24,7 @@ if (array_key_exists('getdiagnostics', $_GET)) {
}
?>
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-fonts.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-<?=$webgui['display']['theme']?>.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-popup.css">
<style>
#spinner_image{position:fixed;left:46%;top:46%;width:16px;height:16px;display:none}
#control_panel{position:fixed;left:5px;right:5px;top:0;padding-top:8px;line-height:24px;white-space:nowrap}
@@ -42,7 +38,7 @@ input[type=button]{margin-right:0;float:right}
input[type=email]{margin-top:8px;float:left}
</style>
<body>
<div style="margin-top:0;font-size:12px;line-height:30px;margin-left:5px;margin-right:5px">
<div style="margin-top:0;line-height:30px;margin-left:5px;margin-right:5px">
<div id="control_panel" class="four">
<label for="optOnlinePoll"><input type="radio" name="mode" id="optOnlinePoll" value="onlinepoll" checked="checked" /> Online Poll</label>
<label for="optFeatureRequest"><input type="radio" name="mode" id="optFeatureRequest" value="featurerequest"/> Feature Request</label>
+2 -6
View File
@@ -11,10 +11,6 @@
*/
?>
<?
$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
$webgui = parse_plugin_cfg('dynamix',true);
$month = [' Jan '=>'-01-',' Feb '=>'-02-',' Mar '=>'-03-',' Apr '=>'-04-',' May '=>'-05-',' Jun '=>'-06-',' Jul '=>'-07-',' Aug '=>'-08-',' Sep '=>'-09-',' Oct '=>'-10-',' Nov '=>'-11-',' Dec '=>'-12-'];
function plus($val, $word, $last) {
@@ -34,10 +30,10 @@ function my_duration($time) {
<html lang="en">
<head>
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-fonts.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-<?=$webgui['display']['theme']?>.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-popup.css">
</head>
<body>
<table class='share_status' style='margin-top:0;font-size:12px'><thead><tr><td>Date</td><td>Duration</td><td>Speed</td><td>Status</td><td>Errors</td></tr></thead><tbody>
<table class='share_status'><thead><tr><td>Date</td><td>Duration</td><td>Speed</td><td>Status</td><td>Errors</td></tr></thead><tbody>
<?
$log = '/boot/config/parity-checks.log'; $list = [];
if (file_exists($log)) {
+2 -6
View File
@@ -10,15 +10,11 @@
*/
?>
<?
$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
$var = parse_ini_file('state/var.ini');
$webgui = parse_plugin_cfg('dynamix',true);
$keyfile = base64_encode(file_get_contents($var['regFILE']));
?>
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-fonts.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-<?=$webgui['display']['theme']?>.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-popup.css">
<script src="/webGui/javascript/dynamix.js"></script>
<script>
function replaceKey(email, guid, keyfile) {
@@ -53,7 +49,7 @@ function replaceKey(email, guid, keyfile) {
}
</script>
<body>
<div style="margin-top:20px;font-size:12px;line-height:30px;margin-left:40px">
<div style="margin-top:20px;line-height:30px;margin-left:40px">
<div id="status_panel"></div>
<form markdown="1" id="input_form">
@@ -12,17 +12,13 @@
*/
?>
<?
$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
$var = parse_ini_file('state/var.ini');
$webgui = parse_plugin_cfg('dynamix',true);
?>
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-fonts.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-<?=$webgui['display']['theme']?>.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-popup.css">
<style>
span.key{width:92px;display:inline-block;font-weight:bold}
div.box{margin-top:8px;line-height:30px;margin-left:40px;font-size:12px}
div.box{margin-top:8px;line-height:30px;margin-left:40px}
</style>
<script>
// server uptime & update period
+2 -6
View File
@@ -10,14 +10,10 @@
*/
?>
<?
$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
$var = parse_ini_file('state/var.ini');
$webgui = parse_plugin_cfg('dynamix',true);
?>
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-fonts.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-<?=$webgui['display']['theme']?>.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-popup.css">
<script src="/webGui/javascript/dynamix.js"></script>
<script>
function registerTrial(email, guid) {
@@ -52,7 +48,7 @@ function registerTrial(email, guid) {
}
</script>
<body>
<div style="margin-top:20px;font-size:12px;line-height:30px;margin-left:40px">
<div style="margin-top:20px;line-height:30px;margin-left:40px">
<div id="status_panel"></div>
<form markdown="1" id="trial_form">