FVDE/ennstatus Changeset - 9f0c38d326dc · Chaos Computer Club Lëtzebuerg Projects

Changeset - 9f0c38d326dc

Parent rev.

Child rev.

[Not reviewed]

Merge feature-cli

0 10 1

Dennis Fink - 9 years ago 2015-10-26 00:04:34
dennis.fink@c3l.lu

Merged dev

11 files changed with 67 insertions and 72 deletions:

ennstatus/donate/forms.py

ennstatus/root/forms.py

ennstatus/static/css/ennstatus.css

ennstatus/status/forms.py

ennstatus/status/views.py

ennstatus/templates/base.html

ennstatus/templates/donate/index.html

ennstatus/templates/donate/received.html

ennstatus/templates/root/contact.html

ennstatus/templates/root/ennstatus.html

ennstatus/templates/status/index.html

0 comments (0 inline, 0 general)

ennstatus/donate/forms.py

➞

Show inline comments

 from flask_wtf import Form
 from wtforms import SelectField
+from wtforms import SelectField, SubmitField
 from wtforms.validators import DataRequired
@@ @@ -10,3 +10,5 @@ class DateForm(Form): @@
                             ('{:02d}'.format(i), str(i)) for i in range(1, 13)
                         ],
                         validators=[DataRequired()])
     submit = SubmitField('Submit')

ennstatus/root/forms.py

➞

Show inline comments

@@ @@ -20,6 +20,7 @@ class BPMForm(Form): @@
     country = SelectField('Country',
                           validators=[DataRequired()],
                           choices=COUNTRIES)
     submit = SubmitField('Submit')
 class MembershipForm(Form):

ennstatus/static/css/ennstatus.css

➞

Show inline comments

@@ @@ -61,57 +61,6 @@ a, a:hover, a:active, a:visited { @@
     color: #af24cb;
+}
 /* Multi level dropdown menu http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3 */
 .dropdown-submenu {
     position: relative;
+}
 .dropdown-submenu > .dropdown-menu {
     top: 0;
     left: 100%;
     margin-top: -6px;
     margin-left: -1px;
     -webkit-border-radius: 0 6px 6px 6px;
     -moz-border-radius: 0 6px 6px 6px;
     border-radius: 0 6px 6px 6px;
+}
 .dropdown-submenu:hover > .dropdown-menu {
     display: block;
+}
 .dropdown-submenu > a:after {
     display: block;
     content: " ";
     float: right;
     width: 0;
     height: 0;
     border-color: transparent;
     border-style: solid;
     border-width: 5px 0 5px 5px;
     border-left-color: #ccc;
     margin-top: 5px;
     margin-right: -10px;
+}
 .dropdown-submenu:hover > a:after {
     border-left-color: #fff;
+}
 .dropdown-submenu .pull-left {
     float: none;
+}
 .dropdown-submenu .pull-left > .dropdown-menu {
     left: -100%;
     margin-left: 10px;
     -webkit-border-radius: 6px 0 6px 6px;
     -moz-border-radius: 6px 0 6px 6px;
     border-radius: 6px 0 6px 6px;
+}
 /* fancy bootstrap checkboxes */
 .form-group input[type="checkbox"] {

ennstatus/status/forms.py

➞

Show inline comments

@@ new file 100644 @@
 from flask_wtf import Form
 from wtforms import SelectField, SubmitField
 from wtforms.validators import DataRequired
 SERVERTYPES = [
     ('all', 'All'),
     ('exit', 'Exits'),
     ('relay', 'Relays'),
     ('bridge', 'Bridges')
+]
 class ServerTypeForm(Form):
     servertype = SelectField(
         'Servertype',
         validators=[DataRequired()],
         choices=SERVERTYPES
+    )
     submit = SubmitField('Submit')

ennstatus/status/views.py

➞

Show inline comments

 from flask import Blueprint, render_template, current_app
 from flask import (Blueprint,
                    render_template,
                    current_app,
                    request,
                    redirect,
                    url_for)
 from ennstatus.status.functions import (all_servers_by_type, single_server,
                                         split_all_servers_to_types)
 from .forms import ServerTypeForm
 status_page = Blueprint('status', __name__)
 @status_page.route('/')
+@status_page.route('/', methods=('GET', 'POST'))
 def index():
     current_app.logger.info('Handling status index!')
     form = ServerTypeForm()
     if request.method == 'POST':
         current_app.logger.debug('Validating form')
         if form.validate_on_submit():
             servertype = form.servertype.data
             if servertype != 'all':
                 return redirect(url_for('status.' + servertype))
     servers = split_all_servers_to_types()
     current_app.logger.info('Returning servers')
     return render_template('status/index.html', exit=servers['exit'],
                            relay=servers['relay'], bridge=servers['bridge'])
                            relay=servers['relay'], bridge=servers['bridge'],
                            form=form)
 @status_page.route('/exit')
 def exit():
     servers = list(all_servers_by_type('exit'))
     return render_template('status/index.html', exit=servers)
     form = ServerTypeForm()
     form.servertype.data = 'exit'
     return render_template('status/index.html', exit=servers, form=form)
 @status_page.route('/relay')
 def relay():
     servers = list(all_servers_by_type('relay'))
     return render_template('status/index.html', relay=servers)
     form = ServerTypeForm()
     form.servertype.data = 'relay'
     return render_template('status/index.html', relay=servers, form=form)
 @status_page.route('/bridge')
 def bridge():
     servers = list(all_servers_by_type('bridge'))
     return render_template('status/index.html', bridge=servers)
     form = ServerTypeForm()
     form.servertype.data = 'bridge'
     return render_template('status/index.html', bridge=servers, form=form)
 @status_page.route('/single/<server_name>')

ennstatus/templates/base.html

➞

Show inline comments

@@ @@ -61,17 +61,8 @@ @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Services <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li class="dropdown-submenu">
               <a>Tor Servers</a>
               <ul class="dropdown-menu">
                 <li><a href="{{ url_for('status.index') }}">All servers</a></li>
                 <li class="divider"></li>
                 <li><a href="{{ url_for('status.exit') }}">Exits</a></li>
                 <li><a href="{{ url_for('status.relay') }}">Relays</a></li>
                 <li><a href="{{ url_for('status.bridge') }}">Bridges</a></li>
               </ul>
             <li><a href="{{ url_for('status.index') }}">Tor Servers</a></li>
             <li class="divider"></li>
             </li>
             <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>
             <li><a href="//{{ wiki_url }}">Wiki</a></li>
             <li class="divider"></li>

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -71,7 +71,7 @@ @@
               {{ form.hidden_tag() }}
               <div class="form-group">
                 {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
-                <noscript><input type="submit" class="btn btn-enn btn-sm" value="Submit"></noscript>
+                <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
               </div>
             </form>
           </div>

ennstatus/templates/donate/received.html

➞

Show inline comments

@@ @@ -23,7 +23,7 @@ @@
           {{ form.year(class_='form-control input-sm') }}
           {{ form.month.label }}
           {{ form.month(class_='form-control input-sm') }}
-          <input type="submit" class="btn btn-enn btn-sm" value="Submit">
+          {{ form.submit(class_='btn btn-enn btn-sm') }}
         </div>
       </form>
     </div>

ennstatus/templates/root/contact.html

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ @@
         {{ form.hidden_tag()}}
         <div class="form-group">
           {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
-          <noscript><input type="submit" class="btn btn-enn btn-sm" value="Submit"></noscript>
+          <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
         </div>
       </form>
     </div>

ennstatus/templates/root/ennstatus.html

➞

Show inline comments

@@ @@ -29,6 +29,7 @@ @@
         <li><a href="http://videojs.com/">video.js</a></li>
       </ul>
       <p>Flag icons provided by: <a href="http://www.famfamfam.com/lab/icons/flags/">famfamfam</a></p>
       <p>Other icons provided by: <a href="http://glyphicons.com/">Glyphicons</a></p>
       <p>Fork us on <a href="https://bitbucket.org/fvde/ennstatus-relaunched">Bitbucket</a></p>
     </div>
   </div>

ennstatus/templates/status/index.html

➞

Show inline comments

@@ @@ -9,7 +9,16 @@ @@
 {% endblock %}
 {% block content %}
   <div class="col-md-12">
   <div class="col-md-12 clearfix">
     <div class="pull-right">
       <form class="form-inline" role="form" method="POST" action="{{ url_for('status.index') }}">
         {{ form.hidden_tag() }}
         <div class="form-group">
           {{ form.servertype(class_='form-control input-sm', onchange='this.form.submit()') }}
           <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
         </div>
       </form>
     </div>
     {% if not (exit or relay or bridge) %}
       <p>No servers found!</p>
     {% else %}

0 comments (0 inline, 0 general)