Commit 81b5be0e authored by Romain Loth's avatar Romain Loth

more informative user messages + separate privacy page with CNIL information

parent 5c0cb309
......@@ -182,7 +182,7 @@
<center>
<a href="about.html"><i class="icon-question-sign"></i> About</a> -
<a href="http://moma.csregistry.org/feedback" target="BLANK"><i class="icon-repeat"></i> Feedback</a> -
<a href="privacy.html"> <i class="icon-list-alt"></i> Privacy</a><br/>
<a href="about/privacy"> <i class="icon-list-alt"></i> Privacy</a><br/>
Directory maintained by the <a href="http://cssociety.org" target="blank">Complex Systems Society</a> and the <a href="http://iscpif.fr" target="blank">Complex Systems Institute of Paris Ile-de-France</a>.<br/>
<a href="http://cssociety.org" target="_BLANK"><img src="static/img/css.png" alt="http://cssociety.org" style="border: none; margin-bottom : -6px;" title="isc-pif" height="25px" /></a> <a href="http://iscpif.fr"><img src="static/css/branding/iscpif_short.png" alt="iscpif.fr" style="border: none; margin-bottom : -6px;" title="isc-pif" /></a>
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/" target="blank"><img alt="Creative Commons License" style="border: none; margin-bottom : -6px;" src="static/img/cc.png" height="20px"/></a> - <a href="http://moma.csregistry.org" target="_BLANK"> MOMA</a> - <a href="http://iscpif.fr" target="_BLANK">ISC-PIF</a> - <a href="http://www.cnrs.fr/fr/recherche/index.htm" target="_BLANK">CNRS</a>.
......
......@@ -380,7 +380,7 @@ $content .= '</div>
<center>
<a href="/about.html"><span class="glyphicon glyphicon-question-sign"></span> About</a> -
<!-- <a href="http://moma.csregistry.org/feedback" target="BLANK"><span class="glyphicon glyphicon-repeat"></span> Feedback</a> - -->
<a href="/privacy.html"> <span class="glyphicon glyphicon-list-alt"></span> Privacy</a>
<a href="/about/privacy"> <span class="glyphicon glyphicon-list-alt"></span> Privacy</a>
<br>
Directory maintained by the <a href="http://iscpif.fr/" target="blank">Complex Systems Institute of Paris Ile-de-France</a> (<a href="http://www.cnrs.fr/fr/recherche/index.htm" target="_BLANK">CNRS</a> UPS 3611) in partnership with the <a href="http://cssociety.org/" target="blank"> Complex Systems Society</a>.
<br>
......
......@@ -209,7 +209,7 @@ $content .= '</div>
<center>
<a href="/about.html"><span class="glyphicon glyphicon-question-sign"></span> About</a> -
<!-- <a href="http://moma.csregistry.org/feedback" target="BLANK"><span class="glyphicon glyphicon-repeat"></span> Feedback</a> - -->
<a href="/privacy.html"> <span class="glyphicon glyphicon-list-alt"></span> Privacy</a>
<a href="/about/privacy"> <span class="glyphicon glyphicon-list-alt"></span> Privacy</a>
<br>
Directory maintained by the <a href="http://iscpif.fr/" target="blank">Complex Systems Institute of Paris Ile-de-France</a> (<a href="http://www.cnrs.fr/fr/recherche/index.htm" target="_BLANK">CNRS</a> UPS 3611) in partnership with the <a href="http://cssociety.org/" target="blank"> Complex Systems Society</a>.
<br>
......
......@@ -550,11 +550,19 @@ def claim_profile():
return render_template(
"message.html",
message = """
This is not the correct link. If you're trying to register to an old profile, please simply click on the link in the email you received.
<p><b>This activation link has already been used !</b></p>
<p>If you just created a new password for an archived profile:
</p>
<ol>
<li>go and click the validation link in your <b>confirmation email</b></li>
<li>then come back here to <span class='link-like' onclick="cmxClt.elts.box.toggleBox('auth_modal')">login</span></li>
</ol>
<br/>
<br/>
Otherwise you can simply register via <span class='code'><a href="%s">%s</a></span>
""" % (url_for('register'),url_for('register'))
<p>
Otherwise you can also register a completely new account via <span class='code'><a href="%(register_url)s">%(register_url)s</a></span>
</p>
""" % { 'register_url': url_for('register') }
)
# claim success
......@@ -622,13 +630,16 @@ def claim_profile():
return render_template(
"message.html",
message = "Your new login credentials are saved. To complete your registration, just click the link in the confirmation email you should receive."
message = """
<p>Your new login credentials are saved. To complete your registration:</p>
<ol>
<li>go check your mailbox and click the link in your <b>confirmation email</b></li>
<li>then come back here to <span class='link-like' onclick="cmxClt.elts.box.toggleBox('auth_modal')">login</span></li> to your old profile with your new credentials.
</ol>
"""
)
# /services/user/register/
@app.route(config['PREFIX'] + config['USR_ROUTE'] + '/register/', methods=['GET','POST'])
def register():
......@@ -706,6 +717,16 @@ def register():
""" % {'luid': luid })
# any static pages with topbar are set in /about prefix
# /about/privacy
@app.route('/about/privacy')
def show_privacy():
return render_template("privacy.html")
########### SUBS ###########
def save_form(clean_records, update_flag=False, previous_user_info=None):
"""
......
......@@ -20,6 +20,7 @@ body {
font-size: 12px;
}
.comex-nav-item {
vertical-align: middle;
line-height: 2em;
......@@ -47,6 +48,18 @@ body {
color: #fff;
}
/* for buttons/divs/spans looking like links */
.link-like {
cursor: pointer;
color: #337ab7;
text-decoration: none;
font-weight: bold;
}
.link-like {
color: #23527c;
text-decoration: underline;
}
/* main content for all new pages */
div.my-box {
padding:0 20px;
......@@ -69,7 +82,7 @@ div.my-box {
padding: 5px 15px;
}
/* for intro text */
/* paragraph, for intro text */
.mini-hero {
margin-top: 5px;
font-size: 16px;
......@@ -83,6 +96,14 @@ div.my-box {
line-height: 110%;
}
/* div, for message main text */
.message-hero {
margin-top: 28px;
font-size: 18px;
line-height: 25px;
}
#cnil_warning {
/*text-align: center;*/
}
......@@ -91,7 +112,6 @@ div.my-box {
}
/* self-made modals */
.modal.self-made {
top:25%;
......@@ -298,7 +318,6 @@ div.ccsection-footer {
}
/* "carte de visite" */
.our-vcard {
line-height: 110%;
......@@ -339,6 +358,11 @@ div.ccsection-footer {
height: 15em;
}
/* spacer columns tend to block what's underneath when hidden-foo-down */
.spacer {
z-index: -1;
}
footer {
line-height: 1.1em;
font-size: .9em;
......
......@@ -83,11 +83,11 @@ button.clean-btn
.cartouche {
border: .4em dotted #988 ;
border: .2em dotted #988 ;
border-radius: 2em;
padding: 1em 3em;
text-align: center;
max-width: 57em;
max-width: 40em;
}
/* ex: profile overview in readonly */
......
......@@ -40,7 +40,7 @@ function setupSavedItems(uinfo) {
var chosenV = uinfo[colName]
var tgtElt = document.getElementById(colName)
if (tgtElt && chosenV != null) {
if (tgtElt && (chosenV != null)) {
// d <=> convert to YY/MM/DD from iso string YYYY-MM-DD
if (colType == 'd') {
// console.log('setting date', colName, 'with', chosenV)
......@@ -77,7 +77,7 @@ function setupSavedItems(uinfo) {
}
}
else {
console.warn("setupSavedItems: couldn't find element: "+colName)
// console.warn("setupSavedItems: couldn't find element: "+colName)
}
}
}
......@@ -152,7 +152,7 @@ function miniregValidate(self) {
function showMessageAndSubmit() {
returnForm.elMainMessage.style.display = "block"
returnForm.elMainMessage.innerHTML = "Registering with ISCPIF Doors and sending validation email..."
returnForm.elMainMessage.innerHTML = "Registering with ISCPIF Doors<br/> and sending validation email..."
returnForm.elForm.submit()
}
......
......@@ -71,7 +71,7 @@ function testAsYouGo() {
var teamCityDivStyle = document.getElementById('team_city_div').style
function registerDoorsAndSubmit(){
regfo.elMainMessage.innerHTML = "Registering with ISCPIF Doors..."
regfo.elMainMessage.innerHTML = "Registering with ISCPIF Doors<br/> and sending validation email..."
// REGISTERING ON THE DOORS -------------------------------------
// all values from the form have now been validated
......
......@@ -124,6 +124,13 @@ cmxClt = (function(cC) {
auForm.elPass.onchange = auForm.elPass.onkeyup
auForm.elPass2.onkeyup = auForm.elPass.onkeyup
auForm.elPass2.onchange = auForm.elPass.onkeyup
// another form submit() overload to prevent double registrations
auForm.elForm.normalSubmitAction = auForm.elForm.submit
auForm.elForm.submit = function() {
auForm.elSubmitBtn.disabled = true
auForm.elForm.normalSubmitAction()
}
}
// 3) for captcha
......@@ -575,7 +582,8 @@ cmxClt = (function(cC) {
type: 'POST',
success: function(data) {
console.log('response data', data)
// console.log('response data', data)
if (typeof data != 'undefined'
&& apiAction == 'userExists') {
// userExists success case: it's all in the message :)
......
......@@ -205,7 +205,7 @@
<center>
<a href="/about.html"><span class="glyphicon glyphicon-question-sign"></span> About</a> -
<!-- <a href="http://moma.csregistry.org/feedback" target="BLANK"><span class="glyphicon glyphicon-repeat"></span> Feedback</a> - -->
<a href="/privacy.html"> <span class="glyphicon glyphicon-list-alt"></span> Privacy</a>
<a href="/about/privacy"> <span class="glyphicon glyphicon-list-alt"></span> Privacy</a>
<br>
Directory maintained by the <a href="http://iscpif.fr/" target="blank">Complex Systems Institute of Paris Ile-de-France</a> (<a href="http://www.cnrs.fr/fr/recherche/index.htm" target="_BLANK">CNRS</a> UPS 3611) in partnership with the <a href="http://cssociety.org/" target="blank"> Complex Systems Society</a>.
<br>
......
......@@ -587,7 +587,7 @@
</div>
</div>
<div class="spacer col-lg-2 col-md-1 hidden-sm-down">&nbsp;</div>
<div class="spacer col-lg-1 hidden-md-down">&nbsp;</div>
</div>
......@@ -596,39 +596,6 @@
<p id="main_message" class="legend"></p>
</div>
<!-- CNIL WARNING -->
<div class="row">
<div class="spacer col-lg-1 hidden-md-down">&nbsp;</div>
<div class="col-lg-9 col-md-11 col-sm-12">
<h2 class="cat"> About your data </h2>
<div class="cartouche" id="cnil_warning">
<p>Les informations recueillies à partir de ce formulaire font l’objet d’un traitement
informatique destiné à: </p>
<p><strong>communityexplorer.org</strong></p>
<p>Pour la ou les finalité(s) suivante(s) : </p>
<p><strong>
Modélisation de la communauté des chercheurs
<br />
Diffusion de l'information dans la communauté
</strong></p>
<p>Le ou les destinataire(s) des données sont :</p>
<p><strong>ISC-PIF (CNRS / UPS 3611)</strong></p>
<p>Conformément à la <a href="https://www.cnil.fr/fr/loi-78-17-du-6-janvier-1978-modifiee">
loi « informatique et libertés » du 6 janvier 1978 modifiée</a>,
vous disposez d’un <a href="https://www.cnil.fr/fr/le-droit-dacces">droit d’accès</a>
et <a href="https://www.cnil.fr/fr/le-droit-de-rectification">de rectification</a>
aux informations qui vous concernent.<!-- , en vous adressant à :</p>
<p class="rtecenter"><strong>todo@iscpif.fr</strong></p> -->
<p>Vous pouvez également, pour des motifs légitimes,
<a href="https://www.cnil.fr/fr/le-droit-dopposition">vous opposer au traitement
des données vous concernant</a>. Pour en savoir plus, <a href="https://www.cnil.fr/fr/comprendre-vos-droits">
consultez vos droits sur le site de la CNIL</a>.
</p>
</div>
</div>
<div class="spacer col-lg-2 col-md-1 hidden-sm-down">&nbsp;</div>
</div>
{% endblock %}
<!-- ======================================================================= -->
......
......@@ -15,9 +15,9 @@
<div class="col-sm-8 col-md-8">
<div id="intro">
<h2 class="oldstyle">Message</h2>
<p class="mini-hero">
<div class="message-hero">
{{ message | safe }}
</p>
</div>
</div>
</div>
<div class="spacer col-sm-2 col-md-2">&nbsp;</div>
......
{% extends "base_layout.html" %}
{% block headers %}
<title>Community Explorer Message</title>
<meta name="description" content="Community Explorer User Information Message">
<meta name="keywords" content="information page, complex systems, community">
{% endblock %}
<!-- ======================================================================= -->
{% block main_content %}
<!-- CNIL WARNING -->
<div class="row">
<div class="spacer col-lg-1 hidden-md-down">&nbsp;</div>
<div class="col-lg-9 col-md-11 col-sm-12">
<h2 class="cat"> About your data </h2>
<div class="message-hero">
<p>Personal data is given on a voluntary basis and people are responsible for the validity and integrity of the data displayed in their profile. We reserve the right to remove any profile that is out of the scope of complex system science and complexity science or does not comply with the rules of conduct. In particular, advertising is not allowed.</p>
<p>For privacy reasons, scholars have to explicitly acknowledge in their profile that they agree to make their personal data public for inclusion in the interactive directories of the Community Explorer.</p>
<p>Personal data will not be used for other purposes than scientific information through the complex systems institute, its hosted scientific web sites and its directories. If displayed in a directory, information about e-mail will always have spam protections. However, our current policy is not to display e-mails in any online media.</p>
<p>At anytime, registered people can modify or remove their personal data on their <a href='/services/user/profile'>profile page</a>.</p>
</div>
<br/>
<h2 class="cat"> About your rights in french law </h2>
<div class="cartouche" id="cnil_warning">
<p>Les informations recueillies à partir de ce formulaire font l’objet d’un traitement
informatique destiné à: </p>
<p><strong>communityexplorer.org</strong></p>
<p>Pour la ou les finalité(s) suivante(s) : </p>
<p><strong>
Modélisation de la communauté des chercheurs
<br />
Diffusion de l'information dans la communauté
</strong></p>
<p>Le ou les destinataire(s) des données sont :</p>
<p><strong>ISC-PIF (CNRS / UPS 3611)</strong></p>
<p>Conformément à la <a href="https://www.cnil.fr/fr/loi-78-17-du-6-janvier-1978-modifiee">
loi « informatique et libertés » du 6 janvier 1978 modifiée</a>,
vous disposez d’un <a href="https://www.cnil.fr/fr/le-droit-dacces">droit d’accès</a>
et <a href="https://www.cnil.fr/fr/le-droit-de-rectification">de rectification</a>
aux informations qui vous concernent via:</p>
<p><a href='/services/user/profile'><b>Votre page Profil</b></a></p>
<p>Vous pouvez également, pour des motifs légitimes,
<a href="https://www.cnil.fr/fr/le-droit-dopposition">vous opposer au traitement des données vous concernant</a>. Pour en savoir plus, <a href="https://www.cnil.fr/fr/comprendre-vos-droits">
consultez vos droits sur le site de la CNIL</a>.
</p>
</div>
</div>
<div class="spacer col-lg-1 hidden-md-down">&nbsp;</div>
</div>
{% endblock %}
......@@ -637,11 +637,10 @@
loi « informatique et libertés » du 6 janvier 1978 modifiée</a>,
vous disposez d’un <a href="https://www.cnil.fr/fr/le-droit-dacces">droit d’accès</a>
et <a href="https://www.cnil.fr/fr/le-droit-de-rectification">de rectification</a>
aux informations qui vous concernent, en vous adressant à :</p>
<p class="rtecenter"><strong>todo@iscpif.fr</strong></p>
aux informations qui vous concernent via:</p>
<p><a href='/services/user/profile'><b>Votre page Profil</b></a></p>
<p>Vous pouvez également, pour des motifs légitimes,
<a href="https://www.cnil.fr/fr/le-droit-dopposition">vous opposer au traitement
des données vous concernant</a>. Pour en savoir plus, <a href="https://www.cnil.fr/fr/comprendre-vos-droits">
<a href="https://www.cnil.fr/fr/le-droit-dopposition">vous opposer au traitement des données vous concernant</a>. Pour en savoir plus, <a href="https://www.cnil.fr/fr/comprendre-vos-droits">
consultez vos droits sur le site de la CNIL</a>.
</p>
</div>
......
......@@ -203,7 +203,7 @@
<center>
<a href="about.html"><i class="icon-question-sign"></i> About</a> -
<a href="http://moma.csregistry.org/feedback" target="BLANK"><i class="icon-repeat"></i> Feedback</a> -
<a href="privacy.html"> <i class="icon-list-alt"></i> Privacy</a><br/>
<a href="/about/privacy"> <i class="icon-list-alt"></i> Privacy</a><br/>
Directory maintained by the <a href="http://cssociety.org" target="blank">Complex Systems Society</a> and the <a href="http://iscpif.fr" target="blank">Complex Systems Institute of Paris Ile-de-France</a>.<br/>
<a href="http://cssociety.org" target="_BLANK"><img src="img/css.png" alt="http://cssociety.org" style="border: none; margin-bottom : -6px;" title="isc-pif" height="25px" /></a> <a href="http://iscpif.fr"><img src="css/branding/iscpif_short.png" alt="iscpif.fr" style="border: none; margin-bottom : -6px;" title="isc-pif" /></a>
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/" target="blank"><img alt="Creative Commons License" style="border: none; margin-bottom : -6px;" src="img/cc.png" height="20px"/></a> - <a href="http://moma.csregistry.org" target="_BLANK"> MOMA</a> - <a href="http://iscpif.fr" target="_BLANK">ISC-PIF</a> - <a href="http://www.cnrs.fr/fr/recherche/index.htm" target="_BLANK">CNRS</a>.
......
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