diff --git a/src/app/components/proposal-carousel/proposal-carousel.directive.js b/src/app/components/proposal-carousel/proposal-carousel.directive.js index a27a9bf..c381541 100644 --- a/src/app/components/proposal-carousel/proposal-carousel.directive.js +++ b/src/app/components/proposal-carousel/proposal-carousel.directive.js @@ -60,7 +60,7 @@ var vm = this; // notify parents - handled by parents - vm.$scope.$emit('proposal-carousel:toProposals'); + vm.$scope.$emit('proposal-carousel:showProposals'); }; var directive = { diff --git a/src/app/components/proposal-list/proposal-list.html b/src/app/components/proposal-list/proposal-list.html index 557656c..fc183b3 100644 --- a/src/app/components/proposal-list/proposal-list.html +++ b/src/app/components/proposal-list/proposal-list.html @@ -1,8 +1,8 @@
-
-
Carregando...
+
+
Carregando...
-
+
@@ -25,13 +25,13 @@
-
+
-
+
diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index e1f47fa..43c4d58 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -118,16 +118,26 @@ ProgramaPageController.prototype.attachListeners = function() { var vm = this; - vm.$scope.$on('proposal-carousel:toProposals', function() { + vm.$scope.$on('proposal-carousel:showProposals', function() { if(!vm._proposal_list){ vm._proposal_list = vm.$element.find('.proposal-ranking-section'); } - vm._proposal_list.slideToggle(); + vm._proposal_list.slideDown(); angular.element('body').animate({scrollTop: vm._proposal_list.offset().top}, 'fast'); }); }; + ProgramaPageController.prototype.hideProposals = function() { + var vm = this; + + if(!vm._proposal_list){ + vm._proposal_list = vm.$element.find('.proposal-ranking-section'); + } + + vm._proposal_list.slideUp(); + }; + ProgramaPageController.prototype.makeProposal = function() { var vm = this; diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html index 9276e0a..37c0a98 100644 --- a/src/app/pages/programas/programa.html +++ b/src/app/pages/programas/programa.html @@ -85,6 +85,9 @@

Resultados de propostas mais votadas

+
diff --git a/src/app/pages/programas/programas.scss b/src/app/pages/programas/programas.scss index 3ced87a..c3e6eae 100644 --- a/src/app/pages/programas/programas.scss +++ b/src/app/pages/programas/programas.scss @@ -69,10 +69,19 @@ h3 { margin-top: 0; } - } .proposal-ranking-section { background-color: #f1f1f1; margin: 30px 0; + + .proposal-ranking-section-header{ + position: relative; + } + + .btn-close { + position: absolute; + right: 0; + top: 0; + } } -- libgit2 0.21.2