Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions emhttp/plugins/dynamix/ArrayOperation.page
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ window.onunload = function(){
case "Started":?>
<tr><td><?status_indicator()?>**_(Started)_<?=((_var($var,'startMode')=='Maintenance')?' - _(Maintenance Mode)_':'')?>**</td>
<td><input type="button" id="stop-button" value="_(Stop)_" onclick="stopArray(this.form)"></td>
<td>**_(Stop)_** _(will take the array off-line)_.<span id="stop-text"></span></td></tr>
<td>**_(Stop)_** _(will take the array offline)_.<span id="stop-text"></span></td></tr>
<? if (_var($var,'fsNumUnmountable',0) > 0):?>
<tr><td>**<?=_('Unmountable disk'.(_var($var,'fsNumUnmountable',0) == 1 ? '' : 's').' present')?>:**<br>
<? $cache = [];
Expand Down Expand Up @@ -753,7 +753,7 @@ window.onunload = function(){
switch (_var($var,'mdState')):
case "STARTED":
?> <tr><td><?status_indicator()?>**_(Stopped)_**. _(Configuration valid)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**_(Start)_** _(will bring the array on-line)_.</td></tr>
<td>**_(Start)_** _(will bring the array online)_.</td></tr>
<? maintenance_mode();
check_encryption();
break;
Expand All @@ -762,36 +762,36 @@ window.onunload = function(){
if ($action[0] == "recon"):
$resync = resync($action[1]);
?> <tr><td><?status_indicator()?>**_(Stopped)_**. _(Configuration valid)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**<?=_('Start')?>** <?=_("will bring the array on-line and start **$resync**")?>.</td></tr>
<td>**<?=_('Start')?>** <?=_("will bring the array online and start **$resync**")?>.</td></tr>
<? elseif ($action[0] == "clear"):?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(New data disk(s) detected)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**_(Start)_** _(will bring the array on-line and start **Disk-Clear** of new data disk(s))_.</td></tr>
<td>**_(Start)_** _(will bring the array online and start **Disk-Clear** of new data disk(s))_.</td></tr>
<? elseif (_var($var,'sbClean') != "yes" && $action[0] == "check" && count($action) > 1):?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Unclean shutdown detected)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**_(Start)_** _(will bring the array on-line and start **Parity-Check**)_.
<td>**_(Start)_** _(will bring the array online and start **Parity-Check**)_.
<br><input type="checkbox" name="optionCorrect" value="correct" checked><small>_(Write corrections to parity)_</small></td></tr>
<? elseif (_var($var,'sbClean') != "yes" && $action[0] == "check"):?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Unclean shutdown detected)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**_(Start)_** _(will bring the array on-line)_.</td></tr>
<td>**_(Start)_** _(will bring the array online)_.</td></tr>
<? elseif (missing_cache()):?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Missing pool disk)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)" disabled></td>
<td>**_(Start)_** _(will remove the missing pool disk and then bring the array on-line)_.
<td>**_(Start)_** _(will remove the missing pool disk and then bring the array online)_.
<br><input type="checkbox" name="confirmStart" value="OFF" onclick="$('#cmdStart').prop('disabled',!arrayOps.confirmStart.checked)"><small>_(Yes, I want to do this)_</small></td></tr>
<? else:?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Configuration valid)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**_(Start)_** _(will bring the array on-line)_.</td></tr>
<td>**_(Start)_** _(will bring the array online)_.</td></tr>
<? endif;
maintenance_mode();
check_encryption();
break;
case "NEW_ARRAY":
if (strpos(_var($disks['parity'],'status'),"DISK_NP") === 0 && strpos(_var($disks['parity2'],'status'),"DISK_NP") === 0):?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Configuration valid)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**_(Start)_** _(will record all disk information and bring the array on-line)_.
<td>**_(Start)_** _(will record all disk information and bring the array online)_.
<br>_(The array will be immediately available, but **unprotected** since *parity* has not been assigned)_.</td></tr>
<? else:?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Configuration valid)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this,true)"></td>
<td>**_(Start)_** _(will record all disk information, bring the array on-line, and start Parity-Sync)_.
<td>**_(Start)_** _(will record all disk information, bring the array online, and start Parity-Sync)_.
<br>_(The array will be immediately available, but **unprotected** until Parity-Sync completes)_.
<br><input type="checkbox" name="md_invalidslot" value="99">_(Parity is already valid)_.</td></tr>
<? endif;
Expand All @@ -800,7 +800,7 @@ window.onunload = function(){
break;
case "DISABLE_DISK":?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Missing disk)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)" disabled></td>
<td>**_(Start)_** _(will disable the missing disk and then bring the array on-line. Install a replacement disk as soon as possible)_.
<td>**_(Start)_** _(will disable the missing disk and then bring the array online. Install a replacement disk as soon as possible)_.
<br><input type="checkbox" name="confirmStart" value="OFF" onclick="$('#cmdStart').prop('disabled',!arrayOps.confirmStart.checked)"><small>_(Yes, I want to do this)_</small></td></tr>
<? maintenance_mode();
check_encryption();
Expand All @@ -814,7 +814,7 @@ window.onunload = function(){
case "SWAP_DSBL":
if (_var($var,'fsCopyPrcnt') == "100"):?>
<tr><td><?status_indicator()?>**_(Stopped)_**. _(Upgrading disk/swapping parity)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form,this)"></td>
<td>**_(Start)_** _(will expand the file system of the data disk (if possible); then bring the array on-line and start Data-Rebuild)_.</td></tr>
<td>**_(Start)_** _(will expand the file system of the data disk (if possible); then bring the array online and start Data-Rebuild)_.</td></tr>
<? maintenance_mode();
check_encryption();
else:?>
Expand Down
2 changes: 1 addition & 1 deletion emhttp/plugins/dynamix/include/Helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function my_usage() {
$used = $arraysize ? 100-round(100*$arrayfree/$arraysize) : 0;
echo "<div class='usage-bar'><span style='width:{$used}%' class='".usage_color($display,$used,false)."'>{$used}%</span></div>";
} else {
echo "<div class='usage-bar'><span style='text-align:center'>".($var['fsState']=='Started'?'Maintenance':'off-line')."</span></div>";
echo "<div class='usage-bar'><span style='text-align:center'>".($var['fsState']=='Started'?'Maintenance':'offline')."</span></div>";
}
}

Expand Down
2 changes: 1 addition & 1 deletion emhttp/plugins/dynamix/nchan/update_2
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function yellow_text($disk) {
function device_status(&$disk, &$error, &$warning) {
global $var;
if (_var($disk,'type')!='Extra' && _var($var,'fsState')=='Stopped') {
$color = 'green'; $text = 'off-line';
$color = 'green'; $text = 'offline';
} else switch (_var($disk,'color')) {
case 'green-on' : $color = 'green'; $text = 'active'; break;
case 'green-blink' : $color = 'grey'; $text = 'standby'; break;
Expand Down
Loading