Commit 05f8ef6a authored by colmoneill's avatar colmoneill

Merge branch 'master' of gitlab.com:bemaker/eu.bemaker.flask

parents 92d6beb2 35f37209
......@@ -73,6 +73,7 @@ def inject_conf_var():
app.config['SECRET_KEY'] = 'super-secret'
app.config['SECURITY_REGISTERABLE'] = True
app.config['SECURITY_RECOVERABLE'] = True
app.config['SECURITY_CHANGEABLE'] = True
# app.config['SECURITY_TRACKABLE'] = True
app.config['SECURITY_PASSWORD_HASH'] = 'bcrypt'
......
......@@ -15,6 +15,7 @@ app = Flask(__name__)
app.config['SECRET_KEY'] = 'w^c4t&fp@9T28p*Q$CrhYE'
app.config['SECURITY_REGISTERABLE'] = True
app.config['SECURITY_RECOVERABLE'] = True
app.config['SECURITY_CHANGEABLE'] = True
# app.config['SECURITY_TRACKABLE'] = True
app.config['SECURITY_PASSWORD_HASH'] = 'bcrypt'
......
......@@ -247,6 +247,11 @@ body {
nav {
font-family: "hershey";
font-size: 18px;
position: fixed;
width: 100%;
background: white;
z-index: 1000;
box-shadow: 0 -3px 10px rgba(100, 100, 100, 0.2);
}
nav .logo {
width: 45px;
......@@ -259,6 +264,7 @@ nav .logo {
.pageWrap {
min-height: 100vh !important;
padding-top: 77px;
}
ul#menuMain li {
......@@ -365,13 +371,16 @@ ul#menuSecond li a:hover {
.cta {
text-align: center;
border-radius: 10%;
border-radius: 4%;
padding: 20px;
border: solid 2px #add8e6;
border: solid 1px #add8e6;
}
.cta img {
max-height: 80px;
}
.cta:hover i {
color: #17a2b8;
}
.cta .ico {
height: 100px;
}
......@@ -436,7 +445,7 @@ ul#menuSecond li a:hover {
top: 15px;
width: 20px;
height: 20px;
z-index: 1000;
z-index: 999;
left: 50%;
border-radius: 50%;
margin-left: -10px;
......@@ -493,6 +502,10 @@ ul#menuSecond li a:hover {
display: block;
}
.workshopList {
padding-top: 40px;
}
.workshopList ul {
list-style: none;
}
......
......@@ -250,6 +250,11 @@ body {
nav {
font-family: "hershey";
font-size: 18px;
position: fixed;
width: 100%;
background: white;
z-index: 1000;
box-shadow:0 -3px 10px rgba(100,100,100,0.2);
.logo {
width: 45px;
height: 45px;
......@@ -262,6 +267,7 @@ nav {
.pageWrap{
min-height: 100vh!important;
padding-top: 77px;
}
ul {
......@@ -374,12 +380,15 @@ ul {
.cta {
text-align: center;
border-radius: 10%;
border-radius: 4%;
padding: 20px;
border: solid 2px #add8e6;
border: solid 1px #add8e6;
img {
max-height: 80px;
}
&:hover i{
color:#17a2b8;
}
.ico {
height: 100px;
}
......@@ -443,7 +452,7 @@ ul {
top: 15px;
width: 20px;
height: 20px;
z-index: 1000;
z-index: 999;
left: 50%;
border-radius: 50%;
margin-left: -10px;
......@@ -511,7 +520,9 @@ ul {
}
.workshopList{
padding-top: 40px;
}
.workshopList ul {
list-style: none;
li {
......
......@@ -16,6 +16,7 @@
{% block nav %}
{% include 'menu.html'%}
{% endblock nav %}
<button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
<div class="pageWrap push">
{% block content %}
{% endblock content %}
......@@ -24,12 +25,32 @@
{% include 'footer.html' %}
{% endblock footer %}
<script>
// When the user scrolls down 20px from the top of the document, show the button
window.onscroll = function() {scrollFunction()};
function scrollFunction() {
if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
document.getElementById("myBtn").style.display = "block";
} else {
document.getElementById("myBtn").style.display = "none";
}
}
// When the user clicks on the button, scroll to the top of the document
function topFunction() {
document.body.scrollTop = 0;
document.documentElement.scrollTop = 0;
}
</script>
<script src="{{ url_for('static', filename='node_modules/jquery/dist/jquery.min.js')}}"></script>
<script src="{{ url_for('static', filename='node_modules/bootstrap/dist/js/bootstrap.min.js')}}"></script>
<script src="//cdn.jsdelivr.net/npm/vivus@latest/dist/vivus.min.js"></script>
<script src="{{ url_for('static', filename='js/bigSlide.min.js')}}"></script>
<script src="{{ url_for('static', filename='js/main.js')}}"></script>
</body>
......
......@@ -2,7 +2,7 @@
{% extends "base.html" %}
{% block content %}
<div class="container ">
<div class="container workshopList">
<h1 style="text-align:center;">Contact</h1>
<dir class="row no-gutters justify-content-md-center">
<div class=" col col-12 col-sm-12 col-md-8 col-lg-8">
......
......@@ -3,22 +3,22 @@
{% block content %}
<div class="container">
<h1>{{_("bonjour")}}{{current_user.first_name}}</h1>
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<ul class=flashes>
{% for category, message in messages %}
<div class="alert {{ category }} alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endfor %}
</ul>
{% endif %}
{% endwith %}
<div class="container workshopList">
<h1>{{_("bonjour")}} {{current_user.first_name}}</h1>
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<ul class=flashes>
{% for category, message in messages %}
<div class="alert {{ category }} alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endfor %}
</ul>
{% endif %}
{% endwith %}
......@@ -48,8 +48,11 @@
#}
</div>
</div>
</div>
<h2>{{_("options")}}</h2>
<a class="center" href="/change"><button type="button" class="btn btn-light">{{_('modifier le mot de passe')}}</button></a>
</div>
</div>
<style type="text/css">
......
......@@ -5,8 +5,8 @@
<div class="container workshopList">
{{page}}
<h1>{{_("LES ATELIERS")}}</h1>
<div class="spacer"></div>
<h1 class="center">{{_("LES ATELIERS")}}</h1>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
......@@ -16,7 +16,7 @@
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
{{page}}
<div class="spacer"></div>
<ul class="workshop">
......
......@@ -17,29 +17,11 @@
</div>
<div class="tutoWrapper">
<button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
<div class="tutoContent container">
<H1>{{_("LEARN")}}</H1>
{{page}}
</div>
</div>
<script>
// When the user scrolls down 20px from the top of the document, show the button
window.onscroll = function() {scrollFunction()};
function scrollFunction() {
if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
document.getElementById("myBtn").style.display = "block";
} else {
document.getElementById("myBtn").style.display = "none";
}
}
// When the user clicks on the button, scroll to the top of the document
function topFunction() {
document.body.scrollTop = 0;
document.documentElement.scrollTop = 0;
}
</script>
{% endblock %}
......@@ -6,15 +6,18 @@
<link href="//cdn-images.mailchimp.com/embedcode/horizontal-slim-10_7.css" rel="stylesheet" type="text/css">
<h4>{{_("inscrivez-vous a la newsletter BeMaker :")}}</h4>
<form action="https://bemaker.us17.list-manage.com/subscribe/post?u=cdd8dfbf90bd0195566431e2f&amp;id=e7e8df078e" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate form-group" target="_blank" novalidate>
<input type="email" value="" name="EMAIL" class="email form-control" id="mce-EMAIL" placeholder="newsletter" required>
<div class="spacer" style="height:10px;"></div>
<div style="position: absolute; left: -5000px;" aria-hidden="true">
<input type="text" name="b_cdd8dfbf90bd0195566431e2f_e7e8df078e" tabindex="-1" value=""></div>
<input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button form-control">
</form>
<!--End mc_embed_signup-->
<!-- Begin MailChimp Signup Form -->
<form action="https://bemaker.us17.list-manage.com/subscribe/post?u=cdd8dfbf90bd0195566431e2f&amp;id=e7e8df078e" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate form-group" target="_blank" novalidate>
<div id="mc_embed_signup_scroll">
<input type="email" value="" name="EMAIL" class="email form-control" id="mce-EMAIL" placeholder="{{_('email@domain.ext')}}" required>
<!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_cdd8dfbf90bd0195566431e2f_e7e8df078e" tabindex="-1" value=""></div>
<div class="clear" style="margin-top:10px"><input type="submit" value="{{_('inscription')}}" name="subscribe" id="mc-embedded-subscribe" class="button form-control"></div>
</div>
</form>
</div>
<div class=" col col-12 col-sm-12 col-md-6 col-lg-4">
......
......@@ -21,7 +21,7 @@
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="container">
<div class="spacer"></div>
<h2>{{_("VERSION ENG")}}</h2>
<h2>{{_("VERSION FR préhistoriques ")}}</h2>
<p>{{page}}</p>
......@@ -31,9 +31,10 @@
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 ">
<div class='cta'>
<div class="ico">
<i class="material-icons md-100">
public
</i>
exposure_plus_1
</i>
</div>
<h3>Inscription</h3>
<p>
......@@ -48,9 +49,10 @@
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 ">
<div class='cta'>
<div class="ico">
<i class="material-icons md-100">
local_bar
<i class="material-icons md-100">
public
</i>
</div>
<h3>Decouvrir</h3>
<p>
......@@ -65,9 +67,9 @@
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 ">
<div class='cta'>
<div class="ico">
<i class="material-icons md-100">
whatshot
</i>
<i class="material-icons md-100">
memory
</i>
</div>
<h3> Atelier </h3>
<p>
......
......@@ -2,7 +2,6 @@
{% block content %}
<div class="spacer"></div>
<div class="container workshopList ">
<div class="spacer"></div>
......
......@@ -5,6 +5,7 @@
<ul id="menuMain">
<li>
<div class="logo">
<a href="/" style="display: block;width:100%;height:100%"> </a>
</div>
</li>
<li class="item"><a href="/">{{_("a propos")}}</a><span class="deco"></span></li>
......
......@@ -2,13 +2,15 @@
{% from "security/_macros.html" import render_field_with_errors, render_field %}
{% block content %}
<div class="container workshopList">
{% include "security/_messages.html" %}
<h1>{{ _('Change password') }}</h1>
<form action="{{ url_for_security('change_password') }}" method="POST" name="change_password_form">
{{ change_password_form.hidden_tag() }}
{{ render_field_with_errors(change_password_form.password) }}
{{ render_field_with_errors(change_password_form.new_password) }}
{{ render_field_with_errors(change_password_form.new_password_confirm) }}
{{ render_field_with_errors(change_password_form.password, class ='form-control' ) }}
{{ render_field_with_errors(change_password_form.new_password , class ='form-control' ) }}
{{ render_field_with_errors(change_password_form.new_password_confirm , class ='form-control' ) }}
{{ render_field(change_password_form.submit) }}
</form>
</div>
{% endblock %}
......@@ -2,11 +2,13 @@
{% from "security/_macros.html" import render_field_with_errors, render_field %}
{% block content %}
<div class="container workshopList">
{% include "security/_messages.html" %}
<h1>{{ _('Send password reset instructions') }}</h1>
<h1 class="center">{{ _('Send password reset instructions') }}</h1>
<form action="{{ url_for_security('forgot_password') }}" method="POST" name="forgot_password_form">
{{ forgot_password_form.hidden_tag() }}
{{ render_field_with_errors(forgot_password_form.email) }}
{{ render_field(forgot_password_form.submit) }}
{{ render_field_with_errors(forgot_password_form.email , class ='form-control' ) }}
{{ render_field(forgot_password_form.submit , class ='form-control') }}
</form>
</div>
{% endblock %}
......@@ -4,12 +4,12 @@
{% block content %}
{% include "security/_messages.html" %}
<div class="container ">
<div class="container workshopList ">
<div class="row no-gutters justify-content-md-center align-items-center">
<div class="row no-gutters justify-content-md-center align-items-center ">
<div class=" col col-12 col-sm-8 col-md-4 col-lg-4 form-group">
<h1>{{ _('Login') }}</h1>
<h1 class="center">{{ _('Login') }}</h1>
<form action="{{ url_for_security('login') }}" method="POST" name="login_user_form" class="form form-horizontal" >
{{ login_user_form.hidden_tag() }}
......
......@@ -6,12 +6,12 @@
<div class="container ">
<div class="container workshopList ">
<div class="row no-gutters justify-content-md-center align-items-center">
<div class=" col col-12 col-sm-8 col-md-4 col-lg-4 form-group">
<h1>{{ _('Register') }}</h1>
<h1 class="center">{{ _('Register') }}</h1>
<form action="{{ url_for_security('register') }}" method="POST" name="register_user_form">
{{ register_user_form.hidden_tag() }}
{{ render_field_with_errors(register_user_form.first_name , class ='form-control') }}
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-07-19 11:49+0200\n"
"PO-Revision-Date: 2018-07-19 11:51+0200\n"
"POT-Creation-Date: 2018-07-23 14:45+0200\n"
"PO-Revision-Date: 2018-07-23 14:47+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: nl\n"
"Language-Team: nl <LL@li.org>\n"
......@@ -18,12 +18,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.6.0\n"
#: __init__.py:312
msgid " Felicitation vous avez le badge : "
#: __init__.py:324
msgid ""
"<i class='material-icons md-48'>sentiment_satisfied</i> Felicitation vous"
" avez le badge : "
msgstr ""
#: __init__.py:316
msgid "ohhh non tu n'as pas eu assez de bonne reponses !"
#: __init__.py:328
msgid ""
" <i class='material-icons md-48'>sentiment_dissatisfied</i> ohhh non tu "
"n'as pas eu assez de bonne reponses ! </br> "
msgstr ""
#: templates/check_quiz.html:32
......@@ -58,6 +62,10 @@ msgstr ""
msgid "TES BADGES"
msgstr ""
#: templates/dashboard.html:51
msgid "modifier le mot de passe"
msgstr ""
#: templates/error.html:10
msgid "page not found"
msgstr ""
......@@ -76,63 +84,59 @@ msgstr ""
msgid "par"
msgstr ""
#: templates/event.html:48 templates/home.html:170
#: templates/event.html:48 templates/home.html:177
msgid "inscription"
msgstr ""
#: templates/flatpage.html:22
msgid "LEARN"
msgstr ""
#: templates/footer.html:18
msgid "PARTENAIRES"
msgstr ""
#: templates/home.html:24
msgid "VERSION ENG"
msgstr ""
msgid "VERSION FR préhistoriques "
msgstr "DUTCH"
#: templates/home.html:88
#: templates/home.html:93
msgid "en savoir plus"
msgstr ""
#: templates/home.html:100 templates/menu.html:11 templates/menu.html:47
#: templates/home.html:106 templates/menu.html:12 templates/menu.html:47
msgid "apprendre"
msgstr ""
#: templates/home.html:135 templates/home.html:182
#: templates/home.html:141 templates/home.html:189
msgid "voir tout"
msgstr ""
#: templates/learn.html:9
#: templates/learn.html:8
msgid "Apprendre"
msgstr ""
#: templates/menu.html:10 templates/menu.html:46
#: templates/menu.html:11 templates/menu.html:46
msgid "a propos"
msgstr ""
#: templates/menu.html:12 templates/menu.html:48
#: templates/menu.html:13 templates/menu.html:48
msgid "evenements"
msgstr ""
#: templates/menu.html:13 templates/menu.html:49
#: templates/menu.html:14 templates/menu.html:49
msgid "contact"
msgstr ""
#: templates/menu.html:24 templates/menu.html:52
#: templates/menu.html:25 templates/menu.html:52
msgid "mon profil"
msgstr ""
#: templates/menu.html:25 templates/menu.html:53
#: templates/menu.html:26 templates/menu.html:53
msgid "deconnection"
msgstr ""
#: templates/quiz.html:18
#: templates/quiz.html:31
msgid "swwooooch"
msgstr ""
#: templates/quizzes.html:5
#: templates/quizzes.html:6
msgid "tout les questionnaires"
msgstr ""
......@@ -161,11 +165,11 @@ msgstr ""
msgid "Confirm account"
msgstr ""
#: templates/security/change_password.html:6
#: templates/security/change_password.html:7
msgid "Change password"
msgstr ""
#: templates/security/forgot_password.html:6
#: templates/security/forgot_password.html:7
msgid "Send password reset instructions"
msgstr ""
......@@ -227,4 +231,3 @@ msgstr ""
#: templates/security/email/welcome.html:4
msgid "You can confirm your email through the link below:"
msgstr ""
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment