Download as
Browse Code »

Commit a6b79c31cfedba665012f2cbbb3a717fc5337aff

Authored by Leonardo Merlin
1 parent 7c8b0fdc
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Fix typo. Change proposal list limit

Showing 6 changed files with 14 additions and 14 deletions   Show diff stats
src/app/components/proposal-carousel/proposal-carousel.html
  Diff comments   View file @a6b79c3
... ... @@ -24,7 +24,7 @@
24 24 </div>
25 25 </div>
26 26 <div class="proposal-carousel-bottom color-theme-common-bg" ng-click="vm.showProposalsList()">
27   - <div>Veja as propostas mais vortadas</div>
  27 + <div>Veja as propostas mais votadas</div>
28 28 <div class="proposal-carousel-bottom-icon">
29 29 <span class="glyphicon glyphicon-chevron-down pull-right color-theme-common-fg"></span>
30 30 </div>
... ...
src/app/components/proposal-list/proposal-list.directive.js
  Diff comments   View file @a6b79c3
... ... @@ -33,8 +33,8 @@
33 33 throw { name: 'NotDefined', message: 'The attribute "proposals" is undefined.'};
34 34 }
35 35  
36   - if(!vm.per_page){
37   - vm.per_page = 5;
  36 + if(!vm.perPage){
  37 + vm.perPage = 5;
38 38 }
39 39  
40 40 vm.initPorposalList();
... ... @@ -50,10 +50,10 @@
50 50 vm.proposalsLength = vm.proposals.length;
51 51  
52 52  
53   - if ((vm.proposalsLength % vm.per_page) === 0) {
54   - vm.pages = vm.proposalsLength / vm.per_page;
  53 + if ((vm.proposalsLength % vm.perPage) === 0) {
  54 + vm.pages = vm.proposalsLength / vm.perPage;
55 55 } else{
56   - vm.pages = (vm.proposalsLength / vm.per_page) + 1;
  56 + vm.pages = (vm.proposalsLength / vm.perPage) + 1;
57 57 }
58 58  
59 59 // vm.arraypages = new Array(Math.ceil(vm.pages));
... ... @@ -81,8 +81,8 @@
81 81 ProposalListController.prototype.getProposalsPerPage = function (pageIndex) {
82 82 var vm = this;
83 83  
84   - var initialIndex = pageIndex * vm.per_page;
85   - var finalIndex = initialIndex + vm.per_page;
  84 + var initialIndex = pageIndex * vm.perPage;
  85 + var finalIndex = initialIndex + vm.perPage;
86 86  
87 87 return vm.proposals.slice(initialIndex, finalIndex);
88 88 };
... ... @@ -132,7 +132,7 @@
132 132 templateUrl: 'app/components/proposal-list/proposal-list.html',
133 133 scope: {
134 134 proposals: '=',
135   - per_page: '='
  135 + perPage: '='
136 136 },
137 137 controller: ProposalListController,
138 138 controllerAs: 'vm',
... ...
src/app/components/proposal-list/proposal-list.html
  Diff comments   View file @a6b79c3
... ... @@ -27,8 +27,7 @@
27 27 <div class="row row-actions">
28 28 <div class="col-sm-8">
29 29 <button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
30   - Avalie esta proposta
31   - <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
  30 + Participe
32 31 </button>
33 32 </div>
34 33 <div class="col-sm-4">
... ...
src/app/pages/programas/programa.controller.js
  Diff comments   View file @a6b79c3
... ... @@ -76,6 +76,7 @@
76 76 vm.loadingTopProposals = true;
77 77 vm.DialogaService.getProposalsByTopicId(vm.article.id, {}, function(data) {
78 78 vm.proposals = data.articles;
  79 + vm.proposalsTopFive = vm.proposals.slice(0, 5);
79 80 vm.proposalsTopRated = vm.proposals.slice(0, 3);
80 81 vm.loadingTopProposals = false;
81 82 }, function(error) {
... ...
src/app/pages/programas/programa.html
  Diff comments   View file @a6b79c3
... ... @@ -111,7 +111,7 @@
111 111 </div>
112 112 </section>
113 113  
114   - <section id="section-proposal-list" class="proposal-extended-section" style="display:none;" ng-if="pagePrograma.proposals && pagePrograma.proposals.length > 0">
  114 + <section id="section-proposal-list" class="proposal-extended-section" style="display:none;" ng-if="pagePrograma.proposalsTopFive && pagePrograma.proposalsTopFive.length > 0">
115 115 <div class="container">
116 116 <div class="proposal-extended-section-header">
117 117 <h3 class="color-theme-fg">Resultados de propostas mais votadas</h3>
... ... @@ -120,7 +120,7 @@
120 120 </button>
121 121 </div>
122 122 <div class="proposal-extended-section-content">
123   - <proposal-list proposals="pagePrograma.proposals"></proposal-list>
  123 + <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list>
124 124 </div>
125 125 </div>
126 126 </section>
... ...
src/app/pages/propostas/ranking.html
  Diff comments   View file @a6b79c3
... ... @@ -78,7 +78,7 @@
78 78  
79 79 <div class="row">
80 80 <div class="col-sm-12" ng-if="pagePropostas.proposals">
81   - <proposal-list proposals="pagePropostas.filtredProposals"></proposal-list>
  81 + <proposal-list proposals="pagePropostas.filtredProposals" per-page="10"></proposal-list>
82 82 </div>
83 83 <div ng-if="!pagePropostas.proposals && pagePropostas.loadingProposals">
84 84 <div class="alert alert-info" role="alert">
... ...