Download as
Browse Code »

Commit bb5a3f39f92529279a5e8fca94cb6de3a07a3aff

Authored by Leonardo Merlin
2 parents 79a8832f 55b863cd
Exists in master and in 5 other branches build, build2, contigency_plan_recaptcha, production, staging

Merge branch 'master' into merlin

Showing 2 changed files with 54 additions and 44 deletions   Show diff stats
index.html
  Diff comments   View file @bb5a3f3
... ... @@ -312,31 +312,7 @@
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="col-sm-12">
316   - <div class="row">
317   - <div class="calendar-container"></div>
318   - </div>
319   - </div>
320   - <div class="col-sm-12">
321   - <div class="talk__participate">
322   - <div class="row">
323   - <div class="col-sm-4 col-md-3 col-lg-2">
324   - <div class="row">
325   - <button id="talk__button-participate" type="button" class="button button-block">Participar</button>
326   - </div>
327   - </div>
328   - <div class="col-sm-8 col-md-9 col-lg-10">
329   - <div class="row">
330   - <div class="talk__counter">
331   - {{!-- <span class="talk__value">8.117</span> --}}
332   - {{!-- <span class="talk__counter-message">se inscreveram para esse hangout</span> --}}
333   - <span class="talk__counter-message">Se inscreva agora para esse hangout.</span>
334   - </div>
335   - </div>
336   - </div>
337   - </div>
338   - </div>
339   - </div>
  315 + <div class="calendar-container"></div>
340 316 </section>
341 317 </div>
342 318 </div>
... ... @@ -501,23 +477,47 @@
501 477 </script>
502 478  
503 479 <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}}
  480 + <div class="col-sm-12">
  481 + <div class="row">
  482 + <ul class="calendar {{category_class}}" data-slick='{"infinite": false, "rows": 2}'>
  483 + <li>
  484 + <div class="event-body">
  485 + {{{event.body}}}
  486 + </div>
  487 + <div class="event-description">
  488 + <span id='ep0'>{{event.setting.presenter}}</span>
  489 + <span>{{category}}</span>
  490 + <div id='ed0' class="date">
  491 + <i class="fa fa-calendar"></i> {{date}}
  492 + </div>
  493 + <div class="time">
  494 + <i class="fa fa-clock-o"></i> {{time}}
  495 + </div>
  496 + </div>
  497 + </li>
  498 + </ul>
  499 + </div>
  500 + </div>
  501 + <div class="col-sm-12">
  502 + <div class="talk__participate">
  503 + <div class="row">
  504 + <div class="col-sm-4 col-md-3 col-lg-2">
  505 + <div class="row">
  506 + <button id="talk__button-participate" type="button" class="button button-block" data-event-id="{{event.id}}">Participar</button>
  507 + </div>
514 508 </div>
515   - <div class="time">
516   - <i class="fa fa-clock-o"></i> {{time}}
  509 + <div class="col-sm-8 col-md-9 col-lg-10">
  510 + <div class="row">
  511 + <div class="talk__counter">
  512 + <span class="talk__value">{{total_followers}}</span>
  513 + <span class="talk__counter-message">se inscreveram para esse hangout</span>
  514 + {{!- <span class="talk__counter-message">Se inscreva agora para esse hangout.</span> --}}
  515 + </div>
  516 + </div>
517 517 </div>
518 518 </div>
519   - </li>
520   - </ul>
  519 + </div>
  520 + </div>
521 521 </script>
522 522  
523 523 <div class="success-panel hide">
... ...
js/main.js
  Diff comments   View file @bb5a3f3
... ... @@ -688,10 +688,13 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
688 688 var dd = new Date(dt);
689 689 var time = dd.getHours() + ':' + (dd.getMinutes()<10?'0':'') + dd.getMinutes();
690 690 var params = {event: data.articles[0], date: date, time: time, category: data.articles[0].categories[0].name, category_class: active_category};
691   - $('.calendar-container').html(calendarTemplate(params));
692   -
693   - $('.calendar-container .calendar.' + active_category).show();
694   - $('.calendar-container .calendar').slick();
  691 + $.getJSON(host+'/api/v1/articles/'+data.articles[0].id+'/followers?private_token=' + Main.private_token + '&_='+new Date().getTime()).done(function (data) {
  692 + //FIXME do not depend on this request
  693 + params['total_followers'] = data.total_followers;
  694 + $('.calendar-container').html(calendarTemplate(params));
  695 + $('.calendar-container .calendar.' + active_category).show();
  696 + $('.calendar-container .calendar').slick();
  697 + });
695 698 });
696 699 },
697 700 computeBoxHeight: function(){
... ... @@ -1122,7 +1125,14 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
1122 1125  
1123 1126 $(document).on('click', '#talk__button-participate', function(e) {
1124 1127 e.preventDefault();
1125   - console.log('TODO: participate action handler not implemented yet.');
  1128 + $.ajax({
  1129 + type: 'post',
  1130 + url: host + '/api/v1/articles/' + $(this).data('event-id') + '/follow',
  1131 + data: {
  1132 + private_token: Main.private_token
  1133 + }
  1134 + }).done(function(data) {
  1135 + });
1126 1136 });
1127 1137  
1128 1138  
... ...