Merge pull request #138 from satnogs/fixes

Fixes

network/base/templatetags/tags.py

@@ -1,20 +1,24 @@
 import re
 
 from django import template
+from django.core.urlresolvers import reverse
 
 register = template.Library()
 
 
 @register.simple_tag
-def active(request, pattern):
-    if re.search(pattern, request.path):
+def active(request, urls):
+    if request.path in ( reverse(url) for url in urls.split() ):
         return 'active'
     return None
 
 
-@register.simple_tag
+@register.filter
 def frq(value):
-    to_format = float(value)
+    try:
+        to_format = float(value)
+    except TypeError:
+        return '-'
     formatted = format(float(to_format) / 1000000, '.3f')
     formatted = formatted + ' Mhz'
     return formatted

network/settings/production.py

@@ -11,7 +11,9 @@ SECURE_HSTS_SECONDS = 60
 SECURE_HSTS_INCLUDE_SUBDOMAINS = True
 SECURE_CONTENT_TYPE_NOSNIFF = True
 SECURE_BROWSER_XSS_FILTER = True
-ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', '*')
+ALLOWED_HOSTS = [
+    os.getenv('ALLOWED_HOSTS', '*')
+]
 
 # Mail
 EMAIL_HOST = 'localhost'

network/settings/stage.py

@@ -4,7 +4,9 @@ from base import *
 ENVIRONMENT = 'stage'
 
 # Security
-ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', '*')
+ALLOWED_HOSTS = [
+    os.getenv('ALLOWED_HOSTS', '*')
+]
 
 # Mail
 EMAIL_HOST = 'localhost'

network/templates/base.html

@@ -41,10 +41,11 @@
           <!-- Collect the nav links, forms, and other content for toggling -->
           <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav">
-              <li class="{% active request '^/$' %}"><a href="{% url 'base:home' %}">Home</a></li>
-              <li class="{% active request '^/observations/$' %}"><a href="{% url 'base:observations_list' %}">Observations</a></li>
-              <li class="{% active request '^/stations/$' %}"><a href="{% url 'base:stations_list' %}">Ground Stations</a></li>
-              <li class="{% active request '^/about/$' %}"><a href="{% url 'base:about' %}">About</a></li>
+              <li class="{% active request 'base:home' %}"><a href="{% url 'base:home' %}">Home</a></li>
+              <li class="{% active request 'base:observations_list' %}"><a href="{% url 'base:observations_list' %}">Observations</a></li>
+              <li class="{% active request 'base:stations_list' %}"><a href="{% url 'base:stations_list' %}">Ground Stations</a></li>
+              <li class="{% active request 'base:about' %}"><a href="{% url 'base:about' %}">About</a></li>
+              <li><a href="https://community.satnogs.org/" target="_blank">Community</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
               {% if request.user.is_authenticated %}

network/templates/base/home.html

@@ -128,7 +128,7 @@
                     </a>
                   </td>
                   <td>{{ observation.satellite.name }}</td>
-                  <td>{% frq observation.transponder.downlink_low %}</td>
+                  <td>{{ observation.transponder.downlink_low|frq }}</td>
                   <td>{{ observation.transponder.mode }}</td>
                   <td>
                     {{ observation.start|date:"Y-m-d H:i:s" }}<br>
@@ -165,7 +165,7 @@
                     </a>
                   </td>
                   <td>{{ observation.satellite.name }}</td>
-                  <td>{% frq observation.transponder.downlink_low %}</td>
+                  <td>{{ observation.transponder.downlink_low|frq }}</td>
                   <td>{{ observation.transponder.mode }}</td>
                   <td>{{ observation.start|date:"Y-m-d H:i:s" }}</br>{{ observation.end|date:"Y-m-d H:i:s" }}</td>
                   <td>{{ observation.author.displayname }}</td>

network/templates/base/observation_new.html

@@ -42,7 +42,7 @@
           {% for transponder in transponders %}
             <option data-satellite="{{ transponder.satellite.norad_cat_id }}"
                     value="{{ transponder.id }}">
-              {{ transponder.description }} - {% frq transponder.downlink_low %} - {{ transponder.mode }}
+              {{ transponder.description }} - {{ transponder.downlink_low|frq }} - {{ transponder.mode }}
             </option>
           {% endfor %}
         </select>

network/templates/base/observation_view.html

@@ -29,7 +29,7 @@
         <tbody>
             <tr>
               <td>{{ observation.satellite.norad_cat_id }} - {{ observation.satellite.name }}</td>
-              <td>{% frq observation.transponder.downlink_low %}</td>
+              <td>{{ observation.transponder.downlink_low|frq }}</td>
               <td>{{ observation.transponder.mode }}</td>
               <td>{{ observation.start|date:"Y-m-d H:i:s" }}</br>{{ observation.end|date:"Y-m-d H:i:s" }}</td>
               <td>

network/templates/base/observations.html

@@ -38,7 +38,7 @@
                 </a>
               </td>
               <td>{{ observation.satellite.name }}</td>
-              <td>{% frq observation.transponder.downlink_low %}</td>
+              <td>{{ observation.transponder.downlink_low|frq }}</td>
               <td>{{ observation.transponder.mode }}</td>
               <td>{{ observation.start|date:"Y-m-d H:i:s" }}</br>{{ observation.end|date:"Y-m-d H:i:s" }}</td>
               <td>

network/templates/base/station_view.html

@@ -92,7 +92,7 @@
         </div>
         <div class="panel panel-default">
           <div class="panel-body">
-            {{ antenna.band }} - {{ antenna.antenna_type }} - {% frq antenna.frequency %}
+            {{ antenna.band }} - {{ antenna.antenna_type }} - {{ antenna.frequency|frq }}
           </div>
         </div>
       {% empty %}

network/templates/includes/stage_notice.html

@@ -1,6 +1,6 @@
 <style>
   #main-navbar {
-      margin-top: 4%;
+      margin-top: 50px;
   }
 </style>
 

network/templates/includes/station_edit.html

@@ -64,7 +64,7 @@
               <select multiple class="form-control" name="antenna">
                 {% for antenna in antennas %}
                   <option value="{{ antenna.id }}">
-                    {{ antenna.band }} - {{ antenna.antenna_type }} - {% frq antenna.frequency %}
+                    {{ antenna.band }} - {{ antenna.antenna_type }} - {{ antenna.frequency|frq }}
                   </option>
                 {% endfor %}
               </select>

network/templates/users/user_detail.html

@@ -128,7 +128,7 @@
                   </a>
                 </td>
                 <td>{{ observation.satellite.name }}</td>
-                <td>{% frq observation.transponder.downlink_low %}</td>
+                <td>{{ observation.transponder.downlink_low|frq }}</td>
                 <td>{{ observation.transponder.mode }}</td>
                 <td>{{ observation.start|date:"Y-m-d H:i:s" }}</br>{{ observation.end|date:"Y-m-d H:i:s" }}</td>
               </tr>