Ability to log in from the main page

pull/1/head
yflory 8 years ago
parent 6652e9d6d9
commit e006ed7076

@ -25,21 +25,21 @@
<span class="slogan" data-localization="main_slogan"></span> <span class="slogan" data-localization="main_slogan"></span>
<span class="right"> <span class="right">
<a href="/about.html">About</a> <a href="/about.html" data-localization="about">About</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/privacy.html">Privacy</a> <a href="/privacy.html" data-localization="privacy">Privacy</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/terms.html">ToS</a> <a href="/terms.html" data-localization="terms">ToS</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/contact.html">Contact</a> <a href="/contact.html" data-localization="contact">Contact</a>
</span> </span>
</div> </div>
<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style> <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
<!-- Thanks! http://tholman.com/github-corners/ --> <!-- Thanks! http://tholman.com/github-corners/ -->
@ -61,7 +61,7 @@
<div id="main_other"> <div id="main_other">
<center> <center>
<h1>About</h1> <h1 data-localization="about">About</h1>
</center> </center>
<p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p> <p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p>

@ -25,21 +25,21 @@
<span class="slogan" data-localization="main_slogan"></span> <span class="slogan" data-localization="main_slogan"></span>
<span class="right"> <span class="right">
<a href="/about.html">About</a> <a href="/about.html" data-localization="about">About</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/privacy.html">Privacy</a> <a href="/privacy.html" data-localization="privacy">Privacy</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/terms.html">ToS</a> <a href="/terms.html" data-localization="terms">ToS</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/contact.html">Contact</a> <a href="/contact.html" data-localization="contact">Contact</a>
</span> </span>
</div> </div>
<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style> <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
<!-- Thanks! http://tholman.com/github-corners/ --> <!-- Thanks! http://tholman.com/github-corners/ -->
@ -61,7 +61,7 @@
<div id="main_other"> <div id="main_other">
<center> <center>
<h1 data-localization="contact_title">Contact</h1> <h1 data-localization="contact">Contact</h1>
</center> </center>
<p data-localization="main_about_p2"><!-- Contact us--></p> <p data-localization="main_about_p2"><!-- Contact us--></p>

@ -25,21 +25,21 @@
<span class="slogan" data-localization="main_slogan"></span> <span class="slogan" data-localization="main_slogan"></span>
<span class="right"> <span class="right">
<a href="/about.html">About</a> <a href="/about.html" data-localization="about">About</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/privacy.html">Privacy</a> <a href="/privacy.html" data-localization="privacy">Privacy</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/terms.html">ToS</a> <a href="/terms.html" data-localization="terms">ToS</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/contact.html">Contact</a> <a href="/contact.html" data-localization="contact">Contact</a>
</span> </span>
</div> </div>
<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style> <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
<!-- Thanks! http://tholman.com/github-corners/ --> <!-- Thanks! http://tholman.com/github-corners/ -->
@ -79,15 +79,15 @@
<h1>Join Us!</h1> <h1>Join Us!</h1>
</center> </center>
<label for="name" data-localization="form_username"></label><br> <label for="name" data-localization="form_username"></label><br>
<input type="text" id="name" data-localization-placeholder="login_username" autofocus><br> <input type="text" id="name" name="name" data-localization-placeholder="login_username" autofocus><br>
<label for="password" data-localization="form_password"></label><br> <label for="password" data-localization="form_password"></label><br>
<input type="password" id="password" data-localization-placeholder="login_password"><br> <input type="password" id="password" name="password" data-localization-placeholder="login_password"><br>
<input type="checkbox" checked="checked"><label for="rememberme" data-localization="login_remember"></label><br> <input type="checkbox" id="rememberme" checked="checked"><label for="rememberme" data-localization="login_remember"></label><br>
<br> <br>
<button class="create button half first">Log in</button> <button class="create button half">Register</button><br> <button class="create button login half first" data-localization="login_login"></button> <button class="create button register half" data-localization="login_register"></button><br>
<button class="create button">Continue without logging in</button> <button class="create button nologin" data-localization="login_nologin"></button>
</div> </div>
</div> </div>

@ -3,7 +3,7 @@
*/ */
.alertify-logs > * { .alertify-logs > * {
padding: 12px 48px; padding: 12px 48px;
color: #111; color: #fafafa;
font-weight: bold; font-weight: bold;
font-size: large; font-size: large;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.2); box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.2);
@ -18,7 +18,7 @@
} }
.alertify-logs > *.success { .alertify-logs > *.success {
background: #46E981; background: #46E981;
color: #ddd; color: #302B28;
} }
.alertify { .alertify {
position: fixed; position: fixed;
@ -79,8 +79,8 @@
} }
.alertify .dialog input:not(.form-control), .alertify .dialog input:not(.form-control),
.alertify .alert input:not(.form-control) { .alertify .alert input:not(.form-control) {
background-color: #ddd; background-color: #302B28;
color: #111; color: #fafafa;
border: 0px; border: 0px;
border-radius: 5px; border-radius: 5px;
margin-bottom: 15px; margin-bottom: 15px;
@ -112,8 +112,8 @@
font-size: 14px; font-size: 14px;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
color: #111; color: #fafafa;
border: 1px solid #ddd; border: 1px solid #302B28;
border-radius: 5px; border-radius: 5px;
} }
.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):hover, .alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):hover,
@ -124,7 +124,7 @@
} }
.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus, .alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus,
.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus { .alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus {
border: 1px dotted #ddd; border: 1px dotted #302B28;
} }
.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button)::-moz-focus-inner, .alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button)::-moz-focus-inner,
.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button)::-moz-focus-inner { .alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button)::-moz-focus-inner {
@ -210,7 +210,7 @@
height: 2.5em; height: 2.5em;
display: inline-block; display: inline-block;
width: 100%; width: 100%;
background: #ddd; background: #302B28;
border-top: 1px solid #444; border-top: 1px solid #444;
} }
.top-bar a, .top-bar a,
@ -226,7 +226,7 @@
display: block; display: block;
margin-left: 10px; margin-left: 10px;
padding-top: 3px; padding-top: 3px;
color: #111; color: #fafafa;
} }
.top-bar img, .top-bar img,
.bottom-bar img { .bottom-bar img {
@ -305,7 +305,7 @@
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 0px;
background: #ddd; background: #302B28;
text-align: center; text-align: center;
font-size: 1.5em; font-size: 1.5em;
} }
@ -450,8 +450,8 @@
html.cp, html.cp,
.cp body { .cp body {
font-size: .875em; font-size: .875em;
background-color: #ddd; background-color: #302B28;
color: #111; color: #fafafa;
font-family: Georgia,Cambria,serif; font-family: Georgia,Cambria,serif;
height: 100%; height: 100%;
} }
@ -460,6 +460,7 @@ html.cp,
top: 80px; top: 80px;
right: 0px; right: 0px;
display: inline-block; display: inline-block;
z-index: 2;
} }
.cp { .cp {
/* buttons */ /* buttons */
@ -475,7 +476,7 @@ html.cp,
} }
.cp a.github-corner > svg { .cp a.github-corner > svg {
fill: #00ADEE; fill: #00ADEE;
color: #ddd; color: #302B28;
} }
.cp .lato { .cp .lato {
font-family: lato, Helvetica, sans-serif; font-family: lato, Helvetica, sans-serif;
@ -487,7 +488,7 @@ html.cp,
.cp h4, .cp h4,
.cp h5, .cp h5,
.cp h6 { .cp h6 {
color: #111; color: #fafafa;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
-webkit-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1; -webkit-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;
-moz-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1; -moz-font-feature-settings: 'dlig' 1, 'liga' 1, 'lnum' 1, 'kern' 1;
@ -711,7 +712,7 @@ html.cp,
cursor: pointer; cursor: pointer;
} }
.cp tbody tr:nth-child(odd) { .cp tbody tr:nth-child(odd) {
background-color: #ffffff; background-color: #685d56;
} }
.cp tbody tr th:first-of-type { .cp tbody tr th:first-of-type {
border-left: 0px; border-left: 0px;
@ -722,7 +723,7 @@ html.cp,
} }
.cp tbody tr th, .cp tbody tr th,
.cp tbody tr td { .cp tbody tr td {
color: #111; color: #fafafa;
} }
.cp tbody tr th.remove, .cp tbody tr th.remove,
.cp tbody tr td.remove { .cp tbody tr td.remove {
@ -793,7 +794,7 @@ html.cp,
.cp form.realtime table tr td div.text-cell input[disabled], .cp form.realtime table tr td div.text-cell input[disabled],
.cp div.realtime table tr td div.text-cell input[disabled] { .cp div.realtime table tr td div.text-cell input[disabled] {
background-color: transparent; background-color: transparent;
color: #111; color: #fafafa;
font-weight: bold; font-weight: bold;
} }
.cp form.realtime table tr td.checkbox-cell, .cp form.realtime table tr td.checkbox-cell,
@ -828,7 +829,7 @@ html.cp,
.cp div.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover { .cp div.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover {
font-weight: bold; font-weight: bold;
background-color: #FF0073; background-color: #FF0073;
color: #ddd; color: #302B28;
display: block; display: block;
} }
.cp form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover:after, .cp form.realtime table tr td.checkbox-cell div.checkbox-contain input[type="checkbox"]:not(.editable) ~ .cover:after,
@ -858,13 +859,13 @@ html.cp,
.cp form.realtime table input[type="text"], .cp form.realtime table input[type="text"],
.cp div.realtime table input[type="text"] { .cp div.realtime table input[type="text"] {
height: auto; height: auto;
border: 1px solid #ddd; border: 1px solid #302B28;
width: 80%; width: 80%;
} }
.cp form.realtime table thead td, .cp form.realtime table thead td,
.cp div.realtime table thead td { .cp div.realtime table thead td {
padding: 0px 5px; padding: 0px 5px;
background: #f7f7f7; background: #4c443f;
border-radius: 20px 20px 0 0; border-radius: 20px 20px 0 0;
text-align: center; text-align: center;
} }
@ -881,7 +882,7 @@ html.cp,
} }
.cp form.realtime table tbody .text-cell, .cp form.realtime table tbody .text-cell,
.cp div.realtime table tbody .text-cell { .cp div.realtime table tbody .text-cell {
background: #f7f7f7; background: #4c443f;
} }
.cp form.realtime table tbody .text-cell input[type="text"], .cp form.realtime table tbody .text-cell input[type="text"],
.cp div.realtime table tbody .text-cell input[type="text"] { .cp div.realtime table tbody .text-cell input[type="text"] {
@ -914,7 +915,7 @@ html.cp,
.cp form.realtime table thead tr th input[type="text"][disabled], .cp form.realtime table thead tr th input[type="text"][disabled],
.cp div.realtime table thead tr th input[type="text"][disabled] { .cp div.realtime table thead tr th input[type="text"][disabled] {
background-color: transparent; background-color: transparent;
color: #111; color: #fafafa;
font-weight: bold; font-weight: bold;
} }
.cp form.realtime table thead tr th .remove, .cp form.realtime table thead tr th .remove,
@ -977,7 +978,7 @@ html.cp,
width: 100%; width: 100%;
height: 100vh; height: 100vh;
display: none; display: none;
background-color: #ddd; background-color: #302B28;
} }
.cp div.modal #content, .cp div.modal #content,
.cp div#modal #content { .cp div#modal #content {
@ -1068,7 +1069,7 @@ html.cp,
width: 80%; width: 80%;
height: 80%; height: 80%;
margin: auto; margin: auto;
border: 1px solid #ffffff; border: 1px solid #685d56;
text-align: center; text-align: center;
} }
.cp div.modal.shown, .cp div.modal.shown,
@ -1084,7 +1085,7 @@ html.cp,
.cp div#modal table input { .cp div#modal table input {
height: 100%; height: 100%;
width: 90%; width: 90%;
border: 3px solid #ddd; border: 3px solid #302B28;
} }
.cp div.modal table tfoot tr td, .cp div.modal table tfoot tr td,
.cp div#modal table tfoot tr td { .cp div#modal table tfoot tr td {

@ -156,10 +156,42 @@ define([
}); });
}; };
var addButtonHandlers = function () {
$('button.login').click(function (e) {
var username = $('#name').val();
var passwd = $('#password').val();
var remember = $('#rememberme').is(':checked');
sessionStorage.login_user = username;
sessionStorage.login_pass = passwd;
sessionStorage.login_rmb = remember;
sessionStorage.login = 1;
document.location.href = '/user';
});
$('button.register').click(function (e) {
var username = $('#name').val();
var passwd = $('#password').val();
var remember = $('#rememberme').is(':checked');
sessionStorage.login_user = username;
sessionStorage.login_pass = passwd;
sessionStorage.login_rmb = remember;
sessionStorage.register = 1;
document.location.href = '/user';
});
$('button.nologin').click(function (e) {
document.location.href = '/drive';
});
};
displayCreateButtons(); displayCreateButtons();
Cryptpad.ready(function () { //Cryptpad.ready(function () {
console.log("ready"); console.log("ready");
if (Cryptpad.isLoggedIn()) {
document.location.href = '/drive';
}
addButtonHandlers();
$table = $('table.scroll'); $table = $('table.scroll');
$tbody = $table.find('tbody'); $tbody = $table.find('tbody');
$tryit = $('#tryit'); $tryit = $('#tryit');
@ -167,6 +199,7 @@ define([
Cryptpad.styleAlerts(); Cryptpad.styleAlerts();
//refreshTable(); //refreshTable();
/*
if (Cryptpad.store && Cryptpad.store.change) { if (Cryptpad.store && Cryptpad.store.change) {
Cryptpad.store.change(function (data) { Cryptpad.store.change(function (data) {
if (data.key === 'CryptPad_RECENTPADS') { if (data.key === 'CryptPad_RECENTPADS') {
@ -174,6 +207,7 @@ define([
} }
}); });
} }
}); */
//});
}); });

@ -25,21 +25,21 @@
<span class="slogan" data-localization="main_slogan"></span> <span class="slogan" data-localization="main_slogan"></span>
<span class="right"> <span class="right">
<a href="/about.html">About</a> <a href="/about.html" data-localization="about">About</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/privacy.html">Privacy</a> <a href="/privacy.html" data-localization="privacy">Privacy</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/terms.html">ToS</a> <a href="/terms.html" data-localization="terms">ToS</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/contact.html">Contact</a> <a href="/contact.html" data-localization="contact">Contact</a>
</span> </span>
</div> </div>
<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style> <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
<!-- Thanks! http://tholman.com/github-corners/ --> <!-- Thanks! http://tholman.com/github-corners/ -->

@ -1,6 +1,6 @@
<div id="main_other"> <div id="main_other">
<center> <center>
<h1>About</h1> <h1 data-localization="about">About</h1>
</center> </center>
<p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p> <p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p>

@ -1,6 +1,6 @@
<div id="main_other"> <div id="main_other">
<center> <center>
<h1 data-localization="contact_title">Contact</h1> <h1 data-localization="contact">Contact</h1>
</center> </center>
<p data-localization="main_about_p2"><!-- Contact us--></p> <p data-localization="main_about_p2"><!-- Contact us--></p>

@ -1,3 +1,3 @@
<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style> <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
<!-- Thanks! http://tholman.com/github-corners/ --> <!-- Thanks! http://tholman.com/github-corners/ -->

@ -18,15 +18,15 @@
<h1>Join Us!</h1> <h1>Join Us!</h1>
</center> </center>
<label for="name" data-localization="form_username"></label><br> <label for="name" data-localization="form_username"></label><br>
<input type="text" id="name" data-localization-placeholder="login_username" autofocus><br> <input type="text" id="name" name="name" data-localization-placeholder="login_username" autofocus><br>
<label for="password" data-localization="form_password"></label><br> <label for="password" data-localization="form_password"></label><br>
<input type="password" id="password" data-localization-placeholder="login_password"><br> <input type="password" id="password" name="password" data-localization-placeholder="login_password"><br>
<input type="checkbox" checked="checked"><label for="rememberme" data-localization="login_remember"></label><br> <input type="checkbox" id="rememberme" checked="checked"><label for="rememberme" data-localization="login_remember"></label><br>
<br> <br>
<button class="create button half first">Log in</button> <button class="create button half">Register</button><br> <button class="create button login half first" data-localization="login_login"></button> <button class="create button register half" data-localization="login_register"></button><br>
<button class="create button">Continue without logging in</button> <button class="create button nologin" data-localization="login_nologin"></button>
</div> </div>
</div> </div>

@ -8,15 +8,15 @@
<span class="slogan" data-localization="main_slogan"></span> <span class="slogan" data-localization="main_slogan"></span>
<span class="right"> <span class="right">
<a href="/about.html">About</a> <a href="/about.html" data-localization="about">About</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/privacy.html">Privacy</a> <a href="/privacy.html" data-localization="privacy">Privacy</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/terms.html">ToS</a> <a href="/terms.html" data-localization="terms">ToS</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/contact.html">Contact</a> <a href="/contact.html" data-localization="contact">Contact</a>
</span> </span>
</div> </div>

@ -22,6 +22,7 @@ html.cp, .cp body {
top: 80px; top: 80px;
right: 0px; right: 0px;
display: inline-block; display: inline-block;
z-index: 2;
} }
} }

@ -1,7 +1,7 @@
@base: #ddd; @base: #302B28;
@light-base: lighten(@base, 20%); @light-base: lighten(@base, 20%);
@less-light-base: lighten(@base, 10%); @less-light-base: lighten(@base, 10%);
@fore: #111; @fore: #fafafa;
@cp-green: #46E981; @cp-green: #46E981;
@cp-accent: lighten(@cp-green, 20%); @cp-accent: lighten(@cp-green, 20%);

@ -25,21 +25,21 @@
<span class="slogan" data-localization="main_slogan"></span> <span class="slogan" data-localization="main_slogan"></span>
<span class="right"> <span class="right">
<a href="/about.html">About</a> <a href="/about.html" data-localization="about">About</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/privacy.html">Privacy</a> <a href="/privacy.html" data-localization="privacy">Privacy</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/terms.html">ToS</a> <a href="/terms.html" data-localization="terms">ToS</a>
</span> </span>
<span class="right"> <span class="right">
<a href="/contact.html">Contact</a> <a href="/contact.html" data-localization="contact">Contact</a>
</span> </span>
</div> </div>
<a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style> <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 80px; border: 0; left: 0; transform: scale(-1, 1);z-index:2;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
<!-- Thanks! http://tholman.com/github-corners/ --> <!-- Thanks! http://tholman.com/github-corners/ -->

@ -255,6 +255,14 @@ define(function () {
out.button_newpoll = 'NOUVEAU SONDAGE'; out.button_newpoll = 'NOUVEAU SONDAGE';
out.button_newslide = 'NOUVELLE PRÉSENTATION'; out.button_newslide = 'NOUVELLE PRÉSENTATION';
out.form_username = "Nom d'utilisateur";
out.form_password = "Mot de passe";
out.about = "À propos";
out.privacy = "Vie privée";
out.contact = "Contact";
out.terms = "Conditions";
// privacy.html // privacy.html
out.policy_title = 'Politique de confidentialité de Cryptpad'; out.policy_title = 'Politique de confidentialité de Cryptpad';

@ -238,6 +238,7 @@ define(function () {
// login // login
out.login_login = "log in"; out.login_login = "log in";
out.login_nologin = "use cryptpad without account";
out.login_register = "register"; out.login_register = "register";
out.logoutButton = "log out"; out.logoutButton = "log out";
@ -301,6 +302,11 @@ define(function () {
out.form_username = "Username"; out.form_username = "Username";
out.form_password = "Password"; out.form_password = "Password";
out.about = "About";
out.privacy = "Privacy";
out.contact = "Contact";
out.terms = "ToS";
// privacy.html // privacy.html
out.policy_title = 'Cryptpad Privacy Policy'; out.policy_title = 'Cryptpad Privacy Policy';

@ -101,6 +101,11 @@ define([
return hash; return hash;
}; };
var isLoggedIn = common.isLoggedIn = function () {
//return typeof getStore().getLoginName() === "string";
return typeof getUserHash() === "string";
};
// var isArray = function (o) { return Object.prototype.toString.call(o) === '[object Array]'; }; // var isArray = function (o) { return Object.prototype.toString.call(o) === '[object Array]'; };
var isArray = common.isArray = $.isArray; var isArray = common.isArray = $.isArray;

@ -287,7 +287,6 @@ define([
}; };
var rt = APP.rt = Listmap.create(config); var rt = APP.rt = Listmap.create(config);
rt.proxy.on('create', function (info) { rt.proxy.on('create', function (info) {
APP.realtime = info.realtime; APP.realtime = info.realtime;
}) })
@ -350,5 +349,21 @@ define([
}, 75); }, 75);
}); });
}); });
if (sessionStorage.login) {
$username.val(sessionStorage.login_user);
$password.val(sessionStorage.login_pass);
$remember.attr('checked', sessionStorage.login_rmb === "true");
$login.click();
}
if (sessionStorage.register) {
$username.val(sessionStorage.login_user);
$password.val(sessionStorage.login_pass);
$remember.attr('checked', sessionStorage.login_rmb === "true");
}
['login', 'register', 'login_user', 'login_pass', 'login_rmb'].forEach(function (k) {
delete sessionStorage[k];
});
}); });
}); });

Loading…
Cancel
Save