===========
+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
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
=======
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
# 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.
# 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"),
+++ /dev/null
-
-Installation
-************
-
-
-Ubuntu 12.04.3 (64) - Django 1.3.x
-==================================
-
-This guide assumes that installation is carried out in /srv/flowspy
-directory. If other directory is to be used, please change the
-corresponding configuration files. It is also assumed that the root
-user will perform every action.
-
-
-Required system packages
-------------------------
-
-Update and install the required packages:
-
- apt-get update
- apt-get upgrade
- apt-get install mysql-server apache2 memcached libapache2-mod-proxy-html gunicorn beanstalkd python-django python-django-extensions python-django-south python-django-tinymce tinymce python-mysqldb python-yaml python-memcache python-django-registration python-ipaddr python-lxml mysql-client git python-django-celery python-paramiko python-gevent vim
-
-Note: Set username and password for mysql if used
-
-Note: If you wish to deploy an outgoing mail server, now it is time to do
- it. Otherwise you could set FoD to send out mails via a third party
- account
-
-
-Create a database
------------------
-
-If you are using mysql, you should create a database:
-
- mysql -u root -p -e 'create database fod'
-
-
-Required application packages
------------------------------
-
-Get the required packages and install them
-
-* ncclient: NETCONF python client:
-
- cd ~
- git clone https://github.com/leopoul/ncclient.git
- cd ncclient
- python setup.py install
-
-* nxpy: Python Objects from/to XML proxy:
-
- cd ~
- git clone https://code.grnet.gr/git/nxpy
- cd nxpy
- python setup.py install
-
-* flowspy: core application. Installation is done at /srv/flowspy:
-
- cd /srv
- git clone https://code.grnet.gr/git/flowspy
- cd flowspy
-
-
-Application configuration
-=========================
-
-Copy settings.py.dist to settings.py:
-
- cp settings.py.dist settings.py
-
-Edit settings.py file and set the following according to your
-configuration:
-
- ADMINS: set your admin name and email (assuming that your server can send notifications)
- DATABASES (to point to your local database). You could use views instead of tables for models: peer, peercontacts, peernetworks. For this to work we suggest MySQL with MyISAM db engine
- SECRET_KEY : Make this unique, and don't share it with anybody
- STATIC_URL (static media directory) . If you have followed the above this should be: /srv/flowspy/static
- TEMPLATE_DIRS : If you have followed the above this should be: /srv/flowspy/templates
- CACHE_BACKEND: If you have followed the above this should be: memcached://127.0.0.1:11211/?timeout=3600
- Alternatively you could go for redis with the corresponding Django client lib.
- NETCONF_DEVICE (tested with Juniper EX4200 but any BGP enabled Juniper should work). This is the flowspec capable device
- NETCONF_USER (enable ssh and netconf on device)
- NETCONF_PASS
- If beanstalk is selected the following should be left intact.
- BROKER_HOST (beanstalk host)
- BROKER_PORT (beanstalk port)
- SERVER_EMAIL
- EMAIL_SUBJECT_PREFIX
- If beanstalk is selected the following should be left intact.
- BROKER_URL (beanstalk url)
- SHIB_AUTH_ENTITLEMENT (if you go for Shibboleth authentication)
- NOTIFY_ADMIN_MAILS (bcc mail addresses)
- PROTECTED_SUBNETS (subnets for which source or destination address will prevent rule creation and notify the NOTIFY_ADMIN_MAILS)
- The whois client is meant to be used in case you have inserted peers with their ASes in the peers table and wish to get network info for each one in an automated manner.
- PRIMARY_WHOIS
- ALTERNATE_WHOIS
- If you wish to deploy FoD with Shibboleth change the following attributes according to your setup:
- SHIB_AUTH_ENTITLEMENT = 'urn:mace'
- SHIB_ADMIN_DOMAIN = 'example.com'
- SHIB_LOGOUT_URL = 'https://example.com/Shibboleth.sso/Logout'
- SHIB_USERNAME = ['HTTP_EPPN']
- SHIB_MAIL = ['mail', 'HTTP_MAIL', 'HTTP_SHIB_INETORGPERSON_MAIL']
- SHIB_FIRSTNAME = ['HTTP_SHIB_INETORGPERSON_GIVENNAME']
- SHIB_LASTNAME = ['HTTP_SHIB_PERSON_SURNAME']
- SHIB_ENTITLEMENT = ['HTTP_SHIB_EP_ENTITLEMENT']
-
-If you have not installed an outgoing mail server you can always use
-your own account (either corporate or gmail, hotmail ,etc) by adding
-the following lines in settings.py:
-
- EMAIL_USE_TLS = True #(or False)
- EMAIL_HOST = 'smtp.example.com'
- EMAIL_HOST_USER = 'username'
- EMAIL_HOST_PASSWORD = 'yourpassword'
- EMAIL_PORT = 587 #(outgoing)
-
-Note: Soon we will release a version with django-registration as a means
- to add users and Shibboleth as an alternative
-
-Let's move on with some copies and dir creations:
-
- cp urls.py.dist urls.py
- mkdir log
- chown -R root:www-data log/
- chmod -R g+w log
-
-
-System configuration
-====================
-
-Apache operates as a gunicorn Proxy with WSGI and Shibboleth modules
-enabled. Depending on the setup the apache configuration may vary:
-
- a2enmod rewrite
- a2enmod proxy
- a2enmod ssl
- a2enmod proxy_http
-
-If shibboleth is to be used:
-
- apt-get install libapache2-mod-shib2
- a2enmod shib2
-
-Now it is time to configure beanstalk, gunicorn, celery and apache.
-
-
-beanstalkd
-----------
-
-Enable beanstalk by editting /etc/default/beanstalkd:
-
- vim /etc/default/beanstalkd
-
-Uncomment the line **START=yes** to enable beanstalk
-
-Start beanstalkd:
-
- service beanstalkd start
-
-
-gunicorn.d
-----------
-
-create and edit /etc/gunicorn.d/fod:
-
- vim /etc/gunicorn.d/fod
-
-FoD is served via gunicorn and is then proxied by Apache. If the above
-directory conventions have been followed so far, then your
-configuration should be:
-
- CONFIG = {
- 'mode': 'django',
- 'working_dir': '/srv/flowspy',
- 'args': (
- '--bind=127.0.0.1:8081',
- '--workers=1',
- '--timeout=360',
- '--worker-class=egg:gunicorn#gevent',
- '--log-level=debug',
- 'settings.py',
- ),
- }
-
-
-celery.d
---------
-
-Celery is used over beanstalkd to apply firewall rules in a serial
-manner so that locks are avoided on the flowspec capable device. In
-our setup celery runs via django. That is why the python-django-celery
-package was installed.
-
-Create the celeryd daemon at /etc/init.d/celeryd:
-
- vim /etc/init.d/celeryd
-
-The configuration should be:
-
- #!/bin/sh -e
- # ============================================
- # celeryd - Starts the Celery worker daemon.
- # ============================================
- #
- # :Usage: /etc/init.d/celeryd {start|stop|force-reload|restart|try-restart|status}
- # :Configuration file: /etc/default/celeryd
- #
- # See http://docs.celeryq.org/en/latest/cookbook/daemonizing.html#init-script-celeryd
-
-
- ### BEGIN INIT INFO
- # Provides: celeryd
- # Required-Start: $network $local_fs $remote_fs
- # Required-Stop: $network $local_fs $remote_fs
- # Default-Start: 2 3 4 5
- # Default-Stop: 0 1 6
- # Short-Description: celery task worker daemon
- ### END INIT INFO
-
- #set -e
-
- DEFAULT_PID_FILE="/var/run/celeryd@%n.pid"
- DEFAULT_LOG_FILE="/var/log/celeryd@%n.log"
- DEFAULT_LOG_LEVEL="INFO"
- DEFAULT_NODES="celery"
- DEFAULT_CELERYD="-m celery.bin.celeryd_detach"
-
- # /etc/init.d/celeryd: start and stop the celery task worker daemon.
-
- CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/celeryd"}
-
- test -f "$CELERY_DEFAULTS" && . "$CELERY_DEFAULTS"
- if [ -f "/etc/default/celeryd" ]; then
- . /etc/default/celeryd
- fi
-
- CELERYD_PID_FILE=${CELERYD_PID_FILE:-${CELERYD_PIDFILE:-$DEFAULT_PID_FILE}}
- CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-${CELERYD_LOGFILE:-$DEFAULT_LOG_FILE}}
- CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-${CELERYD_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
- CELERYD_MULTI=${CELERYD_MULTI:-"celeryd-multi"}
- CELERYD=${CELERYD:-$DEFAULT_CELERYD}
- CELERYCTL=${CELERYCTL:="celeryctl"}
- CELERYD_NODES=${CELERYD_NODES:-$DEFAULT_NODES}
-
- export CELERY_LOADER
-
- if [ -n "$2" ]; then
- CELERYD_OPTS="$CELERYD_OPTS $2"
- fi
-
- CELERYD_LOG_DIR=`dirname $CELERYD_LOG_FILE`
- CELERYD_PID_DIR=`dirname $CELERYD_PID_FILE`
- if [ ! -d "$CELERYD_LOG_DIR" ]; then
- mkdir -p $CELERYD_LOG_DIR
- fi
- if [ ! -d "$CELERYD_PID_DIR" ]; then
- mkdir -p $CELERYD_PID_DIR
- fi
-
- # Extra start-stop-daemon options, like user/group.
- if [ -n "$CELERYD_USER" ]; then
- DAEMON_OPTS="$DAEMON_OPTS --uid=$CELERYD_USER"
- chown "$CELERYD_USER" $CELERYD_LOG_DIR $CELERYD_PID_DIR
- fi
- if [ -n "$CELERYD_GROUP" ]; then
- DAEMON_OPTS="$DAEMON_OPTS --gid=$CELERYD_GROUP"
- chgrp "$CELERYD_GROUP" $CELERYD_LOG_DIR $CELERYD_PID_DIR
- fi
-
- if [ -n "$CELERYD_CHDIR" ]; then
- DAEMON_OPTS="$DAEMON_OPTS --workdir=\"$CELERYD_CHDIR\""
- fi
-
-
- check_dev_null() {
- if [ ! -c /dev/null ]; then
- echo "/dev/null is not a character device!"
- exit 1
- fi
- }
-
-
- export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-
- stop_workers () {
- $CELERYD_MULTI stop $CELERYD_NODES --pidfile="$CELERYD_PID_FILE"
- }
-
-
- start_workers () {
- $CELERYD_MULTI start $CELERYD_NODES $DAEMON_OPTS \
- --pidfile="$CELERYD_PID_FILE" \
- --logfile="$CELERYD_LOG_FILE" \
- --loglevel="$CELERYD_LOG_LEVEL" \
- --cmd="$CELERYD" \
- $CELERYD_OPTS
- }
-
-
- restart_workers () {
- $CELERYD_MULTI restart $CELERYD_NODES $DAEMON_OPTS \
- --pidfile="$CELERYD_PID_FILE" \
- --logfile="$CELERYD_LOG_FILE" \
- --loglevel="$CELERYD_LOG_LEVEL" \
- --cmd="$CELERYD" \
- $CELERYD_OPTS
- }
-
-
-
- case "$1" in
- start)
- check_dev_null
- start_workers
- ;;
-
- stop)
- check_dev_null
- stop_workers
- ;;
-
- reload|force-reload)
- echo "Use restart"
- ;;
-
- status)
- $CELERYCTL status $CELERYCTL_OPTS
- ;;
-
- restart)
- check_dev_null
- restart_workers
- ;;
-
- try-restart)
- check_dev_null
- restart_workers
- ;;
-
- *)
- echo "Usage: /etc/init.d/celeryd {start|stop|restart|try-restart|kill}"
- exit 1
- ;;
- esac
-
- exit 0
-
-and make it executable:
-
- chmod +x /etc/init.d/celeryd
-
-celeryd requires a /etc/default/celeryd file to be in place. Thus we
-are going to create this file (/etc/default/celeryd):
-
- vim /etc/default/celeryd
-
-Again if the directory conventions have been followed the file is (pay
-attention to the CELERYD_USER, CELERYD_GROUP and change accordingly)
-
- # Name of nodes to start, here we have a single node
- CELERYD_NODES="w1"
- # or we could have three nodes:
- #CELERYD_NODES="w1 w2 w3"
-
- # Where to chdir at start.
- CELERYD_CHDIR="/srv/flowspy"
- # How to call "manage.py celeryd_multi"
- CELERYD_MULTI="$CELERYD_CHDIR/manage.py celeryd_multi"
-
- # How to call "manage.py celeryctl"
- CELERYCTL="$CELERYD_CHDIR/manage.py celeryctl"
-
- # Extra arguments to celeryd
- #CELERYD_OPTS="--time-limit=300 --concurrency=8"
- CELERYD_OPTS="-E -B"
- # Name of the celery config module.
- CELERY_CONFIG_MODULE="celeryconfig"
-
- # %n will be replaced with the nodename.
- CELERYD_LOG_FILE="$CELERYD_CHDIR/celery_var/log/celery/%n.log"
- CELERYD_PID_FILE="$CELERYD_CHDIR/celery_var/run/celery/%n.pid"
-
- # Workers should run as an unprivileged user.
- CELERYD_USER="user"
- CELERYD_GROUP="user"
-
- # Name of the projects settings module.
- export DJANGO_SETTINGS_MODULE="settings"
-
-
-Apache
-------
-
-Apache proxies gunicorn. Things are more flexible here as you may
-follow your own configuration and conventions. Create and edit
-/etc/apache2/sites-available/fod. You should set <server_name> and
-<admin_mail> along with your certificates. If under testing
-environment, you can use the provided snakeoil certs. If you do not
-intent to use Shibboleth delete or comment the corresponding
-configuration parts inside **Shibboleth configuration**
-
- vim /etc/apache2/sites-available/fod
-
-Again if the directory conventions have been followed the file should
-be:
-
- <VirtualHost *:80>
- ServerAdmin webmaster@localhost
- ServerName <server_name>
- DocumentRoot /var/www
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /var/www/>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
-
- ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
- <Directory "/usr/lib/cgi-bin">
- AllowOverride None
- Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Order allow,deny
- Allow from all
- </Directory>
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-
- Alias /doc/ "/usr/share/doc/"
- <Directory "/usr/share/doc/">
- Options Indexes MultiViews FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
- Allow from 127.0.0.0/255.0.0.0 ::1/128
- </Directory>
-
- RewriteEngine On
- RewriteCond %{HTTPS} off
- RewriteRule ^/(.*) https://<server_name>/$1 [L,R]
-
- </VirtualHost>
- <VirtualHost *:443>
- ServerName <server_name>
- ServerAdmin <admin_mail>
- ServerSignature On
-
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/example.com.crt
- SSLCertificateChainFile /etc/ssl/certs/example.com.crt
- SSLCertificateKeyFile /etc/ssl/private/example.com.key
-
- AddDefaultCharset UTF-8
- IndexOptions +Charset=UTF-8
-
- # Shibboleth configuration
- ShibConfig /etc/shibboleth/shibboleth2.xml
- Alias /shibboleth-sp /usr/share/shibboleth
-
- <Location /fod/login>
- AuthType shibboleth
- ShibRequireSession On
- ShibUseHeaders On
- require valid-user
- </Location>
-
- # Shibboleth debugging CGI script
- ScriptAlias /shibboleth/test /usr/lib/cgi-bin/shibtest.cgi
- <Location /shibboleth/test>
- AuthType shibboleth
- ShibRequireSession On
- ShibUseHeaders On
- require valid-user
- </Location>
-
- <Location /Shibboleth.sso>
- SetHandler shib
- </Location>
-
- # End of Shibboleth configuration
-
- <Location /admin/media/>
- SetHandler None
- </Location>
-
- Alias /admin/media /usr/share/pyshared/django/contrib/admin/media
- Alias /media /usr/share/pyshared/django/contrib/admin/media
- DocumentRoot /var/www
- <Directory /var/www/>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
-
-
-
- <Proxy *>
- Order allow,deny
- Allow from all
- </Proxy>
-
- SSLProxyEngine off
- ProxyErrorOverride off
- ProxyTimeout 28800
- ProxyPass /fod http://localhost:8081/fod retry=0
- ProxyPassReverse /fod http://localhost:8081/fod
-
- LogLevel warn
- ErrorLog /var/log/apache2/ssl-error.log
- CustomLog /var/log/apache2/ssl-access.log combined
-
-
-
-
- Alias /fodstatic /srv/flowspy/static
-
- </VirtualHost>
-
-Now, enable your site. You might want to disable the default site if
-fod is the only site you host on your server:
-
- a2dissite default
- a2ensite fod
-
-You are not far away from deploying FoD. When asked for a super user,
-create one:
-
- cd /srv/flowspy
- python manage.py syncdb
- python manage.py migrate
-
-Restart, gunicorn and apache:
-
- service gunicorn restart && service apache2 restart
-
-
-Testing the platform
-====================
-
-Log in to the admin interface via https://<your ip>/fod/admin. Go to
-Peer ranges and add a new range (part of/or a complete subnet), eg.
-83.212.0.0/19 Go to Peers and add a new peer, eg. id: 1, name: Test,
-AS: 16503, tag: TEST and move the network you have crteated from
-Avalable to Chosen. From the admin front, go to User, and edit your
-user. From the bottom of the page, select the TEST peer and save. Last
-but not least, modify as required the existing (example.com) Site
-instance (admin home->Sites). You are done. As you are logged-in via
-the admin, there is no need for Shibboleth. Go to https://<your
-ip>/fod/ and create a new rule. Your rule should be applied on the
-flowspec capable device after aprox. 10 seconds.
-
-
-Branding
-========
-
-Via the admin interface you can modify flatpages to suit your needs
-
-
-Logos
------
-
-Inside the static folder you will find two empty png files:
-fod_logo.xcf (Gimp file) and shib_login.dist.png. Edit those two with
-your favourite image processing software and save them as fod_logo.png
-(under static/img/) and shib_login.png (under static/). Image sizes
-are optimized to operate without any other code changes. In case you
-want to incorporate images of different sizes you have to fine tune
-css and/or html as well.
-
-
-Footer
-------
-
-Under the templates folder (templates), you can alter the footer.html
-file to include your own footer messages, badges, etc.
-
-
-Welcome Page
-------------
-
-Under the templates folder (templates), you can alter the welcome page
-- welcome.html with your own images, carousel, videos, etc.
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-01 15:49+0300\n"
+"POT-Creation-Date: 2014-04-07 12:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Leonidas Poulopoulos <leopoul@grnet.gr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Port should be an integer"
msgstr "Η port θα πρέπει να είναι ένας ακέραιος αριθμός"
-#: flowspec/models.py:128 templates/apply.html:237
+#: flowspec/models.py:128 templates/apply.html:242
#: templates/user_routes.html:38 templates/overview/index.html:355
#: templates/overview/index.html.py:383
msgid "Name"
msgid "Network address. Use address/CIDR notation"
msgstr "Διεύθυνση δικτύου/υποδικτύου. Χρησιμοποιήστε σύνταξη διεύθυνσης/CIDR"
-#: flowspec/models.py:130 templates/apply.html:263
+#: flowspec/models.py:130 templates/apply.html:268
msgid "Source Address"
msgstr "Διεύθυνση Πηγής"
msgid "Source Port"
msgstr "Port Πηγής"
-#: flowspec/models.py:132 templates/apply.html:275
+#: flowspec/models.py:132 templates/apply.html:280
msgid "Destination Address"
msgstr "Διεύθυνση Προορισμού"
msgid "Status"
msgstr "Κατάσταση"
-#: flowspec/models.py:148 templates/apply.html:362 templates/dashboard.html:69
+#: flowspec/models.py:148 templates/apply.html:367 templates/dashboard.html:69
#: templates/user_routes.html:43 templates/overview/index.html:388
msgid "Expires"
msgstr "Λήγει"
msgid "Response"
msgstr "Απόκριση Δικτύου"
-#: flowspec/models.py:150 templates/apply.html:376
+#: flowspec/models.py:150 templates/apply.html:381
msgid "Comments"
msgstr "Σχόλια"
msgid "Invalid network address format at Source Field"
msgstr "Λανθασμένη μορφή διεύθυνσης δικυου στο πεδίο Πηγή"
-#: flowspec/views.py:179
+#: flowspec/views.py:181
msgid ""
"Insufficient rights on administrative networks. Cannot add rule. Contact "
"your administrator"
"Μη επαρκή δικαιώματα στα διαχειριστικά δίκτυα. Η προσθήκη φίλτρων δεν είναι "
"εφικτή. Επικοινωνήστε με το διαχειριστή σας"
-#: flowspec/views.py:240
+#: flowspec/views.py:242
#, python-format
msgid "Insufficient rights to edit rule %s"
msgstr "Μη επαρκή δικαιώματα για την επεξεργασία του φίλτρου %s"
-#: flowspec/views.py:252
+#: flowspec/views.py:254
#, python-format
msgid "Cannot edit a pending rule: %s."
msgstr "Δεν είναι δυνατή η επεξεργασία ενός φίλτρου (%s) σε κατάσταση pending "
-#: flowspec/views.py:395
+#: flowspec/views.py:397
msgid ""
"Your idP should release the HTTP_EPPN attribute towards this service<br>"
msgstr ""
"Ο idP σας θα πρέπει να παρέχει την HTTP_EPPN παράμετερο στην υπηρεσία<br>"
-#: flowspec/views.py:399
+#: flowspec/views.py:401
msgid ""
"Your idP should release an appropriate HTTP_SHIB_EP_ENTITLEMENT attribute "
"towards this service<br>"
"Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_EP_ENTITLEMENT παράμετερο στην "
"υπηρεσία<br>"
-#: flowspec/views.py:401
+#: flowspec/views.py:403
msgid ""
"Your idP should release the HTTP_SHIB_INETORGPERSON_MAIL attribute towards "
"this service"
"Ο idP σας θα πρέπει να παρέχει την HTTP_SHIB_INETORGPERSON_MAIL παράμετερο "
"στην υπηρεσία<br>"
-#: flowspec/views.py:432 flowspec/views.py:540
+#: flowspec/views.py:434 flowspec/views.py:542
#, python-format
msgid ""
"User account <strong>%s</strong> is pending activation. Administrators have "
"ενεργοποιηθεί για μεγάλο χρονικό διάστημα, επικοινωνήστε με τον τεχνικό σας "
"υπέυθυνο ή το Helpdesk του ΕΔΕΤ."
-#: flowspec/views.py:436
+#: flowspec/views.py:438
msgid ""
"Something went wrong during user authentication. Contact your administrator"
msgstr ""
"Παρουσιάστηκε ένα σφάλμα κατά την είσοδο του χρήστη. Επικοινωνήστε με το "
"διαχειριστή σας"
-#: flowspec/views.py:440
+#: flowspec/views.py:442
#, python-format
msgid "Invalid login procedure. Error: %s"
msgstr "Εσφαλμένη διαδικασία εισόδου. Σφάλμα: %s"
-#: flowspec/views.py:530
+#: flowspec/views.py:532
msgid ""
"Violation warning: User account is already associated with an institution."
"The event has been logged and our administrators will be notified about it"
msgid "Create new Rule"
msgstr "Δημιουργία νέου Φίλτρου"
-#: templates/apply.html:16 templates/apply.html.py:210
+#: templates/apply.html:16 templates/apply.html.py:215
msgid "Edit rule"
msgstr "Επεξεργασία φίλτρου"
msgid "Create rule"
msgstr "Δημιουργία φίλτρου"
-#: templates/apply.html:211
+#: templates/apply.html:216
msgid "Apply for a new rule"
msgstr "Αίτηση δημιουργίας νέου φίλτρου"
-#: templates/apply.html:249 templates/user_routes.html:42
+#: templates/apply.html:254 templates/user_routes.html:42
#: templates/overview/index.html:387
msgid "Applier"
msgstr "Χρήστης"
-#: templates/apply.html:287
+#: templates/apply.html:292
msgid "Protocol(s)"
msgstr "Πρωτόκολλο"
-#: templates/apply.html:296
+#: templates/apply.html:301
msgid "Fragment Type"
msgstr ""
-#: templates/apply.html:308
+#: templates/apply.html:313
msgid ""
"Select source/destination port(s), or select common port(s) for both source/"
"destination"
msgstr ""
-#: templates/apply.html:311
+#: templates/apply.html:316
msgid "Src. Port(s)"
msgstr "Port Πηγής"
-#: templates/apply.html:317
+#: templates/apply.html:322
msgid "Dest. Port(s)"
msgstr "Port Προορισμού"
-#: templates/apply.html:323
+#: templates/apply.html:328
#, fuzzy
msgid "Port(s)"
msgstr "Port Πηγής"
-#: templates/apply.html:333
+#: templates/apply.html:338
msgid "Add Port"
msgstr "Νέα port"
-#: templates/apply.html:337
+#: templates/apply.html:342
msgid "Add New Port"
msgstr "Νέα port"
-#: templates/apply.html:339 templates/apply.html.py:398
+#: templates/apply.html:344 templates/apply.html.py:403
msgid "Add new port"
msgstr "Νέα port"
-#: templates/apply.html:350
+#: templates/apply.html:355
msgid "Then Actions"
msgstr "Ενέργειες Φίλτρου"
-#: templates/apply.html:389 templates/registration/activate_edit.html:58
+#: templates/apply.html:394 templates/registration/activate_edit.html:58
#: templates/registration/select_institution.html:53
msgid "Apply"
msgstr "Εφαρμογή"
msgstr "Έξοδος"
#: templates/base.html:148 templates/base.html.py:154
-#: templates/welcome.html:47 templates/b3theme/base.html:103
+#: templates/welcome.html:73 templates/b3theme/base.html:103
msgid "Shibboleth Login"
msgstr "Είσοδος με Shibboleth"
msgid "Info"
msgstr "Πληροφορίες"
-#: templates/footer.html:11 templates/welcome.html:38
+#: templates/footer.html:11 templates/welcome.html:64
msgid "Service Terms"
msgstr "Όροι Χρήσης"
msgstr ""
#: templates/profile.html:64 templates/overview/index.html:353
-#, fuzzy
+#: templates/overview/login.html:53
msgid "Username"
-msgstr "Χρήστες"
+msgstr "Όνομα χρήστη"
#: templates/profile.html:65
msgid "First name"
msgid "Resync"
msgstr ""
-#: templates/welcome.html:3
+#: templates/welcome.html:3 templates/overview/login.html:71
msgid "Login"
msgstr "Είσοδος"
-#: templates/welcome.html:27
-msgid "Welcome to GRNET's FoD service."
-msgstr "Καλωσήρθατε στην υπηρεσία FoD του ΕΔΕΤ."
+#: templates/welcome.html:35
+msgid "Join Now"
+msgstr ""
-#: templates/welcome.html:36
+#: templates/welcome.html:62
msgid "What"
msgstr "Τι"
-#: templates/welcome.html:37
+#: templates/welcome.html:63
msgid "If you are new to the service, take some time to read the"
msgstr "Εάν χρησιμοποιείτε την υπηρεσία για πρώτη φορά, δείτε την"
-#: templates/welcome.html:37
+#: templates/welcome.html:63
msgid "Service Description"
msgstr "Περιγραφή της Υπηρεσίας"
-#: templates/welcome.html:38
+#: templates/welcome.html:64
msgid "Before asking why? take some time to look at the"
msgstr "Πριν ρωτήσετε γιατί; διαβάστε την ενότητα"
-#: templates/welcome.html:42
+#: templates/welcome.html:68
msgid "How"
msgstr "Πως"
-#: templates/welcome.html:43
+#: templates/welcome.html:69
msgid "If you have properly set your Shibboleth attributes, you may proceed"
msgstr ""
"Έαν έχετε ορίσει ορθά τις απαιτούμενες παραμέτρους του Shibboleth, μπορείτε "
"να συνεχίσετε"
-#: templates/welcome.html:52
+#: templates/welcome.html:78
msgid "Help"
msgstr "Βοήθεια"
-#: templates/welcome.html:54
+#: templates/welcome.html:79
msgid ""
"For troubleshooting info and remarks do not hesitate to contact GRNET's "
"Helpdesk."
msgid "Key Expired"
msgstr "Λήξη Φίλτρου"
-#: templates/overview/login.html:3 templates/overview/login.html.py:14
+#: templates/overview/login.html:19 templates/overview/login.html.py:28
msgid "Overview Login"
msgstr "Εισόδος στην Επισκόπηση"
+#: templates/overview/login.html:61
+msgid "Password"
+msgstr ""
+
#: templates/registration/activate.html:4
#: templates/registration/activate.html:21
msgid "Activation Status"
#: templates/registration/activation_complete.html:34
msgid "The user will be notified about his/her account activation"
msgstr "Ο χρήστης θα ενημερωθεί για την ενεργοποίηση του λογαριασμού"
+
+#~ msgid "Welcome to GRNET's FoD service."
+#~ msgstr "Καλωσήρθατε στην υπηρεσία FoD του ΕΔΕΤ."
<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>
</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 %}
projects / flowspy / commitdiff