Commit b778f19c authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos
Browse files

Switched to table view for data

parent edac002f
.side-menu > li > a {
border: 1px solid #E5E5E5;
display: block;
margin: 0 0 -1px;
padding: 8px 14px;
}
.side-menu > li:first-child > a {
border-radius: 6px 6px 0 0;
}
\ No newline at end of file
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<head> <head>
<title>Eduroam 101 Template</title> <title>Eduroam 101 Template</title>
<link href="/static/css/bootstrap.min.css" rel="stylesheet"> <link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/style.css" rel="stylesheet">
<style type="text/css"> <style type="text/css">
body { body {
padding-top: 100px; padding-top: 100px;
......
{% extends "base.html"%} {% extends "edumanage/welcome.html"%}
{% block content %} {% block homeactive %}{% endblock %}
<div class="container-fluid"> {% block instactive %}class="active"{% endblock %}
<div class="row-fluid">
<div class="span3"> {% block subcontent %}
<div class="sidebar-nav">
<ul class="nav nav-tabs nav-stacked">
<li>
<a href="{% url manage %}">Home</a>
</li>
<li class="active">
<a href="#">Institution</a>
</li>
<li>
<a href="#">Services</a>
</li>
<li>
<a href="#">Servers</a>
</li>
</ul>
</div><!--/.well -->
</div><!--/span-->
<div class="span9">
<div class="row-fluid">
<!--/span-->
<div class="span12">
<h4>Institution</h4> <h4>Institution</h4>
{% load tolocale %} {% load tolocale %}
{% if institution %} {% if institution %}
...@@ -47,16 +25,5 @@ ...@@ -47,16 +25,5 @@
{% else %} {% else %}
<p>No institution defined!</p> <p>No institution defined!</p>
{% endif %} {% endif %}
</div><!--/span--> {% endblock %}
</div><!--/row-->
</div><!--/span--> \ No newline at end of file
</div><!--/row-->
<hr>
<footer>
<p>&copy; Company 2012</p>
</footer>
</div><!--/.fluid-container-->
{% endblock %}
\ No newline at end of file
{% extends "base.html"%} {% extends "edumanage/welcome.html"%}
{% block homeactive %}{% endblock %}
{% block instactive %}class="active"{% endblock %}
{% block subcontent %}
<h4>Institution</h4>
{% load tolocale %} <h5>{% tolocale institution LANGUAGE_CODE%}</h5>
<form method="POST" class="form-horizontal">
{% csrf_token %}
{% if form.non_field_errors %}
<p class="error">
{{ form.non_field_errors}}
</p>
{% endif %}
<div style="display: none">
{{form.institution}}
</div>
<div class="control-group {% if form.ertype.errors %} error {% endif %}">
<label class="control-label" for="id_ertype">ErType</label>
<div class="controls">
{{ form.ertype }}
{% if form.ertype.errors %} <span class="help-inline"> {{ form.ertype.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.ertype.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.address_street.errors %} error {% endif %}">
<label class="control-label" for="id_address_street">Address Street</label>
<div class="controls">
{{ form.address_street }}
{% if form.address_street.errors %} <span class="help-inline"> {{ form.address_street.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.address_street.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.address_city.errors %} error {% endif %}">
<label class="control-label" for="id_address_city">Address City</label>
<div class="controls">
{{ form.address_city }}
{% if form.address_city.errors %} <span class="help-inline"> {{ form.address_city.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.address_city.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.contact.errors %} error {% endif %}">
<label class="control-label" for="id_contact">Contact(s)</label>
<div class="controls">
{{ form.contact }}
{% if form.contact.errors %} <span class="help-inline"> {{ form.ertype.contact|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.contact.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.url.errors %} error {% endif %}">
<label class="control-label" for="id_url">URL(s)</label>
<div class="controls">
{{ form.url }}
{% if form.url.errors %} <span class="help-inline"> {{ form.url.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.url.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.oper_name.errors %} error {% endif %}">
<label class="control-label" for="id_oper_name">Oper Name</label>
<div class="controls">
{{ form.oper_name }}
{% if form.oper_name.errors %} <span class="help-inline"> {{ form.oper_name.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.oper_name.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.number_user.errors %} error {% endif %}">
<label class="control-label" for="id_number_user">Number User</label>
<div class="controls">
{{ form.number_user }}
{% if form.number_user.errors %} <span class="help-inline"> {{ form.number_user.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.number_user.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.number_id.errors %} error {% endif %}">
<label class="control-label" for="id_number_id">Number Id</label>
<div class="controls">
{{ form.number_id }}
{% if form.number_id.errors %} <span class="help-inline"> {{ form.number_id.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.number_id.help_text }}</span>
</div>
</div>
<div class="control-group">
<div class="controls">
<button type="submit" id="applybutton" value="Apply" class="btn btn-large btn-primary"/>
Apply</button>
</div>
</div>
</form>
{% block content %} {% endblock %}
<div class="container-fluid">
<div class="row-fluid">
<div class="span3">
<div class="sidebar-nav">
<ul class="nav nav-tabs nav-stacked">
<li>
<a href="{% url manage %}">Home</a>
</li>
<li class="active">
<a href="#">Institution</a>
</li>
<li>
<a href="#">Services</a>
</li>
<li>
<a href="#">Servers</a>
</li>
</ul>
</div><!--/.well -->
</div><!--/span-->
<div class="span9">
<div class="row-fluid">
<!--/span-->
<div class="span12">
<h4>Institution</h4>
{% load tolocale %}
<h5>{% tolocale institution LANGUAGE_CODE%}</h5>
<form method="POST" class="form-horizontal">
{% csrf_token %}
{% if form.non_field_errors %}
<p class="error">
{{ form.non_field_errors}}
</p>
{% endif %}
<div style="display: none">
{{form.institution}}
</div>
<div class="control-group {% if form.ertype.errors %} error {% endif %}">
<label class="control-label" for="id_ertype">ErType</label>
<div class="controls">{{ form.ertype }}
{% if form.ertype.errors %}
<span class="help-inline">
{{ form.ertype.errors|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.ertype.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.address_street.errors %} error {% endif %}">
<label class="control-label" for="id_address_street">Address Street</label>
<div class="controls">{{ form.address_street }}
{% if form.address_street.errors %}
<span class="help-inline">
{{ form.address_street.errors|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.address_street.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.address_city.errors %} error {% endif %}">
<label class="control-label" for="id_address_city">Address City</label>
<div class="controls">{{ form.address_city }}
{% if form.address_city.errors %}
<span class="help-inline">
{{ form.address_city.errors|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.address_city.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.contact.errors %} error {% endif %}">
<label class="control-label" for="id_contact">Contact(s)</label>
<div class="controls">{{ form.contact }}
{% if form.contact.errors %}
<span class="help-inline">
{{ form.ertype.contact|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.contact.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.url.errors %} error {% endif %}">
<label class="control-label" for="id_url">URL(s)</label>
<div class="controls">{{ form.url }}
{% if form.url.errors %}
<span class="help-inline">
{{ form.url.errors|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.url.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.oper_name.errors %} error {% endif %}">
<label class="control-label" for="id_oper_name">Oper Name</label>
<div class="controls">{{ form.oper_name }}
{% if form.oper_name.errors %}
<span class="help-inline">
{{ form.oper_name.errors|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.oper_name.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.number_user.errors %} error {% endif %}">
<label class="control-label" for="id_number_user">Number User</label>
<div class="controls">{{ form.number_user }}
{% if form.number_user.errors %}
<span class="help-inline">
{{ form.number_user.errors|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.number_user.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.number_id.errors %} error {% endif %}">
<label class="control-label" for="id_number_id">Number Id</label>
<div class="controls">{{ form.number_id }}
{% if form.number_id.errors %}
<span class="help-inline">
{{ form.number_id.errors|join:", " }}
</span>
{% endif %}
<span class="help-block"> {{ form.number_id.help_text }}</span>
</div>
</div>
<div class="control-group">
<div class="controls">
<button type="submit" id="applybutton" value="Apply" class="btn btn-large btn-primary"/>Apply</button>
</div>
</div>
</form>
</div><!--/span-->
</div><!--/row-->
</div><!--/span-->
</div><!--/row-->
<hr>
<footer>
<p>&copy; Company 2012</p>
</footer>
</div><!--/.fluid-container-->
{% endblock %}
\ No newline at end of file
{% extends "base.html"%} {% extends "edumanage/welcome.html"%}
{% block content %}
<div class="container-fluid">
<div class="row-fluid">
<div class="span3">
<div class="sidebar-nav">
<ul class="nav nav-tabs nav-stacked">
<li>
<a href="{% url manage %}">Home</a>
</li>
<li>
<a href="#">Institution</a>
</li>
<li>
<a href="#">Services</a>
</li>
<li class="active">
<a href="#">Servers</a>
</li>
</ul>
</div><!--/.well -->
</div><!--/span-->
<div class="span9">
<div class="row-fluid">
<!--/span-->
<div class="span12">
<h4>Servers</h4>
<div><a href="{% url edit-servers %}">Add new server</a></div>
{% if servers %}
{% for server in servers %}
<div>
{{server}} (<a href="{% url edit-servers server.pk %}">edit</a>)
</div>
{% endfor %}
{% else %}
<div>No servers defined yet (<a href="{% url edit-servers %}">add</a>)</div>
{% endif %}
</div><!--/span-->
</div><!--/row-->
</div><!--/span-->
</div><!--/row-->
<hr> {% block navbar %}
{% endblock %}
{% block homeactive %}{% endblock %}
{% block serversactive %}class="active"{% endblock %}
{% block subcontent %}
<footer>
<p>&copy; Company 2012</p> <h4>My Servers</h4>
</footer> <div><a href="{% url edit-servers %}">Add new server</a></div>
{% if servers %}
<table class="table .table-bordered">
<thead>
<tr>
<th>Name</th>
<th>Action</th>
<th>Action</th>
</tr>
</thead>
<tbody>
{% for server in servers %}
<tr>
<td>{{server}}</td> <td><a href="{% url edit-servers server.pk %}">edit</a> </td><td><a href="{% url edit-servers server.pk %}">delete</a></td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<div>No servers defined yet (<a href="{% url edit-servers %}">add</a>)</div>
{% endif %}
{% endblock %}
</div><!--/.fluid-container-->
{% endblock %}
\ No newline at end of file
{% extends "base.html"%} {% extends "edumanage/welcome.html"%}
{% block extrahead %} {% block extrahead %}
<script type="text/javascript" src="/static/js/jquery.min.js"></script> <script type="text/javascript" src="/static/js/jquery.min.js"></script>
<script type="text/javascript" <script type="text/javascript"
...@@ -8,212 +8,107 @@ ...@@ -8,212 +8,107 @@
{% endblock %} {% endblock %}
{% block content %}
<div class="container-fluid"> {% block homeactive %}{% endblock %}
<div class="row-fluid"> {% block serversactive %}class="active"{% endblock %}
<div class="span3"> {% block subcontent %} <h4>Servers</h4>
<div class="sidebar-nav"> <h5>Server...</h5>
<ul class="nav nav-tabs nav-stacked"> <form method="POST" class="form-horizontal">
<li> {% csrf_token %}
<a href="{% url manage %}">Home</a> {% if form.non_field_errors %}
</li> <p class="error">
<li class="active"> {{ form.non_field_errors}}
<a href="#">Institution</a> </p>
</li> {% endif %}
<li> <div style="display: none">
<a href="#">Services</a> {{form.instid}}
</li> </div>
<li> <div class="control-group {% if form.ertype.errors %} error {% endif %}">
<a href="#">Servers</a> <label class="control-label" for="id_ertype"><b>ErType</b></label>
</li> <div class="controls">
</ul> {{ form.ertype }}
</div><!--/.well --> {% if form.ertype.errors %} <span class="help-inline"> {{ form.ertype.errors|join:", " }} </span>
</div><!--/span--> {% endif %} <span class="help-block"> {{ form.ertype.help_text }}</span>
</div>
<div class="span9"> </div>
<div class="row-fluid"> <div class="control-group {% if form.name.errors %} error {% endif %}">
<!--/span--> <label class="control-label" for="id_name"><b>name</b></label>
<div class="span12"> <div class="controls">
<h4>Servers</h4> {{ form.name }}
{% if form.name.errors %} <span class="help-inline"> {{ form.name.errors|join:", " }} </span>
<h5>Server...</h5> {% endif %} <span class="help-block"> {{ form.name.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.host.errors %} error {% endif %}">
<label class="control-label" for="id_host"><b>host</b></label>
<div class="controls">
{{ form.host }}
{% if form.host.errors %} <span class="help-inline"> {{ form.host.errors|join:", " }} </span>
{% endif %} <span class="help-block"> {{ form.host.help_text }}</span>
<form method="POST" class="form-horizontal"> </div>
</div>
{% csrf_token %} <div class="control-group {% if form.port.errors %} error {% endif %}">
{% if form.non_field_errors %} <label class="control-label" for="id_port"><b>port</b></label>
<p class="error"> <div class="controls">
{{ form.non_field_errors}} {{ form.port }}
</p> {% if form.port.errors %} <span class="help-inline"> {{ form.port.errors|join:", " }} </span>
{% endif %} {% endif %} <span class="help-block"> {{ form.port.help_text }}</span>
<div style="display: none"> </div>
{{form.instid}} </div>
</div> <div class="control-group {% if form.acct_port.errors %} error {% endif %}">
<label class="control-label" for="id_acct_port"><b>acct_port</b></label>
<div class="controls">
<div class="control-group {% if form.ertype.errors %} error {% endif %}"> {{ form.acct_port }}
<label class="control-label" for="id_ertype"><b>ErType</b></label> {% if form.acct_port.errors %} <span class="help-inline"> {{ form.acct_port.errors|join:", " }} </span>
<div class="controls">{{ form.ertype }} {% endif %} <span class="help-block"> {{ form.acct_port.help_text }}</span>
{% if form.ertype.errors %} </div>
<span class="help-inline"> </div>
{{ form.ertype.errors|join:", " }} <div class="control-group {% if form.timeout.errors %} error {% endif %}">
</span> <label class="control-label" for="id_timeout"><b>timeout</b></label>
{% endif %} <div class="controls">
<span class="help-block"> {{ form.ertype.help_text }}</span> {{ form.timeout }}
</div> {% if form.timeout.errors %} <span class="help-inline"> {{ form.timeout.errors|join:", " }} </span>
</div> {% endif %} <span class="help-block"> {{ form.ertype.help_text }}</span>
</div>
</div>
<div class="control-group {% if form.retry.errors %} error {% endif %}">
<div class="control-group {% if form.name.errors %} error {% endif %}"> <label class="control-label" for="id_retry"><b>retry</b></label>
<label class="control-label" for="id_name"><b>name</b></label> <div class="controls">
<div class="controls">{{ form.name }} {{ form.retry }}
{% if form.name.errors %} {% if form.retry.errors %} <span class="help-inline"> {{ form.retry.errors|join:", " }} </span>
<span class="help-inline"> {% endif %} <span class="help-block"> {{ form.retry.help_text }}</span>
{{ form.name.errors|join:", " }} </div>
</span> </div>
{% endif %} <div class="control-group {% if form.status_server.errors %} error {% endif %}">
<span class="help-block"> {{ form.name.help_text }}</span> <label class="control-label" for="id_status_server">status_server</label>
</div> <div class="controls">
</div> {{ form.status_server }}
{% if form.status_server.errors %} <span class="help-inline"> {{ form.status_server.errors|join:", " }} </span>
<div class="control-group {% if form.host.errors %} error {% endif %}"> {% endif %} <span class="help-block"> {{ form.status_server.help_text }}</span>
<label class="control-label" for="id_host"><b>host</b></label> </div>
<div class="controls">{{ form.host }} </div>
{% if form.host.errors %} <div class="control-group {% if form.secret.errors %} error {% endif %}">
<span class="help-inline"> <label class="control-label" for="id_secret"><b>secret</b></label>
{{ form.host.errors|join:", " }} <div class="controls">
</span> {{ form.secret }}
{% endif %} {% if form.secret.errors %} <span class="help-inline"> {{ form.secret.errors|join:", " }} </span>
<span class="help-block"> {{ form.host.help_text }}</span> {% endif %} <span class="help-block"> {{ form.status_server.help_text }}</span>
</div> </div>
</div> </div>
<div class="control-group {% if form.proto.errors %} error {% endif %}">
<div class="control-group {% if form.port.errors %} error {% endif %}"> <label class="control-label" for="id_proto"><b>proto</b></label>
<label class="control-label" for="id_port"><b>port</b></label> <div class="controls">
<div class="controls">{{ form.port }} {{ form.proto }}
{% if form.port.errors %} {% if form.proto.errors %} <span class="help-inline"> {{ form.proto.errors|join:", " }} </span>
<span class="help-inline"> {% endif %} <span class="help-block"> {{ form.proto.help_text }}</span>