Download as
Browse Code »

Commit 9e65b8d30a336c186aef22c32a583d24061a9aa2

Authored by Leandro Santos
1 parent 2c192b31
Exists in master and in 6 other branches build, build2, capa, contigency_plan_recaptcha, production, staging

put the calendar by category

Showing 2 changed files with 29 additions and 9 deletions   Show diff stats
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 {{#each article.children}} 155 {{#each article.children}}
156 {{!-- <div class="container"> --}} 156 {{!-- <div class="container"> --}}
157 <div class="proposal-detail hide" id="proposal-item-{{id}}"> 157 <div class="proposal-detail hide" id="proposal-item-{{id}}">
158 - <div class="categories {{#each categories}}{{slug}} {{/each}}"> 158 + <div class="categories {{#each categories}}{{slug}}{{/each}}">
159 <ul class="select"> 159 <ul class="select">
160 {{#each categories}} 160 {{#each categories}}
161 <li class="category proposal-category" data-category="{{slug}}"> 161 <li class="category proposal-category" data-category="{{slug}}">
@@ -253,26 +253,32 @@ @@ -253,26 +253,32 @@
253 <div class="talk-proposal"> 253 <div class="talk-proposal">
254 <div class="container-title">Bate-papo com os ministros</div> 254 <div class="container-title">Bate-papo com os ministros</div>
255 <p>Confira as datas e horários:</p> 255 <p>Confira as datas e horários:</p>
256 - <ul class="calendar" data-slick='{"infinite": false, "rows": 2}'> 256 + <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'>
257 <li> 257 <li>
258 <span>Arthur Chioro</span> 258 <span>Arthur Chioro</span>
259 <span>Saúde</span> 259 <span>Saúde</span>
260 <div class="date"><i class="fa fa-calendar"></i> 17/06/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div> 260 <div class="date"><i class="fa fa-calendar"></i> 17/06/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
261 </li> 261 </li>
  262 + </ul>
  263 + <ul class="calendar seguranca-publica" data-slick='{"infinite": false, "rows": 2}'>
262 <li> 264 <li>
263 - <span>Tereza Campello</span>  
264 - <span>Desenvolvimento Social</span>  
265 - <div class="date"><i class="fa fa-calendar"></i> 18/06/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div> 265 + <span>José Eduardo Cardozo</span>
  266 + <span>Justiça</span>
  267 + <div class="date"><i class="fa fa-calendar"></i> 25/04/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
266 </li> 268 </li>
  269 + </ul>
  270 + <ul class="calendar educacao" data-slick='{"infinite": false, "rows": 2}'>
267 <li> 271 <li>
268 <span>Renato Janine Ribeiro</span> 272 <span>Renato Janine Ribeiro</span>
269 <span>Educação</span> 273 <span>Educação</span>
270 <div class="date"><i class="fa fa-calendar"></i> 24/06/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div> 274 <div class="date"><i class="fa fa-calendar"></i> 24/06/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
271 </li> 275 </li>
  276 + </ul>
  277 + <ul class="calendar reducao-da-pobreza" data-slick='{"infinite": false, "rows": 2}'>
272 <li> 278 <li>
273 - <span>José Eduardo Cardozo</span>  
274 - <span>Justiça</span>  
275 - <div class="date"><i class="fa fa-calendar"></i> 25/04/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div> 279 + <span>Tereza Campello</span>
  280 + <span>Desenvolvimento Social</span>
  281 + <div class="date"><i class="fa fa-calendar"></i> 18/06/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
276 </li> 282 </li>
277 </ul> 283 </ul>
278 </div> 284 </div>
@@ -20,7 +20,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F @@ -20,7 +20,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
20 var participa = true; 20 var participa = true;
21 if(participa){ 21 if(participa){
22 var host = 'http://www.participa.br'; 22 var host = 'http://www.participa.br';
23 - var proposal_discussion = '92856'; //participa 23 + var proposal_discussion = '103358'; //participa
24 }else{ 24 }else{
25 var host = 'http://noosfero.com:3000'; 25 var host = 'http://noosfero.com:3000';
26 var proposal_discussion = '632'; //local serpro 26 var proposal_discussion = '632'; //local serpro
@@ -245,6 +245,20 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F @@ -245,6 +245,20 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
245 $proposal.find('.results-container .results-content').hide(); 245 $proposal.find('.results-container .results-content').hide();
246 $proposal.find('.experience-proposal-container').show(); 246 $proposal.find('.experience-proposal-container').show();
247 $proposal.find('.talk-proposal-container').show(); 247 $proposal.find('.talk-proposal-container').show();
  248 + $proposal.find('.calendar').hide();
  249 + var active_category = '';
  250 + switch($proposal.find('.categories').attr('class')) {
  251 + case 'categories saude':
  252 + active_category = 'saude';
  253 + case 'categories educacao':
  254 + active_category = 'educacao';
  255 + case 'categories seguranca-publica':
  256 + active_category = 'seguranca-publica';
  257 + case 'categories reducao-da-pobreza':
  258 + active_category = 'reducao-da-pobreza';
  259 + }
  260 +
  261 + $proposal.find('.calendar.' + active_category).show();
248 $proposal.find('.calendar').slick(); 262 $proposal.find('.calendar').slick();
249 263
250 var topic_id = proposal_id.split('-').pop(); 264 var topic_id = proposal_id.split('-').pop();