Home Explore Help
Sign In
Ninjatrappeur
/
ffdn-db
forked from FFDN/ffdn-db
1
0
Fork 0
Files
Browse Source

Added TODO, members_drupal api

Guillaume Subiron 12 years ago
parent
6112ba7b9d
commit
02e8c195ef
6 changed files with 36 additions and 10 deletions
Split View Show Diff Stats
  1. 6 0
      TODO
  2. 7 2
      main.py
  3. 2 1
      templates/layout.html
  4. 9 0
      templates/members_drupal.html
  5. 9 6
      templates/project.html
  6. 3 1
      templates/projects.html

+ 6 - 0
TODO
View File 

@@ -0,0 +1,6 @@
 
+* Carte sur chaque FAI où il y a des coordonnées GPS
 
+* Moteur de recherche
 
+* include drupal
 
+* include wiki
 
+* Gérer et afficher les logos
 
+

+ 7 - 2
main.py
View File 

@@ -80,7 +80,7 @@ def edit_project(projectid):
 
                     g.db.commit()
 
                     flash(u"Le projet a bien été mis à jour. Merci pour votre contribution !", "success")
 
                     project = query_db('select * from fai where id = ?', [projectid], one=True)
 
-                    return redirect(url_for(project, projectid=projectid))
 
+                    return redirect(url_for('project', projectid=projectid))
 
                 else:
 
                     flash(u'Le nom complet ou le nom court que vous avez choisi est déjà pris.', 'error')
 
             else:
 
@@ -103,7 +103,7 @@ def create_project():
 
                     flash(u"Le projet a bien été créé. Merci pour votre contribution !", "success")
 
                     project = query_db('select * from fai where name = ?', [request.form['name']], one=True)
 
                     if project is not None:
 
-                        return redirect(url_for(project))
 
+                        return redirect(url_for('project', projectid=project['id']))
 
                     else:
 
                         flash(u'Hum… il semble que le projet n\'a pas été créé… vous voulez-bien réessayer ?', 'error')
 
                 else:
 
@@ -133,6 +133,11 @@ def projects_json(projects):
 
         fais[fai['name']] = fai
 
     return jsonify(fais)
 
 
+@app.route('/api/members_drupal')
 
+def members_drupal():
 
+    members = query_db('select * from fai where is_member = 1 order by shortname') 
+    return render_template('members_drupal.html', members=members)
 
+
 
 #------
 
 # Filters

+ 2 - 1
templates/layout.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="fr">
 
   <head>
 
     <meta charset="utf-8">
 
-    <title>CA vote ou pas </title>
 
+    <title>Fédéral Database</title>
 
     <!-- meta -->
 
     <!-- icon
 
     <link rel="shortcut icon" href="favicon.ico"> -->
 
@@ -42,4 +42,5 @@
 
     });
 
   </script>
 
 </body>
 
+
 
 </html>

+ 9 - 0
templates/members_drupal.html
View File 

@@ -0,0 +1,9 @@
 
+{% for member in members %}
 
+<a class="box" href="{{ member.website }}">
 
+  <div class="infobox">
 
+    <h3 class="box-title">{{ member.shortname }}</h3>
 
+    <img class="box-image" src="{{ member.logo }}" alt="Logo {{ member.shortname }}" />
 
+    <span class="box-content">{{ member.services }}<br /><strong>{{ member.zone }}</strong></span>
 
+  </div>
 
+</a>
 
+{% endfor %}

+ 9 - 6
templates/project.html
View File 

@@ -6,16 +6,19 @@
 
 <!--<div class="span9">-->
 
   <a class="pull-right btn btn-success btn-small" href="{{ url_for('edit_project', projectid=project.id) }}"><i class="icon-edit icon-white"></i> Éditer</a>
 
   {% if project.name != project.shortname %}
 
-  <h2 class='page-header'>{{ project.name }} ({{ project.shortname }})</h2> 
+  <h1 class='page-header'>{{ project.name }} ({{ project.shortname }})</h1> 
   {% else %}
 
-  <h2 class='page-header'>{{ project.name }} <small> &nbsp;-&nbsp; {{ project.description }}</small></h2> 
+  <h1 class='page-header'>{{ project.name }} <small> &nbsp;-&nbsp; {{ project.description }}</small></h1> 
   {% endif %}
 
-  {{ project }}
 
   <dl class="dl-horizontal">
 
+    <dt>Zone<dd>{{ project.zone }}
 
+    <dt>Services<dd>{{ project.services }}
 
     <dt>Website<dd><a href="{{ project.website }}">{{ project.website }}</a>
 
-    <dt>Email<dd>{{ project.email }}
 
-    <dt>IRC<dd>Canal {{ project.irc_channel }}, Serveur {{ project.irc_server }}
 
-    <dt>Étape<dd>{{ project.stepname }}
 
+    <dt>Email<dd><code>{{ project.email }}</code>
 
+    <dt>IRC<dd>Canal <code>{{ project.irc_channel }}</code>, Serveur <code>{{ project.irc_server }}</code>
 
+    {% autoescape false %}
 
+    <dt>Étape<dd>{{ project.step | step_to_label }}
 
+    {% endautoescape %}
 
 <!--</div>-->
 
 <!--</div>-->
 
 {% endblock %}

+ 3 - 1
templates/projects.html
View File 

@@ -4,6 +4,7 @@ Liste des projets recencés
 
 {% endblock %}
 
 {% block body %}
 
 <div>
 
+<a class="pull-right btn btn-primary btn-small" href="{{ url_for('create_project') }}">Ajoutez le votre !</a>
 
 <table class="table table-condensed table-striped table-hover">
 
   <thead>
 
     <tr>
 
@@ -17,7 +18,8 @@ Liste des projets recencés
 
   <tbody>
 
     {% for project in projects %}
 
     <tr>
 
-      <td>{% autoescape false %}{{ project.is_member | member_to_label }}{% endautoescape %} &nbsp;{{ project.name }}</td>
 
+      <td>{% autoescape false %}{{ project.is_member | member_to_label }}{% endautoescape %} &nbsp;
 
+        <a href="{{ url_for('project', projectid=project.id) }}">{{ project.name }}</a></td>
 
       <td>{{ project.zone }}</td>
 
       <td>{{ project.services }}</td>
 
       {% autoescape false %}