Web: Add update.html (#187)

* Update packages.cmake

* version.json

* Update version.json

* update webui

* add better icon spacing solution, remove changes from font awesome to keep it update secure

* fix conflict no ci

* resolve conflict no ci

* no ci
This commit is contained in:
brindosch 2016-08-20 16:52:06 +02:00 committed by GitHub
parent ceeed07e6c
commit 7435bb78a2
7 changed files with 72 additions and 11 deletions

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,8 @@
url("../fonts/Roboto-Regular.ttf") format('ttf');
}
body{font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;}
/*icon spacing*/
.fa-fw{margin-right:5px;}
/*Header*/
.navbar-brand{padding: 5px;height:90px;}
@ -12,9 +14,6 @@ body{font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15
.dropdown{font-size:18px;}
@media (max-width: 767px) {.sidebar{margin-top:0px;}}
/*Sidebar*/
.sidebar .fa-fw{width:1.9em}
/*Panels*/
.panel-heading{font-size:18px;}

View File

@ -312,6 +312,15 @@
</li>
<li>
<a class="inactive" href="#" id="load_support"><i class="fa fa-info fa-fw"></i><span lang="en" data-lang-token="main_menu_support_token">Support</span></a>
</li>
<li>
<a class="inactive" href="#"><i class="fa fa-cog fa-fw"></i><span lang="en" data-lang-token="main_menu_system_token">System</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a class="inactive" href="#" id="load_update"><i class="fa fa-download fa-fw"></i><span lang="en" data-lang-token="main_menu_update_token">Update</span></a>
</li>
</ul>
</li>
</li>
</ul>
@ -436,7 +445,11 @@
$("#load_confKodi").on("click", function() {
$("#page-wrapper").load("kodiconf.html");
});
$("#load_update").on("click", function() {
$("#page-wrapper").load("update.html");
});
$("#load_confGeneral").on("click", function() {
$("#page-wrapper").load("generalconf.html");
});

View File

@ -112,12 +112,10 @@
</div>
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading" >
<a href="#kodiWatchInfo" class="panel-heading" data-toggle="collapse">
<div class="panel-heading" data-toggle="collapse" data-target="#dkodiWatchInfo">
Kodi options explained
</a>
</div>
<div id="kodiWatchInfo" class="panel-body">
<div id="kodiWatchInfo" class="collapse panel-body">
<ul>
<li><strong>Enabled:</strong> If checked, the Kodi Checker is enabled</li>
<li><strong>Kodi IP-Address:</strong> The ip address of your kodi "127.0.01" means your kodi on the same machine (see hint below)</li>

View File

@ -24,6 +24,8 @@
"main_menu_colors_token" : "Farben",
"main_menu_effects_token" : "Effekte",
"main_menu_support_token" : "Hilfe",
"main_menu_update_token" : "Update",
"main_menu_general_conf_token":"Allgemein",
"remote_colors_label_color":"Farbe: ",
"remote_colors_button_reset":"Farbe zurücksetzen",
"remote_effects_intro" : "Die Effekt-Fernbedienung ermöglicht es dir Effekte zu starten für Demonstrations- oder Testzwecke. Vergessse nicht den Effekt wieder zu stoppen, wenn du fertig bist.",
@ -57,7 +59,11 @@
"support_label_wikitext" : "Von A bis Z - Alles wissenwerte zu Hyperion",
"support_label_forumtitle" : "Forum",
"support_label_forumtext" : "Diskussion und Hilfestellung von der Community",
"main_menu_general_conf_token" : "Allgemein",
"update_label_intro" : "Diese Seite zeigt dir alle verfügbaren Versionen von Hyperion, du kannst nach Belieben eine aktuellere Version installieren oder eine Ältere. Die aktuellsten Versionen befinden sich immer oben.",
"update_label_description" : "Beschreibung:",
"update_button_install" : "Installieren",
"update_button_changelog" : "Zeige Änderungsprotokoll",
"update_label_type" : "Art:"
"remote_general_conf_intro" : "Hier kannst du allgemeine Einstellungen von Hyperion vornehmen.",
"generalConfForm_jsonform-0-elt-logger.level" : "Stufe Logging",
"generalConfForm_jsonform-0-elt-jsonServer.port" : "Port",
@ -73,7 +79,6 @@
"generalConfForm_jsonform-0-elt-udpListener.timeout" : "Timeout",
"generalConfForm_jsonform-0-elt-webConfig.document_root" : "Root Verzeichnis",
"generalConfForm_jsonform-0-elt-webConfig.enable" : "Aktivieren"
},
"regex": [
["^Something at start of text", ""],

View File

@ -0,0 +1,26 @@
<div class="container-fluid">
<div class="row">
<div class="col-lg-12">
<h1 class="page-header" lang="en" data-lang-token="main_menu_update_token">Update</h1>
<div class="introd">
<h4 lang="en" data-lang-token="update_label_intro">This page gives you an overview of all Hyperion versions available. On top you could update or downgrade your version of Hyperion whenever you want. Sorted from newest to oldest</h4>
</div>
<hr>
<div class="col-lg-12" id="versionlist">
</div>
</div>
</div>
</div>
<script type="text/javascript">
$.get( "https://raw.githubusercontent.com/hyperion-project/hyperion.ng/master/version.json", function( data ) {
var vlist = JSON.parse(data);
for (key in vlist)
{
$('#versionlist').append('<div class="col-lg-6"><div class="panel panel-default"><div class="panel-heading"><i class="fa fa-television fa-fw"></i>Hyperion V'+key+'</div><div class="panel-body"><p><span style="font-weight:bold;" lang="en" data-lang-token="update_label_type">Type:</span> '+ vlist[key].channel +'</p><p><span style="font-weight:bold;" lang="en" data-lang-token="update_label_description">Description:</span> '+vlist[key].versiondesc+'</p><hr><a class="btn btn-primary" href="'+ vlist[key].versionchangelog +'" target="_blank"><i class="fa fa-list fa-fw"></i><span style="font-weight:bold;" lang="en" data-lang-token="update_button_changelog">Full changelog</span></a><button type="button" class="btn btn-warning pull-right"><i class="fa fa-download fa-fw"></i><span lang="en" data-lang-token="update_button_install">Install</span></button></div></div></div>');
}
});
</script>

20
version.json Normal file
View File

@ -0,0 +1,20 @@
{
"2.1.0":
{
"versiondesc": "This version introduces feature x and some small bugfixes at the web configuration",
"versionchangelog":"https://www.hyperion-project.org/blog/id1",
"channel" : "Stable"
},
"2.0.1":
{
"versiondesc": "This is a bugfix release for 2.0.0",
"versionchangelog": "https://www.hyperion-project.org/blog/id3",
"channel" : "Stable"
},
"2.0.0":
{
"versiondesc": "Version 2.0.0 introduces the succesor of Hyperion 1.0 with plenty new features to discover with a entire code rework and a highly extended JSON RPC!",
"versionchangelog": "https://www.hyperion-project.org/blog/id0",
"channel" : "Stable"
}
}