diff --git a/.gitignore b/.gitignore index 775b13f2bd8e30cffd416e71bd0672d410d00988..59e44ab624f7ff16bcab0f0a70dced025f2fa775 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ *.swp -config.js images/* diff --git a/app.css b/app.css index 8ee40b2699192d238d2795e61f0932815adb25d4..613538533011f54497e9b1f1f95f7dbd9cb9d2b6 100644 --- a/app.css +++ b/app.css @@ -114,10 +114,10 @@ h1, h2, h3, h4, h5, h6 { } #firmwareTable h1 { - color: #dc0067; + color: #f9a62b; } -.firmwareTableLink, .notRecommendedLink, .InfoLink { +.firmwareTableLink, .notRecommendedLink, .InfoLink, .oldVersionLink { clear: right; float:right; color: #337ab7; @@ -153,11 +153,11 @@ h1, h2, h3, h4, h5, h6 { } #wizard #model-pane { - border-left: 3px solid #dc0067; + border-left: 3px solid #f9a62b; } #wizard #model-pane h1 { - color: #dc0067; + color: #f9a62b; } #wizard #model-pane input { @@ -250,7 +250,7 @@ h1, h2, h3, h4, h5, h6 { } #wizard select.invalid { - border: 1px solid #dc0067; + border: 1px solid #f9a62b; box-shadow: 0.125em 0.125em 0.5em rgba(219, 0, 102, 0.125); } @@ -336,3 +336,7 @@ h1, h2, h3, h4, h5, h6 { display: block; margin: auto 0.5em; } + +.center { + text-align: center; +} diff --git a/config.js b/config.js new file mode 100644 index 0000000000000000000000000000000000000000..515b68b75029482e83887a2b54903529690b26e9 --- /dev/null +++ b/config.js @@ -0,0 +1,65 @@ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +var config = { + // list images on console that match no model + listMissingImages: true, + // see devices.js for different vendor model maps + vendormodels: vendormodels, + // set enabled categories of devices (see devices.js) + enabled_device_categories: ["recommended", "ath10k_lowmem", "4_32", "8_32", "16_32"], + // Display a checkbox that allows to display not recommended devices. + // This only make sense if enabled_device_categories also contains not + // recommended devices. + recommended_toggle: true, + // community prefix of the firmware images + community_prefix: 'gluon-ffs-', + // firmware version regex + version_regex: "-((experimental|[0-9]+\.[0-9]+)[+][0-9]{4}-[0-9]{2}-[0-9]{2}-g\.[a-f0-9]+-s\.[a-f0-9]+-)", + prettyPrintVersionRegex: "((experimental|[0-9]+\.[0-9]+)[+][0-9]{4}-[0-9]{2}-[0-9]{2})", // removes +2017-09-13-g.d722c26-s.b0e5e48 + // relative image paths and branch + directories: { + //'../gluon/stable/factory/': 'stable', + '../gluon/stable/sysupgrade/': 'stable', + '../gluon/stable/factory/': 'stable', + '../gluon/stable/other/': 'stable', + '../gluon/beta/sysupgrade/': 'beta', + '../gluon/beta/factory/': 'beta', + '../gluon/beta/other/': 'beta', + '../gluon/nightly/sysupgrade/': 'nightly', + '../gluon/nightly/factory/': 'nightly', + '../gluon/nightly/other/': 'nightly', + '../gluon/experimental/sysupgrade/': 'experimental', + '../gluon/experimental/factory/': 'experimental', + '../gluon/experimental/other/': 'experimental' + }, + // page title + title: 'Firmware', + // branch descriptions shown during selection + branch_descriptions: { + stable: 'Empfohlen.', + beta: 'Hilf den Firmware-Entwicklern mit Tests. Kann gelegentlich Probleme machen.', + nightly: 'Ungetestet, automatisch generiert.', + experimental: 'Halte den Lötkolben bereit.' + }, + // recommended branch will be marked during selection + recommended_branch: 'stable', + // experimental branches (show a warning for these branches) + experimental_branches: ['experimental', 'nightly'], + // path to preview pictures directory + preview_pictures: 'pictures/', + // link to changelog + changelog: 'https://wiki.freifunk-stuttgart.net/technik:software:gluon:firmwareversionen_milestones' +}; diff --git a/ffs-logo.png b/ffs-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..043cb19734e71abe649a667cd9ac1ff9a57ef225 Binary files /dev/null and b/ffs-logo.png differ diff --git a/index.html b/index.html index 4fa5e425d19daba535f9c491ef469f0d8c56d4bf..cf923ca7a21ef552eaa8f125fa359e6a5e1d7fbe 100644 --- a/index.html +++ b/index.html @@ -10,17 +10,20 @@ </head> <body> <noscript> - <meta http-equiv="refresh" content="0; url=/images/"> + <meta http-equiv="refresh" content="0; url=/gluon/stable/"> </noscript> <div id="currentVersions"> </div> <div id="wizard"> - <a href="./index.html"><img src="./router.png" ></a> + <div class="center"> + <a href="./index.html"><img src="./ffs-logo.png" class="center"></a> + </div> <div class="pane-wrapper"> <div id="model-pane" class="pane"> <span class="notRecommendedLink">nicht empfohlene Geräte anzeigen</span> <span class="firmwareTableLink">Tabelle anzeigen</span> + <a href="/gluon/archive/" class="oldVersionLink">Alle Versionen</a> <h1>Schritt 1: Wähle Dein Routermodell</h1> <div class="warning-notrecommended"> <p>