Download as
Browse Code »

Commit 2ad145f9b6c1a298c5a7b35661ba28bdf2071c36

Authored by Michel Felipe
2 parents 0e010079 00098c3e
Exists in master and in 2 other branches production, staging

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

Showing 3 changed files with 42 additions and 31 deletions   Show diff stats
@@ -589,49 +589,58 @@ @@ -589,49 +589,58 @@
589 </div> 589 </div>
590 </div> 590 </div>
591 {{/if}} 591 {{/if}}
592 - <div class="col-sm-12">  
593 - <div class="row">  
594 - <div class="calendar__column col-xs-12 col-sm-6">  
595 - <div class="row">  
596 - <div class="calendar__presenter">{{event.setting.presenter}}</div>  
597 - <div class="calendar__presenter-category">{{category}}</div>  
598 - </div>  
599 - </div>  
600 - <div class="calendar__column col-xs-6 col-sm-3">  
601 - <div class="row">  
602 - <div class="calendar__date"><i class="fa fa-calendar" aria-hidden="true"></i> {{date}}</div>  
603 - </div>  
604 - </div>  
605 - <div class="calendar__column col-xs-6 col-sm-3">  
606 - <div class="row">  
607 - <div class="calendar__time"><i class="fa fa-clock-o" aria-hidden="true"></i> {{time}}</div>  
608 - </div> 592 +
  593 + {{#compare event.setting.presenter event.title operator="!=="}}
  594 + <div class="col-sm-12">
  595 + <div class="row">
  596 + <p>{{event.setting.presenter}}</p>
609 </div> 597 </div>
610 </div> 598 </div>
611 - </div>  
612 - <div class="col-sm-12">  
613 - <div class="talk__participate"> 599 + {{^}}
  600 + <div class="col-sm-12">
614 <div class="row"> 601 <div class="row">
615 - <div class="col-sm-4 col-md-3 col-lg-2"> 602 + <div class="calendar__column col-xs-12 col-sm-6">
  603 + <div class="row">
  604 + <div class="calendar__presenter">{{event.setting.presenter}}</div>
  605 + <div class="calendar__presenter-category">{{category}}</div>
  606 + </div>
  607 + </div>
  608 + <div class="calendar__column col-xs-6 col-sm-3">
616 <div class="row"> 609 <div class="row">
617 - <button id="talk__button-participate" type="button" class="button button-block require-main-login" data-event-id="{{event.id}}">Participar</button> 610 + <div class="calendar__date"><i class="fa fa-calendar" aria-hidden="true"></i> {{date}}</div>
618 </div> 611 </div>
619 </div> 612 </div>
620 - <div class="col-sm-8 col-md-9 col-lg-10"> 613 + <div class="calendar__column col-xs-6 col-sm-3">
621 <div class="row"> 614 <div class="row">
622 - <div class="talk__counter">  
623 - {{#compare total_followers 50 operator=">"}}  
624 - <span class="talk__value">{{total_followers}}</span>  
625 - <span class="talk__counter-message">se inscreveram para esse bate-papo virtual</span>  
626 - {{^}}  
627 - <span class="talk__counter-message">Inscreva-se agora para esse bate-papo virtual.</span>  
628 - {{/compare}} 615 + <div class="calendar__time"><i class="fa fa-clock-o" aria-hidden="true"></i> {{time}}</div>
  616 + </div>
  617 + </div>
  618 + </div>
  619 + </div>
  620 + <div class="col-sm-12">
  621 + <div class="talk__participate">
  622 + <div class="row">
  623 + <div class="col-sm-4 col-md-3 col-lg-2">
  624 + <div class="row">
  625 + <button id="talk__button-participate" type="button" class="button button-block require-main-login" data-event-id="{{event.id}}">Participar</button>
  626 + </div>
  627 + </div>
  628 + <div class="col-sm-8 col-md-9 col-lg-10">
  629 + <div class="row">
  630 + <div class="talk__counter">
  631 + {{#compare total_followers 50 operator=">"}}
  632 + <span class="talk__value">{{total_followers}}</span>
  633 + <span class="talk__counter-message">se inscreveram para esse bate-papo virtual</span>
  634 + {{^}}
  635 + <span class="talk__counter-message">Inscreva-se agora para esse bate-papo virtual.</span>
  636 + {{/compare}}
  637 + </div>
629 </div> 638 </div>
630 </div> 639 </div>
631 </div> 640 </div>
632 </div> 641 </div>
633 </div> 642 </div>
634 - </div> 643 + {{/compare}}
635 </script> 644 </script>
636 645
637 <div class="success-panel hide"> 646 <div class="success-panel hide">
js/handlebars-helpers.js
  Diff comments   View file @2ad145f
@@ -139,6 +139,7 @@ define([&#39;handlebars&#39;], function(Handlebars){ @@ -139,6 +139,7 @@ define([&#39;handlebars&#39;], function(Handlebars){
139 '==': function(l,r) { return l == r; }, 139 '==': function(l,r) { return l == r; },
140 '===': function(l,r) { return l === r; }, 140 '===': function(l,r) { return l === r; },
141 '!=': function(l,r) { return l != r; }, 141 '!=': function(l,r) { return l != r; },
  142 + '!==': function(l,r) { return l !== r; },
142 '<': function(l,r) { return l < r; }, 143 '<': function(l,r) { return l < r; },
143 '>': function(l,r) { return l > r; }, 144 '>': function(l,r) { return l > r; },
144 '<=': function(l,r) { return l <= r; }, 145 '<=': function(l,r) { return l <= r; },
@@ -23,6 +23,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -23,6 +23,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
23 var lastHash = window.location.hash; 23 var lastHash = window.location.hash;
24 24
25 var host = 'http://login.dialoga.gov.br'; 25 var host = 'http://login.dialoga.gov.br';
  26 + // var host = 'http://hom.login.dialoga.serpro';
26 var serpro_captcha_clienteId = 'fdbcdc7a0b754ee7ae9d865fda740f17'; 27 var serpro_captcha_clienteId = 'fdbcdc7a0b754ee7ae9d865fda740f17';
27 var dialoga_community = 19195; 28 var dialoga_community = 19195;
28 var proposal_discussion = '103358'; //participa 29 var proposal_discussion = '103358'; //participa