summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordo9xe <h.l.lueth@gmail.com>2015-05-17 12:41:48 +0200
committerdo9xe <h.l.lueth@gmail.com>2015-05-17 12:41:48 +0200
commit99ff551722448dbad33854d37123941f1777b12e (patch)
tree528253963bc4f3611373ec396cea286d9c04c74e
parentfb9609bd3390aa65dd2dbf5ecab4ca7ad60ea0bd (diff)
remove vendor-option, add 0.7-rc1
-rw-r--r--assets/javascripts/main.js59
-rw-r--r--config11
-rw-r--r--index.html19
3 files changed, 23 insertions, 66 deletions
diff --git a/assets/javascripts/main.js b/assets/javascripts/main.js
index 73f8dcf..d681473 100644
--- a/assets/javascripts/main.js
+++ b/assets/javascripts/main.js
@@ -1,51 +1,6 @@
$(document).ready(function() {
- $('#manufacturer').on('change', function() {
- selected=this.value;
- first=[];
- $("#manufacturer option").each(function() {
- o=$(this).val();
- if(o != '-1'){
- if(o != selected && selected != '-1'){
- $("#download-form-router option[value^='" + o + "-']").hide();
- } else {
- $("#download-form-router option[value^='" + o + "-']").show();
- }
- }
- });
- if(selected == 'tp-link'){
- defaultSel=selected + "-tl-wr841n-nd-v9";
- $("#download-form-router").val(defaultSel);
- } else {
- $("#download-form-router").val('-1');
- }
- $("#download-form-router").focus();
- $("#download-form-router").select();
- });
-
- $('#branch').on('change', function() {
- updateButton()
- });
-
- $('#download-form-type').on('change', function() {
- updateButton()
- });
-
- function updateButton(){
- if($('#branch').val() == "1"){
- button_html="Experimental";
- } else {
- button_html="Stable"
- }
-
- if($('#download-form-type').val() == "0"){
- button_html+=" Neuinstallation";
- } else {
- button_html+=" Update";
- }
- $("#download-button").html(button_html + " Herunterladen");
- }
- $('#download-form').submit(function( event ) {
+ $('#download-form').submit(function( event ) {
event.preventDefault();
var type = '',
@@ -68,7 +23,7 @@ $(document).ready(function() {
fileExtension = '-sysupgrade';
break;
default:
- alert('error')
+ alert('error')
}
switch ($('#branch').val()) {
@@ -80,12 +35,16 @@ $(document).ready(function() {
branchdir = 'experimental';
vnumber = '0.7-exp150420';
break;
- default:
+ case '2':
+ branchdir = '07-rc1';
+ vnumber = '0.7';
+ break;
+ default:
branchdir = 'stable';
vnumber = '0.6';
}
- if ((router == "netgear-wndr3700" || router == "netgear-wndr3700" || router == "netgear-wndr3800" ||
+ if ((router == "netgear-wndr3700" || router == "netgear-wndr3700" || router == "netgear-wndr3800" ||
router == "buffalo-wzr-hp-ag300h-wzr-600dhp" || router == "buffalo-wzr-hp-g450h" ||
router == "d-link-dir-615-rev-c1" || router == "gl-inet-6408a-v1" || router == "gl-inet-6416a-v1" ||
router == "tp-link-tl-mr3220-v2" || router == "tp-link-tl-wa701n-nd-v1" ||
@@ -97,7 +56,7 @@ $(document).ready(function() {
{
window.alert('Der ausgewählte Router ist in dieser Version noch nicht verfügbar!');
}
- else if(router === '-1') {
+ else if(router === '-1') {
window.alert('Bitte wähle eine Router aus.');
} else {
window.location.href = '/firmware/'+branchdir+'/'+type+'/gluon-'+site_code+'-'+vnumber+'-'+router+fileExtension+fileEnding;
diff --git a/config b/config
new file mode 100644
index 0000000..b306e5b
--- /dev/null
+++ b/config
@@ -0,0 +1,11 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+[remote "origin"]
+ url = http://git.freifunk.in-kiel.de/ffki-downloader
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
diff --git a/index.html b/index.html
index ae2ecf1..6db4021 100644
--- a/index.html
+++ b/index.html
@@ -16,7 +16,7 @@
<a href="https://freifunk.in-kiel.de/"><img src="assets/images/freifunk_logo.png" alt="Freifunk Kiel Firmware"></a>
<h1><a href="https://freifunk.in-kiel.de/">Freifunk Kiel</a></h1>
<br>
- <h2>Firmware Version 0.6 und 0.7-exp150420 herunterladen</h2>
+ <h2>Firmware Version 0.6 und 0.7-RC1 herunterladen</h2>
<noscript><br><br><br><h1>Bitte aktiviere Javascript</h1>
<a href="http://freifunk.in-kiel.de/firmware.html">Download ohne Javascript</a></noscript>
</header>
@@ -26,23 +26,11 @@
<option value="0">Neuinstallation der Freifunk Firmware</option>
<option value="1">Update der Freifunk Firmware</option>
</select>
-
<select id="branch">
<option value="0">Stabile und getestete Version</option>
+ <option value="2">RC Version 0.7 (für Profis)</option>
<option value="1">Experimentelle Version (für Profis)</option>
</select>
-
- <select id="manufacturer">
- <option value="-1">alle Hersteller anzeigen</option>
- <option value="buffalo">Buffalo</option>
- <option value="d-link">D-Link</option>
- <option value="gl-inet">GL Inet</option>
- <option value="linksys">Linksys</option>
- <option value="netgear">NetGear</option>
- <option value="tp-link">TP-Link</option>
- <option value="ubiquiti">Ubiquiti</option>
- </select>
-
<select id="download-form-router">
<option value="-1">Bitte wähle einen Router</option>
<optgroup label="Buffalo">
@@ -125,7 +113,7 @@
</optgroup>
</select>
- <button class="button" id="download-button">Herunterladen</button>
+ <button class="button">Herunterladen</button>
<a class="button" href="/firmware/ffki-images-0.6.zip">Alle Stable-Images als ZIP herunterladen</a>
</form>
@@ -137,4 +125,3 @@
<script src="assets/javascripts/main.js" type="text/javascript"></script>
</body>
</html>
-