clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-31 11:27:34 +01:00
Code Issues Releases Wiki Activity

Improved lock and registration page UI

Browse Source
This commit is contained in:
Giulio Cesare Solaroli
2015-09-23 13:39:22 +02:00
parent 3891ffa476
commit 4218ba33bb
7 changed files with 257 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

310
frontend/delta/css/clipperz.css
View File

@@ -1329,10 +1329,10 @@ div.help {
z-index: 10; z-index: 10;
background-color: transparent; } background-color: transparent; }
#loginPage, #registrationPage { #loginPage, #registrationPage, #unlockPage {
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; } -webkit-overflow-scrolling: touch; }
#loginPage .content, #registrationPage .content { #loginPage .content, #registrationPage .content, #unlockPage .content {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -moz-flex; display: -moz-flex;
@@ -1345,14 +1345,14 @@ div.help {
-ms-flex-direction: column; -ms-flex-direction: column;
flex-direction: column; flex-direction: column;
height: 100%; } height: 100%; }
#loginPage .content .miscInfo, #registrationPage .content .miscInfo { #loginPage .content .miscInfo, #registrationPage .content .miscInfo, #unlockPage .content .miscInfo {
-webkit-box-flex: 0; -webkit-box-flex: 0;
-webkit-flex: 0; -webkit-flex: 0;
-moz-box-flex: 0; -moz-box-flex: 0;
-moz-flex: 0; -moz-flex: 0;
-ms-flex: 0; -ms-flex: 0;
flex: 0; } flex: 0; }
#loginPage .content header, #registrationPage .content header { #loginPage .content header, #registrationPage .content header, #unlockPage .content header {
-webkit-box-flex: auto; -webkit-box-flex: auto;
-webkit-flex: auto; -webkit-flex: auto;
-moz-box-flex: auto; -moz-box-flex: auto;
@@ -1363,15 +1363,10 @@ div.help {
display: -webkit-flex; display: -webkit-flex;
display: -moz-flex; display: -moz-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex; }
-webkit-box-align: end; #loginPage .content header .headerContent, #registrationPage .content header .headerContent, #unlockPage .content header .headerContent {
-ms-flex-align: end;
-webkit-align-items: flex-end;
-moz-align-items: flex-end;
align-items: flex-end; }
#loginPage .content header .headerContent, #registrationPage .content header .headerContent {
width: 100%; } width: 100%; }
#loginPage .content .body, #registrationPage .content .body { #loginPage .content .body, #registrationPage .content .body, #unlockPage .content .body {
-webkit-box-flex: auto; -webkit-box-flex: auto;
-webkit-flex: auto; -webkit-flex: auto;
-moz-box-flex: auto; -moz-box-flex: auto;
@@ -1382,16 +1377,11 @@ div.help {
display: -webkit-flex; display: -webkit-flex;
display: -moz-flex; display: -moz-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex; }
-webkit-box-align: center; #loginPage .content .body .bodyContent, #registrationPage .content .body .bodyContent, #unlockPage .content .body .bodyContent {
-ms-flex-align: center;
-webkit-align-items: center;
-moz-align-items: center;
align-items: center; }
#loginPage .content .body .bodyContent, #registrationPage .content .body .bodyContent {
margin-left: auto; margin-left: auto;
margin-right: auto; } margin-right: auto; }
#loginPage .content .other, #registrationPage .content .other { #loginPage .content .other, #registrationPage .content .other, #unlockPage .content .other {
-webkit-box-flex: auto; -webkit-box-flex: auto;
-webkit-flex: auto; -webkit-flex: auto;
-moz-box-flex: auto; -moz-box-flex: auto;
@@ -1408,9 +1398,9 @@ div.help {
-webkit-align-items: center; -webkit-align-items: center;
-moz-align-items: center; -moz-align-items: center;
align-items: center; } align-items: center; }
#loginPage .content .other .otherContent, #registrationPage .content .other .otherContent { #loginPage .content .other .otherContent, #registrationPage .content .other .otherContent, #unlockPage .content .other .otherContent {
width: 100%; } width: 100%; }
#loginPage .content footer, #registrationPage .content footer { #loginPage .content footer, #registrationPage .content footer, #unlockPage .content footer {
-webkit-box-flex: auto; -webkit-box-flex: auto;
-webkit-flex: auto; -webkit-flex: auto;
-moz-box-flex: auto; -moz-box-flex: auto;
@@ -1427,7 +1417,7 @@ div.help {
-webkit-align-items: flex-end; -webkit-align-items: flex-end;
-moz-align-items: flex-end; -moz-align-items: flex-end;
align-items: flex-end; } align-items: flex-end; }
#loginPage .content footer .footerContent, #registrationPage .content footer .footerContent { #loginPage .content footer .footerContent, #registrationPage .content footer .footerContent, #unlockPage .content footer .footerContent {
width: 100%; } width: 100%; }
.tagEditor { .tagEditor {
@@ -1560,7 +1550,15 @@ div.help {
color: black; color: black;
background-color: #ff9900; } background-color: #ff9900; }
#loginPage .content, #registrationPage .content { #unlockPage .content {
background-color: #ff9900; }
#unlockPage .content .body {
background-color: #ff9900; }
#unlockPage .content footer {
color: white;
background-color: black; }
#loginPage .content, #registrationPage .content, #unlockPage .content {
text-align: center; text-align: center;
/* /*
&.extra-short { &.extra-short {
@@ -1595,161 +1593,173 @@ div.help {
} }
} }
*/ } */ }
#loginPage .content header, #registrationPage .content header { #loginPage .content header, #registrationPage .content header, #unlockPage .content header {
-webkit-box-align: end;
-ms-flex-align: end;
-webkit-align-items: flex-end;
-moz-align-items: flex-end;
align-items: flex-end;
max-height: 15%; max-height: 15%;
min-height: 70px; min-height: 70px;
padding: 10px; padding: 10px;
color: white; } color: white; }
#loginPage .content header h3, #registrationPage .content header h3 { #loginPage .content header h3, #registrationPage .content header h3, #unlockPage .content header h3 {
font-weight: bold; font-weight: bold;
font-size: 38pt; } font-size: 38pt; }
#loginPage .content header h5, #registrationPage .content header h5 { #loginPage .content header h5, #registrationPage .content header h5, #unlockPage .content header h5 {
font-size: 16pt; } font-size: 16pt; }
#loginPage .content .body form, #registrationPage .content .body form { #loginPage .content .body, #registrationPage .content .body, #unlockPage .content .body {
position: relative; -webkit-box-align: start;
background: white; -ms-flex-align: start;
padding: 20px; -webkit-align-items: flex-start;
max-width: 400px; -moz-align-items: flex-start;
margin-left: auto; align-items: flex-start; }
margin-right: auto; } #loginPage .content .body form, #registrationPage .content .body form, #unlockPage .content .body form {
#loginPage .content .body form label, #registrationPage .content .body form label { position: relative;
display: none; } background: white;
#loginPage .content .body form input, #registrationPage .content .body form input { padding: 20px;
font-family: "clipperz-font"; max-width: 400px;
display: block; margin-left: auto;
padding: 5px; margin-right: auto; }
margin-top: 5px; #loginPage .content .body form label, #registrationPage .content .body form label, #unlockPage .content .body form label {
margin-bottom: 10px;
font-size: 100%;
font-size: 24pt;
width: 100%;
border: 1px solid #ccc;
border-radius: 0px; }
#loginPage .content .body form .steps, #registrationPage .content .body form .steps {
text-align: center; }
#loginPage .content .body form .steps .step, #registrationPage .content .body form .steps .step {
display: none; } display: none; }
#loginPage .content .body form .steps .step.center, #registrationPage .content .body form .steps .step.center { #loginPage .content .body form input, #registrationPage .content .body form input, #unlockPage .content .body form input {
display: block; } font-family: "clipperz-font";
#loginPage .content .body form .steps .step h1, #registrationPage .content .body form .steps .step h1 { display: block;
color: #268bd2; padding: 5px;
font-size: 24pt; margin-top: 5px;
font-weight: 700; margin-bottom: 10px;
margin: 0px; font-size: 100%;
padding-top: 15px; } font-size: 24pt;
#loginPage .content .body form .steps .step p, #registrationPage .content .body form .steps .step p { width: 100%;
color: #657b83; border: 1px solid #ccc;
font-size: 14pt; border-radius: 0px; }
font-weight: 100; #loginPage .content .body form .steps, #registrationPage .content .body form .steps, #unlockPage .content .body form .steps {
margin: 0px; text-align: center; }
padding: 5px 0px; } #loginPage .content .body form .steps .step, #registrationPage .content .body form .steps .step, #unlockPage .content .body form .steps .step {
#loginPage .content .body form .steps .step label, #registrationPage .content .body form .steps .step label {
display: none; } display: none; }
#loginPage .content .body form .steps .step input, #registrationPage .content .body form .steps .step input { #loginPage .content .body form .steps .step.center, #registrationPage .content .body form .steps .step.center, #unlockPage .content .body form .steps .step.center {
font-family: "clipperz-font"; display: block; }
display: block; #loginPage .content .body form .steps .step h1, #registrationPage .content .body form .steps .step h1, #unlockPage .content .body form .steps .step h1 {
padding: 5px; color: #268bd2;
margin-bottom: 10px; font-size: 24pt;
font-size: 100%; font-weight: 700;
font-size: 24pt; margin: 0px;
width: 100%; } padding-top: 15px; }
#loginPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock input, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock input { #loginPage .content .body form .steps .step p, #registrationPage .content .body form .steps .step p, #unlockPage .content .body form .steps .step p {
display: block; color: #657b83;
float: left; font-size: 14pt;
margin-top: 10px; font-weight: 100;
width: 30px; } margin: 0px;
#loginPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p { padding: 5px 0px; }
font-size: 12pt; #loginPage .content .body form .steps .step label, #registrationPage .content .body form .steps .step label, #unlockPage .content .body form .steps .step label {
font-weight: 500; display: none; }
display: block; #loginPage .content .body form .steps .step input, #registrationPage .content .body form .steps .step input, #unlockPage .content .body form .steps .step input {
text-align: left; font-family: "clipperz-font";
margin-left: 50px; display: block;
line-height: 1.5em; } padding: 5px;
#loginPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p a, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p a { margin-bottom: 10px;
color: #dc322f; } font-size: 100%;
#loginPage .content .body form .steps .step.TERMS_OF_SERVICE .stepIndex, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .stepIndex { font-size: 24pt;
margin-top: 10px; } width: 100%; }
#loginPage .content .body form .steps .step .stepBody, #registrationPage .content .body form .steps .step .stepBody { #loginPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock input, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock input, #unlockPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock input {
min-height: 140px; } display: block;
#loginPage .content .body form .steps .step .stepIndex, #registrationPage .content .body form .steps .step .stepIndex { float: left;
text-align: center; } margin-top: 10px;
#loginPage .content .body form .steps .step .stepIndex .stepIndexItem, #registrationPage .content .body form .steps .step .stepIndex .stepIndexItem { width: 30px; }
font-weight: 900; #loginPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p, #unlockPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p {
font-size: 28pt; font-size: 12pt;
display: inline; font-weight: 500;
color: lightgrey; } display: block;
#loginPage .content .body form .steps .step .stepIndex .stepIndexItem.center, #registrationPage .content .body form .steps .step .stepIndex .stepIndexItem.center { text-align: left;
color: gray; } margin-left: 50px;
#loginPage .content .body form .steps .step .buttons, #registrationPage .content .body form .steps .step .buttons { line-height: 1.5em;
text-align: center; cursor: pointer; }
margin-top: 10px; } #loginPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p a, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p a, #unlockPage .content .body form .steps .step.TERMS_OF_SERVICE .checkboxBlock p a {
#loginPage .content .body form .steps .step .buttons .button, #registrationPage .content .body form .steps .step .buttons .button { color: #dc322f; }
margin: 10px; #loginPage .content .body form .steps .step.TERMS_OF_SERVICE .stepIndex, #registrationPage .content .body form .steps .step.TERMS_OF_SERVICE .stepIndex, #unlockPage .content .body form .steps .step.TERMS_OF_SERVICE .stepIndex {
margin-top: 10px; }
#loginPage .content .body form .steps .step .stepBody, #registrationPage .content .body form .steps .step .stepBody, #unlockPage .content .body form .steps .step .stepBody {
min-height: 140px; }
#loginPage .content .body form .steps .step .stepIndex, #registrationPage .content .body form .steps .step .stepIndex, #unlockPage .content .body form .steps .step .stepIndex {
text-align: center; }
#loginPage .content .body form .steps .step .stepIndex .stepIndexItem, #registrationPage .content .body form .steps .step .stepIndex .stepIndexItem, #unlockPage .content .body form .steps .step .stepIndex .stepIndexItem {
font-weight: 900;
font-size: 28pt;
display: inline;
color: lightgrey; }
#loginPage .content .body form .steps .step .stepIndex .stepIndexItem.center, #registrationPage .content .body form .steps .step .stepIndex .stepIndexItem.center, #unlockPage .content .body form .steps .step .stepIndex .stepIndexItem.center {
color: gray; }
#loginPage .content .body form .steps .step .buttons, #registrationPage .content .body form .steps .step .buttons, #unlockPage .content .body form .steps .step .buttons {
text-align: center; text-align: center;
vertical-align: middle; margin-top: 10px; }
display: inline-block; #loginPage .content .body form .steps .step .buttons .button, #registrationPage .content .body form .steps .step .buttons .button, #unlockPage .content .body form .steps .step .buttons .button {
width: 80px; margin: 10px;
font-weight: 900; text-align: center;
line-height: 45px; vertical-align: middle;
font-size: 24px; } display: inline-block;
#loginPage .content .body form .steps .step .buttons .button.back, #registrationPage .content .body form .steps .step .buttons .button.back { width: 80px;
background-color: lightgrey; } font-weight: 900;
#loginPage .content .body form .steps .step .buttons .button.back.step_-1, #registrationPage .content .body form .steps .step .buttons .button.back.step_-1 { line-height: 45px;
visibility: hidden; } font-size: 24px; }
#loginPage .content .body form .steps .step .buttons .button.disabled, #registrationPage .content .body form .steps .step .buttons .button.disabled { #loginPage .content .body form .steps .step .buttons .button.back, #registrationPage .content .body form .steps .step .buttons .button.back, #unlockPage .content .body form .steps .step .buttons .button.back {
background-color: #c0c0c0; background-color: lightgrey; }
cursor: default; } #loginPage .content .body form .steps .step .buttons .button.back.step_-1, #registrationPage .content .body form .steps .step .buttons .button.back.step_-1, #unlockPage .content .body form .steps .step .buttons .button.back.step_-1 {
#loginPage .content .body form .steps .step .buttons .button.enabled, #registrationPage .content .body form .steps .step .buttons .button.enabled { visibility: hidden; }
background-color: #ff9900; } #loginPage .content .body form .steps .step .buttons .button.disabled, #registrationPage .content .body form .steps .step .buttons .button.disabled, #unlockPage .content .body form .steps .step .buttons .button.disabled {
#loginPage .content .body form button, #registrationPage .content .body form button { background-color: #c0c0c0;
font-family: "clipperz-font"; cursor: default; }
min-height: 48px; #loginPage .content .body form .steps .step .buttons .button.enabled, #registrationPage .content .body form .steps .step .buttons .button.enabled, #unlockPage .content .body form .steps .step .buttons .button.enabled {
min-width: 48px; background-color: #ff9900; }
color: white; #loginPage .content .body form button, #registrationPage .content .body form button, #unlockPage .content .body form button {
font-size: 24pt; font-family: "clipperz-font";
font-weight: 500; min-height: 48px;
border: 0px; min-width: 48px;
padding: 10px 25px; color: white;
border: 1px solid white; font-size: 24pt;
background-color: #ff9900; font-weight: 500;
-webkit-transition: background-color font-weight 0.2s linear; border: 0px;
-moz-transition: background-color font-weight 0.2s linear; padding: 10px 25px;
-o-transition: background-color font-weight 0.2s linear; border: 1px solid white;
-ms-transition: background-color font-weight 0.2s linear; background-color: #ff9900;
transition: background-color font-weight 0.2s linear; } -webkit-transition: background-color font-weight 0.2s linear;
#loginPage .content .body form button:disabled, #registrationPage .content .body form button:disabled { -moz-transition: background-color font-weight 0.2s linear;
font-weight: 100; -o-transition: background-color font-weight 0.2s linear;
background-color: #c0c0c0; -ms-transition: background-color font-weight 0.2s linear;
cursor: default; } transition: background-color font-weight 0.2s linear; }
#loginPage .content .other, #registrationPage .content .other { #loginPage .content .body form button:disabled, #registrationPage .content .body form button:disabled, #unlockPage .content .body form button:disabled {
font-weight: 100;
background-color: #c0c0c0;
cursor: default; }
#loginPage .content .other, #registrationPage .content .other, #unlockPage .content .other {
font-size: 24pt; font-size: 24pt;
padding: 20px; padding: 20px;
max-height: 20%; } max-height: 20%; }
#loginPage .content .other a, #registrationPage .content .other a { #loginPage .content .other a, #registrationPage .content .other a, #unlockPage .content .other a {
cursor: pointer; } cursor: pointer; }
#loginPage .content footer, #registrationPage .content footer { #loginPage .content footer, #registrationPage .content footer, #unlockPage .content footer {
max-height: 50px; } max-height: 50px; }
#loginPage .content footer .links ul, #registrationPage .content footer .links ul { #loginPage .content footer .links ul, #registrationPage .content footer .links ul, #unlockPage .content footer .links ul {
padding: 3px; padding: 3px;
padding-bottom: 6px; } padding-bottom: 6px; }
#loginPage .content footer .links ul li, #registrationPage .content footer .links ul li { #loginPage .content footer .links ul li, #registrationPage .content footer .links ul li, #unlockPage .content footer .links ul li {
display: inline-block; display: inline-block;
cursor: pointer; } cursor: pointer; }
#loginPage .content footer .links ul li:after, #registrationPage .content footer .links ul li:after { #loginPage .content footer .links ul li:after, #registrationPage .content footer .links ul li:after, #unlockPage .content footer .links ul li:after {
content: '-'; content: '-';
padding-left: 4px; padding-left: 4px;
padding-right: 4px; padding-right: 4px;
cursor: default; } cursor: default; }
#loginPage .content footer .links ul li:last-child:after, #registrationPage .content footer .links ul li:last-child:after { #loginPage .content footer .links ul li:last-child:after, #registrationPage .content footer .links ul li:last-child:after, #unlockPage .content footer .links ul li:last-child:after {
content: ''; content: '';
padding-left: 0px; padding-left: 0px;
padding-right: 0px; } padding-right: 0px; }
#loginPage .content footer .applicationVersion, #registrationPage .content footer .applicationVersion { #loginPage .content footer .applicationVersion, #registrationPage .content footer .applicationVersion, #unlockPage .content footer .applicationVersion {
padding: 2px; padding: 2px;
font-size: 8pt; } font-size: 8pt; }
#loginPage .content footer .applicationVersion span:after, #registrationPage .content footer .applicationVersion span:after { #loginPage .content footer .applicationVersion span:after, #registrationPage .content footer .applicationVersion span:after, #unlockPage .content footer .applicationVersion span:after {
content: ":"; } content: ":"; }
#loginPage .content footer .applicationVersion a, #registrationPage .content footer .applicationVersion a { #loginPage .content footer .applicationVersion a, #registrationPage .content footer .applicationVersion a, #unlockPage .content footer .applicationVersion a {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
padding-left: 5px; padding-left: 5px;

2
frontend/delta/css/clipperz.css.map
View File

File diff suppressed because one or more lines are too long

16
frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
View File

@@ -123,6 +123,14 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
} }
}, },
toggleCheckbox: function (aCheckboxRef, anEvent) {
var newState = {};
this.refs[aCheckboxRef].getDOMNode().checked = ! this.refs[aCheckboxRef].getDOMNode().checked;
newState[aCheckboxRef] = this.refs[aCheckboxRef].getDOMNode().checked;
this.setState(newState);
},
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
canMoveForward: function () { canMoveForward: function () {
@@ -154,7 +162,7 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
} else { } else {
newState[refName] = anEvent.target.value; newState[refName] = anEvent.target.value;
} }
this.setState(newState); this.setState(newState);
}, },
//========================================================================= //=========================================================================
@@ -191,14 +199,14 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
React.DOM.div({'key':'termsOfService_choice_1', 'className':'checkboxBlock'}, [ React.DOM.div({'key':'termsOfService_choice_1', 'className':'checkboxBlock'}, [
React.DOM.label({'key':'termsOfService_label_1', 'htmlFor':'no_password_recovery'}, "I understand that Clipperz is unable to recover a lost passphrase."), React.DOM.label({'key':'termsOfService_label_1', 'htmlFor':'no_password_recovery'}, "I understand that Clipperz is unable to recover a lost passphrase."),
React.DOM.input({'key':'no_password_recovery', 'type':'checkbox', 'name':'no_password_recovery', 'ref':'no_password_recovery', 'id':'no_password_recovery'}), React.DOM.input({'key':'no_password_recovery', 'type':'checkbox', 'name':'no_password_recovery', 'ref':'no_password_recovery', 'id':'no_password_recovery'}),
React.DOM.p({'key':'termsOfService_description_1'}, "I understand that Clipperz is unable to recover a lost passphrase.") React.DOM.p({'key':'termsOfService_description_1', 'onClick':MochiKit.Base.method(this, 'toggleCheckbox', 'no_password_recovery')}, "I understand that Clipperz is unable to recover a lost passphrase.")
]), ]),
React.DOM.div({'key':'termsOfService_choice_2', 'className':'checkboxBlock'}, [ React.DOM.div({'key':'termsOfService_choice_2', 'className':'checkboxBlock'}, [
React.DOM.label({'key':'termsOfService_label_2', 'htmlFor':'agree_terms_of_service'}, "I have read and agreed to the Terms of Service."), React.DOM.label({'key':'termsOfService_label_2', 'htmlFor':'agree_terms_of_service'}, "I have read and agreed to the Terms of Service."),
React.DOM.input({'key':'agree_terms_of_service', 'type':'checkbox', 'name':'agree_terms_of_service', 'ref':'agree_terms_of_service', 'id':'agree_terms_of_service'}), React.DOM.input({'key':'agree_terms_of_service', 'type':'checkbox', 'name':'agree_terms_of_service', 'ref':'agree_terms_of_service', 'id':'agree_terms_of_service'}),
React.DOM.p({'key':'termsOfService_description_2'}, [ React.DOM.p({'key':'termsOfService_description_2'}, [
React.DOM.span({'key':'termsOfService_description_2_p1'}, "I have read and agreed to the "), React.DOM.span({'key':'termsOfService_description_2_p1', 'onClick':MochiKit.Base.method(this, 'toggleCheckbox', 'agree_terms_of_service')}, "I have read and agreed to the "),
React.DOM.a({'key':'termsOfService_description_2_p2', 'href':'https://clipperz.com/terms_service/', target:'_blank'}, "Terms of Service.") React.DOM.a({'key':'termsOfService_description_2_p2', 'onClick':this.showUrl('/terms_service/')}, "Terms of Service.")
]) ])
]) ])
]); ]);

145
frontend/delta/js/Clipperz/PM/UI/Components/Pages/UnlockPage.js
View File

@@ -27,20 +27,11 @@ Clipperz.Base.module('Clipperz.PM.UI.Components.Pages');
Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({ Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
propTypes: { propTypes: {
mode: React.PropTypes.oneOf(['CREDENTIALS','PIN']).isRequired, username: React.PropTypes.string.isRequired,
// isNewUserRegistrationAvailable: React.PropTypes.bool.isRequired, mode: React.PropTypes.oneOf(['CREDENTIALS','PIN']).isRequired,
disabled: React.PropTypes.bool.isRequired disabled: React.PropTypes.bool.isRequired,
}, },
/*
getDefaultProps: function () {
return {
mode: 'CREDENTIALS',
isNewUserRegistrationAvailable: false,
disabled: false,
// template: Clipperz.PM.UI.Components.PageTemplate
}
},
*/
getInitialState: function () { getInitialState: function () {
return { return {
passphrase: '', passphrase: '',
@@ -55,35 +46,16 @@ Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
newState['passphrase'] = anEvent.target.value; newState['passphrase'] = anEvent.target.value;
this.setState(newState); this.setState(newState);
}, },
// pollForChanges: function() {
// if (this.props.mode == 'CREDENTIALS') {
// var newState;
// var usernameValue = this.refs['username'].getDOMNode().value;
// var passphraseValue = this.refs['passphrase'].getDOMNode().value;
// newState = {};
// newState['username'] = (usernameValue) ? usernameValue : "";
// newState['passphrase'] = (passphraseValue) ? passphraseValue : "";
// this.setState(newState);
// }
// },
//========================================================================= //=========================================================================
handlePassphraseSubmit: function (event) { handlePassphraseSubmit: function (event) {
event.preventDefault(); event.preventDefault();
this.refs['passphrase'].getDOMNode().blur(); this.refs['passphrase'].getDOMNode().blur();
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'unlock', this.refs['passphrase'].getDOMNode().value); MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'unlock', this.refs['passphrase'].getDOMNode().value);
}, },
resetUnlockForm: function() { resetUnlockForm: function() {
@@ -93,50 +65,6 @@ Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
shouldEnableUnlockButton: function () {
var result;
return (
(this.state['passphrase'] != '')
||
(this.state['pin'] != '')
)
&&
!this.props['disabled'];
},
unlockForm: function () {
return React.DOM.form({'key':'form', 'className':'unlockForm credentials', 'autoComplete':'off', 'autoCorrect':'off', 'autoCapitalize':'off', 'onChange':this.handleChange, 'onSubmit':this.handlePassphraseSubmit}, [
React.DOM.div({'key':'fields'},[
React.DOM.label({'key':'passphrase-label', 'htmlFor' :'passphrase'}, "passphrase"),
React.DOM.input({'key':'passphrase', 'type':'password', 'name':'passphrase', 'ref':'passphrase', 'placeholder':"passphrase"})
]),
React.DOM.button({'key':'button', 'type':'submit', 'disabled':!this.shouldEnableUnlockButton(), 'className':'button'}, "unlock")
]);
},
// handlePINSubmit: function (event) {
// event.preventDefault();
// this.refs['pin'].getDOMNode().blur();
// var credentials = {
// pin: this.refs['pin'].getDOMNode().value
// }
// MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'doLogin', credentials);
// },
// pinForm: function () {
// return React.DOM.form({'className':'pinForm pin', 'autoComplete':'off', 'onChange':this.handleChange, 'onSubmit':this.handlePINSubmit}, [
// React.DOM.div({'key':'pinFormDiv'},[
// React.DOM.label({'for':'pin'}, "pin"),
// React.DOM.input({'type':'text', 'name':'pin', 'ref':'pin', placeholder:"PIN", 'key':'pin', 'autocapitalize':'none'})
// ]),
// React.DOM.button({'key':'submitButton', 'type':'submit', 'disabled':this.props.disabled, 'className':'button'}, "login")
// ]);
// },
setInitialFocus: function () { setInitialFocus: function () {
if (this.props.mode == 'PIN') { if (this.props.mode == 'PIN') {
this.refs['pin'].getDOMNode().select(); this.refs['pin'].getDOMNode().select();
@@ -145,26 +73,63 @@ Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
} }
}, },
// showUrl: function (anUrl) { showUrl: function (anUrl) {
// return function () { return function () {
// window.open(anUrl, 'clipperz_about'); window.open(anUrl, 'clipperz_about');
// } }
// }, },
loginForm: function () {
return React.DOM.form({'key':'form', 'className':'loginForm credentials', 'autoComplete':'off', 'autoCorrect':'off', 'autoCapitalize':'off', 'onChange':this.handleChange, 'onSubmit':this.handlePassphraseSubmit}, [
React.DOM.div({'key':'fields'},[
React.DOM.label({'key':'username-label', 'htmlFor' :'name'}, "username"),
React.DOM.input({'key':'username', 'type':'text', 'name':'name', 'ref':'username', 'placeholder':"username", 'autoComplete':'off', 'autoCorrect':'off', 'autoCapitalize':'off', 'spellCheck': false, 'value':this.props['username'], 'disabled':true}),
React.DOM.label({'key':'passphrase-label', 'htmlFor' :'passphrase'}, "passphrase"),
React.DOM.input({'key':'passphrase', 'type':'password', 'name':'passphrase', 'ref':'passphrase', 'placeholder':"passphrase"})
]),
React.DOM.button({'key':'button', 'type':'submit', 'disabled':!this.shouldEnableUnlockButton(), 'className':'button'}, "unlock")
]);
},
shouldEnableUnlockButton: function () {
var result;
return (
(this.state['passphrase'] != '')
||
(this.state['pin'] != '')
)
&&
!this.props['disabled'];
},
render: function() { render: function() {
//console.log("LOGIN PAGE", this.props); return React.DOM.div({'key':'unlockForm', 'className':'unlockForm content ' + this.props['style']}, [
return React.DOM.div({'key':'unlockForm', 'className':'unlockForm ' + this.props['style']}, [
Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['proxyInfo'])), Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['proxyInfo'])),
React.DOM.header({'key':'header'}, [ React.DOM.header({'key':'header'}, [
React.DOM.h3({}, 'Type your passphrase to unlock'), React.DOM.div({'className':'headerContent'}, [
React.DOM.h3({}, 'clipperz'),
React.DOM.h5({}, 'keep it to yourself'),
]),
]), ]),
React.DOM.div({'key':'formWrapper', 'className':'form'}, [ React.DOM.div({'key':'formWrapper', 'className':'form body'}, [
this.props.mode == 'PIN' ? this.pinForm() : this.unlockForm(), React.DOM.div({'className':'bodyContent'}, [
this.props.mode == 'PIN' ? this.pinForm() : this.loginForm(),
]),
]), ]),
React.DOM.footer({'key':'footer'}, [ React.DOM.footer({'key':'footer'}, [
React.DOM.div({'key':'applicationVersion', 'className':'applicationVersion'}, [ React.DOM.div({'className':'footerContent'}, [
React.DOM.span({'key':'applicationVersionLabel'}, "application version"), React.DOM.div({'key':'links', 'className':'links'}, [
React.DOM.a({'key':'applicationVersionLink', 'href':'https://github.com/clipperz/password-manager/commit/' + Clipperz_version, 'target':'github'}, Clipperz_version) React.DOM.ul({}, [
React.DOM.li({'key':'about', 'onClick':this.showUrl('/about/')}, "About"),
React.DOM.li({'key':'terms', 'onClick':this.showUrl('/terms_service/')}, "Terms of service"),
React.DOM.li({'key':'privacy', 'onClick':this.showUrl('/privacy_policy/')}, "Privacy"),
])
]),
React.DOM.div({'key':'applicationVersion', 'className':'applicationVersion'}, [
React.DOM.span({'key':'applicationVersionLabel'}, "application version"),
React.DOM.a({'key':'applicationVersionLink', 'href':'https://github.com/clipperz/password-manager/commit/' + Clipperz_version, 'target':'github'}, Clipperz_version)
])
]) ])
]) ])
]); ]);

9
frontend/delta/js/Clipperz/PM/UI/MainController.js
View File

@@ -402,6 +402,7 @@ Clipperz.log("THE BROWSER IS OFFLINE");
deferredResult.addMethod(this, 'moveOutPage', this.currentPage(), 'unlockPage'); deferredResult.addMethod(this, 'moveOutPage', this.currentPage(), 'unlockPage');
deferredResult.addMethod(this.user(), 'lock'); deferredResult.addMethod(this.user(), 'lock');
deferredResult.addMethod(this, 'deleteCleanTextData'); deferredResult.addMethod(this, 'deleteCleanTextData');
deferredResult.addMethod(this.pages()['unlockPage'], 'setProps', {'username': this.user().username()});
deferredResult.addMethod(this.pages()['unlockPage'], 'setInitialFocus'); deferredResult.addMethod(this.pages()['unlockPage'], 'setInitialFocus');
deferredResult.addCallback(MochiKit.Async.callLater, 1, MochiKit.Base.method(this.pages()['mainPage'], 'replaceProps', {'locked': true})); deferredResult.addCallback(MochiKit.Async.callLater, 1, MochiKit.Base.method(this.pages()['mainPage'], 'replaceProps', {'locked': true}));
@@ -415,7 +416,9 @@ Clipperz.log("THE BROWSER IS OFFLINE");
var user = this.user(); var user = this.user();
var unlockPage = this.pages()['unlockPage']; var unlockPage = this.pages()['unlockPage'];
var overlay = this.overlay();
overlay.show("validating…");
deferredResult = new Clipperz.Async.Deferred('MainController.unlock_handler', {trace:false}); deferredResult = new Clipperz.Async.Deferred('MainController.unlock_handler', {trace:false});
deferredResult.addMethod(unlockPage, 'setProps', {'disabled': true}); deferredResult.addMethod(unlockPage, 'setProps', {'disabled': true});
@@ -430,6 +433,7 @@ Clipperz.log("THE BROWSER IS OFFLINE");
innerDeferredResult.addMethodcaller('deleteAllCleanTextData'); innerDeferredResult.addMethodcaller('deleteAllCleanTextData');
innerDeferredResult.addMethod(unlockPage, 'setProps', {'disabled': false}); innerDeferredResult.addMethod(unlockPage, 'setProps', {'disabled': false});
innerDeferredResult.addMethod(unlockPage, 'setInitialFocus'); innerDeferredResult.addMethod(unlockPage, 'setInitialFocus');
innerDeferredResult.addMethod(overlay, 'failed', "", 1);
innerDeferredResult.addCallback(MochiKit.Async.fail, aValue); innerDeferredResult.addCallback(MochiKit.Async.fail, aValue);
innerDeferredResult.callback(); innerDeferredResult.callback();
@@ -442,6 +446,7 @@ Clipperz.log("THE BROWSER IS OFFLINE");
deferredResult.addMethod(unlockPage, 'resetUnlockForm'); // #ASK ? deferredResult.addMethod(unlockPage, 'resetUnlockForm'); // #ASK ?
// deferredResult.addMethod(this, 'resetLockTimeout'); // deferredResult.addMethod(this, 'resetLockTimeout');
deferredResult.addCallback(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'enableLock'); deferredResult.addCallback(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'enableLock');
deferredResult.addMethod(overlay, 'done', "", 0.5);
deferredResult.callback(); deferredResult.callback();
@@ -1103,11 +1108,11 @@ Clipperz.log("THE BROWSER IS OFFLINE");
//......................................................................... //.........................................................................
userInfo: function () { userInfo: function () {
var result; var result;
result = {}; result = {};
result['checkPassphraseCallback'] = MochiKit.Base.bind(this.checkPassphrase,this); result['checkPassphraseCallback'] = MochiKit.Base.bind(this.checkPassphrase, this);
if (this.user() != null) { if (this.user() != null) {
result['username'] = this.user().username(); result['username'] = this.user().username();
} }

4
frontend/delta/scss/core/layout.scss
View File

@@ -617,7 +617,7 @@ div.help {
} }
#loginPage, #registrationPage { #loginPage, #registrationPage, #unlockPage {
@include overflow-auto; @include overflow-auto;
.content { .content {
@@ -637,7 +637,6 @@ div.help {
// background-color: yellow; // background-color: yellow;
@include flexbox(); @include flexbox();
@include align-items(flex-end);
.headerContent { .headerContent {
width: 100%; width: 100%;
} }
@@ -648,7 +647,6 @@ div.help {
// background-color: green; // background-color: green;
@include flexbox(); @include flexbox();
@include align-items(center);
.bodyContent { .bodyContent {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;

22
frontend/delta/scss/style/loginPage.scss
View File

@@ -73,15 +73,31 @@ refer to http://www.clipperz.com.
} }
} }
#unlockPage {
.content {
background-color: $main-color;
.body {
background-color: $main-color;
}
footer {
color: $main-alternate-text-color;
background-color: $main-alternate-color;
}
}
}
//============================================================== //==============================================================
#loginPage, #registrationPage { #loginPage, #registrationPage, #unlockPage {
.content { .content {
text-align: center; text-align: center;
// background-color: $main-color; // background-color: $main-color;
header { header {
@include align-items(flex-end);
max-height: 15%; max-height: 15%;
min-height: 70px; min-height: 70px;
padding: 10px; padding: 10px;
@@ -98,6 +114,9 @@ refer to http://www.clipperz.com.
} }
.body { .body {
// @include align-items(center);
@include align-items(flex-start);
form { form {
position: relative; position: relative;
background: $main-alternate-text-color; background: $main-alternate-text-color;
@@ -189,6 +208,7 @@ refer to http://www.clipperz.com.
text-align: left; text-align: left;
margin-left: 50px; margin-left: 50px;
line-height: 1.5em; line-height: 1.5em;
cursor: pointer;
a { a {
color: $solarize-Accent-Red; color: $solarize-Accent-Red;