pyc-website
main website for pyc inc.
git clone https://9o.is/git/pyc-website.git
commit 35bafb513c474ad75f8d9a827247c826ea204f71 parent b29daff2fc4b2f1d35a02f28e550c1c9ce8f7a27 Author: Jul <jul@9o.is> Date: Tue, 24 Jun 2014 13:34:48 -0400 editted text and formatting of alerts from server Diffstat:
| M | src/main/scala/inc/pyc/snippet/AtmSnip.scala | | | 14 | +++++++------- |
| M | src/main/scala/inc/pyc/snippet/NgAlert.scala | | | 2 | +- |
| M | src/main/scala/inc/pyc/snippet/UserSnip.scala | | | 39 | +++++++++++++++++++++------------------ |
| M | src/main/webapp/less/overrides.less | | | 4 | ++++ |
4 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/main/scala/inc/pyc/snippet/AtmSnip.scala b/src/main/scala/inc/pyc/snippet/AtmSnip.scala @@ -32,13 +32,13 @@ class AtmApplication extends AngularSnippet { NgAlert.success( <i class="fa-fw fa fa-thumbs-o-up"></i> ++ - <span>Your Bitcoin ATM application for {rec.name.get} has been received.</span> ++ - <span> We will contact you when we are ready. Thank you for applying.</span> + <span>Bitcoin ATM application for {rec.name.get} has been received.</span> ++ + <p> We will contact you when we are ready. Thank you for applying.</p> ) case errors => NgAlert.danger( <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <span>Your application could not be processed.</span>, + <span>Invalid submission</span>, errors ) } @@ -87,7 +87,7 @@ class FindAtm extends AngularSnippet { case errors => NgAlert.danger( <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <span>Something went wrong. We apologize for the inconvenience.</span>, + <span>Invalid submission</span>, errors ) } @@ -107,13 +107,13 @@ class NearAtmNotify extends AngularSnippet { rec.save(false) NgAlert.success( <i class="fa-fw fa fa-thumbs-o-up"></i> ++ - <span>Hi {rec.fname.get}, your notification has been received.</span> ++ - <span> We will notify you when there is an ATM near {rec.city.get}, {rec.state.get}.</span> + <span>Hello {rec.fname.get}, your notification has been received.</span> ++ + <p>We will notify you when there is an ATM near {rec.city.get}, {rec.state.get}.</p> ) case errors => NgAlert.danger( <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <span>Hi {rec.fname.get}, your notification was not submitted successfully.</span>, + <span>Invalid submission</span>, errors ) } diff --git a/src/main/scala/inc/pyc/snippet/NgAlert.scala b/src/main/scala/inc/pyc/snippet/NgAlert.scala @@ -25,7 +25,7 @@ object NgAlert extends Logger { debug(errors) msgBox("danger", msg ++ - errors.foldLeft(<ul></ul>)((el,err) => el.copy(child = el.child :+ <li>{err.msg}</li>))) + errors.foldLeft(<ul></ul>)((el,err) => el.copy(child = el.child :+ <li>{" - "+err.msg}</li>))) } def danger(msg: String, errors: List[FieldError] = Nil): JValue = danger(Text(msg), errors) diff --git a/src/main/scala/inc/pyc/snippet/UserSnip.scala b/src/main/scala/inc/pyc/snippet/UserSnip.scala @@ -87,7 +87,7 @@ trait AngularUserSnippet extends AngularSnippet { user.validate match { case Nil => f case errors => - NgAlert.danger("The information submitted is invalid", errors) + NgAlert.danger("Invalid submission", errors) } } } @@ -116,7 +116,8 @@ class UserLogin extends AngularSnippet { case Full(user) if !user.verified.get => NgAlert.danger( <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <p>Your email has not been verified. Please verify before loggin in.</p>, Nil) + <span>Unverified Email:</span> ++ + <p>Please verify before logging in.</p>, Nil) case Full(user) if (user.password.isMatch(password)) => User.logUserIn(user, remember) @@ -160,11 +161,11 @@ class PasswordChange extends AngularCurrentUser { NgAlert.success( <i class="fa-fw fa fa-thumbs-o-up"></i> ++ - <span>Your password is now updated.</span>) + <span>Password has been updated.</span>) } else { NgAlert.danger( <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <span>Your password must contain</span> ++ + <span>Password must have:</span> ++ <ul><li>no white spaces</li><li>at least 8 characters</li><li>at least one non-alpha character</li></ul>, Nil) } @@ -182,18 +183,18 @@ class PasswordRecovery extends AngularSnippet { } yield { val email = e.toLowerCase.trim + def msg = NgAlert.success( + <i class="fa-fw fa fa-thumbs-o-up"></i> ++ + <span>An email has been sent</span> ++ + <p>If email exists in our database, go to your inbox and follow the instructions for accessing your account.</p>) + User.findByEmail(email) match { case Full(user) => User.sendLoginToken(user) User.loginCredentials.remove() - - NgAlert.success( - <i class="fa-fw fa fa-thumbs-o-up"></i> ++ - <span>An email has been sent to you with instructions for accessing your account.</span>) - case _ => - NgAlert.danger( - <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <span>Your email could not be found.</span>, Nil) + msg + + case _ => msg } } } @@ -224,12 +225,12 @@ class UserRegistration extends AngularSnippet { NgAlert.success( <i class="fa-fw fa fa-thumbs-o-up"></i> ++ <span>Thank you for registering, {user.fname.get}.</span> ++ - <span> An email has been sent for you to log in.</span> + <p>An email has been sent with instructions for accessing your account.</p> ) case errors => NgAlert.danger( <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <span>Your application could not be processed.</span>, + <span>Invalid submission</span>, errors ) } @@ -299,7 +300,7 @@ class UserSettingsEmail extends AngularCurrentUser { NgAlert.success( <i class="fa-fw fa fa-thumbs-o-up"></i> ++ - <span> An email has been sent for you to verify your new email.</span> + <span>An email has been sent for verification.</span> ) } } @@ -379,12 +380,13 @@ class IdVerification extends AngularCurrentUser { notifyIdentityRequest(user) NgAlert.success( <i class="fa-fw fa fa-thumbs-o-up"></i> ++ - <span> We have received your application and will notify you as soon as we are done reviewing your information.</span> + <span>We have received your application:</span> ++ + <p>We will notify you as soon as we are done reviewing your information.</p> ) } else { NgAlert.danger( <i class="fa-fw fa fa-thumbs-o-down"></i> ++ - <span> Your information could not be uploaded. Please try again.</span>, Nil + <span>File could not be uploaded. Please try again.</span>, Nil ) } } @@ -398,7 +400,8 @@ class IdVerification extends AngularCurrentUser { NgAlert.success( <i class="fa-fw fa fa-thumbs-o-up"></i> ++ - <span> Your application will be verified by the third party company. Thank you for your patience.</span> + <span>Application will be verified by third party company</span> ++ + <p>Thank you for your patience.</p> ) } diff --git a/src/main/webapp/less/overrides.less b/src/main/webapp/less/overrides.less @@ -163,6 +163,10 @@ body { z-index: @alert-zindex; ul { .list-unstyled(); } margin-bottom: 0; + + p { + font-size: @font-size-base !important; + } } .alert-danger {