Commit ae8e4e891644668ce0556ee6e27573699a2c1a83
1 parent
d2009d0f
Exists in
master
and in
5 other branches
fix 263 fix 293
Showing
3 changed files
with
11 additions
and
10 deletions
Show diff stats
index.html
| ... | ... | @@ -312,7 +312,7 @@ |
| 312 | 312 | |
| 313 | 313 | <div class="talk-proposal-container col-sm-12"> |
| 314 | 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 | 316 | <p>Confira as datas e horários:</p> |
| 317 | 317 | <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'> |
| 318 | 318 | <li> | ... | ... |
js/main.js
| ... | ... | @@ -211,7 +211,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F |
| 211 | 211 | if(token){ |
| 212 | 212 | Main.private_token = token; |
| 213 | 213 | } |
| 214 | - requireLoginContainer = $('.require-login-container'); | |
| 214 | + // requireLoginContainer = $('.require-login-container'); | |
| 215 | 215 | requireLoginContainer.find('.require-login').show(); |
| 216 | 216 | requireLoginContainer.find('.require-login .message').show(); |
| 217 | 217 | requireLoginContainer.find('.login-container').hide(); |
| ... | ... | @@ -221,9 +221,9 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F |
| 221 | 221 | loginContainer.show(); |
| 222 | 222 | loginContainer.find('.new-user').click(); |
| 223 | 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 | 227 | //signupForm.find(".password").hide(); |
| 228 | 228 | //signupForm.find(".password-confirmation").hide(); |
| 229 | 229 | } else { |
| ... | ... | @@ -309,7 +309,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F |
| 309 | 309 | // $('.login-container').hide(); |
| 310 | 310 | $('.proposal-detail').hide(); // hide all proposals |
| 311 | 311 | // $('.proposal-detail-base').hide(); |
| 312 | - $proposal = $('#' + proposal_id); | |
| 312 | + var $proposal = $('#' + proposal_id); | |
| 313 | 313 | $proposal.find('.proposal-detail-base').hide(); |
| 314 | 314 | $proposal.show(); |
| 315 | 315 | $proposal.find('.proposal-header').show(); |
| ... | ... | @@ -350,7 +350,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F |
| 350 | 350 | $('nav').hide(); |
| 351 | 351 | $('#content').hide(); |
| 352 | 352 | $('#article-container').hide(); |
| 353 | - $proposal = $('#proposal-item-' + proposal_id); | |
| 353 | + var $proposal = $('#proposal-item-' + proposal_id); | |
| 354 | 354 | $proposal.find('.proposal-header').hide(); |
| 355 | 355 | $proposal.find('.make-proposal-container').hide(); |
| 356 | 356 | $proposal.find('.support-proposal-container').hide(); |
| ... | ... | @@ -771,10 +771,10 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F |
| 771 | 771 | |
| 772 | 772 | //display form to send proposal (or login form for non-logged users) |
| 773 | 773 | var $this = $(this); |
| 774 | - loginButton = $this.parents('.button-send'); | |
| 774 | + loginButton = $this.closest('.button-send'); | |
| 775 | 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 | 778 | $wrapper.find('.subtitle').show(); |
| 779 | 779 | $wrapper.find('.info').show(); |
| 780 | 780 | Main.loginCallback(logged_in); | ... | ... |