1
0
Fork 0

Beautify ground station edit and add. WIP.

merge-requests/79/head
Pierros Papadeas 2014-12-13 22:16:22 +02:00 committed by Nikos Roussos
parent 37b5f1bb1a
commit 27819aab45
4 changed files with 105 additions and 68 deletions

View File

@ -5,16 +5,73 @@
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="StationModal">Edit Ground Station</h4>
</div>
<form enctype="multipart/form-data" method="post" action="{% url 'stations_edit_station' %}">{% csrf_token %}
<form class="form-horizontal"
role="form"
enctype="multipart/form-data"
method="post"
action="{% url 'stations_edit_station' %}">{% csrf_token %}
<div class="modal-body">
<input name="name" type="text">
<input name="image" type="file">
<input name="alt" type="number">
<input name="alt" type="number">
<input name="alt" type="number">
<select name="antenna" multiple="multiple">
</select>
<input name="online" type="checkbox">
<div class="form-group">
<label for="name" class="col-sm-2 control-label">Name</label>
<div class="col-sm-10">
<input id="name" type="text" class="form-control" name="name" placeholder="Name">
</div>
</div>
<div class="form-group">
<label for="image" class="col-sm-2 control-label">Image</label>
<div class="col-sm-10">
<input id="image" type="file" name="image">
</div>
</div>
<div class="form-group">
<label for="alt" class="col-sm-2 control-label">Altitude</label>
<div class="col-sm-10">
<input id="alt" type="text" class="form-control" name="alt" placeholder="Altitude">
</div>
</div>
<div class="form-group">
<label for="lat" class="col-sm-2 control-label">Latitude</label>
<div class="col-sm-10">
<input id="lat" type="text" class="form-control" name="lat" placeholder="Latitude">
</div>
</div>
<div class="form-group">
<label for="lng" class="col-sm-2 control-label">Longtitude</label>
<div class="col-sm-10">
<input id="lng" type="text" class="form-control" name="lng" placeholder="Longtitude">
</div>
</div>
<div class="form-group">
<label for="location" class="col-sm-2 control-label">Location</label>
<div class="col-sm-10">
<input class="form-control"
id="location"
type="text"
placeholder="Geocoded location here"
disabled>
</div>
</div>
<div class="form-group">
<label for="antennas" class="col-sm-2 control-label">Antennas</label>
<div class="col-sm-10">
<select multiple class="form-control" name="antennas">
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div class="checkbox">
<label>
<input type="checkbox" name="online"> Online Ground Station
</label>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

View File

@ -6,8 +6,6 @@
{% block title %}User: {{ user.username }}{% endblock %}
{% block content %}
<div class="container">
<div class="row">
<div class="col-sm-12">
<h2>{% avatar user 50 %} {{ user.get_full_name }} ({{ user.username }})
@ -20,7 +18,6 @@
</div>
{% endif %}
</h2>
</div>
</div>
@ -72,6 +69,7 @@
</div>
</div>
{% endif %}
<div class="row">
<div class="col-md-12">
{% if user == request.user %}
@ -80,11 +78,6 @@
</div>
</div>
<div class="row">
<div class="col-sm-12">
<h3>Observations</h3>
</div>
</div>
{% if observations %}
<div class="row">
@ -132,29 +125,27 @@
</div>
{% endif %}
</div>
<!-- API Modal -->
<div class="modal fade" id="APIModal" tabindex="-1" role="dialog" aria-labelledby="APIModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="APIModalLabel">API Key</h4>
</div>
<div class="modal-body">
<div>You can use this token to interact with the API.</div>
<div>
<code>{{ token }}</code>
<!-- API Modal -->
<div class="modal fade" id="APIModal" tabindex="-1" role="dialog" aria-labelledby="APIModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="APIModalLabel">API Key</h4>
</div>
<div class="modal-body">
<div>You can use this token to interact with the API.</div>
<div>
<code>{{ token }}</code>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<!-- Station Modal -->
{% include 'includes/station_edit.html' %}
<!-- Station Modal -->
{% include 'includes/station_edit.html' %}
{% endblock content %}

View File

@ -4,23 +4,19 @@
{% block title %}User: {{ user.username }}{% endblock %}
{% block content %}
<div class="container">
<div class="row">
<div class="col-lg-12">
<h1>{% block header %}User: {{ user.username }}{% endblock %}</h1>
<form class="form-horizontal"
method="post"
action="{% url 'users:update_user' %}">
{% csrf_token %}
{{ form|crispy }}
<div class="control-group">
<div class="controls">
<button type="submit" class="btn">Update</button>
</div>
</div>
</form>
<div class="row">
<div class="col-lg-12">
<h1>{% block header %}User: {{ user.username }}{% endblock %}</h1>
<form class="form-horizontal"
method="post"
action="{% url 'users:update_user' %}">{% csrf_token %}
{{ form|crispy }}
<div class="control-group">
<div class="controls">
<button type="submit" class="btn btn-default">Update</button>
</div>
</div>
</form>
</div>
</div>
</div>
{% endblock %}

View File

@ -1,13 +1,10 @@
{% extends "base.html" %}
{% load static %}{% load i18n %}
{% load static %}
{% load avatar_tags %}
{% block title %}Members{% endblock %}
{% block content %}
<div class="container">
<div class="row">
<div class="col-xs-12">
<h2>Users</h2>
@ -17,17 +14,13 @@
<div class="row">
<div class="col-lg-12">
<div class="list-group">
{% for user in user_list %}
<a href="{% url 'users:view_user' username=user.username %}" class="list-group-item">
<h4 class="list-group-item-heading">{% avatar user 35 %} {{ user.username }}</h4>
<p class="list-group-item-text">{{ maker.tagline }}</p>
</a>
{% endfor %}
{% for user in user_list %}
<a href="{% url 'users:view_user' username=user.username %}" class="list-group-item">
<h4 class="list-group-item-heading">{% avatar user 35 %} {{ user.username }}</h4>
<p class="list-group-item-text">{{ maker.tagline }}</p>
</a>
{% endfor %}
</div>
</div>
</div>
</div>
{% endblock content %}