Home Explore Help
Sign In
FFDN
/
Cavote
4
0
Fork 0
Files Issues 2 Pull Requests 0
Browse Source

Update libs, debug html and add user button

Guillaume Subiron 13 years ago
parent
71a55d03f9
commit
bd2a1af9c0
6 changed files with 12120 additions and 1119 deletions
Unified View Show Diff Stats
  1. 9 4
      main.py
  2. 2442 847
      static/css/bootstrap.css
  3. 357 255
      static/js/bootstrap.js
  4. 9252 0
      static/js/jquery.js
  5. 5 0
      templates/index.html
  6. 55 13
      templates/layout.html

+ 9 - 4
main.py
View File 

@@ -18,7 +18,7 @@ app = Flask(__name__)
 
 app.config.from_object(__name__)
 
 app.config.from_object(__name__)
 
 
 
 def connect_db():
 
 def connect_db():
 
-        return sqlite3.connect(app.config['DATABASE'])
 
+    return sqlite3.connect(app.config['DATABASE'])
 
 
 
 @app.before_request
 
 @app.before_request
 
 def before_request():
 
 def before_request():
 
@@ -28,6 +28,10 @@ def before_request():
 
 def teardown_request(exception):
 
 def teardown_request(exception):
 
     g.db.close()
 
     g.db.close()
 
 
 
+@app.route('/')
 
+def home():
 
+    return render_template('index.html')
 
+
 
 @app.route('/admin/votes')
 
 @app.route('/admin/votes')
 
 def show_votes():
 
 def show_votes():
 
     cur = g.db.execute('select title, description, date from votes order by id desc')
 
     cur = g.db.execute('select title, description, date from votes order by id desc')
 
@@ -44,7 +48,7 @@ def add_vote():
 
             [request.form['title'], request.form['description'], ndate])
 
             [request.form['title'], request.form['description'], ndate])
 
     g.db.commit()
 
     g.db.commit()
 
     flash('New entry was successfully posted')
 
     flash('New entry was successfully posted')
 
-    return redirect(url_for('show_votes'))
 
+    return redirect(url_for('home'))
 
 
 
 @app.route('/login', methods=['GET', 'POST'])
 
 @app.route('/login', methods=['GET', 'POST'])
 
 def login():
 
 def login():
 
@@ -56,15 +60,16 @@ def login():
 
             error = 'Invalid password'
 
             error = 'Invalid password'
 
         else:
 
         else:
 
             session['logged_in'] = True
 
             session['logged_in'] = True
 
+            session['nickname'] = request.form['username']
 
             flash('You were logged in')
 
             flash('You were logged in')
 
-            return redirect(url_for('show_votes'))
 
+            return redirect(url_for('home'))
 
     return render_template('login.html', error=error)
 
     return render_template('login.html', error=error)
 
 
 
 @app.route('/logout')
 
 @app.route('/logout')
 
 def logout():
 
 def logout():
 
     session.pop('logged_in', None)
 
     session.pop('logged_in', None)
 
     flash('You were logged out')
 
     flash('You were logged out')
 
-    return redirect(url_for('show_votes'))
 
+    return redirect(url_for('home'))

File diff suppressed because it is too large
+ 2442 - 847
static/css/bootstrap.css


File diff suppressed because it is too large
+ 357 - 255
static/js/bootstrap.js


File diff suppressed because it is too large
+ 9252 - 0
static/js/jquery.js


+ 5 - 0
templates/index.html
View File 

@@ -0,0 +1,5 @@
 
+{% extends "layout.html" %}
 
+{% block body %}
 
+  {% if error %}<p class=error><strong>Error:</strong> {{ error }}{% endif %}
 
+  <p>Bienvenue sur cavote, l'outil de vote de la Fédération FDN !</p>
 
+{% endblock %}

+ 55 - 13
templates/layout.html
View File 

@@ -11,25 +11,67 @@
 
     <!-- css javascript -->
 
     <!-- css javascript -->
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/jquery.ui.all.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/jquery.ui.all.css') }}">
 
     <!-- javascript -->
 
     <!-- javascript -->
 
-</head>
 
+  </head>
 
+<body>
 
+  <!--
 
+<div class="navbar">
 
+  <div class="navbar-inner">
 
+    <div class="container">
 
+      <a class="brand" href="/">Cavote</a>
 
+      <ul class="nav">
 
+      </ul>
 
+      <ul class="nav pull-right">
 
+        <li class="divider-vertical"></li>
 
+        {% if not session.logged_in %}
 
+        <li><a href="{{ url_for('login') }}"><i class="icon-user icon-white"></i> Connexion</a></li>
 
+        {% else %}
 
+        <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user icon-white"></i> {{ session.nickname }} <b class="caret"></b></a>
 
+          <ul class="dropdown-menu">
 
+            <li><a href=""><i class="icon-cog"></i> Paramètres</a></li>
 
+            <li><a href="{{ url_for('logout') }}"><i class="icon-off"></i> Déconnexion</a></li>
 
+          </ul>
 
+        </li>
 
+        {% endif %}
 
+      <ul class="nav">
 
+    </div>
 
+  </div>
 
+</div>
 
+  -->
 
+
 
 <div class="container-fluid">
 
 <div class="container-fluid">
 
-  <div class=metanav>
 
-  {% if not session.logged_in %}
 
-    <a href="{{ url_for('login') }}">log in</a>
 
-  {% else %}
 
-    <a href="{{ url_for('logout') }}">log out</a>
 
-  {% endif %}
 
+
 
+  <div class="btn-toolbar">
 
+    <div class="btn-group pull-right">
 
+      {% if not session.logged_in %}
 
+      <a class="btn btn-primary" href="{{ url_for('login') }}"><i class="icon-user icon-white"></i> Connexion</a></li>
 
+      {% else %}
 
+      <a href="#" class="btn"><i class="icon-user"></i> {{ session.nickname }}</a>
 
+      <a href="#" class="btn dropdown-toggle" data-toggle="dropdown"><b class="caret"></b></a>
 
+      <ul class="dropdown-menu pull-right">
 
+        <li><a href=""><i class="icon-comment"></i> Votes en attente</a></li>
 
+        <li><a href=""><i class="icon-cog"></i> Paramètres</a></li>
 
+        <li class="divider"></li>
 
+        <li><a href="{{ url_for('logout') }}"><i class="icon-off"></i> Déconnexion</a></li>
 
+      </ul>
 
+      {% endif %}
 
+    </div>
 
   </div>
 
   </div>
 
-<h1><a href="/" style="text-decoration:none;">Outil de vote du CA FFDN</a></h1>
 
+
 
+<h1 class="page-header"><a href="/" style="text-decoration:none;">Outil de vote du CA FFDN</a></h1>
 
 {% with messages = get_flashed_messages() %}
 
 {% with messages = get_flashed_messages() %}
 
   {% if messages %}
 
   {% if messages %}
 
-    <ul class=flashes>
 
     {% for message in messages %}
 
     {% for message in messages %}
 
-      <li>{{ message }}</li>
 
+    <div class="alert alert-info fade in">
 
+      <button class="close" data-dismiss="alert">×</button>
 
+      {{ message }}
 
+    </div>
 
     {% endfor %}
 
     {% endfor %}
 
-    </ul>
 
   {% endif %}
 
   {% endif %}
 
 {% endwith %}
 
 {% endwith %}
 
 {% block body %}{% endblock %}
 
 {% block body %}{% endblock %}
 
-</div>    
-    <script src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
 
+
 
+</div> <!-- container -->   
+  <script src="{{ url_for('static', filename='js/jquery.js') }}"></script>
 
+  <script src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
 
+</body>
 
+</html>