Commit 1b39b805 authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos

Minor fixes. New stable version

parent b7566dcc
===========
1.0.1 RELEASE
Minor fixes
Fixes:
-Overview login theme
-Add missing urls
===========
1.0.0 RELEASE
Major UI redesign, Debian Wheezy version, Django 1.4
......
......@@ -36,21 +36,10 @@ Attention: Make sure your FoD server has ssh access to your flowspec device.
Installation Considerations
===========================
You can find the installation instructions for Ubuntu 12.04.3 (64)
with Django 1.3.x in install.txt file. FoD depends on a bunch of
packages. Installing in Debian Squeeze proved to be really tough as
the majority of the required packages are not provided by any repos
and need to be installed manually. This guide presents the
installation procedures for Ubuntu 12.04.3 (64) with Django 1.3.x.
Really soon, we will provide a guide for Debian Wheezy. However, users
who wish to go for Wheezy, need to read the Django 1.4 changelist. One
of the most significant changes in Django 1.4 is that the application
dir layout has to be restructured. Also bear in mind that Django 1.4
introduces new aspects when it comes to application library
inclussions.
Soon we will post a branch of FoD tailored for Django 1.4.
You can find the installation instructions for Debian Wheezy (64)
with Django 1.4.x at http://flowspy.readthedocs.org.
If upgrading from a previous version bear in mind
the changes introduced in Django 1.4.
Contact
=======
......@@ -58,4 +47,4 @@ Contact
You can find more about FoD or raise your issues at GRNET FoD
repository: https://code.grnet.gr/fod.
You can contactus directly at leopoul{at}noc[dot]grnet(.)gr
You can contact us directly at leopoul{at}noc[dot]grnet(.)gr
......@@ -45,9 +45,9 @@ copyright = u'2014, Leonidas Poulopoulos (@leopoul), GRNET S.A'
# built documents.
#
# The short X.Y version.
version = '1.0.0'
version = '1.0.1'
# The full version, including alpha/beta/rc tags.
release = '1.0.0'
release = '1.0.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -9,6 +9,9 @@ urlpatterns = patterns('',
# Example:
(r'^poll/', include('poller.urls')),
url(r'^/?$', 'flowspec.views.group_routes', name="group-routes"),
url(r'^routes_ajax/?$', 'flowspec.views.group_routes_ajax', name="group-routes-ajax"),
url(r'^overview_ajax/?$', 'flowspec.views.overview_routes_ajax', name="overview-ajax"),
url(r'^dashboard/?$', 'flowspec.views.dashboard', name="dashboard"),
url(r'^profile/?$', 'flowspec.views.user_profile', name="user-profile"),
url(r'^add/?$', 'flowspec.views.add_route', name="add-route"),
#url(r'^addrl/?$', 'flowspec.views.add_rate_limit', name="add-rate-limit"),
......
This diff is collapsed.
This diff is collapsed.
......@@ -24,6 +24,58 @@
<link href="{{STATIC_URL}}b3theme/css/plugins/timeline/timeline.css" rel="stylesheet">
<link href="{{STATIC_URL}}datepicker/css/datepicker.css" rel="stylesheet">
{% endblock %}
{% block extraheadbottom %}
<style type="text/css">
#rule_form_container input:not([type="submit"]), #rule_form_container select {
background: none repeat scroll 0 0 #FFFFFF;
border: 1px solid #DDDDDD;
-moz-border-radius: 3px; border-radius:3px; -webkit-border-radius: 3px;
float: left;
font-family: "Century Gothic",Helvetica,sans-serif;
font-size: 13px;
outline: medium none;
padding: 5px;
width: 180px;
}
#rule_form_container{
-moz-border-radius: 10px 10px 10px 10px; border-radius:10px; -webkit-border-radius: 10px;
-moz-box-shadow: 0 0 3px #AAAAAA; box-shadow: 0 0 3px #AAAAAA; -webkit-box-shadow: 0 0 3px #AAAAAA;
background-color: #F9F9F9;
border: 2px solid #FFFFFF;
overflow: hidden;
width: 800px;
}
#rule_form_container div label {
color: #666666;
float: left;
font-family: "Century Gothic",Helvetica,sans-serif;
font-size: 15px;
font-weight: bold;
line-height: 26px;
margin-right: 15px;
text-align: right;
text-shadow: 1px 1px 1px #FFFFFF;
width: 180px;
}
#rule_form_container p.submit {
background: none repeat scroll 0 0 transparent;
border: medium none;
box-shadow: none;
}
.errorlist{
list-style: none outside none;
}
</style>
{% endblock %}
{% block pagejsbottom %}
<script type="text/javascript" src="{{STATIC_URL}}datepicker/js/bootstrap-datepicker.js"></script>
<script>
......@@ -154,54 +206,7 @@
</script>
{% endblock %}
{% block contentplaceholder %}
<style type="text/css">
#rule_form_container input:not([type="submit"]), #rule_form_container select {
background: none repeat scroll 0 0 #FFFFFF;
border: 1px solid #DDDDDD;
-moz-border-radius: 3px; border-radius:3px; -webkit-border-radius: 3px;
float: left;
font-family: "Century Gothic",Helvetica,sans-serif;
font-size: 13px;
outline: medium none;
padding: 5px;
width: 180px;
}
#rule_form_container{
-moz-border-radius: 10px 10px 10px 10px; border-radius:10px; -webkit-border-radius: 10px;
-moz-box-shadow: 0 0 3px #AAAAAA; box-shadow: 0 0 3px #AAAAAA; -webkit-box-shadow: 0 0 3px #AAAAAA;
background-color: #F9F9F9;
border: 2px solid #FFFFFF;
overflow: hidden;
width: 800px;
}
#rule_form_container div label {
color: #666666;
float: left;
font-family: "Century Gothic",Helvetica,sans-serif;
font-size: 15px;
font-weight: bold;
line-height: 26px;
margin-right: 15px;
text-align: right;
text-shadow: 1px 1px 1px #FFFFFF;
width: 180px;
}
#rule_form_container p.submit {
background: none repeat scroll 0 0 transparent;
border: medium none;
box-shadow: none;
}
.errorlist{
list-style: none outside none;
}
</style>
<div class="row">
<div class="col-lg-12">
<h1 class="page-header"> {% if edit %}{% trans "Edit rule" %}: {{form.data.name}}
......
{% extends "base.html" %}
{% extends "b3theme/base.html" %}
{% load widget_tweaks %}
{% load i18n %}
{% block title %}{% trans "Overview Login" %}{% endblock %}
{% block extraheadbottom %}
<style>
@media (min-width: 768px) {
#page-wrapper {
border-left: none;
margin: 0;
}
}
.errorlist{
list-style: none outside none;
}
</style>
{% endblock %}
{% block title %}
{% trans "Overview Login" %}
{% block content %}
<div class="container-fluid">
<div class="row-fluid">
<div class="span2">
</div><!--/span-->
{% endblock %}
<div class="span10">
<div class="row-fluid">
<!--/span-->
<h3 class="muted">{% trans "Overview Login" %}</h3>
<hr>
<form class="form-horizontal" method="post"
action="{% url altlogin %}">
{% if form.non_field_errors %} {% for err in form.non_field_errors %}
<div class="control-group error ">
<div class="controls error">
<span style="color: #B94A48;">{{err}}</span>
</div>
</div>
{% endfor %} {% endif %} {% csrf_token %}
<div class="control-group {% if form.username.errors %} error {% endif %}">
<label class="control-label" for="id_username">Username</label>
<div class="controls">
{{ form.username }} {% if form.username.errors %} <span class="help-inline"> {{ form.username.errors|join:", "}} </span> {% endif %}
</div>
</div>
<div class="control-group {% if form.password.errors %} error {% endif %}">
<label class="control-label" for="id_password">Password</label>
<div class="controls">
{{ form.password }} {% if form.password.errors %} <span
class="help-inline"> {{ form.password.errors|join:", "}} </span> {% endif %}
</div>
</div>
<div class="control-group">
<div class="controls">
<button type="submit" class="btn">Sign in</button>
<input type="hidden" name="next" value="{% url overview %}" />
</div>
</div>
</form>
<!--/span-->
</div><!--/row-->
</div><!--/span-->
</div><!--/span-->
</div><!--/.fluid-container-->
{% block contentplaceholder %}
<div class="container">
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">{% trans "Overview Login" %}</h1>
</div>
<!-- /.col-lg-12 -->
</div>
<div class="row">
<div class="col-lg-8">
<div class="panel panel-primary">
<div class="panel-heading">
<i class="fa fa-user fa-fw"></i> Login
</div>
<!-- /.panel-heading -->
<div class="panel-body">
<form class="form-horizontal" method="post" action="{% url altlogin %}" role="form">
{% csrf_token %}
{% load unescape %}
{% if form.non_field_errors %}
<div class="form-group {% if form.non_field_errors %} has-error {% endif %}" style="color: #A94442;">
{{ form.non_field_errors|unescape}}
</div>
{% endif %}
<div class="form-group {% if form.username.errors %} has-error {% endif %}">
<label for="id_username" class="col-md-2 control-label"><b>{% trans "Username" %}</b></label>
<div class="col-md-8">
{% render_field form.username class+="form-control" %}
{% if form.username.errors %} <span class="help-block"> {{ form.username.errors|join:", " }} </span>
{% endif %}
</div>
</div>
<div class="form-group {% if form.password.errors %} has-error {% endif %}">
<label for="id_password" class="col-md-2 control-label"><b>{% trans "Password" %}</b></label>
<div class="col-md-8">
{% render_field form.password class+="form-control" %}
{% if form.password.errors %} <span class="help-block"> {{ form.password.errors|join:", " }} </span>
{% endif %}
</div>
</div>
<div class="form-group">
<div class="col-md-2"></div>
<div class="col-md-8">
<button type="submit" id="applybutton" value="{% trans 'Login' %}" class="btn btn-md btn-primary">Login</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment