Download as
Browse Code »

Commit 2949616f3e4db9e3ca92287da119a48421553115

Authored by Evandro Junior
2 parents f9be1f4f c8fcb549
Exists in master and in 2 other branches production, staging

Merge branch 'master' of gitlab.com:participa/proposal-app 

* 'master' of gitlab.com:participa/proposal-app:
  Add og meta tags (for social)
  Fix bug to login after user confirmation
Showing 2 changed files with 10 additions and 3 deletions   Show diff stats
@@ -7,6 +7,9 @@ @@ -7,6 +7,9 @@
7 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 7 <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 <meta name="viewport" content="width=device-width, initial-scale=1"> 8 <meta name="viewport" content="width=device-width, initial-scale=1">
9 <meta property="og:title" content="Dialoga Brasil" /> 9 <meta property="og:title" content="Dialoga Brasil" />
  10 + <meta property="og:description" content="Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo" />
  11 + <meta property="og:image" content="http://dialoga.gov.br/images/logo.png" />
  12 + <meta property="og:locale" content="pt_BR" />
10 13
11 <link rel="icon" type="image/x-icon" href="data:image/png;base64,iVBORw0KGgo=" /> 14 <link rel="icon" type="image/x-icon" href="data:image/png;base64,iVBORw0KGgo=" />
12 15
@@ -325,7 +325,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -325,7 +325,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
325 } 325 }
326 } else if (user) { 326 } else if (user) {
327 // fluxo signup vindo das caixas de login dentro dos programas 327 // fluxo signup vindo das caixas de login dentro dos programas
328 - if(requireLoginContainer.length > 0){ 328 + if(requireLoginContainer && requireLoginContainer.length > 0){
329 var loginContainer = requireLoginContainer.find('.login-container'); 329 var loginContainer = requireLoginContainer.find('.login-container');
330 loginContainer.show(); 330 loginContainer.show();
331 loginContainer.find('.new-user').click(); 331 loginContainer.find('.new-user').click();
@@ -337,8 +337,11 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -337,8 +337,11 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
337 fillSignupForm($signupForm, user); 337 fillSignupForm($signupForm, user);
338 } 338 }
339 } else { 339 } else {
340 - requireLoginContainer.find('.require-login').hide();  
341 - requireLoginContainer.find('.login-container').show(); 340 +
  341 + if(requireLoginContainer){
  342 + requireLoginContainer.find('.require-login').hide();
  343 + requireLoginContainer.find('.login-container').show();
  344 + }
342 Main.showLogin(); 345 Main.showLogin();
343 } 346 }
344 }, 347 },
@@ -977,6 +980,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -977,6 +980,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
977 if(data.person){ 980 if(data.person){
978 Main.setUser(data); 981 Main.setUser(data);
979 } 982 }
  983 + data = data.user || data;
980 Main.loginCallback(data.activated, data.private_token); 984 Main.loginCallback(data.activated, data.private_token);
981 }, 985 },
982 handleLoginFail: function (e){ 986 handleLoginFail: function (e){