Download as
Browse Code »

Commit cb72c30858031f658eeab7561110cf1b7835eaa7

Authored by Leonardo Merlin
1 parent be956383
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Clean code

Showing 2 changed files with 24 additions and 6 deletions   Show diff stats
src/app/pages/ranking/ranking.controller.js
  Diff comments   View file @cb72c30
@@ -33,7 +33,6 @@ @@ -33,7 +33,6 @@
33 vm.selectedTheme = null; 33 vm.selectedTheme = null;
34 vm.filtredPrograms = null; 34 vm.filtredPrograms = null;
35 vm.selectedProgram = null; 35 vm.selectedProgram = null;
36 - vm.proposals = null;  
37 vm.filtredProposals = null; 36 vm.filtredProposals = null;
38 vm.query = null; 37 vm.query = null;
39 vm.search = vm.$location.search(); 38 vm.search = vm.$location.search();
@@ -141,8 +140,7 @@ @@ -141,8 +140,7 @@
141 page: vm.page, 140 page: vm.page,
142 per_page: vm.per_page 141 per_page: vm.per_page
143 }, function(data){ 142 }, function(data){
144 - vm.proposals = data.articles;  
145 - vm.filtredProposals = vm.proposals; 143 + vm.filtredProposals = data.articles;
146 vm.loadingProposals = false; 144 vm.loadingProposals = false;
147 145
148 vm.attachListeners(); 146 vm.attachListeners();
src/app/pages/ranking/ranking.html
  Diff comments   View file @cb72c30
@@ -6,8 +6,27 @@ @@ -6,8 +6,27 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 8
9 -<div class="page--propostas">  
10 - <section class="section--info"> 9 +<div class="page--ranking" role="main">
  10 +
  11 + <section class="section-info" ng-if="pageRanking.loading || pageRanking.error">
  12 + <div class="container">
  13 + <div class="row">
  14 + <div class="col-md-12">
  15 + <div ng-if="pageRanking.loading && !pageRanking.error">
  16 + <div class="alert alert-info" role="alert">Carregando conteúdo...</div>
  17 + </div>
  18 +
  19 + <div ng-if="pageRanking.error">
  20 + <div class="alert alert-danger" role="alert">
  21 + Erro ao carregar o conteúdo principal.
  22 + </div>
  23 + </div>
  24 + </div>
  25 + </div>
  26 + </div>
  27 + </section>
  28 +
  29 + <section class="section--info" ng-if="pageRanking.filtredProposals || pageRanking.themes">
11 <div class="container"> 30 <div class="container">
12 <div class="row"> 31 <div class="row">
13 <div class="col-sm-12"> 32 <div class="col-sm-12">
@@ -16,7 +35,8 @@ @@ -16,7 +35,8 @@
16 </div> 35 </div>
17 </div> 36 </div>
18 </section> 37 </section>
19 - <section class="section--articles section-gray section-space-up" ng-if="pageRanking.proposals"> 38 +
  39 + <section class="section--articles section-gray section-space-up" ng-if="pageRanking.filtredProposals || pageRanking.themes">
20 <div class="container"> 40 <div class="container">
21 <div id="lista-de-propostas" class="row"> 41 <div id="lista-de-propostas" class="row">
22 <div class="col-sm-4 col-md-3"> 42 <div class="col-sm-4 col-md-3">