Download as
Browse Code »

Commit 84ac10a9956fe94b0b8c47a92323ea29c58d32a1

Authored by Leonardo Merlin
1 parent cdc8acac
Exists in master and in 8 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, production, staging

Modificações nas regras jQuery para os 'show/hide' da app. #Fix #193

Showing 2 changed files with 40 additions and 25 deletions   Show diff stats
index.html
  Diff comments   View file @84ac10a
... ... @@ -198,12 +198,13 @@
198 198 <input type="submit" id="make-proposal-button" name="make-proposal-button" class="make-proposal-button" value="Enviar">
199 199 </form>
200 200 <div class="success-proposal-sent success-sent hide send-button">
201   - <p>Sua proposta foi encaminhada com sucesso!</p>
  201 + <p>Sua proposta foi encaminhada com sucesso! Ela se tornará pública em até 24 horas e poderá ser apoiada por outros participantes.</p>
202 202 <a href="#">Faça nova proposta</a>
203 203 </div>
204   - <br style="clear: both;" />
  204 + <div class="clearfix"></div>
205 205 </div>
206 206 </div>
  207 +
207 208 <div class="support-proposal-container">
208 209 <div class="support-proposal">
209 210 <div class="container-title"> Apoie outras propostas</div>
... ... @@ -212,7 +213,9 @@
212 213 <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
213 214 </div>
214 215 </div>
  216 +
215 217 <div class="results-container hide"></div>
  218 +
216 219 <div class="experience-proposal-container">
217 220 <div class="experience-proposal">
218 221 <div class="container-title">Conte sua experiência</div>
... ... @@ -237,6 +240,7 @@
237 240 </div>
238 241 </div>
239 242 </div>
  243 +
240 244 <div class="talk-proposal-container">
241 245 <div class="talk-proposal">
242 246 <div class="container-title">Bate-papo com os ministros</div>
... ... @@ -265,6 +269,8 @@
265 269 </ul>
266 270 </div>
267 271 </div>
  272 +
  273 + <div class="clearfix"></div>
268 274 </div>
269 275 </div>
270 276 {{!-- </div> --}}
... ...
js/main.js
  Diff comments   View file @84ac10a
... ... @@ -178,20 +178,23 @@ define([&#39;handlebars&#39;,&#39;handlebars_helpers&#39;], function(Handlebars){
178 178 $('#proposal-group').hide();
179 179 $('nav').hide();
180 180 $('#content').hide();
181   - $('.make-proposal-form').hide();
182   - $('.login-container').hide();
183   - $('.proposal-detail').hide();
184   - $('.proposal-detail-base').hide();
185   - $('#' + proposal_id).show();
186   - $('.proposal-header').show();
187   - $('.make-proposal-container').show();
188   - $('.support-proposal-container').show();
189   - $('.results-container').hide();
190   - $('.results-container .loading').hide();
191   - $('.results-container .results-content').hide();
192   - $('.experience-proposal-container').show();
193   - $('.talk-proposal-container').show();
194   - $('.calendar').slick();
  181 + // $('.make-proposal-form').hide();
  182 + // $('.login-container').hide();
  183 + $('.proposal-detail').hide(); // hide all proposals
  184 + // $('.proposal-detail-base').hide();
  185 + $proposal = $('#' + proposal_id);
  186 + $proposal.find('.proposal-detail-base').hide();
  187 + $proposal.show();
  188 + $proposal.find('.proposal-header').show();
  189 + $proposal.find('.make-proposal-container').show();
  190 + $proposal.find('.support-proposal-container').show();
  191 + $proposal.find('.results-container').hide();
  192 + $proposal.find('.results-container .loading').hide();
  193 + $proposal.find('.results-container .results-content').hide();
  194 + $proposal.find('.experience-proposal-container').show();
  195 + $proposal.find('.talk-proposal-container').show();
  196 + $proposal.find('.calendar').slick();
  197 +
195 198 var topic_id = proposal_id.split('-').pop();
196 199 this.loadRandomProposal(topic_id, private_token);
197 200 },
... ... @@ -200,15 +203,16 @@ define([&#39;handlebars&#39;,&#39;handlebars_helpers&#39;], function(Handlebars){
200 203 $('#proposal-group').hide();
201 204 $('nav').hide();
202 205 $('#content').hide();
203   - $('.make-proposal-form').hide();
204   - $('.proposal-header').hide();
205   - $('.make-proposal-container').hide();
206   - $('.support-proposal-container').hide();
207   - $('.results-container').hide();
208   - $('.experience-proposal-container').hide();
209   - $('.talk-proposal-container').hide();
210   - $('#proposal-item-' + proposal_id + '.proposal-detail').show();
211   - $('#proposal-item-' + proposal_id + ' .body').show();
  206 + $proposal = $('#proposal-item-' + proposal_id);
  207 + $proposal.find('.make-proposal-form').hide();
  208 + $proposal.find('.proposal-header').hide();
  209 + $proposal.find('.make-proposal-container').hide();
  210 + $proposal.find('.support-proposal-container').hide();
  211 + $proposal.find('.results-container').hide();
  212 + $proposal.find('.experience-proposal-container').hide();
  213 + $proposal.find('.talk-proposal-container').hide();
  214 + $proposal.find('.body').show();
  215 + $proposal.show();
212 216  
213 217 var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
214 218 $.getJSON(url).done(function( data ) {
... ... @@ -456,6 +460,9 @@ define([&#39;handlebars&#39;,&#39;handlebars_helpers&#39;], function(Handlebars){
456 460 loginButton = $this.parents('.send-button');
457 461 loginButton.hide();
458 462 $this.parents('.success-proposal-sent').hide();
  463 + $wrapper = $this.parents('.make-proposal');
  464 + $wrapper.find('.subtitle').show();
  465 + $wrapper.find('.info').show();
459 466 Main.loginCallback(logged_in);
460 467 });
461 468  
... ... @@ -525,6 +532,8 @@ define([&#39;handlebars&#39;,&#39;handlebars_helpers&#39;], function(Handlebars){
525 532 form.reset();
526 533 $form.hide();
527 534 $form.siblings('.success-sent').show();
  535 + $form.siblings('.subtitle').hide();
  536 + $form.siblings('.info').hide();
528 537 })
529 538 .fail(function( jqxhr, textStatus, error ) {
530 539 var err = textStatus + ', ' + error;
... ...