Download as
Browse Code »

Commit ae8e4e891644668ce0556ee6e27573699a2c1a83

Authored by Leonardo Merlin
1 parent d2009d0f
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

fix 263 fix 293

Showing 3 changed files with 11 additions and 10 deletions   Show diff stats
@@ -312,7 +312,7 @@ @@ -312,7 +312,7 @@
312 312
313 <div class="talk-proposal-container col-sm-12"> 313 <div class="talk-proposal-container col-sm-12">
314 <section class="talk-proposal box box-propostas"> 314 <section class="talk-proposal box box-propostas">
315 - <div class="container-title box-title">Bate-papo com os ministros</div> 315 + <div class="container-title box-title">Bate-papo com ministras e ministros</div>
316 <p>Confira as datas e horários:</p> 316 <p>Confira as datas e horários:</p>
317 <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'> 317 <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'>
318 <li> 318 <li>
@@ -211,7 +211,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F @@ -211,7 +211,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
211 if(token){ 211 if(token){
212 Main.private_token = token; 212 Main.private_token = token;
213 } 213 }
214 - requireLoginContainer = $('.require-login-container'); 214 + // requireLoginContainer = $('.require-login-container');
215 requireLoginContainer.find('.require-login').show(); 215 requireLoginContainer.find('.require-login').show();
216 requireLoginContainer.find('.require-login .message').show(); 216 requireLoginContainer.find('.require-login .message').show();
217 requireLoginContainer.find('.login-container').hide(); 217 requireLoginContainer.find('.login-container').hide();
@@ -221,9 +221,9 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F @@ -221,9 +221,9 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
221 loginContainer.show(); 221 loginContainer.show();
222 loginContainer.find('.new-user').click(); 222 loginContainer.find('.new-user').click();
223 var signupForm = loginContainer.find('#signup-form'); 223 var signupForm = loginContainer.find('#signup-form');
224 - signupForm.find("#user_email").val(user.email);  
225 - signupForm.find("#user_name").val(user.login);  
226 - signupForm.find("#user_oauth_providers").val(user.oauth_providers); 224 + signupForm.find('#user_email').val(user.email);
  225 + signupForm.find('#user_name').val(user.login);
  226 + signupForm.find('#user_oauth_providers').val(user.oauth_providers);
227 //signupForm.find(".password").hide(); 227 //signupForm.find(".password").hide();
228 //signupForm.find(".password-confirmation").hide(); 228 //signupForm.find(".password-confirmation").hide();
229 } else { 229 } else {
@@ -309,7 +309,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F @@ -309,7 +309,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
309 // $('.login-container').hide(); 309 // $('.login-container').hide();
310 $('.proposal-detail').hide(); // hide all proposals 310 $('.proposal-detail').hide(); // hide all proposals
311 // $('.proposal-detail-base').hide(); 311 // $('.proposal-detail-base').hide();
312 - $proposal = $('#' + proposal_id); 312 + var $proposal = $('#' + proposal_id);
313 $proposal.find('.proposal-detail-base').hide(); 313 $proposal.find('.proposal-detail-base').hide();
314 $proposal.show(); 314 $proposal.show();
315 $proposal.find('.proposal-header').show(); 315 $proposal.find('.proposal-header').show();
@@ -350,7 +350,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F @@ -350,7 +350,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
350 $('nav').hide(); 350 $('nav').hide();
351 $('#content').hide(); 351 $('#content').hide();
352 $('#article-container').hide(); 352 $('#article-container').hide();
353 - $proposal = $('#proposal-item-' + proposal_id); 353 + var $proposal = $('#proposal-item-' + proposal_id);
354 $proposal.find('.proposal-header').hide(); 354 $proposal.find('.proposal-header').hide();
355 $proposal.find('.make-proposal-container').hide(); 355 $proposal.find('.make-proposal-container').hide();
356 $proposal.find('.support-proposal-container').hide(); 356 $proposal.find('.support-proposal-container').hide();
@@ -771,10 +771,10 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F @@ -771,10 +771,10 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
771 771
772 //display form to send proposal (or login form for non-logged users) 772 //display form to send proposal (or login form for non-logged users)
773 var $this = $(this); 773 var $this = $(this);
774 - loginButton = $this.parents('.button-send'); 774 + loginButton = $this.closest('.button-send');
775 loginButton.hide(); 775 loginButton.hide();
776 - $this.parents('.success-proposal-sent').hide();  
777 - $wrapper = $this.parents('.make-proposal'); 776 + $this.closest('.success-proposal-sent').hide();
  777 + var $wrapper = $this.closest('.make-proposal');
778 $wrapper.find('.subtitle').show(); 778 $wrapper.find('.subtitle').show();
779 $wrapper.find('.info').show(); 779 $wrapper.find('.info').show();
780 Main.loginCallback(logged_in); 780 Main.loginCallback(logged_in);
sass/style.sass
  Diff comments   View file @ae8e4e8
@@ -176,6 +176,7 @@ textarea @@ -176,6 +176,7 @@ textarea
176 padding-right: $gutter * 0.5 176 padding-right: $gutter * 0.5
177 padding-top: $gutter * 0.25 177 padding-top: $gutter * 0.25
178 width: 100% 178 width: 100%
  179 + height: 100px
179 180
180 181
181 // ------------------------------------ 182 // ------------------------------------