From 7963f62a96e60dfee6aa75f092fbd567087d4f19 Mon Sep 17 00:00:00 2001
From: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Date: Wed, 27 May 2015 09:28:26 -0300
Subject: [PATCH] support for recaptcha v2

---
 index.html      | 16 ++++++++--------
 js/main.js      | 16 ++++++++++++----
 sass/style.scss |  1 -
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 2808ef8..8493cca 100644
--- a/index.html
+++ b/index.html
@@ -365,29 +365,28 @@
       <form id="signup-form" class="signup hide" autocomplete="off">
         <div class="email">
           <label for="user_email" class="label">E-mail:</label>
-          <input id="user_email" name="email" type="text" placeholder="E-mail">
+          <input id="user_email" name="email" type="email" required placeholder="E-mail">
         </div>
         <div class="username">
           <label for="user_name" class="label">Nome de Usuário</label>
-          <input id="user_name" name="login" type="text" placeholder="Nome do usuário">
+          <input id="user_name" name="login" type="text" required placeholder="Nome do usuário">
         </div>
         <div class="password">
           <label for="user_password" class="label">Senha:</label>
-          <input id="user_password" name="password" type="password" placeholder="Senha">
+          <input id="user_password" name="password" type="password" required placeholder="Senha">
         </div>
         <div class="password-confirmation">
           <label for="user_password_confirmation" class="label">Confirme a senha:</label>
-          <input id="user_password_confirmation" name="password_confirmation" type="password" placeholder="Confirme a senha">
+          <input id="user_password_confirmation" name="password_confirmation" type="password" required placeholder="Confirme a senha">
+        </div>
+        <div class="captcha">
+          <div id="g-recaptcha"></div>
         </div>
         <div class="actions">
           <div class="message hide"></div>
           <a href="#" class="confirm-signup">Confirmar</a>
           <a href="#" class="cancel-signup">Cancelar</a>
         </div>
-        <div class="captcha">
-            <div class="g-recaptcha" data-sitekey="6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i"></div>
-            <script src='https://www.google.com/recaptcha/api.js?hl=pt-BR' async defer></script>
-        </div>
       </form>
     </script>
 
@@ -404,6 +403,7 @@
       loadRequireJS();
     </script>
 
+    <script src='https://www.google.com/recaptcha/api.js?hl=pt-BR' async defer></script>
 
   </body>
 
diff --git a/js/main.js b/js/main.js
index b8c3d55..1435d09 100644
--- a/js/main.js
+++ b/js/main.js
@@ -17,13 +17,15 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
 
   var loginButton;
 
-  var participa = true;
+  var participa = false;
   if(participa){
     var host = 'http://www.participa.br';
     var proposal_discussion = '103358'; //participa
+    window.recaptchaSiteKey = '6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i'
   }else{
     var host = 'http://noosfero.com:3000';
-    var proposal_discussion = '632'; //local serpro
+    var proposal_discussion = '372'; //local serpro
+    window.recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-' //http://noosfero.com/
   }
 
   var BARRA_ADDED = false;
@@ -32,7 +34,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
   Main = (function(){
 
     return {
-      private_token: '375bee7e17d0021af7160ce664874618',
+      private_token: 'db34efd2c7df703b61226c88b7b477c8',
       getProposalId: function() {
         var regexProposals = /\d.*\/propostas\/*.*/;
         var proposalId = 0;
@@ -687,9 +689,13 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
 
     $(document).on('click', '.new-user', function(e) {
       var loginForm = $(this).parents('#login-form');
+      var signupForm = loginForm.siblings('#signup-form');
+      
       loginForm.hide();
-      loginForm.siblings('#signup-form').show();
+      signupForm.show();
       loginForm.find('.message').hide();
+      console.log(signupForm.find('#g-recaptcha')[0]);
+      grecaptcha.render(signupForm.find('#g-recaptcha')[0], {'sitekey' : window.recaptchaSiteKey });
       e.preventDefault();
     })
 
@@ -697,6 +703,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
       var signupForm = $(this).parents('#signup-form');
       signupForm.hide();
       signupForm.siblings('#login-form').show();
+      grecaptcha.reset();
       e.preventDefault();
     });
 
@@ -723,6 +730,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
         loading.hide();
         signup.show();
       });
+      grecaptcha.reset();
       e.preventDefault();
     });
 
diff --git a/sass/style.scss b/sass/style.scss
index 22e666f..fc166a6 100755
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -154,7 +154,6 @@ form {
 }
 
 .captcha{
-  padding-left: 25px;
   padding-top: 20px;
 }
 
--
libgit2 0.21.2