From 10b3e2efadcd6c0b06349250d39171f6636355e5 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Mon, 20 Jul 2015 14:23:23 -0300
Subject: [PATCH] Improve user activation message

---
 index.html |  1 +
 js/main.js | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 96b47f8..976a36d 100644
--- a/index.html
+++ b/index.html
@@ -392,6 +392,7 @@
       <div class="loading">Carregando...</div>
       <form id="login-form" class="login" method="post">
         <div class="message hide"></div>
+        <div class="message-success alert-success hide"></div>
         <div class="row">
           <div class="col-sm-4">
             <a href="#" class="new-user button">Cadastre-se</a>
diff --git a/js/main.js b/js/main.js
index 97d0799..03aecbf 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1509,14 +1509,16 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
               $signupForm.removeClass('hide');
               var $sectionContent = $button.closest('.section-content');
 
-              var message = 'Cadastro efetuado com sucesso';
-              if(!data.activated) {
-                message = 'Verifique seu email para confirmar o cadastro.';
-              }
-              if($sectionContent && $sectionContent.length > 0){
-                Main.displaySuccess($sectionContent, message, 1000, 'icon-user-created');
+              if(data.activated) {
+                if($sectionContent && $sectionContent.length > 0){
+                  Main.displaySuccess($sectionContent, 'Cadastro efetuado com sucesso', 1000, 'icon-user-created');
+                }
+                $(document).trigger('login:success', data);
+              } else {
+                var $message = $signupForm.siblings('#login-form').find('.message-success');
+                $message.html('Cadastro efetuado com sucesso.<br/>Verifique seu email para confirmar o cadastro.');
+                $message.show();
               }
-              $(document).trigger('login:success', data);
             })
         .fail(function (data) {
               var msg = '';
--
libgit2 0.21.2