From e27f3b3c0e690bbe1f99e2ace679d6502564df07 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Mon, 14 Sep 2015 10:58:47 -0300
Subject: [PATCH] Fix scroll behaviour. Add footer directive

---
 src/app/components/proposal-carousel/proposal-carousel.directive.js | 15 ++++++++++++++-
 src/app/components/proposal-carousel/proposal-carousel.html         | 12 ++++++++++--
 src/app/components/proposal-carousel/proposal-carousel.scss         | 20 ++++++++++++++++----
 src/app/index.run.js                                                |  2 +-
 src/app/pages/article/article.controller.js                         |  5 ++++-
 src/app/pages/auth/auth.controller.js                               |  2 ++
 src/app/pages/programas/programa.controller.js                      |  5 +++--
 src/app/pages/programas/programa.html                               | 12 ++++++------
 src/app/pages/programas/programas.controller.js                     |  6 ++++--
 src/app/pages/programas/programas.html                              |  2 +-
 src/index.html                                                      |  5 +++--
 11 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/src/app/components/proposal-carousel/proposal-carousel.directive.js b/src/app/components/proposal-carousel/proposal-carousel.directive.js
index 866e432..8cdb508 100644
--- a/src/app/components/proposal-carousel/proposal-carousel.directive.js
+++ b/src/app/components/proposal-carousel/proposal-carousel.directive.js
@@ -9,11 +9,12 @@
   function proposalCarousel() {
 
     /** @ngInject */
-    function ProposalCarouselController($scope, $element, $timeout, $log) {
+    function ProposalCarouselController($scope, $state, $element, $timeout, $log) {
       $log.debug('ProposalCarouselController');
 
       var vm = this;
       vm.$scope = $scope;
+      vm.$state = $state;
       vm.$element = $element;
       vm.$timeout = $timeout;
       vm.$log = $log;
@@ -63,6 +64,18 @@
       vm.$scope.$emit('proposal-carousel:showProposalsList');
     };
 
+    ProposalCarouselController.prototype.showContent = function (proposal) {
+      var vm = this;
+
+      vm.$state.go('programa', {
+        slug: proposal.parent.slug,
+        proposal_id: proposal.id
+      }, {
+        location: true,
+        reload: true
+      });
+    };
+
     var directive = {
       restrict: 'E',
       templateUrl: 'app/components/proposal-carousel/proposal-carousel.html',
diff --git a/src/app/components/proposal-carousel/proposal-carousel.html b/src/app/components/proposal-carousel/proposal-carousel.html
index a7855cc..54bc9fd 100644
--- a/src/app/components/proposal-carousel/proposal-carousel.html
+++ b/src/app/components/proposal-carousel/proposal-carousel.html
@@ -16,7 +16,15 @@
     <div class="proposal-carousel-middle" ng-swipe-left="vm.swipeLeft()" ng-swipe-right="vm.swipeRight()">
       <div ng-repeat="proposal in vm.proposals" class="animation-swipe">
         <div class="content">
-          <div ng-show="vm.activeIndex === $index">{{::proposal.abstract}}</div>
+          <div ng-show="vm.activeIndex === $index">
+            <div class="inner">{{::proposal.abstract}}</div>
+          </div>
+        </div>
+        <div class="join">
+          <button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
+            Participe
+            <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+          </button>
         </div>
         <div class="proposal-carousel-middle-watermark" ng-show="vm.activeIndex === $index">
           <span>{{::($index+1)}}º</span>
@@ -26,7 +34,7 @@
     <div class="proposal-carousel-bottom color-theme-common-bg" ng-click="vm.showProposalsList()">
       <div>Veja as propostas mais votadas</div>
       <div class="proposal-carousel-bottom-icon">
-        <span class="glyphicon glyphicon-chevron-down pull-right color-theme-common-fg"></span>
+        <span class="glyphicon glyphicon-chevron-down pull-right color-theme-common-fg" aria-hidden="true"></span>
       </div>
     </div>
   </div>
diff --git a/src/app/components/proposal-carousel/proposal-carousel.scss b/src/app/components/proposal-carousel/proposal-carousel.scss
index 619d064..5e3fe2f 100644
--- a/src/app/components/proposal-carousel/proposal-carousel.scss
+++ b/src/app/components/proposal-carousel/proposal-carousel.scss
@@ -9,12 +9,12 @@
         color: #fff;
         font-weight: bold;
         font-size: 25px;
-        padding: 20px 15px;
+        padding: 10px 15px;
 
         &-triggers {
             position: absolute;
             right: 15px;
-            top: 20px;
+            top: 8px;
 
             button {
                 border: 1px solid #fff;
@@ -46,14 +46,26 @@
 
         .content {
             position: relative;
-            z-index: 2;
+            z-index: 10;
+        }
+
+        .join {
+            position: absolute;
+            bottom: 32px;
+            z-index: 10;
+
+            .btn {
+                padding: 0;
+                font-weight: bold;
+                font-size: 16px;
+            }
         }
 
         &-watermark {
             position: absolute;
             bottom: 1px;
             left: -5px;
-            color: #ddd;
+            color: #e6e6e6;
             font-size: 150px;
             font-weight: bold;
             line-height: 116px;
diff --git a/src/app/index.run.js b/src/app/index.run.js
index 569fe3c..2155234 100644
--- a/src/app/index.run.js
+++ b/src/app/index.run.js
@@ -142,7 +142,7 @@
 
       if (mainContentArea) {
         $timeout(function() {
-          $rootScope.scrollTo(mainContentArea, $event);
+          $rootScope.scrollTo(angular.element(mainContentArea), $event);
         }, 90); // force queue
       } else {
         $log.warn('role="main" not found.');
diff --git a/src/app/pages/article/article.controller.js b/src/app/pages/article/article.controller.js
index a29f359..2c206ec 100644
--- a/src/app/pages/article/article.controller.js
+++ b/src/app/pages/article/article.controller.js
@@ -6,10 +6,11 @@
     .controller('ArticlePageController', ArticlePageController);
 
   /** @ngInject */
-  function ArticlePageController(DialogaService, $state, $sce, $log) {
+  function ArticlePageController(DialogaService, $rootScope, $state, $sce, $log) {
     var vm = this;
 
     vm.DialogaService = DialogaService;
+    vm.$rootScope = $rootScope;
     vm.$state = $state;
     vm.$sce = $sce;
     vm.$log = $log;
@@ -17,6 +18,8 @@
     vm.init();
     vm.loadData();
 
+    vm.$rootScope.focusMainContent();
+
     vm.$log.debug('ArticlePageController');
   }
 
diff --git a/src/app/pages/auth/auth.controller.js b/src/app/pages/auth/auth.controller.js
index deba871..5729471 100644
--- a/src/app/pages/auth/auth.controller.js
+++ b/src/app/pages/auth/auth.controller.js
@@ -26,6 +26,8 @@
     vm.loadData();
     vm.attachListeners();
 
+    vm.$rootScope.focusMainContent();
+
     vm.$log.debug('AuthPageController');
   }
 
diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js
index 8260b3a..122e76a 100644
--- a/src/app/pages/programas/programa.controller.js
+++ b/src/app/pages/programas/programa.controller.js
@@ -7,8 +7,6 @@
 
   /** @ngInject */
   function ProgramaPageController(DialogaService, PATH, VOTE_OPTIONS, $state, $location, $scope, $rootScope, $element, $timeout, $log) {
-    $log.debug('ProgramaPageController');
-
     var vm = this;
 
     vm.DialogaService = DialogaService;
@@ -25,6 +23,9 @@
     vm.init();
     vm.loadData();
     vm.attachListeners();
+    vm.$rootScope.focusMainContent();
+
+    vm.$log.debug('ProgramaPageController');
   }
 
   ProgramaPageController.prototype.init = function() {
diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html
index 30ebc90..6642eae 100644
--- a/src/app/pages/programas/programa.html
+++ b/src/app/pages/programas/programa.html
@@ -18,8 +18,8 @@
     </div>
   </section>
 
-  <div ng-if="pagePrograma.article.body" ng-class="pagePrograma.category.slug">
-    <section>
+  <div role="main">
+    <section ng-if="pagePrograma.article.body" ng-class="pagePrograma.category.slug">
       <div class="container">
         <div class="row">
           <article class="program-preview">
@@ -60,7 +60,7 @@
               <!-- Preview > coluna da direita -->
               <div class="col-md-4">
                 <div class="row">
-                  
+
                   <!-- Top Proposals -->
                   <div>
                     <!-- Loading Top Proposals -->
@@ -69,7 +69,7 @@
                         Carregando propostas mais votadas...
                       </div>
                     </div>
-                    
+
                     <!-- Top Proposals > Carousel -->
                     <div class="col-xs-12" ng-if="!pagePrograma.loadingTopProposals && pagePrograma.proposalsTopRated && pagePrograma.proposalsTopRated.length > 0">
                       <h3 class="color-theme-fg">Propostas mais votadas</h3>
@@ -83,7 +83,7 @@
                       <h3 class="color-theme-fg">Propostas nesse programa</h3>
                       <proposal-box proposal="pagePrograma.randomProposal" topic="pagePrograma.article" category="pagePrograma.category" can-vote="true" focus="{{pagePrograma.search.proposal_id}}" ></proposal-box>
                     </div>
-                    
+
                     <!-- Loading Proposal Box -->
                     <div ng-if="pagePrograma.loadingProposalBox">
                       <div class="alert alert-info" role="alert">
@@ -91,7 +91,7 @@
                       </div>
                     </div>
                   </div>
-                  
+
                   <!-- No Proposals? okay! -->
                   <div ng-if="!pagePrograma.loadingTopProposals && !pagePrograma.loadingProposalBox">
                     <div class="col-xs-12" ng-if="!pagePrograma.randomProposal && !(pagePrograma.proposalsTopRated && pagePrograma.proposalsTopRated.length > 0)">
diff --git a/src/app/pages/programas/programas.controller.js b/src/app/pages/programas/programas.controller.js
index d602b64..17deb30 100644
--- a/src/app/pages/programas/programas.controller.js
+++ b/src/app/pages/programas/programas.controller.js
@@ -6,11 +6,12 @@
     .controller('ProgramasPageController', ProgramasPageController);
 
   /** @ngInject */
-  function ProgramasPageController(DialogaService, $scope, $location, $filter, $log) {
+  function ProgramasPageController(DialogaService, $scope, $rootScope, $location, $filter, $log) {
     var vm = this;
 
     vm.DialogaService = DialogaService;
     vm.$scope = $scope;
+    vm.$rootScope = $rootScope;
     vm.$location = $location;
     vm.$filter = $filter;
     vm.$log = $log;
@@ -18,8 +19,9 @@
     vm.init();
     vm.loadData();
     vm.attachListeners();
+    vm.$rootScope.focusMainContent();
 
-    $log.debug('ProgramasPageController');
+    vm.$log.debug('ProgramasPageController');
   }
 
   ProgramasPageController.prototype.init = function () {
diff --git a/src/app/pages/programas/programas.html b/src/app/pages/programas/programas.html
index d8c05ab..a28b12a 100644
--- a/src/app/pages/programas/programas.html
+++ b/src/app/pages/programas/programas.html
@@ -6,7 +6,7 @@
   </div>
 </div>
 
-<div class="page--programas">
+<div class="page--programas" role="main">
   <section class="section--info">
     <div class="container">
       <div class="row">
diff --git a/src/index.html b/src/index.html
index 8a06c26..c2110f2 100644
--- a/src/index.html
+++ b/src/index.html
@@ -38,9 +38,10 @@
     <![endif]-->
 
     <app-header></app-header>
-    
+
     <div id="content" ui-view="main"></div>
-    <div ui-view="footer"></div>
+
+    <app-footer></app-footer>
 
     <div id="footer-brasil"></div>
 
--
libgit2 0.21.2