diff --git a/modules/admin.py b/modules/admin.py index a9c6d675d24b3461766f22e5821db581ec87f5bd..62f9959ab3cca925250fa51dfd273581aa5bc07b 100644 --- a/modules/admin.py +++ b/modules/admin.py @@ -76,7 +76,7 @@ def event(): return render_layout("admin_event_index.html", events=events) -@admin.route("/even/show") +@admin.route("/event/show") @login_required @admin_permission.require() def event_show(): diff --git a/requirements.txt b/requirements.txt index 585ce9ef5c434434b98e9ab966cc1d787e758de8..0daa349d9618cbc92955fe69225f7cc320487f43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,33 @@ -Flask==0.10.1 -Flask-Login==0.2.11 -Flask-Passlib==0.1 -Flask-Principal==0.4.0 -Flask-SQLAlchemy==2.0 -Flask-WTF==0.12 -Jinja2==2.8 -MarkupSafe==0.23 -SQLAlchemy==1.0.8 -WTForms==2.0.2 -Werkzeug==0.10.4 -blinker==1.4 -itsdangerous==0.24 -passlib==1.6.1 +aiohttp==0.18.3 +av==0.2.4 +blessings==1.6 +bpython==0.14.2 +cffi==1.3.0 +chardet==2.3.0 +curtsies==0.1.19 +cycler==0.9.0 +greenlet==0.4.9 +iotop==0.6 +matplotlib==1.5.0 +numpy==1.10.1 +packaging==15.3 +passlib==1.6.5 +Pillow==3.0.0 +ply==3.8 psycopg2==2.6.1 -wheel==0.24.0 -Flask-Script -Flask-Migrate +pycparser==2.14 +Pygments==2.0.2 +pygobject==3.18.2 +pyparsing==2.0.5 +python-aalib==0.3 +python-dateutil==2.4.2 +python-sane==2.8.2 +pytz==2015.7 +pyxdg==0.25 +regex==2015.10.22 +requests==2.8.1 +scipy==0.16.1 +six==1.10.0 +team==1.0 +urllib3===dev +virtualenv==13.1.2 diff --git a/templates/content_index.html b/templates/content_index.html index b19c5488e13d8a28d89ce0906ae89e7c7d699c78..97f49dc5c5fc0027001cd016cf5b551b0cba8bb7 100644 --- a/templates/content_index.html +++ b/templates/content_index.html @@ -4,8 +4,8 @@ <h3 class="mdl-card__title-text">{{ topic.name }}: {{ speaker.name }}</h3> </div> <div class="mdl-card__actions"> - {% if current_user.is_authenticated() and "user" in current_user.roles %} - <a href="{{ url_for("speech.index", topic=event.id) }}"> + {% if current_user.is_authenticated and "user" in current_user.roles %} + <a href="{{ url_for("speech.index", event=event.id) }}"> <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored"> <i class="material-icons" role="presentation">build</i> </button> diff --git a/templates/layout.html b/templates/layout.html index 3cf73678f076f9c5613b0b7bc0374c00f1a49d03..ee9b659775b42ff3352546d284e584e9e48a9be6 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -44,7 +44,7 @@ <header class="rede-drawer-header"> <div class="rede-account-dropdown"> <span> - {% if current_user.is_authenticated() %} + {% if current_user.is_authenticated %} <p class="md-24"> <i class="material-icons md-48"> {% if "user" in current_user.roles and not "admin" in current_user.roles %} @@ -69,7 +69,7 @@ </button> </span> <ul class="mdl-menu mdl-menu--bottom-left mdl-js-menu mdl-js-ripple-effet" for="accbtn"> - {% if current_user.is_authenticated() %} + {% if current_user.is_authenticated %} <li class="mdl-menu__item"><a class="mdl-navigation__link" href="{{ url_for("logout") }}">Logout</a></li> {% else %} <li class="mdl-menu__item"><a class="mdl-navigation__link" href="{{ url_for("login") }}">Login</a></li> @@ -83,7 +83,7 @@ <a class="mdl-navigation__link" href="{{ url_for("speech.index") }}"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">build</i>Handle speakers</a> {% endif %} <a class="mdl-navigation__link" href="{{ url_for("speech.show") }}"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">announcement</i>Pending speakers</a> - {% if current_user.is_authenticated() and "admin" in current_user.roles %} + {% if current_user.is_authenticated and "admin" in current_user.roles %} <a class="mdl-navigation__link" href="{{ url_for("admin.index") }}"><i class="mdl-color-text--blue-grey-400 material-icons" role="presentation">computer</i>Administration</a> {% block additional_sidelinks %} <!-- put your additional sidelinks here --> diff --git a/templates/speech_index.html b/templates/speech_index.html index e4b70309af702b2c2adaa9f1e304a90455c38c15..7ae308a25f2e120cafc6c4d719ac3b0e79a9af0d 100644 --- a/templates/speech_index.html +++ b/templates/speech_index.html @@ -56,8 +56,8 @@ {% endfor %} </tbody> </table> - {% if current_user.is_authenticated() and "user" in current_user.roles %} - {{ render_form(add_form, action_url=url_for('.add', next=".index", topic=event_id), action_text="Add", title="Add Speaker to {}".format(event.name)) }} + {% if current_user.is_authenticated and "user" in current_user.roles %} + {{ render_form(add_form, action_url=url_for('.add', next=".index", event=event_id), action_text="Add", title="Add Speaker to {}".format(event.name)) }} {% endif %} {% endfor %} {% endblock %}