mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-28 04:29:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #673 from bergware/mutli-language

Browse Source 
Added 'beta' version to previous OS display
This commit is contained in:
tom mortensen
2020-05-08 21:48:48 -07:00
committed by GitHub
parent 84accb45d3 bd067e09b9
commit 06ba455a8c
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,6 +668,7 @@ $(function() {
var status = $(this).is(':checked');
toggleRows('advanced', status, 'basic');
load_contOverview();
$("#catSelect").dropdownchecklist("destroy");
$("#catSelect").dropdownchecklist({emptyText:'_(Select categories)_...', maxDropHeight:200, width:300, explicitClose:'..._(close)_'});
});
});
@@ -760,7 +761,7 @@ _(Repository)_:
<div markdown="1" class="<?=$authoring?>">
_(Categories)_:
: <input type="hidden" name="contCategory">
<select id="catSelect" multiple="multiple" style="display:none" onchange="prepareCategory();">
<select id="catSelect" size="1" multiple="multiple" style="display:none" onchange="prepareCategory();">
<optgroup label="_(Categories)_">
<option value="Backup:">_(Backup)_</option>
<option value="Cloud:">_(Cloud)_</option>

2
plugins/dynamix.plugin.manager/Update.page
View File

@@ -30,7 +30,7 @@ if (file_exists('/boot/previous/changes.txt')) {
break;
}
}
$branch = strpos($version,'rc')===false ? 'Stable' : 'Next';
$branch = strpos($version,'rc')!==false ? 'Next' : (strpos($version,'beta')!==false ? 'Beta' : 'Stable');
}
?>
<style>

2
plugins/dynamix/EthX.page
View File

@@ -308,7 +308,7 @@ _(IPv6 address)_:
_(IPv6 default gateway)_:
: <input type="text" name="GATEWAY6:0" maxlength="39" value="<?=$ethX["GATEWAY6:0"]?>" pattern="<?=$validIP6?>" title="_(IPv6 address nnnn:xxxx::yyyy)_">
<input type="text" name="METRIC6:0" min="0" max="9999" value="<?=$ethX["METRIC6:0"]?>" class="slim"><i class="fa fa-sort-numeric-asc"></i> *_(optional metric (lowest is preferred))_*
<input type="text" name="METRIC6:0" min="0" max="9999" value="<?=$ethX["METRIC6:0"]?>" class="slim"><i class="fa fa-sort-numeric-asc"></i> *_(optional metric (lowest is preferred, 0 is no default gateway))_*
:help137
> Greyed out when using automatic IP assignment. Otherwise specify here the IPv6 address of your router.

4
plugins/dynamix/include/LanguageReset.php
View File

@@ -14,7 +14,5 @@
$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
$lang = $_POST['lang'] ?? '';
if ( ! is_file("/boot/config/plugins/dynamix/dynamix.cfg") )
copy("$docroot/plugins/dynamix/default.cfg","/boot/config/plugins/dynamix/dynamix.cfg");
exec("sed -ri 's/^(locale=\")[^\"]*/\\1$lang/' /boot/config/plugins/dynamix/dynamix.cfg");
exec("sed -ri 's/^(locale=\")[^\"]*/\\1$lang/' /boot/config/plugins/dynamix/dynamix.cfg 2>/dev/null");
?>