Add labels

main.py

@@ -50,7 +50,7 @@ def members():
 @app.route('/projects')
 def projects():
     projects = list()
-    for project in query_db('select * from fai order by is_member,step,name'):
+    for project in query_db('select * from fai order by is_member,step desc,name'):
         project['stepname'] = STEPS[project['step']]
         projects.append(project)
     return render_template('projects.html', projects=projects)
@@ -94,6 +94,19 @@ def projects_json(projects):
     return jsonify(fais)
 
 #------
+# Filters
+
+@app.template_filter('step_to_label')
+def step_to_label(step):
+    return u"<a href='#' rel='tooltip' data-placement='right' title='" + STEPS[step] + "'><span class='badge badge-" + STEPS_LABELS[step] + "'>" + str(step) + "</span></a>"
+
+@app.template_filter('member_to_label')
+def member_to_label(is_member):
+    if is_member:
+        return u'<a href="#" rel="tooltip" data-placement="right" title="Membre de la Fédération FDN"><span class="label label-success">FFDN</span></a>'
+    return ''
+
+#------
 # Main
 
 if __name__ == '__main__':

schema.sql

@@ -20,15 +20,15 @@ create table fai (
 INSERT INTO fai VALUES (1, "Aquilenet", "Aquilenet",  "Aquitaine", "10:10", "Fournisseur d'accès Internet en Aquitaine", "ADSL", "http://www.aquilenet.fr", "contact@aquilenet.fr", "freenode.net", "#aquilenet", 7, 1);
 INSERT INTO fai VALUES (2, "FaiMaison", "FaiMaison",  "Nantes", "10:10", "", "ADSL", "http://faimaison.net/", "", "", "", 7, 1);
 INSERT INTO fai VALUES (3, "Ilico",     "Ilico",      "Corrèze", "", "", "ADSL", "http://www.ilico.org/", "", "", "", 7, 1);
-INSERT INTO fai VALUES (4, "Illyse",    "Illyse",     "Lyon - St Étienne", "", "", "ADSL", "http://www.illyse.net/", "", "", "", 7, 1);
-INSERT INTO fai VALUES (5, "Iloth",     "Iloth",      "Hérault", "", "", "ADSL", "http://iloth.net/", "", "", "", 7, 1);
-INSERT INTO fai VALUES (6, "Netopi",    "Netopi",     "Seine-et-Marne", "", "", "ADSL", "http://www.netopi.fr/", "", "", "", 7, 1);
-INSERT INTO fai VALUES (7, "Rézine",    "Rézine",     "Région grenobloise", "", "", "", "http://www.rezine.org/", "", "", "", 7, 1);
+INSERT INTO fai VALUES (4, "Illyse",    "Illyse",     "Lyon - St Étienne", "", "", "ADSL", "http://www.illyse.net/", "", "", "", 5, 1);
+INSERT INTO fai VALUES (5, "Iloth",     "Iloth",      "Hérault", "", "", "ADSL", "http://iloth.net/", "", "", "", 5, 1);
+INSERT INTO fai VALUES (6, "Netopi",    "Netopi",     "Seine-et-Marne", "", "", "ADSL", "http://www.netopi.fr/", "", "", "", 6, 1);
+INSERT INTO fai VALUES (7, "Rézine",    "Rézine",     "Région grenobloise", "", "", "", "http://www.rezine.org/", "", "", "", 5, 1);
 INSERT INTO fai VALUES (8, "Rhizome",   "Rhizome",    "Compiègne (Oise)", "", "", "Wifi d'initiative étudiante", "http://rhizome-fai.net/", "", "", "", 7, 1);
 INSERT INTO fai VALUES (9, "French Data Network",     "FDN", "France entière", "", "", "ADSL", "http://www.fdn.fr/", "", "", "", 7, 1);
 INSERT INTO fai VALUES (10, "Loraine Data Network",    "LDN", "Lorraine", "", "", "ADSL", "http://ldn-fai.net/", "", "", "", 7, 1);
 INSERT INTO fai VALUES (11, "Nice Data Network",       "NDN", "Alpes-Maritimes", "", "", "ADSL", "http://www.ndn-fai.net/", "", "", "", 7, 1);
-INSERT INTO fai VALUES (12, "Sallanches Data Network", "SDN", "Sallanches (Haut-Savoie)", "", "", "", "http://www.sdnet.info/", "", "", "", 7, 1);
+INSERT INTO fai VALUES (12, "Sallanches Data Network", "SDN", "Sallanches (Haut-Savoie)", "", "", "", "http://www.sdnet.info/", "", "", "", 5, 1);
 INSERT INTO fai VALUES (13, "Sames Wireless",  "Sames",       "village de Sames (Pyrénées-Atlantiques)", "", "", "Wifi zone blanche", "http://www.sameswireless.fr/", "", "", "", 7, 1);
 INSERT INTO fai VALUES (14, "tetaneutral.net", "ttnn",        "Toulouse", "", "", "ADSL et Wifi en zones blanches et denses", "http://tetaneutral.net/", "", "", "", 7, 1);
 INSERT INTO fai VALUES (15, "Franciliens.net", "Franciliens.net", "Île-de-France", "", "", "ADSL et VPN", "http://www.franciliens.net", "", "", "", 7, 1);

settings.py

@@ -11,3 +11,4 @@ TITLE = u"Fédéral Database"
 #SMTP_SERVER = "127.0.0.1"
 #PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
 STEPS = {1:u'Projet envisagé', 2:u'Porteurs du projet identifiés', 3:u'Structure en cours de création', 4:u'Structure constituée', 5:u'Outils de base créés (compte en banque, premiers adhérents)', 6:u'FAI opérationnel partiellement (premiers accès ouverts, p-e en mode dégradé)', 7:u'FAI pleinement opérationnel'}
+STEPS_LABELS = {1:'', 2:'info', 3:'info', 4:'important', 5:'important', 6:'warning', 7:'success'}

templates/projects.html

@@ -4,7 +4,7 @@ Liste des projets recencés
 {% endblock %}
 {% block body %}
 <div>
-<table class="table">
+<table class="table table-condensed table-striped table-hover">
   <thead>
     <tr>
       <th>Nom</th>
@@ -16,9 +16,11 @@ Liste des projets recencés
   <tbody>
     {% for project in projects %}
     <tr>
-      <td>{{ project.name }}</td>
+      <td>{% autoescape false %}{{ project.is_member | member_to_label }}{% endautoescape %} &nbsp;{{ project.name }}</td>
       <td>{{ project.zone }}</td>
-      <td><a href="#" rel="tooltip" data-placement="right" title="{{ project.stepname }}">{{ project.step }}</a></td>
+      {% autoescape false %}
+      <td>{{ project.step | step_to_label }}</td>
+      {% endautoescape %}
       <td><a class="pull-right btn btn-small" href="{{ url_for('project', projectid=project.id) }}"><i class="icon-search"></i></a>
     </tr>
     {% endfor %}