Merge pull request #48 from satnogs/dev

Merge for 0.6.1

db/.env-dist

@@ -1,12 +0,0 @@
-# dev, production, etc
-DJANGO_SETTINGS_MODULE=db.settings.dev
-
-# Mail
-DEFAULT_FROM_EMAIL=noreply@example.com
-
-# Security
-SECRET_KEY=changeme
-ALLOWED_HOSTS=
-
-# Database
-DATABASE_URL=sqlite:///db.sqlite3

db/templates/base/satellite.html

@@ -23,7 +23,7 @@
             </button>
             {% if suggestions %}
               <span class="suggestions-counter pull-right label label-primary">
-                {{ suggestions }} suggestions pending
+                {{ suggestions }} suggestion{{ suggestions|pluralize }} pending
               </span>
             {% endif %}
           </h3>
@@ -230,7 +230,7 @@
                 <div class="input-group-addon">Mode</div>
                 <select class="form-control" name="mode">
                   {% for mode in modes %}
-                    <option value="{{ mode }}">
+                    <option value="{{ mode.id }}">
                       {{ mode }}
                     </option>
                   {% endfor %}