spacecruft
/
satnogs-db
1
0
Fork 0
Code Releases Activity

Merge pull request #18 from satnogs/fixes 

Minor UI fixes
merge-requests/22/head
Nikos Roussos 2015-07-12 18:49:20 +03:00
parent 1aca09a0e1 49918cff1f
commit 42cb13e44f
8 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
db/base/templatetags/__init__.py 100644
View File

24
db/base/templatetags/tags.py 100644
View File

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

4
db/settings/production.py
View File

@ -8,7 +8,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', '*')
]
# Email
EMAIL_HOST = 'localhost'

4
db/settings/stage.py
View File

@ -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'

7
db/static/css/app.css
View File

@ -178,9 +178,14 @@ footer {
.stage-notice {
background-color: #D74545;
color: white;
padding: 10px;
padding: 5px;
text-align: center;
font-size: 0.9em;
z-index: 20;
width: 100%;
position: fixed;
top: 0px;
left: 0px;
}
.stage-notice a {

7
db/templates/base.html
View File

@ -1,4 +1,5 @@
{% load staticfiles %}
{% load tags %}
<!DOCTYPE html>
<html lang="en" ng-app>
@ -36,9 +37,9 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="{% url 'home' %}">Home</a></li>
<li><a href="{% url 'about' %}">About</a></li>
<li><a href="{% url 'faq' %}">FAQ</a></li>
<li class="{% active request 'home' %}"><a href="{% url 'home' %}">Home</a></li>
<li class="{% active request 'about' %}"><a href="{% url 'about' %}">About</a></li>
<li class="{% active request 'faq' %}"><a href="{% url 'faq' %}">FAQ</a></li>
<li><a href="https://community.satnogs.org/" target="_blank">Community</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">

30
db/templates/base/suggest.html
View File

@ -1,5 +1,7 @@
{% extends "base/home.html" %}
{% load tags %}
{% block title %} - Suggest{% endblock %}
{% block content %}
@ -41,25 +43,25 @@
<div class="container transponder-element">
<div class="col-md-3">
<span class="label label-default">Alive</span>
<span class="pull-right">{{ transponder.alive|default:"-" }}</span>
<span class="pull-right">{{ transponder.alive|frq }}</span>
</div>
</div>
<div class="container transponder-element">
<div class="col-md-3">
<span class="label label-default">Uplink Low</span>
<span class="pull-right">{{ transponder.uplink_low|default:"-" }}</span>
<span class="pull-right">{{ transponder.uplink_low|frq }}</span>
</div>
</div>
<div class="container transponder-element">
<div class="col-md-3">
<span class="label label-default">Uplink High</span>
<span class="pull-right">{{ transponder.uplink_high|default:"-" }}</span>
<span class="pull-right">{{ transponder.uplink_high|frq }}</span>
</div>
</div>
<div class="container transponder-element">
<div class="col-md-3">
<span class="label label-default">Downlink Low</span>
<span class="pull-right">{{ transponder.downlink_low|default:"-" }}</span>
<span class="pull-right">{{ transponder.downlink_low|frq }}</span>
</div>
</div>
</div>
@ -114,19 +116,19 @@
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Uplink Low</div>
<input type="text" class="form-control" name="uplink_low" value="{{ transponder.uplink_low|default_if_none:'' }}">
<input type="number" class="form-control" name="uplink_low" value="{{ transponder.uplink_low|default_if_none:'' }}">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Uplink High</div>
<input type="text" class="form-control" name="uplink_high" value="{{ transponder.uplink_high|default_if_none:'' }}">
<input type="number" class="form-control" name="uplink_high" value="{{ transponder.uplink_high|default_if_none:'' }}">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Downlink Low</div>
<input type="text" class="form-control" name="downlink_low" value="{{ transponder.downlink_low|default_if_none:'' }}">
<input type="number" class="form-control" name="downlink_low" value="{{ transponder.downlink_low|default_if_none:'' }}">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Downlink High</div>
<input type="text" class="form-control" name="downlink_high" value="{{ transponder.downlink_high|default_if_none:'' }}">
<input type="number" class="form-control" name="downlink_high" value="{{ transponder.downlink_high|default_if_none:'' }}">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Mode</div>
@ -143,7 +145,7 @@
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Baud Rate</div>
<input type="text" class="form-control" name="baud" value="{{ transponder.baud|default_if_none:'' }}">
<input type="number" class="form-control" name="baud" value="{{ transponder.baud|default_if_none:'' }}">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Citation URL</div>
@ -200,19 +202,19 @@
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Uplink_Low</div>
<input type="text" class="form-control" name="uplink_low">
<input type="number" class="form-control" name="uplink_low">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Uplink High</div>
<input type="text" class="form-control" name="uplink_high">
<input type="number" class="form-control" name="uplink_high">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Downlink Low</div>
<input type="text" class="form-control" name="downlink_low">
<input type="number" class="form-control" name="downlink_low">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Downlink High</div>
<input type="text" class="form-control" name="downlink_high">
<input type="number" class="form-control" name="downlink_high">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Mode</div>
@ -229,7 +231,7 @@
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Baud Rate</div>
<input type="text" class="form-control" name="baud">
<input type="number" class="form-control" name="baud">
</div>
<div class="input-group transponder-element-suggest">
<div class="input-group-addon">Citation URL</div>

6
db/templates/includes/stage_notice.html
View File

@ -1,3 +1,9 @@
<style>
#main-navbar {
margin-top: 50px;
}
</style>
<div class="stage-notice">
This is the stage enviroment.
Feel free to test it and <a href="https://github.com/satnogs/satnogs-db/issues" target="_blank">report bugs</a>.