Download as
Browse Code »

Commit 61b7dfa7953bec126b5ea7bc0f0c7b9d608436f4

Authored by Leandro Santos
1 parent b85f2d62
Exists in master and in 12 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, login, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

show group by category

Showing 2 changed files with 22 additions and 5 deletions   Show diff stats
@@ -27,9 +27,16 @@ @@ -27,9 +27,16 @@
27 27
28 <ul id="proposal-categories"> 28 <ul id="proposal-categories">
29 {{#each article.categories}} 29 {{#each article.categories}}
30 - <li class="category"> 30 + <li class="proposal-category">
31 <img src="{{../host}}{{image.thumb_url}}"/> 31 <img src="{{../host}}{{image.thumb_url}}"/>
32 {{#link name id}}{{/link}} 32 {{#link name id}}{{/link}}
  33 + <ul id='proposal-item-{{id}}' class='proposal-category-item hide'>
  34 + {{#each ../article.children}}
  35 + <li class="proposal-item">
  36 + {{#link title id}}{{/link}}
  37 + </li>
  38 + {{/each}}
  39 + </ul>
33 </li> 40 </li>
34 {{/each}} 41 {{/each}}
35 </ul> 42 </ul>
@@ -28,19 +28,29 @@ $.getJSON(noosferoAPI) @@ -28,19 +28,29 @@ $.getJSON(noosferoAPI)
28 $( 'a' ).click(function(event){ 28 $( 'a' ).click(function(event){
29 var item = this.href.split('#').pop(); 29 var item = this.href.split('#').pop();
30 if(item == 'proposal-categories'){ 30 if(item == 'proposal-categories'){
  31 + //Display the category tab
31 $('#proposal-group').hide(); 32 $('#proposal-group').hide();
32 $('#nav-proposal-categories a').addClass('active'); 33 $('#nav-proposal-categories a').addClass('active');
33 $('#nav-proposal-group a').removeClass('active'); 34 $('#nav-proposal-group a').removeClass('active');
34 }else if(item == 'proposal-group'){ 35 }else if(item == 'proposal-group'){
  36 + //Display the Topics or Discussions
35 $('#proposal-categories').hide(); 37 $('#proposal-categories').hide();
36 $('#nav-proposal-group a').addClass('active'); 38 $('#nav-proposal-group a').addClass('active');
37 $('#nav-proposal-categories a').removeClass('active'); 39 $('#nav-proposal-categories a').removeClass('active');
38 }else{ 40 }else{
39 - $('#proposal-categories').hide();  
40 - $('#proposal-group').hide(); 41 + if($('#' + item).hasClass('proposal-category-item')){
  42 + //Display Topics or Discussion by category
  43 + $('.proposal-category-item').hide();
  44 + $('#' + item).show();
  45 +
  46 + }else{
  47 + //Display Proposal
  48 + $('#proposal-categories').hide();
  49 + $('#proposal-group').hide();
  50 + $('.proposal-detail').hide();
  51 + $('#' + item).show();
  52 + }
41 } 53 }
42 - $('.proposal-detail').hide();  
43 - $('#' + item).show();  
44 event.preventDefault(); 54 event.preventDefault();
45 }); 55 });
46 }) 56 })