diff --git a/app.css b/app.css index 6a3b893d22eb48aeafa1aedafc14cd85185cd0b0..c37eab282742529ce591e61cda96c9401a08b514 100644 --- a/app.css +++ b/app.css @@ -91,6 +91,11 @@ h1, h2, h3, h4, h5, h6 { background: rgba(255, 255, 255, 0.8); } +#branchName { + text-transform: capitalize; + font-weight: bold; +} + #currentVersions { float:right; padding: .5em; diff --git a/app.js b/app.js index f0141569e7bbaee90d52169308babfd92c6ac30e..b06e1aac6b0f7802d966620be92517dbb0bcb2b4 100644 --- a/app.js +++ b/app.js @@ -832,6 +832,7 @@ var firmwarewizard = function() { return branches.indexOf(a.branch) > branches.indexOf(b.branch); }); + $('#branchdescs').innerHTML = ''; $('#branchselect').innerHTML = ''; $('#branch-experimental-dl').innerHTML = ''; @@ -849,6 +850,29 @@ var firmwarewizard = function() { (rev.size!==''?' ['+rev.size+']':'') + ' (' +prettyPrintVersion(rev.version)+')'; + if (rev.branch in config.branch_descriptions) { + var li = document.createElement('li'); + var name = document.createElement('span'); + name.innerText = rev.branch; + name.id = 'branchName'; + var desc = document.createElement('span'); + desc.id = 'branchDesc' + desc.innerText = ' ' + config.branch_descriptions[rev.branch]; + + li.appendChild(name); + + if (rev.branch == config.recommended_branch) { + var recommended = document.createElement('sup'); + recommended.innerText = ' Empfehlung'; + name.appendChild(recommended); + } + + br = document.createElement('br'); + li.appendChild(br); + li.appendChild(desc); + $('#branchdescs').appendChild(li); + } + if (config.experimental_branches.indexOf(rev.branch) != -1) { if($('#branchselect .dl-experimental') === null) { var button = document.createElement('button'); diff --git a/config_template.js b/config_template.js index c8b8cd0266113d613778b9f1346b7cc21c0206b4..3fa86c0f23a21d6af83435555071eb5eaf98abb4 100644 --- a/config_template.js +++ b/config_template.js @@ -30,6 +30,14 @@ var config = { './images/gluon-factory-example.html': 'stable', './images/gluon-sysupgrade-example.html': 'stable' }, + // branch descriptions shown during selection + branch_descriptions: { + stable: 'Gut getestet, zuverlässig und stabil.', + beta: 'Vorabtests neuer Stable-Kandidaten.', + experimental: 'Ungetestet, automatisch generiert.' + }, + // recommended branch will be marked during selection + recommended_branch: 'stable', // experimental branches (show a warning for these branches) experimental_branches: ['experimental'], // path to preview pictures directory diff --git a/index.html b/index.html index e747503ee4b6b4072cebe6770e66654f17eb2f32..1250e31eef4225e15e70ccfac24c94caf3920823 100644 --- a/index.html +++ b/index.html @@ -47,7 +47,7 @@ <em>Upgrade</em> bezeichnete Version. </p> <p> - Einige Geräte benötigen spezielle Images, welche über den Bootloader + Einige Geräte benötigen spezielle Images, welche über den Bootloader des Herstellers eingespiel werden. </p> <radiogroup id="typeselect" class="radiogroup"></radiogroup> @@ -57,20 +57,7 @@ <div id="branch-pane" class="pane initiallyhidden"> <h1>Schritt 3: Wähle Deinen Update-Kanal</h1> <p>Diese Freifunk-Firmware bieten wir in verschiedenen Versionen an:</p> - <ul> - <li> - <strong>Stable <sup>Empfehlung</sup></strong><br /> - Gut getestet, zuverlässig und stabil.<br /> - </li> - <li> - <strong>Beta</strong><br /> - Vorabtests neuer Stable-Kandidaten.<br /> - </li> - <li> - <strong>Experimental</strong><br /> - Ungetestet, automatisch generiert.<br /> - </li> - </ul> + <ul id="branchdescs"></ul> <p>Die Auswahl der passenden Version entscheidet über die Stablität des Routers und den potentiell anfallenden Wartungsaufwand.</p>