Further refinements for account recovery

diff --git a/www/css/blerg.css b/www/css/blerg.css
index 14dc591..66add67 100644 (file)
--- a/www/css/blerg.css
+++ b/www/css/blerg.css
@@ -167,11 +167,11 @@ h1, h2, h3 {
 }
 
 .blerg-main h2 {
-       margin: 40px 0 10px 0;
+       margin: 40px 0 17px 0;
 }
 
 .blerg-main h2:first-child {
-    margin: 0 0 10px 0;
+    margin: 0 0 17px 0;
 }
 
 .blerg-post {

diff --git a/www/jssrc/blerg/AccountCenter.js b/www/jssrc/blerg/AccountCenter.js
index 80db769..c3d4667 100644 (file)
--- a/www/jssrc/blerg/AccountCenter.js
+++ b/www/jssrc/blerg/AccountCenter.js
@@ -4,8 +4,8 @@ enyo.kind({
         {tag: 'h2', content: "Change Password"},
         {kind: "blerg.PasswdForm"},
         {tag: 'h2', content: "Generate recovery link"},
-        {content: "A recovery link is a URL that will allow you to reset the password on your account. Whoever has this link will be able to gain control of your account. This link should be kept in a safe place like an encrypted password manager or a physical piece of paper locked in a safe. The link will expire after one year or the next password change (either via a recovery link or by changing it manually above). To indicate that you understand this, please copy <code>blërg</code> into the textbox below.", tag: 'p', allowHtml: true},
-        {tag: 'p', components: [
+        {content: "A recovery link is a URL that will allow you to reset the password on your account at a later time. Whoever has this link will be able to gain control of your account. This link should be kept in a safe place like an encrypted password manager or a physical piece of paper locked in a safe. The link will expire after one year or the next password change (either via a recovery link or by changing it manually above). To indicate that you understand this, please copy <code>blërg</code> into the textbox below.", tag: 'p', allowHtml: true},
+        {tag: 'form', onsubmit: 'generateRecoveryLink', components: [
             {kind: 'onyx.InputDecorator', classes: "recovery", components: [
                 {kind: 'onyx.Input', name: "recoveryVerifier"}
             ]},

diff --git a/www/jssrc/blerg/Blerg.js b/www/jssrc/blerg/Blerg.js
index 4a95114..755067f 100644 (file)
--- a/www/jssrc/blerg/Blerg.js
+++ b/www/jssrc/blerg/Blerg.js
@@ -26,7 +26,6 @@ enyo.kind({
         ]},
         {name: "main", kind: "blerg.Main"},
         {name: "signupDialog", kind: "blerg.SignupDialog"},
-        {name: "passwdDialog", kind: "blerg.PasswdDialog"},
         {name: "api", kind: "blerg.API",
          onLoginSuccessful: "loginSuccessful",
          onLoginFailed: "loginFailed",
@@ -98,9 +97,6 @@ enyo.kind({
     sendReload: function() {
         this.$.main.waterfall('onReload');
     },
-    showChangePassword: function() {
-        this.$.passwdDialog.show();
-    },
     authFailure: function(inSender, inEvent) {
         this.logout();
     }

diff --git a/www/jssrc/blerg/Recovery.js b/www/jssrc/blerg/Recovery.js
index c3efbad..31401c7 100644 (file)
--- a/www/jssrc/blerg/Recovery.js
+++ b/www/jssrc/blerg/Recovery.js
@@ -2,9 +2,9 @@ enyo.kind({
     name: "blerg.Recovery",
     components: [
         {tag: 'h2', content: "Reset Your Password"},
-        {tag: 'p', components: [
+        {tag: 'form', onsubmit: 'submitRecovery', components: [
             {kind: 'onyx.InputDecorator', classes: "recovery", components: [
-                {kind: 'onyx.Input', name: "newPassword"}
+                {kind: 'onyx.Input', name: "newPassword", type: 'password'}
             ]},
             {kind: 'onyx.Button', content: "Set", onclick: "submitRecovery", classes: "recovery"}
         ]}