From a0e5bc712e5da8e1309f9f51a9f421fc5a06d8fa Mon Sep 17 00:00:00 2001 From: Goutte Date: Mon, 26 Mar 2018 08:32:58 +0200 Subject: [PATCH] Keep trying to fix the website for IE, the idiot browser for ignorants. Every time you use IE, god kills a kitten. --- CHANGELOG.md | 6 +++++- VERSION | 2 +- web/run.py | 1 + web/view/home.html.jinja2 | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca0e287..7841a55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,13 +39,17 @@ et prendre aussi - [ ] Check IE compat -## 1.2 +## 1.3 - [ ] Earth pdyn = pvĀ² - [ ] Earth omnihour B is a Vector3 - [ ] Layers - SW Catalogs - Auroral Emissions + + +## 1.2 + - [x] Restore Earth - [x] Clean NetCDF, stage 1 - [x] Accordion on the parameters list diff --git a/VERSION b/VERSION index b18d465..89a6e74 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.0.1 +v1.2 diff --git a/web/run.py b/web/run.py index 2ce937b..1ec19c0 100755 --- a/web/run.py +++ b/web/run.py @@ -765,6 +765,7 @@ def home(): input_slug = get_input_slug_from_query() return render_view('home.html.jinja2', { 'targets': config['targets'], + 'active_targets': [t for t in config['targets'] if not t['locked']], 'parameters': parameters, 'input_slug': input_slug, 'planets': [s for s in config['targets'] if s['type'] == 'planet'], diff --git a/web/view/home.html.jinja2 b/web/view/home.html.jinja2 index 5051bc3..d2ef13e 100755 --- a/web/view/home.html.jinja2 +++ b/web/view/home.html.jinja2 @@ -623,15 +623,14 @@ var configuration = { img: '{{ static('img/sun_128.png') }}' }, targets: { -{% for target in targets if not target.locked %} - {% if not loop.first %},{% endif %} +{% for target in active_targets %} '{{ target.slug }}': { slug: '{{ target.slug }}', name: '{{ target.name }}', active: true, orbit: { a: {{ target.orbit.semimajor or 0 }}, b: {{ target.orbit.semiminor or 0 }} }, img: '{{ static('img/target/'~target.slug~'_128.png') }}' - } + }{{ ',' if not loop.last }} {% endfor %} }, parameters: [ @@ -710,6 +709,7 @@ jQuery().ready(function($){ }); var download_spinner = $('#download_spinner'); var waiting_for_download = false; + $('#download').on("click", function(e){ if (waiting_for_download) return; download_spinner.css('display', 'inline-block'); -- libgit2 0.21.2