Start page spelling fixes and more

canvas/css/canvas.css

@@ -126,6 +126,9 @@ a.logo img {
     min-width: 80%;
     margin-left: 3.5em;
 }
+.form-header .user-profile li:hover {
+    background-color: #ffffff;
+}
 .form-header .user-profile img {
     width: 2.6em;
     margin-right: 0.5em;
@@ -141,7 +144,6 @@ a.logo img {
 }
 .form-header .user-profile button:hover {
     padding: 0.2em;
-    background-color: #ffffff;
 }
 
 /* Bootstrap dropdown classes */

canvas/php/dashboard.php

@@ -69,7 +69,7 @@
                    <div class="row ">
                      <div class="user-canvases-intro text-center col-md-6 col-md-offset-3 ">
                         <h2 >Your canvases</h2>
-                        <p> The Canvases that you create are shown here</p>
+                        <p>The Canvases that you have created are displayed here.</p>
                      </div>
                     </div>
                      <div class="row user-canvas-gallery">

css/landing.css

@@ -26,8 +26,8 @@ pre {
 }
 
 /* ------------------------------
-          HEADR
- ------------------------------ */
+HEADR
+------------------------------ */
 
 .header, footer {
 
@@ -65,8 +65,8 @@ a.logo img {
 }
 
 /* ------------------------------
-          CAROUSEL
- ------------------------------ */
+CAROUSEL
+------------------------------ */
 
 .slider-area {
     /*prevent horizontal scrolling*/
@@ -121,8 +121,8 @@ a.logo img {
 }
 
 /* ------------------------------
-     CONTENT: HOW IT WORKS
- ------------------------------ */
+CONTENT: HOW IT WORKS
+------------------------------ */
 
 .how-it-works {
     margin-bottom: 3em;
@@ -140,8 +140,8 @@ a.logo img {
 }
 
 /* ------------------------------------
-     CONTENT: ABOUT THE ETHICS CANVAS
- -------------------------------------- */
+CONTENT: ABOUT THE ETHICS CANVAS
+-------------------------------------- */
 
 .about-ethics-canvas {
     margin-bottom: 1em;
@@ -159,36 +159,36 @@ a.logo img {
 }
 
 .chalky-canvas img{
-width:60%;
-border-radius: 5px;
+    width:60%;
+    border-radius: 5px;
 
 
 }
 .chalky-canvas{
-margin:1em auto;
+    margin:1em auto;
 
 }
 
 /* ------------------------------------
-     CONTENT: MEET THE TEAM
- -------------------------------------- */
+CONTENT: MEET THE TEAM
+-------------------------------------- */
 
 .meet-the-team {
 
-  padding: 2.5em 0;
+    padding: 2.5em 0;
 }
 .team-member.col-md-4{
-background-color: rgba(255, 255, 255, 0.45);
-margin:1%;
-width:30%;
-border-radius: 10px;
-min-height:65em;
+    background-color: rgba(255, 255, 255, 0.45);
+    margin:1%;
+    width:30%;
+    border-radius: 10px;
+    min-height:65em;
 }
 /*Tell the parent to clear it's children*/
 .meet-the-team div:after {
-content: "";
-display: table;
-clear: both;
+    content: "";
+    display: table;
+    clear: both;
 
 }
 
@@ -200,17 +200,17 @@ clear: both;
 
 }
 .meet-the-team p.team-intro {
-margin-bottom: 3em;
+    margin-bottom: 3em;
 }
 .meet-the-team p.member-role{
-  margin-bottom: 0;
-  text-align:center;
-  padding-bottom: 0;
-  }
+    margin-bottom: 0;
+    text-align:center;
+    padding-bottom: 0;
+}
 .meet-the-team p.member-contact {
-  margin-bottom: 0;
-  text-align:center;
-  padding-bottom: 1em;
+    margin-bottom: 0;
+    text-align:center;
+    padding-bottom: 1em;
 }
 
 .meet-the-team h2 {
@@ -233,7 +233,7 @@ margin-bottom: 3em;
 }
 
 .team-member.killian h3,
- .team-member.killian .member-contact{
+.team-member.killian .member-contact{
     color:#606eb2;
 }
 
@@ -265,22 +265,22 @@ a.adapt {
 }
 
 /* ------------------------------
-     CONTENT: OUR VALUES
- ------------------------------ */
+CONTENT: OUR VALUES
+------------------------------ */
 
 .our-values {
     margin-bottom: 3em;
     padding: 1.5em;
 }
 .our-values div{
-min-height:47em;
+    min-height:47em;
 }
 .our-values div.col-md-3{
-background-color: rgba(255, 255, 255, 0.45);
-margin:1%;
-width:23%;
-padding-top:1em;
-border-radius: 10px;
+    background-color: rgba(255, 255, 255, 0.45);
+    margin:1%;
+    width:23%;
+    padding-top:1em;
+    border-radius: 10px;
 }
 
 .our-values img {
@@ -314,8 +314,8 @@ border-radius: 10px;
     color: #80BF63;
 }
 /* ------------------------------
-     CONTENT: OUR PARTNERS
- ------------------------------ */
+CONTENT: OUR PARTNERS
+------------------------------ */
 
 .our-partners {
     margin-bottom: 3em;
@@ -324,15 +324,15 @@ border-radius: 10px;
 .our-partners div{
     min-height:26em;
 }
-.our-partners  div.col-md-3{
-background-color: rgba(255, 255, 255, 0.45);
-margin:1%;
-width:23%;
-padding-top:1em;
-border-radius: 10px;
+.our-partners div.col-md-3{
+    background-color: rgba(255, 255, 255, 0.45);
+    margin:1%;
+    width:23%;
+    padding-top:1em;
+    border-radius: 10px;
 }
 .our-partners a{
-  text-decoration: none;
+    text-decoration: none;
 }
 .our-partners  img {
     display: block;
@@ -354,14 +354,14 @@ border-radius: 10px;
     text-align: center;
 }
 /* ------------------------------
-    USER AREA FORMS
-  (try, sign-up, download)
- ------------------------------ */
-
+USER AREA FORMS
+(try, sign-up, download)
+------------------------------ */
+/*  ååå */
 form.sign-up-form p, form.log-in-form p,
 form.reset-password-form p {
     margin: 0 auto;
-    padding: 0.6em 0.6em 0.3em 0.6em;
+    padding: 0.3em 0.6em 0.3em 0.6em;
 }
 form.sign-up-form label, form.log-in-form label,
 form.reset-password-form label {
@@ -372,6 +372,7 @@ form.sign-up-form input, form.log-in-form input,
 form.reset-password-form input {
     width: 90%;
     padding: 0.6em;
+    margin-bottom: 0.6em;
     border: none;
     border-radius: 10px;
     background-color: rgba(84, 110, 122, 0.2);
@@ -383,17 +384,17 @@ form.reset-password-form input:focus {
 }
 /*FORGOT PASSWORD*/
 .forgot-password a{
-  color:#15af97;
-  display:block;
-  padding:1em;
-  margin:0 0 1em 1em;
+    color:#15af97;
+    display:block;
+    padding:1em;
+    margin:0 0 1em 1em;
 
 }
 /* ---------------------------------------
-     USER AREA GENERAL SETTINGS OF
-     BOTTONS & LINKS
-     (try, sign-up, download)
- ----------------------------------------- */
+USER AREA GENERAL SETTINGS OF
+BOTTONS & LINKS
+(try, sign-up, download)
+----------------------------------------- */
 
 .btn {
     color: #fff;
@@ -418,9 +419,9 @@ form.reset-password-form input:focus {
     -ms-transform: rotate(5deg); /* IE 9 */
     -ms-transform-origin: 51% top; /* IE 9 */
     -webkit-transform: rotate(5deg); /* Chrome, Safari, Opera */
-  -webkit-transform-origin: 51% top; /* Chrome, Safari, Opera */
-       transform: rotate(5deg);
-        transform-origin: 51% top;
+    -webkit-transform-origin: 51% top; /* Chrome, Safari, Opera */
+    transform: rotate(5deg);
+    transform-origin: 51% top;
 }
 .user-area h2 {
     color: #444;
@@ -498,7 +499,7 @@ button.btn.log-in {
 }
 /* ---- #Reset password ---- */
 button.reset-password{
-  background-image: url('../icon/Reset-password-Btn.svg');
+    background-image: url('../icon/Reset-password-Btn.svg');
 }
 
 /* ---- #Download pdf ---- */
@@ -514,8 +515,8 @@ button.reset-password{
 }
 
 /* -------------
-     TAB NAV
- --------------*/
+TAB NAV
+--------------*/
 
 .nav-tabs {
     width: 85%;
@@ -547,7 +548,7 @@ button.reset-password{
 /*No need to show the pill/tab*/
 /*we show the pill content when we click on "Forgot your password link under the log  in area"*/
 .nav-tabs li#forgot-password-pill{
-  display:none;
+    display:none;
 }
 
 /* The tab pills area*/
@@ -570,36 +571,36 @@ button.reset-password{
 }
 
 /*-------------------------------
-    FORM HANDLING MESSAGES
+FORM HANDLING MESSAGES
 ---------------------------------*/
 /* Dymanically added class by jQuery*/
 /*activating email fails, shown in the page header
 after the user is redirected to the page*/
 .failed-activation,
 .success-activation {
-margin:3em auto 1.6em auto;
+    margin:3em auto 1.6em auto;
 
 }
 .failed-activation p,
 .success-activation p
 {
-  color: #759BCF;
+    color: #759BCF;
 
 }
 .failed-activation a,
 .success-activation a{
-  text-decoration:none;
-  color: #9dc963;
+    text-decoration:none;
+    color: #9dc963;
 
 }
 /* email activation successful*/
 .success-activation a{
- border:1px solid #9dc963;
- border-radius: 3px;
- display:block;
- padding:1em;
- width:50%;
- margin:0.75em auto;
+    border:1px solid #9dc963;
+    border-radius: 3px;
+    display:block;
+    padding:1em;
+    width:50%;
+    margin:0.75em auto;
 
 }
 
@@ -612,7 +613,7 @@ margin:3em auto 1.6em auto;
     border-radius: 10px;
     height: 1.55em;
     width: 80%;
-    margin: 0 0 0.5em 1.5em;
+    margin: -0.25em 0 1em 1.5em;
     padding-left: 1em;
 }
 
@@ -653,33 +654,33 @@ margin:3em auto 1.6em auto;
 .success-feedback p{
     color: #aed581;
     padding: 0.75em;
-      margin-bottom: 0;
+    margin-bottom: 0;
 }
 
 /*the button to resend the activation email, on top of the form
- when trying to log in with an unactivated email*/
+when trying to log in with an unactivated email*/
 button.resend-activation {
-  border:1px solid #fff;
-  color:#fff;
-  background-color:transparent;
-  margin:0 auto 1em 1em;
-  border-radius: 5px;
+    border:1px solid #fff;
+    color:#fff;
+    background-color:transparent;
+    margin:0 auto 1em 1em;
+    border-radius: 5px;
 }
 button.resend-activation:active,
- button.resend-activation:focus{
-  outline:none;
+button.resend-activation:focus{
+    outline:none;
 }
 button.resend-activation:hover{
-  border:1px solid #fff;
-  color:#fff;
-  background-color:transparent;
+    border:1px solid #fff;
+    color:#fff;
+    background-color:transparent;
 }
 /* ------------------------------
-        Footer
- ------------------------------ */
+Footer
+------------------------------ */
 
 footer {
-font-size:1em;
+    font-size:1em;
 
     margin-top: 2em;
     padding: 1.5em;
@@ -690,17 +691,17 @@ footer p{
     color: white;
 }
 footer .contact p{
-  color: #18AE90;
+    color: #18AE90;
 }
 footer .contact h2{
-  color:#6bb5b4;
+    color:#6bb5b4;
 }
 footer .license a{
-  color:#759BCF;
+    color:#759BCF;
 }
 
 footer .license {
-  margin:0.5em auto 1.8em auto;
+    margin:0.5em auto 1.8em auto;
 }
 
 footer p.ethics-copy.terms,
@@ -714,115 +715,115 @@ footer p.ethics-copy.privacy
 
 }
 footer p.cc{
-  margin-top:2.8em ;
+    margin-top:2.8em ;
 }
 footer p.terms,
 footer p.privacy{
-  margin:1.9em auto;
+    margin:1.9em auto;
 }
 footer .privacy a{
-  color:#a67de0;
+    color:#a67de0;
 }
 footer .terms a{
-  color:#aed581;
+    color:#aed581;
 }
 /*footer license icons */
 footer .license-icons ul{
-  list-style-type: none;
-  margin-left: 0;
-  padding-left: 0;
+    list-style-type: none;
+    margin-left: 0;
+    padding-left: 0;
 }
 footer .license-icons li{
-  display:inline-block;
-  margin: 1.2em 0.2em;
+    display:inline-block;
+    margin: 1.2em 0.2em;
 }
 footer .license-icons ul img{
-  width:3.5em;
+    width:3.5em;
 
 }
 /* ------------------------------
-         ADAPT Colors
- ------------------------------ */
+ADAPT Colors
+------------------------------ */
 
 
 /*
 .bg--blue {
-    background-color: #7297ce;
-      color: #759BCF;
+background-color: #7297ce;
+color: #759BCF;
 }
 .bg--darkblue {
-    background-color: #7986cb;
+background-color: #7986cb;
 
 }
 .bg--green {
-    color:#80BF63;
-    background-color: #aed581;
-    background-color: #9dc963;
+color:#80BF63;
+background-color: #aed581;
+background-color: #9dc963;
 }
 .bg--seagreen {
-    background-color: #6bb5b4;
+background-color: #6bb5b4;
 }
 .bg--purple {
-    background-color: #59358c;
-    color:#7E67A7;
-    background-color: #8f68c5;
+background-color: #59358c;
+color:#7E67A7;
+background-color: #8f68c5;
 }
 .bg--green1 {
-     color:#18AE90;
-    background-color: #15af97;
+color:#18AE90;
+background-color: #15af97;
 }
 .bg--violet {
-    background-color: #ce93d8;
+background-color: #ce93d8;
 }
 .bg--mineral {
-    background-color: #607d8b;
+background-color: #607d8b;
 }
 .bg--roasted {
-    background-color: #F7B36B;
-    color: #ffca99;
+background-color: #F7B36B;
+color: #ffca99;
 }F7B36B
 */
 
 /* ------------------------------
-    NEW PASSWORD in reset.html
- ------------------------------ */
+NEW PASSWORD in reset.html
+------------------------------ */
 .new-password{
-  background-color:rgba(255,255,255,0.6);
-  margin-top:2em;
-  padding-left: 3em;
-  padding-bottom: 1.2em;
+    background-color:rgba(255,255,255,0.6);
+    margin-top:2em;
+    padding-left: 3em;
+    padding-bottom: 1.2em;
 }
 .new-password h1{
-  font-size:2em;
+    font-size:2em;
 }
 .new-password label{
-  margin-top:1em;
-  margin-bottom:0;
+    margin-top:1em;
+    margin-bottom:0;
 }
 .new-password input{
-  width: 90%;
-  padding: 0.6em;
-  border: none;
-  border-radius: 5px;
-  background-color: rgba(84, 110, 122, 0.2);
-  color: #555;
+    width: 90%;
+    padding: 0.6em;
+    border: none;
+    border-radius: 5px;
+    background-color: rgba(84, 110, 122, 0.2);
+    color: #555;
 }
 .new-password button{
-  color: #fff;
-  background-color:#15af97 ;
-  text-decoration: none;
-  outline: none;
-  transition: all 0.5s;
-  width: 89%;
-  height:2.5em;
-  margin-top:1em;
-  border:none;
-  border-radius: 5px;
+    color: #fff;
+    background-color:#15af97 ;
+    text-decoration: none;
+    outline: none;
+    transition: all 0.5s;
+    width: 89%;
+    height:2.5em;
+    margin-top:1em;
+    border:none;
+    border-radius: 5px;
 }
 
 .new-password button:focus{
-  border: 0;
-  outline: none;
+    border: 0;
+    outline: none;
 }
 
 .new-password button:hover,
@@ -831,8 +832,8 @@ footer .license-icons ul img{
     background-color:#6bb5b4 ;
 }
 /* =================================================
-           MEDIA QUERIES
- ==================================================*/
+MEDIA QUERIES
+==================================================*/
 
 
 /* ----------------- 1 COL ------------------  */
@@ -863,18 +864,18 @@ footer .license-icons ul img{
     /*COLUMNS*/
     .team-member.col-md-4{
 
-    margin:1%;
-    width:98%;
+        margin:1%;
+        width:98%;
 
     }
     .our-values div.col-md-3{
-    background-color: rgba(255, 255, 255, 0.45);
-    margin:1%;
-    width:98%;
+        background-color: rgba(255, 255, 255, 0.45);
+        margin:1%;
+        width:98%;
 
     }
     .chalky-canvas img{
-      width:98%;
+        width:98%;
     }
 }
 @media (min-width: 500px) and (max-width: 991px) {
@@ -896,25 +897,25 @@ footer .license-icons ul img{
     }
     /*COLUMNS*/
     .team-member.col-md-4{
-    margin:1em auto;
-    width:60%;
-    float:none;
+        margin:1em auto;
+        width:60%;
+        float:none;
 
     }
     .team-member.col-sm-6{
-    margin:1em auto;
-    width:60%;
-  float:none;
+        margin:1em auto;
+        width:60%;
+        float:none;
     }
     /*overriding bootstrap settings -> */
     .our-values .col-md-3{
-      margin:1em auto!important;
-      width:60%!important;
-      float:none;
+        margin:1em auto!important;
+        width:60%!important;
+        float:none;
 
     }
     .chalky-canvas img{
-      width:70%;
+        width:70%;
     }
 
 

index.html

@@ -101,7 +101,7 @@
             <div class="row user-area">
                 <!-- try it online -->
                 <div class=" try-online col-md-4 ">
-                    <h2 >Try The Canvas Online</h2>
+                    <h2 >Try the Canvas Online</h2>
                     <p>Start using the online Ethics Canvas without registration, and export your work in PDF or JSON format.</p>
                     <!-- link to the online canvas -->
                     <a class="btn try-canvas" href="canvas/index.php">
@@ -110,7 +110,7 @@
                 </div>
                 <!-- sign up/sign in -->
                 <div class=" sign-up-in col-md-4 " id="login-area">
-                    <h2 >Sign Up To Save Your Canvas</h2>
+                    <h2 >Sign Up to Save Your Canvas</h2>
                     <p>Create an account so you can save your work in your dashboard.</p>
 
                     <!-- ======================================= -->
@@ -121,8 +121,7 @@
                             </li>
                             <li id="log-in-pill">
                                 <a data-toggle="pill" href="#login-tab">
-                                    <span>Have an account?
-                                    </span>Log In</a>
+                                    Log In</a>
                             </li>
                             <li id="forgot-password-pill">
                                 <a data-toggle="pill" href="#reset-password-tab">
@@ -250,7 +249,7 @@
                 </div>
                 <!-- download as pdf -->
                 <div class="download-pdf col-md-4 ">
-                    <h2 >Download A PDF version</h2>
+                    <h2 >Download a PDF Version</h2>
                     <p>Work offline. Download a printable version of the Ethics Canvas to use it in workshops. <b>Need help?</b> <a href="download/handbook.pdf" target="_blank" download>Download the handbook</a> for further details and examples.</p>
                     <!-- The attribute is not supported in Safari-->
                     <a class="btn download-canvas" href="download/online-ethics-canvas.pdf" target="_blank" download>
@@ -322,7 +321,7 @@
                 <h2>OUR VALUES</h2>
                 <div class="nonprofit col-md-3 col-sm-6">
                     <img src="icon/heart.svg"/>
-                    <h3>Driven By Conviction, Not By Money</h3>
+                    <h3>Driven by Conviction, Not by Money</h3>
                     <p>We are a non-profit organisation. We work on the canvas for the purpose of empowering people, not for making money.
                     </p>
                 </div>
@@ -334,13 +333,13 @@
                 </div>
                 <div class="open-source col-md-3 col-sm-6">
                     <img src="icon/open.svg"/>
-                    <h3>Subscribing To The Open Source Principles</h3>
+                    <h3>Subscribing to the Open Source Principles</h3>
                     <p>The online Ethics Canvas is an open source project, which means that the code is openly available. We support and adhere to the open source principles of transparency, participation and collaboration.
                     </p>
                 </div>
                 <div class=" data-privacy col-md-3 col-sm-6 ">
                     <img src="icon/key.svg"/>
-                    <h3>Responsible Use Of Personal Data</h3>
+                    <h3>Responsible Use of Personal Data</h3>
                     <p>As a platform that tries to promote ethics, our core priority is to focus on ethical data handling. Explicit consent for the use of personal data will always be asked, with clear and simple terms and conditions. Personal data will only be gathered
                         for research purposes and community building purposes, never for commercial purposes.
                     </p>

js/landing.js

@@ -31,7 +31,7 @@ $(function() {
         //create an html for the activation fail message
 
         var verificationMessage_true =
-            "<div class='success-activation'><p>Great! Your email is activated. You can now log in.</p><p><a href='#log-in-pill'>Log in</a>  </p></div>";
+            "<div class='success-activation'><p>Great! Your email is activated. You can now log in!</p><p><a href='#log-in-pill'>Log in</a>  </p></div>";
         $('header').append(verificationMessage_true);
         /*clicking on the login will send the user to the log in area
         the user does not nesseccarily want to log in at this point (optional)
@@ -43,7 +43,7 @@ $(function() {
     } else if (emailVerification !== null && emailVerification === 'false') {
         //create an html for the activation fail message
         var verificationMessage_false =
-            "<div class='failed-activation'><p>Sorry, We couldn't activate your email :(</p><p>Please contact us at <a href='mailto:hello@ethicscanvas.org'>hello@ethicscanvas.org</a>  and we will fix it.</p></div>";
+            "<div class='failed-activation'><p>Sorry, we couldn't activate your email :(</p><p>Please contact us at <a href='mailto:hello@ethicscanvas.org'>hello@ethicscanvas.org</a> and we will fix it for you.</p></div>";
         $('header').append(verificationMessage_false);
     }
     /*This is for testing*/
@@ -58,7 +58,7 @@ $(function() {
     if (passwordReset !== null && passwordReset === 'true') {
         //create an html for the "password changed" message
         var passwordResetMessage_true =
-            "<div class='success-activation'><p>Great! Your password is changed. You can now log in.</p><p><a href='#log-in-pill'>Log in</a>  </p></div>";
+            "<div class='success-activation'><p>Great! Your password has been changed. You can now log in!</p><p><a href='#log-in-pill'>Log in</a>  </p></div>";
         $('header').append(passwordResetMessage_true);
         /*clicking on the login will send the user to the log in area
         the user does not nesseccarily want to log in at this point (optional)
@@ -70,7 +70,7 @@ $(function() {
     } else if (passwordReset !== null && passwordReset === 'false') {
         //create an html for the activation fail message
         var passwordResetMessage_false =
-            "<div class='failed-activation'><p>Sorry, We couldn't change your password :(</p><p>Please contact us at <a href='mailto:hello@ethicscanvas.org'>hello@ethicscanvas.org</a>  and we will fix it.</p></div>";
+            "<div class='failed-activation'><p>Sorry, We couldn't change your password :(</p><p>Please contact us at <a href='mailto:hello@ethicscanvas.org'>hello@ethicscanvas.org</a> and we will fix it for you.</p></div>";
         $('header').append(passwordResetMessage_false);
     }
     /*This is for testing*/
@@ -194,7 +194,7 @@ $(function() {
             } else if (data == 401) {
                 $('.sign-up-in').find('.form-login-feedback').addClass(
                     'warning-feedback').html(
-                    '<p>The username or password is incorrect. Please try again.</p>'
+                    '<p>The username or password is incorrect. Please try again!</p>'
                 );
 
             } else if (data == 200) {
@@ -206,7 +206,7 @@ $(function() {
             } else if (data == 402) {
                 $('.sign-up-in').find('.form-login-feedback').addClass(
                     'warning-feedback').html(
-                    '<p>You already have an account. Please activate it through the email we sent you.</p><button class="resend-activation">Send me the activation email again</button>'
+                    '<p>You already have an account. Please activate it in the email we sent you.</p><button class="resend-activation">Send me the activation email again</button>'
                 );
             }
         }).fail(function(jqXHR) {
@@ -247,7 +247,7 @@ $(function() {
             $('.nav-tabs a[href="#reset-password-tab"]').tab('show'); // Select tab by name
             //get the value of the email input field in the login form
             var email_to_reset = $('.log-in-form').find('#email-login').val();
-            /*if the user already entered an email adress here, and it's a valid email*/
+            /*if the user already entered an email address here, and it's a valid email*/
             /* put that email address in the input field of the password reset*/
             if (email_to_reset !== null && ValidateEmail($("#email-login").val())) {
                 $('.reset-password-form').find('#email-reset-password').val(
@@ -268,11 +268,11 @@ $(function() {
         }, function(data, status) {
 
             if (data == 400) {
-                $('.sign-up-in').find('.form-reset-password-feedback').addClass('warning-feedback').html('<p>Something is not right :/ Please contact us at hello@thicscanvas.org</p>');
+                $('.sign-up-in').find('.form-reset-password-feedback').addClass('warning-feedback').html('<p>Something is not right. :/ Please contact us at hello@thicscanvas.org</p>');
             } else if (data == 401) {
-                $('.sign-up-in').find('.form-reset-password-feedback').addClass('warning-feedback').html('<p>Please enter your correct email address.</p>');
+                $('.sign-up-in').find('.form-reset-password-feedback').addClass('warning-feedback').html('<p>Please enter a correct email address.</p>');
             } else if (data == 200) {
-                $('.sign-up-in').find('.form-reset-password-feedback').addClass('success-feedback').html('<p>Thanks :) We sent you an email to reset your password</p>');
+                $('.sign-up-in').find('.form-reset-password-feedback').addClass('success-feedback').html('<p>Thank you! :) We sent you an email to reset your password</p>');
 
             }
 
@@ -292,7 +292,7 @@ $(function() {
         var user_name = $('#firstname-signup').val();
         if (user_name === '') {
             $('#name-register-message').addClass('message-field').text(
-                "Please tell us your name");
+                "Please enter your name.");
         } else {
             $('#name-register-message').removeClass('message-field').text(
                 "");
@@ -300,7 +300,7 @@ $(function() {
 
         if (!ValidateEmail($("#email-signup").val())) {
             $('#email-register-message').addClass('message-field').text(
-                'please give us a valid email adress.');
+                'Please enter a valid email address.');
         } else {
             $('#email-register-message').removeClass('message-field')
                 .text(
@@ -310,13 +310,13 @@ $(function() {
         var pass2 = $('#password-signup-conf').val();
         if (pass1 === '') {
             $('#pass-register-message').addClass('message-field').text(
-                "Please enter a password");
+                "Please enter a password.");
         }
 
         if (pass2 === '') {
             $('#pass-conf-register-message').addClass('message-field')
                 .text(
-                    "Please confirm your password");
+                    "Please confirm your password.");
         }
 
         if (pass1 !== '' && pass2 !== '' && pass1 !== pass2) {
@@ -337,14 +337,14 @@ $(function() {
     $(".log-in-form").on("click", '.log-in', function() {
         if (!ValidateEmail($("#email-login").val())) {
             $('#email-login-message').addClass('message-field').text(
-                'please give us a valid email adress.');
+                'Please enter a valid email address.');
         }
 
         var pass1b = $('#password-login').val();
 
         if (pass1b === '') {
             $('#pass-login-message').addClass('message-field').text(
-                "Please enter your password");
+                "Please enter your password.");
         }
 
     });
@@ -357,7 +357,7 @@ $(function() {
         // if the email input field is empty
         if ($('.reset-password-form').find(
                 '#email-reset-password').val() === '') {
-            $('.reset-password-form').find('#reset-password-message').addClass('message-field').text('Please enter your email');
+            $('.reset-password-form').find('#reset-password-message').addClass('message-field').text('Please enter your email.');
         }
 
     }); // end of click on reset

js/reset.js

@@ -14,7 +14,7 @@ $(function() {
     if (pass1 === '') {
       console.log("Didn't enter password.");
       $('#new-password-message1').addClass('message-field').text(
-        "Please enter a password");
+        "Please enter a password.");
         //don't submit the form
         event.preventDefault();
     }
@@ -23,7 +23,7 @@ $(function() {
       console.log("Didn't confirm password.");
       $('#new-password-message2').addClass('message-field')
         .text(
-          "Please confirm your password");
+          "Please confirm your password.");
           //don't submit the form
           event.preventDefault();
     }

php/resend-activation.php

@@ -27,7 +27,7 @@
 
         // Activation email
         $activationLink = "https://ethicscanvas.org/activation.php?salt=$salt";
-        $activationEmail = "Hi $name,<br><br>Thanks for signing up at EthicsCanvas.org.<br><br>Please, click on the link below in order to verify you email address:<br>$activationLink<br><br>Thanks,<br><br>Ethics Canvas Team";
+        $activationEmail = "Hi $name,<br><br>Thanks for signing up at EthicsCanvas.org!<br><br>Please click on the link below in order to verify your email address:<br>$activationLink<br><br>Thank you,<br>The Ethics Canvas Team";
 
         // Send activation email
         include('mailer.php');