Merge pull request #579 from b1rdhous3/master

Renaming versionBranch, JSONEditor Enchancements and Chang Readme.md
This commit is contained in:
Paulchen Panther
2019-07-19 17:44:19 +02:00
committed by GitHub
12 changed files with 33 additions and 20 deletions

View File

@@ -1,10 +1,10 @@
<div class="container-fluid">
<h3 class="page-header"><i class="fa fa-info-circle fa-fw"></i><span data-i18n="main_menu_about_token">About Hyperion</span></h3>
<div class="row">
<div class="col-lg-6">
<div class="col-lg-12">
<div id="about_cont"></div>
</div>
<div id="danger_act"class="col-lg-6" style="display:none">
<div id="danger_act"class="col-lg-6" style="display:none;padding-top:20px">
<h4>You found a hidden service menu!</h4>
<button id="reset_cache" class="btn btn-danger">Reset Browser Cache</button>
<button id="hyp_restart" class="btn btn-danger">Force Hyperion Restart</button>
@@ -49,4 +49,6 @@
$('#hyp_restart').off().on('click',function(){
initRestart();
});
removeOverlay();
</script>

View File

@@ -38,8 +38,8 @@
<td id="dash_currv">unknown</td>
</tr>
<tr>
<td data-i18n="dashboard_infobox_label_versionbranch">Version Branch:</td>
<td id="dash_versionbranch">unknown</td>
<td data-i18n="dashboard_infobox_label_watchedversionbranch">Watched version branch:</td>
<td id="dash_watchedversionbranch">unknown</td>
</tr>
<tr>
<td data-i18n="dashboard_infobox_label_latesthyp">Latest version:</td>

View File

@@ -25,7 +25,7 @@ $(document).ready( function(error) {
for (var key in window.gitHubVersionList)
{
if(window.gitHubVersionList[key].name == null || (window.serverConfig.general.versionBranch == "Stable" && window.gitHubVersionList[key].prerelease == true))
if(window.gitHubVersionList[key].name == null || (window.serverConfig.general.watchedVersionBranch == "Stable" && window.gitHubVersionList[key].prerelease == true))
{
continue;
}