From 84ac10a9956fe94b0b8c47a92323ea29c58d32a1 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Tue, 5 May 2015 13:22:07 -0300
Subject: [PATCH] Modificações nas regras jQuery para os 'show/hide' da app. #Fix #193

---
 index.html | 10 ++++++++--
 js/main.js | 55 ++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/index.html b/index.html
index b1590c5..9d69ad4 100644
--- a/index.html
+++ b/index.html
@@ -198,12 +198,13 @@
                     <input type="submit" id="make-proposal-button" name="make-proposal-button" class="make-proposal-button" value="Enviar">
                   </form>
                   <div class="success-proposal-sent success-sent hide send-button">
-                    <p>Sua proposta foi encaminhada com sucesso!</p>
+                    <p>Sua proposta foi encaminhada com sucesso! Ela se tornará pública em até 24 horas e poderá ser apoiada por outros participantes.</p>
                     <a href="#">Faça nova proposta</a>
                   </div>
-                  <br style="clear: both;" />
+                  <div class="clearfix"></div>
                 </div>
               </div>
+
               <div class="support-proposal-container">
                 <div class="support-proposal">
                   <div class="container-title"> Apoie outras propostas</div>
@@ -212,7 +213,9 @@
                   <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
                 </div>
               </div>
+
               <div class="results-container hide"></div>
+              
               <div class="experience-proposal-container">
                 <div class="experience-proposal">
                   <div class="container-title">Conte sua experiência</div>
@@ -237,6 +240,7 @@
                   </div>
                 </div>
               </div>
+
               <div class="talk-proposal-container">
                 <div class="talk-proposal">
                   <div class="container-title">Bate-papo com os ministros</div>
@@ -265,6 +269,8 @@
                   </ul>
                 </div>
               </div>
+              
+              <div class="clearfix"></div>
             </div>
           </div>
         {{!-- </div> --}}
diff --git a/js/main.js b/js/main.js
index e4a530c..6f279f3 100644
--- a/js/main.js
+++ b/js/main.js
@@ -178,20 +178,23 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
           $('#proposal-group').hide();
           $('nav').hide();
           $('#content').hide();
-          $('.make-proposal-form').hide();
-          $('.login-container').hide();
-          $('.proposal-detail').hide();
-          $('.proposal-detail-base').hide();
-          $('#' + proposal_id).show();
-          $('.proposal-header').show();
-          $('.make-proposal-container').show();
-          $('.support-proposal-container').show();
-          $('.results-container').hide();
-          $('.results-container .loading').hide();
-          $('.results-container .results-content').hide();
-          $('.experience-proposal-container').show();
-          $('.talk-proposal-container').show();
-          $('.calendar').slick();
+          // $('.make-proposal-form').hide();
+          // $('.login-container').hide();
+          $('.proposal-detail').hide(); // hide all proposals
+          // $('.proposal-detail-base').hide();
+          $proposal = $('#' + proposal_id);
+          $proposal.find('.proposal-detail-base').hide();
+          $proposal.show();
+          $proposal.find('.proposal-header').show();
+          $proposal.find('.make-proposal-container').show();
+          $proposal.find('.support-proposal-container').show();
+          $proposal.find('.results-container').hide();
+          $proposal.find('.results-container .loading').hide();
+          $proposal.find('.results-container .results-content').hide();
+          $proposal.find('.experience-proposal-container').show();
+          $proposal.find('.talk-proposal-container').show();
+          $proposal.find('.calendar').slick();
+
           var topic_id = proposal_id.split('-').pop();
           this.loadRandomProposal(topic_id, private_token);
         },
@@ -200,15 +203,16 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
           $('#proposal-group').hide();
           $('nav').hide();
           $('#content').hide();
-          $('.make-proposal-form').hide();
-          $('.proposal-header').hide();
-          $('.make-proposal-container').hide();
-          $('.support-proposal-container').hide();
-          $('.results-container').hide();
-          $('.experience-proposal-container').hide();
-          $('.talk-proposal-container').hide();
-          $('#proposal-item-' + proposal_id + '.proposal-detail').show();
-          $('#proposal-item-' + proposal_id + ' .body').show();
+          $proposal = $('#proposal-item-' + proposal_id);
+          $proposal.find('.make-proposal-form').hide();
+          $proposal.find('.proposal-header').hide();
+          $proposal.find('.make-proposal-container').hide();
+          $proposal.find('.support-proposal-container').hide();
+          $proposal.find('.results-container').hide();
+          $proposal.find('.experience-proposal-container').hide();
+          $proposal.find('.talk-proposal-container').hide();
+          $proposal.find('.body').show();
+          $proposal.show();
 
           var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
           $.getJSON(url).done(function( data ) {
@@ -456,6 +460,9 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
         loginButton = $this.parents('.send-button');
         loginButton.hide();
         $this.parents('.success-proposal-sent').hide();
+        $wrapper = $this.parents('.make-proposal');
+        $wrapper.find('.subtitle').show();
+        $wrapper.find('.info').show();
         Main.loginCallback(logged_in);
       });
 
@@ -525,6 +532,8 @@ define(['handlebars','handlebars_helpers'], function(Handlebars){
           form.reset();
           $form.hide();
           $form.siblings('.success-sent').show();
+          $form.siblings('.subtitle').hide();
+          $form.siblings('.info').hide();
         })
         .fail(function( jqxhr, textStatus, error ) {
           var err = textStatus + ', ' + error;
--
libgit2 0.21.2