Commit e0d6d523d845d5171a6da646b44fafeff2cf43e6
1 parent
31594891
Exists in
master
and in
5 other branches
Active Piwik and add improve the track (close #50)
Active Piwik and add improve the track (close #50) Active Piwik and add improve the track (close #50)
Showing
2 changed files
with
42 additions
and
14 deletions
Show diff stats
js/main.js
@@ -24,7 +24,6 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | @@ -24,7 +24,6 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | ||
24 | var participa = true; | 24 | var participa = true; |
25 | 25 | ||
26 | 26 | ||
27 | - | ||
28 | //Detects for localhost settings | 27 | //Detects for localhost settings |
29 | var patt = new RegExp(":3001/"); | 28 | var patt = new RegExp(":3001/"); |
30 | if(patt.test(window.location.href)) | 29 | if(patt.test(window.location.href)) |
@@ -494,13 +493,6 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | @@ -494,13 +493,6 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | ||
494 | lastHash = hash; | 493 | lastHash = hash; |
495 | }, | 494 | }, |
496 | navigateTo: function(hash, lastHash) { | 495 | navigateTo: function(hash, lastHash) { |
497 | - // _paq.push(['trackEvent', 'NavegarPara', hash || '/']); | ||
498 | - // _paq.push(['setDocumentTitle', document.domain + '/' + hash]); | ||
499 | - // _paq.push(['trackPageView']); | ||
500 | - if (window._paq){ | ||
501 | - window._paq.push(['trackPageView', 'navigateTo', hash, lastHash]); | ||
502 | - } | ||
503 | - // console.log('event tracked.'); | ||
504 | 496 | ||
505 | var scrollTop = 0; | 497 | var scrollTop = 0; |
506 | var $nav = $('nav[role="tabpanel"]'); | 498 | var $nav = $('nav[role="tabpanel"]'); |
@@ -511,6 +503,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | @@ -511,6 +503,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | ||
511 | var regexHideBarra = /barra=false$/; | 503 | var regexHideBarra = /barra=false$/; |
512 | var regexArticle = /#\/artigo/; | 504 | var regexArticle = /#\/artigo/; |
513 | var regexResultados = /resultados$/; | 505 | var regexResultados = /resultados$/; |
506 | + var regexSobreOPrograma = /sobre-o-programa$/; | ||
514 | 507 | ||
515 | if( !(regexHideBarra.exec(hash) !== null) && !HIDE_BARRA_DO_GOVERNO ){ | 508 | if( !(regexHideBarra.exec(hash) !== null) && !HIDE_BARRA_DO_GOVERNO ){ |
516 | this.addBarraDoGoverno(); | 509 | this.addBarraDoGoverno(); |
@@ -523,10 +516,11 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | @@ -523,10 +516,11 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | ||
523 | 516 | ||
524 | var parts = hash.split('/'); | 517 | var parts = hash.split('/'); |
525 | 518 | ||
526 | - var isProposal = regexProposals.exec(hash) !== null; | ||
527 | - var isCategory = regexCategory.exec(hash) !== null; | ||
528 | - var isArticle = regexArticle.exec(hash) !== null; | ||
529 | - var isResultados = regexResultados.exec(hash) !== null; | 519 | + var isProposal = regexProposals.exec(hash) !== null; |
520 | + var isCategory = regexCategory.exec(hash) !== null; | ||
521 | + var isArticle = regexArticle.exec(hash) !== null; | ||
522 | + var isResultados = regexResultados.exec(hash) !== null; | ||
523 | + var isSobreOPrograma = regexSobreOPrograma.exec(hash) !== null; | ||
530 | 524 | ||
531 | if(isArticle) { | 525 | if(isArticle) { |
532 | this.display_article(hash.split('/')[2], lastHash); | 526 | this.display_article(hash.split('/')[2], lastHash); |
@@ -539,6 +533,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | @@ -539,6 +533,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | ||
539 | this.navigateToProposal(proposalId); | 533 | this.navigateToProposal(proposalId); |
540 | 534 | ||
541 | var $proposal = $('#proposal-item-' + proposalId); | 535 | var $proposal = $('#proposal-item-' + proposalId); |
536 | + var proposalTitle = $proposal.find('.title').text(); | ||
542 | var proposalOffset = $proposal.offset(); | 537 | var proposalOffset = $proposal.offset(); |
543 | if(proposalOffset){ | 538 | if(proposalOffset){ |
544 | scrollTop = proposalOffset.top; | 539 | scrollTop = proposalOffset.top; |
@@ -571,6 +566,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | @@ -571,6 +566,7 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | ||
571 | if( isCategory ){ | 566 | if( isCategory ){ |
572 | 567 | ||
573 | // go to category | 568 | // go to category |
569 | + var categorySlug = parts[2]; | ||
574 | var categoryId = parts[3]; | 570 | var categoryId = parts[3]; |
575 | this.navigateToCategory(categoryId); | 571 | this.navigateToCategory(categoryId); |
576 | 572 | ||
@@ -591,6 +587,38 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | @@ -591,6 +587,38 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun | ||
591 | this.display_category_tab(); | 587 | this.display_category_tab(); |
592 | } | 588 | } |
593 | 589 | ||
590 | + // [BEGIN] Tracking | ||
591 | + if (window._paq){ | ||
592 | + // _paq.push(['trackEvent', 'NavegarPara', hash || '/']); | ||
593 | + // _paq.push(['setDocumentTitle', document.domain + '/' + hash]); | ||
594 | + // _paq.push(['trackPageView']); | ||
595 | + | ||
596 | + var trackPageTitle = ''; | ||
597 | + if(isArticle){ | ||
598 | + trackPageTitle = 'Página: Sobre' | ||
599 | + } | ||
600 | + | ||
601 | + if(isProposal){ | ||
602 | + trackPageTitle = 'Proposta: ' + (proposalTitle || 'todas as propostas'); | ||
603 | + | ||
604 | + if(isResultados){ | ||
605 | + trackPageTitle += ' / Resultados' ; | ||
606 | + } | ||
607 | + | ||
608 | + if(isSobreOPrograma){ | ||
609 | + trackPageTitle += ' / Sobre o programa' ; | ||
610 | + } | ||
611 | + } | ||
612 | + | ||
613 | + if(isCategory){ | ||
614 | + trackPageTitle = 'Tema: ' + categorySlug; | ||
615 | + } | ||
616 | + | ||
617 | + window._paq.push(['trackPageView', trackPageTitle]); | ||
618 | + console.log('tracked page view', trackPageTitle); | ||
619 | + } | ||
620 | + // [END] Tracking | ||
621 | + | ||
594 | $('html, body').animate({ scrollTop: scrollTop }, 'fast'); | 622 | $('html, body').animate({ scrollTop: scrollTop }, 'fast'); |
595 | }, | 623 | }, |
596 | navigateToProposal: function(proposalId){ | 624 | navigateToProposal: function(proposalId){ |
js/piwik.js
1 | define(['piwik'], function(){ | 1 | define(['piwik'], function(){ |
2 | -/* | 2 | + |
3 | var _paq = _paq || []; | 3 | var _paq = _paq || []; |
4 | _paq.push(["trackPageView"]); | 4 | _paq.push(["trackPageView"]); |
5 | _paq.push(["enableLinkTracking"]); | 5 | _paq.push(["enableLinkTracking"]); |
@@ -14,5 +14,5 @@ define(['piwik'], function(){ | @@ -14,5 +14,5 @@ define(['piwik'], function(){ | ||
14 | 14 | ||
15 | window._paq = _paq; | 15 | window._paq = _paq; |
16 | return _paq; | 16 | return _paq; |
17 | -*/ | 17 | + |
18 | }); | 18 | }); |