Download as
Browse Code »

Commit f7b67ddaf66cf83d1a61de8215d476e891ea4d02

Authored by Leonardo Merlin
2 parents 336cb3aa 7f70e24f
Exists in staging and in 1 other branch production

Merge branch 'master' into staging

Showing 3 changed files with 121 additions and 60 deletions   Show diff stats
@@ -175,8 +175,25 @@ @@ -175,8 +175,25 @@
175 </div> 175 </div>
176 176
177 <div id="content" class="container video-smaller"> 177 <div id="content" class="container video-smaller">
178 - <div class="embed-responsive embed-responsive-16by9">  
179 - {{{article.abstract}}} 178 + <div class="freeze--home-message">
  179 + <p style="font-size: 26px;">
  180 + O Dialoga Brasil está no ar desde 28 de julho de 2015, lançado pela Presidenta Dilma.
  181 + <br/>
  182 + Acumulou 24.320 usuários cadastrados, 10.436 propostas e 264.708 votos.
  183 + </p>
  184 + <p style="font-size: 28px;">
  185 + <span style="color: #F3A727;">Agora o</span>
  186 + <span style="color: #E24F4D;">Dialoga Brasil</span>
  187 + <span style="color: #F3A727;">entra em uma nova fase!</span>
  188 + </p>
  189 + <p style="font-size: 24px; color: #5AAB2F;">
  190 + Agora o governo federal analisará as 3 propostas mais apoiadas em cada programa e dará retorno à sociedade.
  191 + </p>
  192 + <p style="font-size: 20px; color: #0086B7;">
  193 + Continue com a gente!
  194 + <br/>
  195 + A resposta à sua participação e novos temas entrarão na plataforma em breve!
  196 + </p>
180 </div> 197 </div>
181 </div> 198 </div>
182 199
@@ -208,6 +225,13 @@ @@ -208,6 +225,13 @@
208 <div class="header proposal-title"> 225 <div class="header proposal-title">
209 <h2 class="name">{{name}}</h2> 226 <h2 class="name">{{name}}</h2>
210 <div class="description"></div> 227 <div class="description"></div>
  228 + <div class="freeze--theme-message">
  229 + <p>
  230 + Agora o Dialoga Brasil entra em uma nova fase!
  231 + <br/>
  232 + O governo federal analisará as 3 propostas mais apoiadas em cada programa e dará um retorno à sociedade.
  233 + </p>
  234 + </div>
211 </div> 235 </div>
212 <ul class="proposal-list row"> 236 <ul class="proposal-list row">
213 {{#list_proposal ../article.children category=slug host=../host}} 237 {{#list_proposal ../article.children category=slug host=../host}}
@@ -291,69 +315,37 @@ @@ -291,69 +315,37 @@
291 </div> 315 </div>
292 316
293 <div class="row"> 317 <div class="row">
294 - <div class="make-proposal-container col-sm-6 require-login-container">  
295 - <section class="make-proposal box box-propostas">  
296 - <div class="section-content">  
297 - <div class="container-title box-title">Faça uma proposta</div>  
298 - <div class="subtitle box-subtitle">Qual a sua sugestão para melhorar este programa?</div>  
299 - <div class="info box-info"></div>  
300 - <div class="row">  
301 - <div class="col-sm-6 col-sm-offset-3">  
302 - <div class="button send-proposal-button button-send box-footer">  
303 - <a href="#"><span>Envie sua proposta</span></a>  
304 - </div>  
305 - </div>  
306 - </div>  
307 - <div class="login-container hide">Login</div>  
308 - <form class="make-proposal-form save-article-form require-login hide" id="make-proposal-form-{{id}}" action="{{proposal_action ../article . }}" method="post">  
309 - <div class="message hide"></div>  
310 - <div>  
311 - <div><label for="article_abstract">Descrição <span title="Campo obrigatório.">(*)</span></label></div>  
312 - <textarea id="article_abstract" class="countdown" name="article[abstract]" placeholder="Escreva sua proposta aqui." maxlength="200" required></textarea>  
313 - </div>  
314 - <input type="hidden" id="type" name="article[type]" value="ProposalsDiscussionPlugin::Proposal">  
315 - <input type="hidden" id="content_type" name="content_type" value="ProposalsDiscussionPlugin::Proposal">  
316 - <div class="row">  
317 - <div class="col-sm-6 col-sm-offset-3">  
318 - <input type="submit" id="make-proposal-button" name="make-proposal-button" class="make-proposal-button button" value="Enviar">  
319 - </div>  
320 - </div>  
321 - </form>  
322 - <div class="success-proposal-sent success-sent hide button-send">  
323 - <p>Sua proposta foi encaminhada com sucesso! Você receberá um retorno por email em até 48 horas.</p>  
324 - <a href="#">Faça nova proposta</a>  
325 - </div>  
326 - <div class="clearfix"></div>  
327 - </div>  
328 - </section> 318 + <div class="freeze--program-message">
  319 + <p>
  320 + Estamos trabalhando nas respostas às propostas mais apoiadas para o {{title}}.
  321 + <br/>
  322 + Afinal, acreditamos que o país fica melhor quando você participa!
  323 + </p>
  324 + <p>
  325 + Confira abaixo as três propostas mais apoiadas.
  326 + O resultado completo das propostas apresentadas você encontra no link
  327 + <a href="#/programas/{{id}}/resultados" class="vote-result box-bottom">resultado geral</a>.
  328 + </p>
329 </div> 329 </div>
330 330
331 - <div class="support-proposal-container col-sm-6 require-login-container">  
332 - <section class="support-proposal box box-propostas box-center box-apoie">  
333 - <div class="section-content">  
334 - <div class="container-title box-title"> Apoie outras propostas</div>  
335 - <div class="alert alert-warning hide" role="alert">  
336 - <i class="fa fa-warning" aria-hidden="true"></i><strong>Proposta não encontrada</strong>  
337 - </div>  
338 - <div class="support-proposal-content require-login">  
339 - <div class="random-proposal"></div>  
340 - <div class="loading">Carregando...</div>  
341 - <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>  
342 - </div>  
343 - <div class="login-container hide">Login</div>  
344 - <div class="button-send hide"><a href="#"><span>Login</span></a></div>  
345 - </div>  
346 - </section> 331 + <div class="freeze--top-proposals" style="display: none;">
  332 +
  333 + <table>
  334 + <thead>
  335 + <tr class="header">
  336 + <th class="position">Posição <a href="#/artigo/108047" class="question-link"><span class="fa fa-question"></span></a></th>
  337 + <th class="abstract-text" data-toggle="true">Propostas</th>
  338 + <th class="views" data-hide="phone">Exibições</th>
  339 + <th class="votes-for" data-hide="phone"><span class="sr-only">A favor</span><span class="fa fa-check"></span></th>
  340 + <th class="votes-against" data-hide="phone"><span class="sr-only">Contra</span><span class="fa fa-times"></span></th>
  341 + </tr>
  342 + </thead>
  343 + <tbody></tbody>
  344 + </table>
  345 +
347 </div> 346 </div>
348 347
349 <div class="results-container hide col-sm-12"></div> 348 <div class="results-container hide col-sm-12"></div>
350 -  
351 - <div class="talk-proposal-container col-sm-12">  
352 - <section class="talk-proposal box box-propostas">  
353 - <div class="container-title box-title">Bate-papo virtual com ministras e ministros</div>  
354 - <div class="calendar-container"></div>  
355 - </section>  
356 - </div>  
357 </div> 349 </div>
358 350
359 <div class="clearfix"></div> 351 <div class="clearfix"></div>
@@ -241,6 +241,60 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -241,6 +241,60 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
241 $('.support-proposal .alert').show(); 241 $('.support-proposal .alert').show();
242 }); 242 });
243 }, 243 },
  244 + loadTopProposals: function (topic_id) {
  245 +
  246 + // TODO: start loading
  247 +
  248 + var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking?per_page=3&page=1';
  249 + $.getJSON(url).done(function( data, stats, xhr ) {
  250 +
  251 + // TODO: stop loading
  252 +
  253 + if ( !data || !data.proposals ) {
  254 + console.error('Proposals not found.');
  255 + return;
  256 + }
  257 +
  258 + var $containerWrapper = $('#proposal-item-' + topic_id);
  259 + var $containerTopProposals = $containerWrapper.find('.freeze--top-proposals');
  260 + var $tbody = $containerTopProposals.find('tbody');
  261 +
  262 + if ( $containerTopProposals.css('display') === 'block' ) {
  263 + console.log('Top ranking already loaded.');
  264 + return;
  265 + }
  266 +
  267 + var TEMPLATE_TR = '' +
  268 + '<tr>' +
  269 + '<td>{{position}}°</td>' +
  270 + '<td>{{abstract}}</td>' +
  271 + '<td>{{hits}}</td>' +
  272 + '<td>{{votes_for}}</td>' +
  273 + '<td>{{votes_against}}</td>' +
  274 + '</tr>';
  275 +
  276 + var proposals = data.proposals;
  277 + var proposal = null;
  278 + var proposal_tpl = null;
  279 +
  280 + for (var i = proposals.length - 1; i >= 0; i--) {
  281 + proposal = proposals[i];
  282 + proposal_tpl = '' + TEMPLATE_TR;
  283 + proposal_tpl = replace(proposal_tpl, '{{position}}', proposal.position);
  284 + proposal_tpl = replace(proposal_tpl, '{{abstract}}', proposal.abstract);
  285 + proposal_tpl = replace(proposal_tpl, '{{hits}}', proposal.hits);
  286 + proposal_tpl = replace(proposal_tpl, '{{votes_for}}', proposal.votes_for);
  287 + proposal_tpl = replace(proposal_tpl, '{{votes_against}}', proposal.votes_against);
  288 +
  289 + $tbody.prepend($(proposal_tpl));
  290 + }
  291 +
  292 + $containerTopProposals.css('display', 'block');
  293 +
  294 + console.log('data', data);
  295 +
  296 + });
  297 + },
244 loadRanking: function($resultsContainer, topic_id, page) { 298 loadRanking: function($resultsContainer, topic_id, page) {
245 $resultsContainer.find('.loading').show(); 299 $resultsContainer.find('.loading').show();
246 $resultsContainer.find('.results-content').hide(); 300 $resultsContainer.find('.results-content').hide();
@@ -483,6 +537,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -483,6 +537,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
483 537
484 var topic_id = proposal_id.split('-').pop(); 538 var topic_id = proposal_id.split('-').pop();
485 this.loadRandomProposal(topic_id); 539 this.loadRandomProposal(topic_id);
  540 + this.loadTopProposals(topic_id);
486 Main.display_events(category_id, active_category); 541 Main.display_events(category_id, active_category);
487 }, 542 },
488 display_proposal_detail: function(proposal_id){ 543 display_proposal_detail: function(proposal_id){
sass/style.sass
  Diff comments   View file @f7b67dd
@@ -1273,6 +1273,15 @@ td @@ -1273,6 +1273,15 @@ td
1273 position: relative 1273 position: relative
1274 margin-bottom: 10px 1274 margin-bottom: 10px
1275 1275
  1276 +
  1277 +// 6.23 - freeze messages
  1278 +// .freeze--home-message
  1279 +.freeze--theme-message
  1280 + font-weight: bold
  1281 + margin: 10px 0
  1282 +.freeze--top-proposals
  1283 + margin: 10px 0
  1284 +
1276 // ------------------------------------ 1285 // ------------------------------------
1277 // 7 - Modificadores 1286 // 7 - Modificadores
1278 // ------------------------------------ 1287 // ------------------------------------
@@ -1397,6 +1406,11 @@ h3.titulo-destaque @@ -1397,6 +1406,11 @@ h3.titulo-destaque
1397 .category-title 1406 .category-title
1398 background-color: $color 1407 background-color: $color
1399 border-color: darken($color, $darken) 1408 border-color: darken($color, $darken)
  1409 +
  1410 + .freeze--theme-message p,
  1411 + .freeze--program-message p
  1412 + color: $color
  1413 +
1400 .icon 1414 .icon
1401 &-#{$category} 1415 &-#{$category}
1402 background-color: $color 1416 background-color: $color