CDPP / HELIOPROPA

Commit 575e380a237ed889f2debbb134450e354f294aa8

Authored by Goutte
1 parent cdf79b23
Exists in master and in 2 other branches DEV, rhitier-dev

Add disabled layer buttons.

Showing 4 changed files with 29 additions and 17 deletions   Show diff stats
Inline Side-by-side
CHANGELOG.md
  Diff comments   View file @575e380
... ... @@ -13,7 +13,6 @@
13 13 - [ ] juno/rosetta doivent aussi bouger le long de leur orbite lorsque l'on parcourt à la souris les données de la série temporelle; pour les intervalles de temps où rosetta n'existe plus (crash à la surface de la comète) il faut qu'elle disparaisse; pour les intervalles de temps où juno est en orbite autour de jupiter il faut que juno suive jupiter
14 14 -> tout ceci est configurable dans le fichier de configuration, je n'ai pas les ids !
15 15  
16   -- [ ] ajouter dans le bandeau vertical un onglet LAYERS avec 3 choix possibles: Jupiter Thermosphere Model, HST Jupiter Observations, HST Saturn Observations
17 16  
18 17 ## Future ?
19 18  
... ... @@ -32,8 +31,7 @@
32 31  
33 32 ## 1.0.0-rc7
34 33  
35   -
36   -- [ ] Add disabled layer buttons
  34 +- [x] Add disabled layer buttons
37 35 - [x] Give the future data another color
38 36 - [x] Change the default interval (from 2 months in the past to one in the future)
39 37 - [x] Prepare horizontal lines in the time series
... ...
VERSION
  Diff comments   View file @575e380
1   -1.0.0-rc6
2 1 \ No newline at end of file
  2 +1.0.0-rc7
3 3 \ No newline at end of file
... ...
config.yml
  Diff comments   View file @575e380
... ... @@ -46,6 +46,17 @@ authors:
46 46  
47 47 amda: "http://cdpp.irap.omp.eu/BASE/DDService/getDataUrl.php?dataSet={dataSet}&StartTime={startTime}&StopTime={stopTime}"
48 48  
  49 +layers:
  50 + - slug: "jupiterthermospheremodel"
  51 + name: "Jupiter Thermo."
  52 + desc: "Jupiter Thermosphere Model"
  53 + - slug: "hstjupiterobservations"
  54 + name: "HST Jupiter"
  55 + desc: "HST Jupiter Observations"
  56 + - slug: "hstsaturnobservations"
  57 + name: "HST Saturn"
  58 + desc: "HST Saturn Observations"
  59 +
49 60 inputs:
50 61 - slug: "l1"
51 62 name: "L1"
... ...
web/view/home.html.jinja2
  Diff comments   View file @575e380
... ... @@ -98,19 +98,19 @@
98 98 <br>
99 99 <hr class="clear">
100 100  
101   -{# <span class="mdl-layout-title">{{ icon('database') }} Layers</span>#}
102   -{##}
103   -{# <section class="section-drawer">#}
104   -{#{% for layer in config.layers %}#}
105   -{# <label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-layer-{{ layer.slug }}" title="{{ layer.desc }}">#}
106   -{# <input type="radio" id="option-layer-{{ layer.slug }}" class="mdl-radio__button" name="layer_slug" value="{{ layer.slug }}" {{ 'checked' if layer.slug == layer_slug }}>#}
107   -{# <span class="mdl-radio__label">{{ layer.name }}</span>#}
108   -{# </label>#}
109   -{# <br />#}
110   -{#{% endfor %}#}
111   -{# </section>#}
112   -{##}
113   -{# <hr class="clear">#}
  101 + <span class="mdl-layout-title">{{ icon('area-chart') }} Layers</span>
  102 +
  103 + <section class="section-drawer">
  104 +{% for layer in config.layers %}
  105 + <label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-layer-{{ layer.slug }}" title="{{ layer.desc }}">
  106 + <input type="checkbox" disabled id="option-layer-{{ layer.slug }}" class="mdl-radio__button" name="layer_slug" value="{{ layer.slug }}" {{ 'checked' if layer.slug == layer_slug }}>
  107 + <span class="mdl-radio__label">{{ layer.name }}</span>
  108 + </label>
  109 + <br />
  110 +{% endfor %}
  111 + </section>
  112 +
  113 + <hr class="clear">
114 114  
115 115 {# <span class="mdl-layout-title">{{ icon('database') }} Inputs</span>#}
116 116 {##}
... ... @@ -424,6 +424,9 @@
424 424  
425 425 #parameters .parameter {
426 426 outline: 0;
  427 + padding-top: 7px;
  428 + padding-bottom: 7px;
  429 +
427 430 }
428 431 #parameters .parameter.active {
429 432 background-color: #c8d3e1;
... ...