Download as
Browse Code »

Commit 10189c031081b0955670d21c5e84eabecfdc51be

Authored by Victor Costa
1 parent 4286ac6e
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Fix event display

Showing 2 changed files with 41 additions and 65 deletions   Show diff stats
index.html
  Diff comments   View file @10189c0
... ... @@ -312,42 +312,9 @@
312 312 <div class="talk-proposal-container col-sm-12">
313 313 <section class="talk-proposal box box-propostas">
314 314 <div class="container-title box-title">Bate-papo com ministras e ministros</div>
315   - <div class="talk__description">
316   - <div class="embed-responsive embed-responsive-16by9">
317   - <iframe src="//www.youtube.com/embed/pe6bePBLZkc?showinfo=0&amp;iv_load_policy=3&amp;controls=0" width="425" height="350"></iframe>
318   - </div>
319   - <p>Confira as datas e horários:</p>
320   - </div>
321 315 <div class="col-sm-12">
322 316 <div class="row">
323   - <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'>
324   - <li>
325   - <span id='ep0'></span>
326   - <span>Saúde</span>
327   - <div id='ed0' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
328   - </li>
329   - </ul>
330   - <ul class="calendar seguranca-publica" data-slick='{"infinite": false, "rows": 2}'>
331   - <li>
332   - <span id='ep1'></span>
333   - <span id='ed1'>Justiça</span>
334   - <div class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
335   - </li>
336   - </ul>
337   - <ul class="calendar educacao" data-slick='{"infinite": false, "rows": 2}'>
338   - <li>
339   - <span id='ep2'></span>
340   - <span>Educação</span>
341   - <div id='ed2' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
342   - </li>
343   - </ul>
344   - <ul class="calendar reducao-da-pobreza" data-slick='{"infinite": false, "rows": 2}'>
345   - <li>
346   - <span id='ep3'></span>
347   - <span>Desenvolvimento Social</span>
348   - <div id='ed3' class="date"><i class="fa fa-calendar"></i></div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
349   - </li>
350   - </ul>
  317 + <div class="calendar-container"></div>
351 318 </div>
352 319 </div>
353 320 <div class="col-sm-12">
... ... @@ -533,6 +500,26 @@
533 500 </div>
534 501 </script>
535 502  
  503 + <script id="calendar-template" type="text/x-handlebars-template">
  504 + <ul class="calendar {{category_class}}" data-slick='{"infinite": false, "rows": 2}'>
  505 + <li>
  506 + <div class="event-body">
  507 + {{{event.body}}}
  508 + </div>
  509 + <div class="event-description">
  510 + <span id='ep0'>{{event.setting.presenter}}</span>
  511 + <span>{{category}}</span>
  512 + <div id='ed0' class="date">
  513 + <i class="fa fa-calendar"></i> {{date}}
  514 + </div>
  515 + <div class="time">
  516 + <i class="fa fa-clock-o"></i> {{time}}
  517 + </div>
  518 + </div>
  519 + </li>
  520 + </ul>
  521 + </script>
  522 +
536 523 <div class="success-panel hide">
537 524 <div class="icon"></div>
538 525 <div class="message"></div>
... ...
js/main.js
  Diff comments   View file @10189c0
... ... @@ -10,6 +10,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
10 10 var loginTemplate = Handlebars.compile(document.getElementById('login-template').innerHTML);
11 11 var resultsTemplate = Handlebars.compile(document.getElementById('results-template').innerHTML);
12 12 var articleTemplate = Handlebars.compile(document.getElementById('article-template').innerHTML);
  13 + var calendarTemplate = Handlebars.compile(document.getElementById('calendar-template').innerHTML);
13 14  
14 15 // The div/container that we are going to display the results in
15 16 var resultsPlaceholder = document.getElementById('proposal-result');
... ... @@ -39,12 +40,6 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
39 40 var cat_educacao = 181;
40 41 var cat_reducao_da_pobreza = 183;
41 42  
42   - window.themes_cat = [];
43   - window.themes_cat[0] = cat_saude;
44   - window.themes_cat[1] = cat_seguranca_publica;
45   - window.themes_cat[2] = cat_educacao;
46   - window.themes_cat[3] = cat_reducao_da_pobreza;
47   -
48 43 window.recaptchaSiteKey = '6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i'
49 44 }else{
50 45 var host = 'http://noosfero.com:3001';
... ... @@ -54,8 +49,6 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
54 49  
55 50 window.proposal_discussion = '392'
56 51 var cat_saude = 23;
57   - window.themes_cat = [];
58   - window.themes_cat[0] = cat_saude;
59 52 }
60 53  
61 54 var BARRA_ADDED = false;
... ... @@ -359,27 +352,29 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
359 352 $proposal.find('.talk-proposal-container').show();
360 353 $proposal.find('.calendar').hide();
361 354 var active_category = '';
  355 + var category_id;
362 356 switch($proposal.find('.categories').attr('class')) {
363 357 case 'categories saude':
364 358 active_category = 'saude';
  359 + category_id = 180;
365 360 break;
366 361 case 'categories educacao':
367 362 active_category = 'educacao';
  363 + category_id = 181;
368 364 break;
369 365 case 'categories seguranca-publica':
370 366 active_category = 'seguranca-publica';
  367 + category_id = 182;
371 368 break;
372 369 case 'categories reducao-da-pobreza':
373 370 active_category = 'reducao-da-pobreza';
  371 + category_id = 183;
374 372 break;
375   - }
376   -
377   - $proposal.find('.calendar.' + active_category).show();
378   - $proposal.find('.calendar').slick();
  373 + }
379 374  
380 375 var topic_id = proposal_id.split('-').pop();
381 376 this.loadRandomProposal(topic_id);
382   - Main.display_events();
  377 + Main.display_events(category_id, active_category);
383 378 },
384 379 display_proposal_detail: function(proposal_id){
385 380 $('.content').removeClass('background'); /* Remove class background */
... ... @@ -684,24 +679,18 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
684 679 msg = msg.substring(0, msg.length - 5) + ".";
685 680 return msg;
686 681 },
687   - display_events: function() {
688   - // /api/v1/communities/64/articles?from=2013-04-04-14:41:43&until=2015-06-11-14:41:43&limit=10&categories_ids[]=7&categories_ids[]=8&private_token=a97b6a5cae2c4c54e4ae18dde1829a49
689   - var url;
690   - count = 0;
691   - for (var i = 0; i < window.themes_cat.length; ++i) {
692   - url = host + '/api/v1/communities/' + window.dialoga_community + '/articles?categories_ids[]=' + window.themes_cat[i] + '&content_type=Event&private_token=' + Main.private_token;
693   - console.log(url);
694   - $.getJSON(url).done(function (data) {
695   - console.log(data);
696   - $('#ep' + count).text(data.articles[0].setting.presenter);
697   - var dt = data.articles[0].start_date;
698   - dia = dt.substr(8, 2);
699   - mes = dt.substr(5, 2);
700   - ano = dt.substr(0, 4);
701   - $('#ed' + count).text(dia + '/' + mes + '/' + ano);
702   - count++;
703   - });
704   - }
  682 + display_events: function(cat_id, active_category) {
  683 + var url = host + '/api/v1/communities/' + window.dialoga_community + '/articles?categories_ids[]=' + cat_id + '&content_type=Event&private_token=' + Main.private_token;
  684 + $.getJSON(url).done(function (data) {
  685 + if(data.articles.length==0) return;
  686 + var dt = data.articles[0].start_date;
  687 + var date = dt.substr(8, 2) + '/' + dt.substr(5, 2) + '/' + dt.substr(0, 4);
  688 + var params = {event: data.articles[0], date: date, time: "19:00", category: data.articles[0].categories[0].name, category_class: active_category};
  689 + $('.calendar-container').html(calendarTemplate(params));
  690 +
  691 + $('.calendar-container .calendar.' + active_category).show();
  692 + $('.calendar-container .calendar').slick();
  693 + });
705 694 },
706 695 computeBoxHeight: function(){
707 696 var hPerLineOnTitle = 25;
... ...