Download as
Browse Code »

Commit a5d67d066b124a73c6580a5e6088fe836e9e693c

Authored by Leandro Santos
2 parents 0ee7069a 6b0b7fbd
Exists in master and in 11 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

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

Showing 2 changed files with 23 additions and 11 deletions   Show diff stats
index.html
  Diff comments   View file @a5d67d0
... ... @@ -101,6 +101,13 @@
101 101 </div>
102 102 </div>
103 103 <div class='support-proposal-container'>
  104 + <div class='support-proposal'>
  105 + <div class='container-title'> Apoie outras propostas</div>
  106 + <div class='subtitle'> Propostas da sociedade</div>
  107 + <div class="random-proposal"></div>
  108 + <div class="loading">Carregando...</div>
  109 + <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
  110 + </div>
104 111 </div>
105 112 <div class='experience-proposal-container'>
106 113 <div class='experience-proposal'>
... ... @@ -134,15 +141,11 @@
134 141 </script>
135 142  
136 143 <script id='support-proposal-template' type='text/x-handlebars-template'>
137   - <div class='support-proposal'>
138   - <div class='container-title'> Apoie outras propostas</div>
139   - <div class='subtitle'> Propostas da sociedade</div>
140   - <div class='abstract'><p>"{{abstract}}"</p></div>
141   - <div class="vote-actions">
142   - <a href="#" class="like dislike" data-vote-value="-1"></a>
143   - <a href="#" class="like" data-vote-value="1"></a>
144   - <a href="#" class="skip">Pular</a>
145   - </div>
  144 + <div class='abstract'><p>"{{abstract}}"</p></div>
  145 + <div class="vote-actions">
  146 + <a href="#" class="like dislike" data-vote-value="-1"></a>
  147 + <a href="#" class="like" data-vote-value="1"></a>
  148 + <a href="#" class="skip">Pular</a>
146 149 </div>
147 150 </script>
148 151  
... ...
js/main.js
  Diff comments   View file @a5d67d0
... ... @@ -126,11 +126,20 @@ $.getJSON(noosferoAPI)
126 126 });
127 127  
128 128 function loadRandomProposal(topic_id, private_token) {
  129 + $(".no-proposals").hide();
  130 + $(".loading").show();
  131 + $('.random-proposal').html('');
129 132 var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by';
130 133 $.getJSON(url).done(function( data ) {
131   - if(data.articles.length == 0) return;
  134 + $(".loading").hide();
  135 +
  136 + if(data.articles.length == 0) {
  137 + $(".no-proposals").show();
  138 + return;
  139 + }
  140 +
132 141 var article = data.articles[0];
133   - $('.support-proposal-container').html(supportProposalTemplate(article));
  142 + $('.random-proposal').html(supportProposalTemplate(article));
134 143 $(".abstract").dotdotdot();
135 144 $(document.body).off('click', '.vote-actions .skip');
136 145 $(document.body).on('click', '.vote-actions .skip', function(e) {
... ...