Commit f42e60cff3597442bdd3da3f159bd07ac7753834
1 parent
bab2b271
Exists in
master
and in
11 other branches
change category list
Showing
5 changed files
with
8 additions
and
5 deletions
Show diff stats
2.3 KB
images/icons/pobreza.png
1.05 KB
images/icons/reducao-da-pobreza.png
js/handlebars-helpers.js
@@ -12,21 +12,23 @@ Handlebars.registerHelper('list_proposal', function(proposals, options) { | @@ -12,21 +12,23 @@ Handlebars.registerHelper('list_proposal', function(proposals, options) { | ||
12 | var ret = ""; | 12 | var ret = ""; |
13 | for(var i=0, j=proposals.length; i<j; i++) { | 13 | for(var i=0, j=proposals.length; i<j; i++) { |
14 | element = "<li class='proposal-item'><div class='item'>"; | 14 | element = "<li class='proposal-item'><div class='item'>"; |
15 | - element = element + "<ul class='category'>"; | 15 | + category = "<ul class='category'>"; |
16 | 16 | ||
17 | for(var x=0, y=proposals[i].categories.length; x<y; x++) { | 17 | for(var x=0, y=proposals[i].categories.length; x<y; x++) { |
18 | if((options.hash['category'] != null) && (options.hash['category'] != proposals[i].categories[x].slug)){ | 18 | if((options.hash['category'] != null) && (options.hash['category'] != proposals[i].categories[x].slug)){ |
19 | element = ''; | 19 | element = ''; |
20 | continue; | 20 | continue; |
21 | } | 21 | } |
22 | - element = element + '<li class="category-'+proposals[i].categories[x].slug+'">' + proposals[i].categories[x].name + '</li>'; | 22 | + category = category + '<li class="category-'+proposals[i].categories[x].slug+'">' + proposals[i].categories[x].name + '</li>'; |
23 | } | 23 | } |
24 | if(element == ''){ | 24 | if(element == ''){ |
25 | continue; | 25 | continue; |
26 | } | 26 | } |
27 | - element = element + '</ul>'; | 27 | + category = category + '</ul>'; |
28 | element = element + options.fn(proposals[i]); | 28 | element = element + options.fn(proposals[i]); |
29 | - element = element + '<p>' + (proposals[i].abstract ? proposals[i].abstract : '') + '</p>'; | 29 | + element = element + (proposals[i].abstract ? proposals[i].abstract : ''); |
30 | + | ||
31 | + element = element + category; | ||
30 | ret = ret + element + '</div></li>'; | 32 | ret = ret + element + '</div></li>'; |
31 | } | 33 | } |
32 | return ret; | 34 | return ret; |
sass/_proposal_categories.scss
@@ -50,8 +50,10 @@ | @@ -50,8 +50,10 @@ | ||
50 | } | 50 | } |
51 | 51 | ||
52 | ul.category { | 52 | ul.category { |
53 | + border-top: 1px dotted #045312; | ||
53 | text-align: left; | 54 | text-align: left; |
54 | padding: 0; | 55 | padding: 0; |
56 | + padding-top: 10px; | ||
55 | } | 57 | } |
56 | 58 | ||
57 | .proposal-item p { | 59 | .proposal-item p { |
@@ -68,7 +70,6 @@ | @@ -68,7 +70,6 @@ | ||
68 | } | 70 | } |
69 | 71 | ||
70 | .proposal-item .proposal-link { | 72 | .proposal-item .proposal-link { |
71 | - border-top: 1px dotted #045312; | ||
72 | padding-top: 10px; | 73 | padding-top: 10px; |
73 | display: block; | 74 | display: block; |
74 | margin: 0; | 75 | margin: 0; |