diff --git a/README.md b/README.md index fcdc354..b17e4b0 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ See the [documentation](http://docs.satnogs.org/network/). You can take a look for the current status of development issues at our [Kanban board](https://huboard.com/satnogs/satnogs-network). +[![Requirements Status](https://requires.io/github/satnogs/satnogs-network/requirements.svg?branch=dev)](https://requires.io/github/satnogs/satnogs-network/requirements/?branch=dev) + ## License © 2014-2016 [Libre Space Foundation](http://librespacefoundation.org). diff --git a/network/static/css/app.css b/network/static/css/app.css index bdd1e7f..d633eab 100644 --- a/network/static/css/app.css +++ b/network/static/css/app.css @@ -288,11 +288,15 @@ code.log p { display: none; } -.epoch { +.tle { display: none; margin-top: 5px; } +.timezone { + margin-top: 5px; +} + .tle-data { margin-bottom: 15px; } diff --git a/network/static/js/observation_new.js b/network/static/js/observation_new.js index 1dfd602..ed88033 100644 --- a/network/static/js/observation_new.js +++ b/network/static/js/observation_new.js @@ -18,8 +18,8 @@ $(function () { $('#transmitter-selection option').hide(); $('#transmitter-selection option[data-satellite="'+norad+'"]').show().prop('selected', true); - $('.epoch').hide(); - $('.epoch[data-norad="'+norad+'"]').show(); + $('.tle').hide(); + $('.tle[data-norad="'+norad+'"]').show(); }); }); diff --git a/network/templates/base/observation_new.html b/network/templates/base/observation_new.html index 9187c05..c99b50d 100644 --- a/network/templates/base/observation_new.html +++ b/network/templates/base/observation_new.html @@ -46,14 +46,12 @@ {% endfor %} {% for satellite in satellites %} -
+ {% if satellite.tle_no %} Using TLE {{ satellite.tle_no }} issued - - {{ satellite.tle_epoch|timesince }} ago - + {{ satellite.tle_epoch|timesince }} ago {% endif %} -
+ {% endfor %} @@ -89,9 +87,8 @@ - - IMPORTANT: - Timeframe is considered to be in UTC timezone. + + Timeframe is in UTC diff --git a/requirements/base.txt b/requirements/base.txt index 97e5d86..bcbba33 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -22,9 +22,9 @@ django-avatar==2.2.1 django-crispy-forms==1.6.0 # Astronomy -orbit==0.2 +git+https://github.com/comzeradd/orbit.git@cache##egg=orbit # API djangorestframework==3.3.2 Markdown==2.6.5 -django-filter==0.12.0 +git+https://github.com/alex/django-filter.git@0.12.0#egg=django-filter