Commit e99bdac03238fb5e111f609d64b98364f94d17b2
1 parent
28761672
Exists in
master
and in
5 other branches
Display terms of use link
Showing
5 changed files
with
56 additions
and
0 deletions
Show diff stats
index.html
@@ -105,6 +105,8 @@ | @@ -105,6 +105,8 @@ | ||
105 | <h1><a href="#">{{article.title}}</a></h1> | 105 | <h1><a href="#">{{article.title}}</a></h1> |
106 | </header> | 106 | </header> |
107 | 107 | ||
108 | + <div id="article-container" class="hide"></div> | ||
109 | + | ||
108 | <div id="content"> | 110 | <div id="content"> |
109 | {{{article.abstract}}} | 111 | {{{article.abstract}}} |
110 | </div> | 112 | </div> |
@@ -431,6 +433,22 @@ | @@ -431,6 +433,22 @@ | ||
431 | </ul> | 433 | </ul> |
432 | </script> | 434 | </script> |
433 | 435 | ||
436 | + <script id="article" type="text/x-handlebars-template"> | ||
437 | + <div class="title"> | ||
438 | + {{{title}}} | ||
439 | + </div> | ||
440 | + <div class="abstract"> | ||
441 | + {{{abstract}}} | ||
442 | + </div> | ||
443 | + <div class="body"> | ||
444 | + {{{body}}} | ||
445 | + </div> | ||
446 | + </script> | ||
447 | + | ||
448 | + <div class="terms-of-use"> | ||
449 | + <a href="#/artigo/107880">Termos de uso</a> | ||
450 | + </div> | ||
451 | + | ||
434 | <script type='text/javascript' > | 452 | <script type='text/javascript' > |
435 | loadRequireJS(); | 453 | loadRequireJS(); |
436 | </script> | 454 | </script> |
js/main.js
@@ -9,6 +9,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -9,6 +9,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
9 | var supportProposalTemplate = Handlebars.compile(document.getElementById('support-proposal-template').innerHTML); | 9 | var supportProposalTemplate = Handlebars.compile(document.getElementById('support-proposal-template').innerHTML); |
10 | var loginTemplate = Handlebars.compile(document.getElementById('login').innerHTML); | 10 | var loginTemplate = Handlebars.compile(document.getElementById('login').innerHTML); |
11 | var resultsTemplate = Handlebars.compile(document.getElementById('results').innerHTML); | 11 | var resultsTemplate = Handlebars.compile(document.getElementById('results').innerHTML); |
12 | + var articleTemplate = Handlebars.compile(document.getElementById('article').innerHTML); | ||
12 | 13 | ||
13 | // The div/container that we are going to display the results in | 14 | // The div/container that we are going to display the results in |
14 | var resultsPlaceholder = document.getElementById('proposal-result'); | 15 | var resultsPlaceholder = document.getElementById('proposal-result'); |
@@ -225,6 +226,17 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -225,6 +226,17 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
225 | } | 226 | } |
226 | return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4(); | 227 | return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4(); |
227 | }, | 228 | }, |
229 | + display_article: function(article_id) { | ||
230 | + var url = host + '/api/v1/articles/' + article_id + '?private_token=' + Main.private_token; | ||
231 | + $.getJSON(url).done(function( data ) { | ||
232 | + $('#article-container').html(articleTemplate(data.article)); | ||
233 | + $('#article-container').show(); | ||
234 | + $('#proposal-categories').hide(); | ||
235 | + $('#proposal-group').hide(); | ||
236 | + $('nav').hide(); | ||
237 | + $('#content').hide(); | ||
238 | + }); | ||
239 | + }, | ||
228 | display_category_tab: function(){ | 240 | display_category_tab: function(){ |
229 | $('#proposal-group').hide(); | 241 | $('#proposal-group').hide(); |
230 | $('#proposal-categories').show(); | 242 | $('#proposal-categories').show(); |
@@ -233,6 +245,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -233,6 +245,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
233 | $('.proposal-category-items').hide(); | 245 | $('.proposal-category-items').hide(); |
234 | $('.proposal-category .arrow-box').hide(); | 246 | $('.proposal-category .arrow-box').hide(); |
235 | $('.proposal-detail').hide(); | 247 | $('.proposal-detail').hide(); |
248 | + $('#article-container').hide(); | ||
236 | 249 | ||
237 | $('#content').show(); | 250 | $('#content').show(); |
238 | $('nav').show(); | 251 | $('nav').show(); |
@@ -243,6 +256,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -243,6 +256,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
243 | $('#nav-proposal-group a').addClass('active'); | 256 | $('#nav-proposal-group a').addClass('active'); |
244 | $('#nav-proposal-categories a').removeClass('active'); | 257 | $('#nav-proposal-categories a').removeClass('active'); |
245 | $('#content').show(); | 258 | $('#content').show(); |
259 | + $('#article-container').hide(); | ||
246 | $('nav').show(); | 260 | $('nav').show(); |
247 | }, | 261 | }, |
248 | display_proposal: function(proposal_id){ | 262 | display_proposal: function(proposal_id){ |
@@ -250,6 +264,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -250,6 +264,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
250 | $('#proposal-group').hide(); | 264 | $('#proposal-group').hide(); |
251 | $('nav').hide(); | 265 | $('nav').hide(); |
252 | $('#content').hide(); | 266 | $('#content').hide(); |
267 | + $('#article-container').hide(); | ||
253 | // $('.make-proposal-form').hide(); | 268 | // $('.make-proposal-form').hide(); |
254 | // $('.login-container').hide(); | 269 | // $('.login-container').hide(); |
255 | $('.proposal-detail').hide(); // hide all proposals | 270 | $('.proposal-detail').hide(); // hide all proposals |
@@ -293,6 +308,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -293,6 +308,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
293 | $('#proposal-group').hide(); | 308 | $('#proposal-group').hide(); |
294 | $('nav').hide(); | 309 | $('nav').hide(); |
295 | $('#content').hide(); | 310 | $('#content').hide(); |
311 | + $('#article-container').hide(); | ||
296 | $proposal = $('#proposal-item-' + proposal_id); | 312 | $proposal = $('#proposal-item-' + proposal_id); |
297 | $proposal.find('.make-proposal-form').hide(); | 313 | $proposal.find('.make-proposal-form').hide(); |
298 | $proposal.find('.proposal-header').hide(); | 314 | $proposal.find('.proposal-header').hide(); |
@@ -403,6 +419,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -403,6 +419,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
403 | var regexProposals = /#\/programas/; | 419 | var regexProposals = /#\/programas/; |
404 | var regexCategory = /#\/temas/; | 420 | var regexCategory = /#\/temas/; |
405 | var regexHideBarra = /barra=false$/; | 421 | var regexHideBarra = /barra=false$/; |
422 | + var regexArticle = /#\/artigo/; | ||
406 | 423 | ||
407 | if( !(regexHideBarra.exec(hash) !== null) && !HIDE_BARRA_DO_GOVERNO ){ | 424 | if( !(regexHideBarra.exec(hash) !== null) && !HIDE_BARRA_DO_GOVERNO ){ |
408 | this.addBarraDoGoverno(); | 425 | this.addBarraDoGoverno(); |
@@ -417,6 +434,11 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -417,6 +434,11 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
417 | 434 | ||
418 | var isProposal = regexProposals.exec(hash) !== null; | 435 | var isProposal = regexProposals.exec(hash) !== null; |
419 | var isCategory = regexCategory.exec(hash) !== null; | 436 | var isCategory = regexCategory.exec(hash) !== null; |
437 | + var isArticle = regexArticle.exec(hash) !== null; | ||
438 | + | ||
439 | + if(isArticle) { | ||
440 | + this.display_article(hash.split('/')[2]); | ||
441 | + } | ||
420 | 442 | ||
421 | if( isProposal ){ | 443 | if( isProposal ){ |
422 | 444 |
sass/_footer.scss
sass/style.scss
@@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
11 | @import 'slick'; | 11 | @import 'slick'; |
12 | @import 'slick-theme'; | 12 | @import 'slick-theme'; |
13 | @import 'share'; | 13 | @import 'share'; |
14 | +@import 'article'; | ||
14 | 15 | ||
15 | @import 'proposal_detail/proposal-detail-base'; | 16 | @import 'proposal_detail/proposal-detail-base'; |
16 | @import 'proposal_detail/urgencia-e-emergencia'; | 17 | @import 'proposal_detail/urgencia-e-emergencia'; |