Merge branch 'merlin' into staging

Leonardo Merlin
2 parents 96331083 91b68ef5
Showing 30 changed files with 759 additions and 202 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/components/auth-user/auth-user.directive.js
src/app/components/auth/auth.service.js
src/app/components/category-list/category-list.directive.js
src/app/components/category-list/category-list.html
src/app/components/event-list/event-list.directive.js
src/app/components/event-list/event-list.html
src/app/components/navbar/navbar.html
src/app/components/proposal-box/proposal-box.directive.js
src/app/components/proposal-box/proposal-box.html
src/app/components/proposal-box/proposal-box.scss
src/app/components/proposal-grid/proposal-grid.directive.js
src/app/components/proposal-list/proposal-list.directive.js
src/app/components/proposal-list/proposal-list.html
src/app/components/proposal-list/proposal-list.scss
src/app/components/social-share/social-share.html
src/app/index.route.js
src/app/pages/article/article.html
src/app/pages/auth/auth.controller.js
src/app/pages/inicio/inicio.controller.js
@@ -19,6 +19,7 @@
       getTopics: getTopics,
       getTopicById: getTopicById,
       getProposals: getProposals,
+      getProposalById: getProposalById,
       getProposalsByTopicId: getProposalsByTopicId,
       getEvents: getEvents,
       subscribeToEvent: subscribeToEvent,
@@ -108,26 +109,18 @@
       // });
       //
-      searchTopics(params, cbSuccess, cbError);
+      searchProposals({
+        query: ''
+      }, cbSuccess, cbError);
     }
-    /**
-     * Ex.: /api/v1/articles/[article_id]/children?[params]content_type=ProposalsDiscussionPlugin::Proposal
-     * Ex.: /api/v1/articles/103644/children?limit=20&fields=id,name,slug,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal
-     *
-     * @param  {Integer}  topicId   topic where has those proposals
-     * @param  {Object}   params    params for pagination ant others
-     * @param  {Function} cbSuccess callback for success
-     * @param  {Function} cbError   callback for error
-     * @return {Array}           [description]
-     */
-    function getProposalsByTopicId (topicId, params, cbSuccess, cbError) {
-      var url = service.apiArticles + topicId + '/children';
+    function getProposalById (proposalId, params, cbSuccess, cbError) {
+      var url = service.apiArticles + proposalId;
       var paramsExtended = angular.extend({
         // 'fields[]': ['id', 'title', 'abstract', 'children', 'children_count', 'ranking_position', 'hits', 'votes_for', 'votes_against'],
-        // 'limit':'20',
         // 'per_page':'1',
+        'limit':'1',
         'content_type':'ProposalsDiscussionPlugin::Proposal'
       }, params);
@@ -137,6 +130,21 @@
       }).catch(function(error){
         cbError(error);
       });
+
+    }
+
+    /**
+     * Ex.: /api/v1/articles/[article_id]/children?[params]content_type=ProposalsDiscussionPlugin::Proposal
+     * Ex.: /api/v1/articles/103644/children?limit=20&fields=id,name,slug,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal
+     *
+     * @param  {Integer}  topicId   topic where has those proposals
+     * @param  {Object}   params    params for pagination ant others
+     * @param  {Function} cbSuccess callback for success
+     * @param  {Function} cbError   callback for error
+     * @return {Array}           [description]
+     */
+    function getProposalsByTopicId (topicId, params, cbSuccess, cbError) {
+      getProposalById(topicId + '/children', params, cbSuccess, cbError);
     }
     function getEvents (community_id, params, cbSuccess, cbError) {
@@ -156,19 +164,36 @@
       });
     }
-    function subscribeToEvent (event_id, params, cbSuccess, cbError) {
-      var url = service.apiArticles + event_id + '/follow';
+    function getSubscribers (event_id, params, cbSuccess, cbError) {
+      var url = service.apiArticles + event_id + '/followers?_=' + new Date().getTime();
       var paramsExtended = angular.extend({
-        private_token: API.token
+        // 'fields[]': ['id', 'slug', 'title', 'abstract', 'body', 'categories', 'created_at', 'start_date', 'end_date', 'hits'],
+        'content_type':'Event'
       }, params);
-      UtilService.post(url, {params: paramsExtended}).then(function(data){
+      UtilService.get(url, {params: paramsExtended}).then(function(data){
         cbSuccess(data.articles);
       }).catch(function(error){
         cbError(error);
       });
     }
+    function subscribeToEvent (event_id, params, cbSuccess, cbError) {
+
+      if(!$rootScope.currentUser){
+        cbError({message: 'Usuário não logado.'});
+      }
+
+      var url = service.apiArticles + event_id + '/follow';
+      var encodedParams = 'private_token=' + $rootScope.currentUser.private_token;
+
+      UtilService.post(url, encodedParams).then(function(response){
+        cbSuccess(response);
+      }).catch(function(error){
+        cbError(error);
+      });
+    }
+
     function searchTopics (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Topic&query=cisternas
       var url = '/api/v1/search/article';
@@ -188,11 +213,13 @@
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
       var url = '/api/v1/search/article';
       var paramsExtended = angular.extend({
-        'fields[]': ['id', 'title', 'slug', 'abstract', 'categories', 'setting', 'children_count', 'hits'],
+        // 'fields[]': ['id', 'title', 'slug', 'abstract', 'categories', 'setting', 'children_count', 'hits'],
         'type': 'ProposalsDiscussionPlugin::Proposal'
       }, params);
       UtilService.get(url, {params: paramsExtended}).then(function(data){
+        _pipeInjectSlugIntoParentProgram(data);
+        _pipeSortByRankinPosition(data);
         cbSuccess(data);
       }).catch(function(error){
         cbError(error);
@@ -200,6 +227,9 @@
     }
     function _pipeInjectSlugIntoParentProgram(data){
+      if(!data.articles && data.article){
+        data.articles = [data.article];
+      }
       var proposals = data.articles;
       for (var i = proposals.length - 1; i >= 0; i--) {
         var proposal = proposals[i];
@@ -208,5 +238,14 @@
         }
       }
     }
+
+    function _pipeSortByRankinPosition(data){
+      if(!data.articles && data.article){
+        data.articles = [data.article];
+      }
+      data.articles = data.articles.sort(function(pA, pB){
+        return pA.ranking_position - pB.ranking_position;
+      });
+    }
   }
 })();
@@ -42,7 +42,6 @@
     AuthUserController.prototype.onClickLogout = function (){
       var vm = this;
-      // TODO: emit event?
       vm.AuthService.logout();
     };
@@ -130,6 +130,7 @@
           $log.debug('AuthService.login [SUCCESS] response', response);
           var currentUser = Session.create(response.data);
+          $rootScope.currentUser = currentUser;
           $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
           return currentUser;
@@ -142,7 +143,7 @@
     function logout () {
       Session.destroy();
-
+      $rootScope.currentUser = null;
       $rootScope.$broadcast(AUTH_EVENTS.logoutSuccess);
     }
@@ -65,7 +65,7 @@
       templateUrl: 'app/components/category-list/category-list.html',
       scope: {
         categories: '=',
-        selectedCategory: '@'
+        selectedCategory: '='
       },
       controller: CategoryListController,
       controllerAs: 'vm',
@@ -15,7 +15,8 @@
         <span class="category-list--icon-circle"  aria-hidden="true" ng-class="category.slug"></span>
         <span class="category-list--icon icon" aria-hidden="true" ng-class="'icon-tema-' + category.slug"></span>
         <span class="category-list--label">{{::category.name}}</span>
-        <span class="category-list--icon--right glyphicon glyphicon-chevron-right hidden-xs"></span>
+        <span class="category-list--icon--right glyphicon glyphicon-chevron-right hidden-xs" ng-hide="vm.selectedCategory.slug === category.slug"></span>
+        <span class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span>
       </button>
     </div>
   </nav>
@@ -8,11 +8,12 @@
   /** @ngInject */
   function eventList() {
     /** @ngInject */
-    function EventListController($scope, $rootScope, $state, $log) {
+    function EventListController(ArticleService, $scope, $rootScope, $state, $log) {
       $log.debug('EventListController');
       var vm = this;
+      vm.ArticleService = ArticleService;
       vm.$scope = $scope;
       vm.$rootScope = $rootScope;
       vm.$state = $state;
@@ -39,10 +40,26 @@
       vm.isCollapsed = !vm.isCollapsed;
     };
-    EventListController.prototype.subscribe = function (data) {
+    EventListController.prototype.subscribe = function (event_id) {
       var vm = this;
-      vm.$log.debug('data', data);
+      vm.$log.debug('event_id', event_id);
+
+      if(!vm.$rootScope.currentUser){
+        vm.$log.warn('User is not logged in. Redirect to Auth page.');
+        vm.$state.go('entrar',{
+          redirect_uri: 'state=inicio&task=subscribe&event_id=' + event_id
+        },{
+          location: true
+        });
+      }else{
+        vm.ArticleService.subscribeToEvent(event_id, {}, function(response){
+          vm.$log.debug('response', response);
+        }, function(error){
+          vm.$log.debug('error', error);
+        })
+      }
+
     };
     var directive = {
@@ -59,12 +59,14 @@
                     <span class="theme">{{::event.categories[0].name}}</span>
                   </td>
                   <td align="right">
-                    <b>(?)</b>
-                    <br/>
-                    <span>Inscritos</span>
+                    <div ng-if="event.followers_count > 0">
+                      <b>{{::event.followers_count}}</b>
+                      <br/>
+                      <span>Inscritos</span>
+                    </div>
                   </td>
                   <td align="left">
-                    <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe('EVENT_ID')">
+                    <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe(event.id)">
                       Inscreva-se
                       <span class="sr-only">no bate-papo com (ministro) no dia {event.start_date | date : "dd/MM/yyyy"}} as {{event.start_date | date : "HH:mm"}} horas</span>
                     </button>
@@ -22,7 +22,7 @@
         <li ui-sref-active="active"><a ui-sref="duvidas">Dúvidas</a></li>
         <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span class="icon icon-social-share-small"></span></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a>
           <social-share class="dropdown-menu dropdown-menu-right"></social-share>
           <!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">
             <li>
@@ -24,14 +24,16 @@
       var vm = this;
       if (!vm.vote) { vm.vote = false; }
+      if (!vm.focus) { vm.focus = false; }
     };
-    ProposalBoxController.prototype.showContent2 = function (topic) {
+    ProposalBoxController.prototype.showContent = function (slug) {
       var vm = this;
       vm.$state.go('programa-conteudo', {
-        slug: topic.slug
+        slug: slug,
+        proposal_id: vm.proposal.id
       }, {
         location: true
       });
@@ -44,7 +46,11 @@
         proposal: '=',
         topic: '=',
         category: '=',
-        vote: '='
+        vote: '=',
+        focus: '@'
+        // @ -> Text binding / one-way binding
+        // = -> Direct model binding / two-way binding
+        // & -> Behaviour binding / Method binding
       },
       controller: ProposalBoxController,
       controllerAs: 'vm',
-<div class="proposal-box" ng-class="[{'focus': vm.isFocused}, vm.category.slug]">
+<div class="proposal-box" ng-class="[{'focus': vm.focus}, vm.category.slug]">
   <div class="proposal-box--top">
     <div class="proposal-box--theme color-theme-bg-darker">{{::vm.category.name}}</div>
     <div class="proposal-box--program color-theme-bg">{{::vm.topic.title}}</div>
   </div>
   <div class="proposal-box--middle">
     <div class="proposal-box--content">
-     <div class="proposal-box--content-inner" ng-bind-html="vm.proposal.abstract"></div>
+     <div class="proposal-box--content-inner">{{::vm.proposal.abstract}}</div>
    </div>
-   <div ng-show="!vm.vote" class="proposal-box--join">
-    <button class="btn btn-link" ng-click="vm.showContent2(vm.topic)">Participe</button>
+   <div ng-hide="vm.vote" class="proposal-box--join">
+    <button class="btn btn-link color-theme-common-fg" ng-click="vm.showContent(vm.topic.slug)">
+      Participe
+      <span class="glyphicon glyphicon-menu-right color-theme-common-fg" aria-hidde="true"></span>
+    </button>
   </div>
   <div ng-show="vm.vote"class="proposal-box--actions text-center">
     <div class="row">
@@ -43,7 +46,7 @@
   <div class="proposal-box--share">
     <span>COMPARTILHE ESSA <b>PROPOSTA</b></span>
     <div class="dropdown">
-      <button id="dropdown-share-btn" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="icon icon-social-share-small" aria-hidden="true"></span></button>
+      <button id="dropdown-share-btn" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="Mostrar ou esconder a lista redes sociais para compartilhamento"><span class="icon icon-social-share-small" aria-hidden="true"></span></button>
       <social-share class="dropdown-menu dropdown-menu-right"></social-share>
     </div>
   </div>
@@ -2,6 +2,7 @@
 	background-color: #f1f1f1;
 	border-radius: 5px;
 	// overflow: hidden;
+    margin-bottom: 20px;
 	&.focus {
 		border: 7px solid #000;
@@ -20,6 +21,14 @@
 	&--middle {
         padding: 30px;
+        min-height: 180px;
+
+        // position: relative;
+        // .proposal-box--join {
+        //     position: absolute;
+        //     bottom: 10px;
+        //     left: 30px;
+        // }
     }
 	&--bottom {
@@ -56,17 +65,27 @@
         margin-top: 10px;
     }
+    .proposal-box--join {
+        .btn {
+            font-weight: bold;
+        }
+    }
+
+    .action {
+        .glyphicon {
+            color: #fff;
+        }
+    }
+
     .dropdown {
         display: inline-block;
     }
+
     .dropdown-menu {
         padding: 0;
         margin: 0;
     }
-	.glyphicon {
-		color: #fff;
-	}
 	.icon-circle {
 		cursor: pointer;
@@ -22,7 +22,6 @@
       vm.$location = $location;
       vm.$filter = $filter;
       vm.$log = $log;
-      vm.defaultLimit = 6;
       // initialization
       vm.init();
@@ -30,8 +29,7 @@
     }
     ProposalGridController.prototype.init = function() {
-      // var vm = this;
-      // vm.programs = null; // scope var
+      var vm = this;
     };
     ProposalGridController.prototype.attachListeners = function() {
@@ -2,26 +2,27 @@
   'use strict';
   angular
-    .module('dialoga')
-    .directive('proposalList', proposalList);
+  .module('dialoga')
+  .directive('proposalList', proposalList);
   /** @ngInject */
   function proposalList() {
     /** @ngInject */
-    function ProposalListController(ArticleService, $scope, $element, $timeout, $log) {
+    function ProposalListController(ArticleService, $state, $scope, $element, $timeout, $log) {
       $log.debug('ProposalListController');
       var vm = this;
       vm.ArticleService = ArticleService;
+      vm.$state = $state;
       vm.$scope = $scope;
       vm.$element = $element;
       vm.$timeout = $timeout;
       vm.$log = $log;
       vm.init();
-
       vm.loadData();
+      vm.attachListeners();
     }
     ProposalListController.prototype.init = function () {
@@ -36,9 +37,27 @@
         vm.per_page = 5;
       }
+      vm.initPorposalList();
+    };
+
+    ProposalListController.prototype.initPorposalList = function () {
+      var vm = this;
+
+      vm.currentPageIndex = 0;
+
       vm.proposalsPerPage = vm.getProposalsPerPage(0);
       vm.proposalsLength = vm.proposals.length;
+
+
+      if ((vm.proposalsLength % vm.per_page) === 0) {
+        vm.pages =  vm.proposalsLength / vm.per_page;
+      } else{
+        vm.pages =  (vm.proposalsLength / vm.per_page) + 1;
+      }
+
+      // vm.arraypages = new Array(Math.ceil(vm.pages));
+      vm.arraypages = new Array(Math.floor(vm.pages));
     };
     ProposalListController.prototype.loadData = function () {
@@ -51,6 +70,14 @@
       }, 1000);
     };
+    ProposalListController.prototype.attachListeners = function () {
+      var vm = this;
+
+      vm.$scope.$watch('vm.proposals', function(/*newValue, oldValue*/) {
+        vm.initPorposalList();
+      });
+    };
+
     ProposalListController.prototype.getProposalsPerPage = function (pageIndex) {
       var vm = this;
@@ -62,7 +89,28 @@
     ProposalListController.prototype.showPage = function (pageIndex) {
       var vm = this;
+
+      if (pageIndex < 0) {
+        pageIndex = 0;
+      }
+
+      if (pageIndex > (vm.arraypages.length-1)) {
+        pageIndex = vm.arraypages.length-1;
+      }
+
       vm.proposalsPerPage = vm.getProposalsPerPage(pageIndex);
+      vm.currentPageIndex = pageIndex;
+    };
+
+    ProposalListController.prototype.showContent = function (proposal) {
+      var vm = this;
+
+      vm.$state.go('programa-conteudo', {
+        slug: proposal.parent.slug,
+        proposal_id: proposal.id
+      }, {
+        location: true
+      });
     };
     function attachPopover(){
 <div class="proposal-list">
-  <div class="table-responsive" ng-if="vm.loading">
-    <div class="table-responsive">Carregando...</div>
-  </div>
-  <div class="table-responsive" ng-if="!vm.loading && vm.proposalsPerPage">
-    <table class="table table-striped">
-      <thead>
-        <tr>
-          <th>
-            Colocação
-            <a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
-          </th>
-          <th>{{vm.proposals.length}} PROPOSTAS</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr ng-repeat="proposal in vm.proposalsPerPage">
-          <td class="color-theme-fg">
-            <span class="position">{{::($index+1)}}º</span>
-          </td>
-          <td>
-            <div class="row">
-              <div class="col-xs-12">
-                <div class="abstract" ng-bind-html="proposal.abstract"></div>
-              </div>
-            </div>
-            <div class="row row-actions">
-              <div class="col-md-9">
-                <button type="button" class="btn btn-link btn-rate color-theme-common-fg">
-                  Avalie esta proposta
-                  <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-                </button>
-              </div>
-              <div class="col-md-3">
-                <proposal-stats views="{{::proposal.hits}}" up="{{::proposal.votes_for}}" down="{{::proposal.votes_against}}"></proposal-stats>
-              </div>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <nav>
-      <ul class="pagination">
-        <li>
-          <a href="#" aria-label="Previous">
-            <span aria-hidden="true">&laquo;</span>
-          </a>
-        </li>
-        <li><a href="#" ng-click="vm.showPage(1)">1</a></li>
-        <li><a href="#" ng-click="vm.showPage(2)">2</a></li>
-        <li><a href="#" ng-click="vm.showPage(3)">3</a></li>
-        <li><a href="#" ng-click="vm.showPage(4)">4</a></li>
-        <li><a href="#" ng-click="vm.showPage(5)">5</a></li>
-        <li>
-          <a href="#" aria-label="Next">
-            <span aria-hidden="true">&raquo;</span>
-          </a>
-        </li>
-      </ul>
-    </nav>
-  </div>
+	<div class="table-responsive" ng-if="vm.loading">
+		<div class="table-responsive">Carregando...</div>
+	</div>
+	<div class="table-responsive" ng-if="!vm.loading && vm.proposalsPerPage">
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th>
+						Colocação
+						<a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
+					</th>
+					<th>{{vm.proposals.length}} PROPOSTAS</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr ng-repeat="proposal in vm.proposalsPerPage">
+					<td class="color-theme-fg">
+						<span class="position">{{::proposal.ranking_position}}º</span>
+					</td>
+					<td>
+						<div class="row">
+							<div class="col-xs-12">
+								<div class="abstract" ng-bind-html="proposal.abstract"></div>
+							</div>
+						</div>
+						<div class="row row-actions">
+							<div class="col-md-8">
+								<button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
+									Avalie esta proposta
+									<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+								</button>
+							</div>
+							<div class="col-md-4">
+								<proposal-stats class="text-right" views="{{::proposal.hits}}" up="{{::proposal.votes_for}}" down="{{::proposal.votes_against}}"></proposal-stats>
+							</div>
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		<nav>
+			<ul class="pagination">
+				<li ng-class="{ 'disabled' : vm.currentPageIndex == 0}">
+					<a  class="btn-pagination" href="#" aria-label="Previous" ng-click="vm.showPage(vm.currentPageIndex-1)">
+						<span aria-hidden="true" class="glyphicon glyphicon-chevron-left pagination-icon"></span>
+					</a>
+				</li>
+				<li ng-repeat="paginas in vm.arraypages track by $index" ng-class="{ 'active' : ($index) == vm.currentPageIndex }" >
+					<a class="btn-pagination"  href="#" ng-click="vm.showPage($index)">{{::($index)+1}}</a>
+				</li>
+				<li  ng-class="{ 'disabled' : vm.currentPageIndex == (vm.arraypages.length -1)}">
+					<a  class="btn-pagination" href="#" aria-label="Next" ng-click="vm.showPage(vm.currentPageIndex+1)">
+						<span aria-hidden="true" class="glyphicon glyphicon-chevron-right pagination-icon"></span>
+					</a>
+				</li>
+			</ul>
+		</nav>
+	</div>
 </div>
@@ -79,4 +79,42 @@
             background-color: #eaeaea;
         }
     }
+
+    .btn-pagination {
+        background-color: transparent;
+        border: none;
+        border-radius: 100%;
+        font-weight: bold;
+        font-size: 20px;
+        padding: 0px 8px;
+        width: 28px;
+        height: 28px;
+        text-decoration: underline;
+        color: $defaultblue;
+    }
+
+    .pagination-icon {
+        color: $defaultblue;
+    }
+
+    .pagination > .active > a,
+    .pagination > .active > a:hover,
+    .pagination > .active > a:focus,
+    .pagination > .active > span,
+    .pagination > .active > span:hover,
+    .pagination > .active > span:focus {
+        background-color: $defaultblue;
+        text-decoration: none;
+
+    }
+
+    .pagination > .disabled > span,
+    .pagination > .disabled > span:hover,
+    .pagination > .disabled > span:focus,
+    .pagination > .disabled > a,
+    .pagination > .disabled > a:hover,
+    .pagination > .disabled > a:focus {
+        background-color: transparent;
+    }
+
 }
 <ul class="social-share list-inline">
   <li>
-    <a socialshare
+    <a href="#" role="button"
+      socialshare
       socialshare-provider="facebook"
       socialshare-url="http://dialoga.gov.br"
       socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
       title="Compartilhar no Facebook">
-      <span class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
+      <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
       <span class="sr-only">Compartilhar no Facebook</span>
     </a>
   </li>
   <li>
-    <a socialshare
+    <a href="#" role="button"
+      socialshare
       socialshare-provider="twitter"
       socialshare-url="http://dialoga.gov.br"
       socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
       socialshare-hastags="dialogabrasil"
       title="Compartilhar no Twitter">
-      <span class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
+      <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
       <span class="sr-only">Compartilhar no Twitter</span>
     </a>
   </li>
   <li>
-    <a socialshare
-      socialshare-provider="gplus"
+    <a href="#" role="button"
+      socialshare
+      socialshare-provider="google+"
       socialshare-url="http://dialoga.gov.br"
       socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
       title="Compartilhar no Google Plus">
-      <span class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>
+      <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>
       <span class="sr-only">Compartilhar no Google Plus</span>
     </a>
   </li>
   <li>
-    <a href="mailto:contato@dialoga.gov.br?subject=Conheça o Dialoga Brasil" title="Enviar por email">
-      <span class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>
+    <a href="whatsapp://send?text=Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo http://dialoga.gov.br/" title="Compartilhar no WhatsApp">
+      <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>
       <span class="sr-only">Enviar por email</span>
     </a>
   </li>
@@ -23,7 +23,7 @@
         }
       })
       .state('entrar', {
-        url: '/entrar',
+        url: '/entrar?redirect_uri',
         ncyBreadcrumb: {label: 'Entrar'},
         views: {
           'header': { templateUrl: 'app/pages/header/header.html' },
@@ -75,7 +75,7 @@
         }
       })
       .state('programas', {
-        url: '/programas',
+        url: '/programas?tema',
         ncyBreadcrumb: {label: 'Programas'},
         views: {
           'header': { templateUrl: 'app/pages/header/header.html' },
@@ -88,7 +88,7 @@
         }
       })
       .state('programa-conteudo', {
-        url: '/programa/:slug',
+        url: '/programa/:slug?proposal_id',
         ncyBreadcrumb: {
           label: '{{$parent.$root.contentTitle}}',
           parent: 'programas'
@@ -104,7 +104,7 @@
         }
       })
       .state('propostas', {
-        url: '/propostas',
+        url: '/propostas?tema',
         ncyBreadcrumb: {label: 'Propostas'},
         views: {
           'header': { templateUrl: 'app/pages/header/header.html' },
@@ -117,14 +117,14 @@
         }
       })
       .state('ranking', {
-        url: '/ranking',
+        url: '/ranking?tema',
         ncyBreadcrumb: {label: 'Propostas'},
         views: {
           'header': { templateUrl: 'app/pages/header/header.html' },
           'main': {
             templateUrl: 'app/pages/propostas/ranking.html',
             controller: 'PropostasPageController',
-            controllerAs: 'pageRanking'
+            controllerAs: 'pagePropostas'
           },
           'footer': { templateUrl: 'app/pages/footer/footer.html' }
         }
@@ -203,6 +203,15 @@
           'footer': { templateUrl: 'app/pages/footer/footer.html' }
         }
       })
+     .state('mapa', {
+        url: '/mapa',
+        ncyBreadcrumb: {label: 'Mapa'},
+        views: {
+          'header': { templateUrl: 'app/pages/header/header.html' },
+          'main': { templateUrl: 'app/pages/mapa/mapa.html' },
+          'footer': { templateUrl: 'app/pages/footer/footer.html' }
+        }
+      })
       ;
     $urlRouterProvider.otherwise('/erro');
@@ -26,9 +26,15 @@
 	<article>
 		<header class="container">
       <div class="row">
-        <h1>{{::pageArticle.article.title}}</h1>
+        <div class="col-sm-12">
+          <h1>{{::pageArticle.article.title}}</h1>
+        </div>
       </div>
 		</header>
-		<div ng-bind-html="pageArticle.article.body"></div>
+    <article>
+      <div class="container">
+		    <div ng-bind-html="pageArticle.article.body"></div>
+      </div>
+    </article>
 	</article>
 </div>
@@ -6,13 +6,13 @@
     .controller('AuthPageController', AuthPageController);
   /** @ngInject */
-  function AuthPageController($scope, $rootScope, AUTH_EVENTS, AuthService, DialogaService, Session, $log) {
-    $log.debug('AuthPageController');
-
+  function AuthPageController($scope, $rootScope, $location, $state, AUTH_EVENTS, AuthService, DialogaService, Session, $log) {
     var vm = this;
-    vm.$rootScope = $rootScope;
     vm.$scope = $scope;
+    vm.$rootScope = $rootScope;
+    vm.$location = $location;
+    vm.$state = $state;
     vm.AUTH_EVENTS = AUTH_EVENTS;
     vm.AuthService = AuthService;
     vm.DialogaService = DialogaService;
@@ -21,6 +21,8 @@
     vm.init();
     vm.loadData();
+
+    vm.$log.debug('AuthPageController');
   }
   AuthPageController.prototype.init = function() {
@@ -32,6 +34,12 @@
     vm.terms = null;
     vm.loadingTerms = null;
+    vm.search = vm.$location.search();
+    var redirect = vm.search.redirect_uri || '';
+    if(redirect && redirect.length > 0){
+      vm.params = JSON.parse('{"' + decodeURI(redirect).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}');
+    }
+
     // attach events
     vm.currentUser = vm.Session.getCurrentUser();
@@ -78,6 +86,8 @@
       // 'Cadastro efetuado com sucesso.'
       // 'Verifique seu email para confirmar o cadastro.'
+      // TODO: show messagens and redirect timeout
+      vm.redirectBack();
     }, function(response){
       vm.$log.debug('register error.response', response);
@@ -92,9 +102,28 @@
     vm.AuthService.login(credentials).then(function(user) {
       // handle view
       vm.$log.debug('user', user);
+      vm.redirectBack();
     }, function() {
       // handle view
     });
   };
+  AuthPageController.prototype.redirectBack = function(){
+    var vm = this;
+
+    if(!vm.params){
+      vm.$log.warn('No redirect params defined.');
+      return;
+    }
+    var state = vm.params.state;
+    switch(state){
+      case 'inicio':
+        vm.$state.go(state, {
+          event_id: vm.params.event_id,
+          task: vm.params.task
+        });
+        break;
+    }
+  }
+
 })();
@@ -33,6 +33,18 @@
     vm.query = null;
     vm.search = vm.$location.search();
+    if (vm.search.tema) {
+      vm._filtredByThemeSlug = vm.search.tema;
+    }
+
+    if (vm.search.filtro) {
+      vm._filtredByQuery = vm.search.filtro;
+    }
+
+    if (vm.search.tema || vm.search.filtro) {
+      vm.loadingFilter = true;
+    }
+
     vm.error = null;
     vm.loadData();
@@ -42,7 +54,6 @@
   InicioPageController.prototype.loadData = function() {
     var vm = this;
-
     // Load main content
     vm.loading = true;
     vm.DialogaService.getHome(function(data) {
@@ -77,6 +88,8 @@
       vm.DialogaService.getThemes(function(data) {
         vm.themes = data;
         vm.loadingThemes = false;
+
+        vm.filter();
       }, function(error) {
         vm.$log.error('Error on getThemes.', error);
       });
@@ -87,13 +100,38 @@
         vm.programs = vm.article.children;
         vm.filtredPrograms = data.articles;
         vm.loadingPrograms = false;
+
+        vm.filter();
       }, function(error) {
         vm.$log.error('Error on getPrograms.', error);
       });
-
-      vm.filter();
     }
+  };
+
+  InicioPageController.prototype.attachListeners = function() {
+    var vm = this;
+
+    vm.$scope.$on('change-selectedCategory', function(event, selectedCategory) {
+      vm.selectedTheme = selectedCategory;
+    });
+
+    vm.$scope.$watch('pageInicio.selectedTheme', function(newValue/*, oldValue*/) {
+      vm.search.tema = newValue ? newValue.slug : null;
+      vm.$location.search('tema', vm.search.tema);
+      if (!vm.loadingFilter) {
+        vm.filtredPrograms = vm.getFiltredPrograms();
+      }
+    });
+
+    vm.$scope.$watch('pageInicio.query', function(newValue/*, oldValue*/) {
+      vm.search.filtro = newValue ? newValue : null;
+      vm.$location.search('filtro', vm.search.filtro);
+
+      if (!vm.loadingFilter) {
+        vm.filtredPrograms = vm.getFiltredPrograms();
+      }
+    });
   };
   InicioPageController.prototype.showVideo = function() {
@@ -114,41 +152,32 @@
     vm.article.videoIsLoaded = true;
   };
-  InicioPageController.prototype.attachListeners = function() {
-    var vm = this;
-
-    vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) {
-      vm.selectedTheme = selectedCategory;
-    });
-
-    vm.$scope.$watch('pageInicio.selectedTheme', function(newValue/*, oldValue*/) {
-      vm.search.tema = newValue ? newValue.slug : null;
-      vm.$location.search('tema', vm.search.tema);
-      vm.filtredPrograms = vm.getFiltredPrograms();
-    });
-
-    vm.$scope.$watch('pageInicio.query', function(newValue/*, oldValue*/) {
-      vm.search.filtro = newValue ? newValue : null;
-      vm.$location.search('filtro', vm.search.filtro);
-      vm.filtredPrograms = vm.getFiltredPrograms();
-    });
-  };
-
   InicioPageController.prototype.filter = function() {
     var vm = this;
-    if (vm.search && vm.search.tema) {
-      var slug = vm.search.tema;
-      vm.$log.debug('filter by theme', slug);
+    if (vm.loadingThemes || vm.loadingPrograms) {
+      vm.$log.info('No programs or themes loaded yet. Abort.');
+      return;
+    }
-      vm.DialogaService.getThemeBySlug(slug, function(theme){
+    if (vm._filtredByThemeSlug) {
+      var slug = vm._filtredByThemeSlug;
+
+      vm.DialogaService.getThemeBySlug(slug, function(theme) {
         vm.selectedTheme = theme;
-        vm.$log.debug('getThemeBySlug.slug', slug);
-        vm.$log.debug('getThemeBySlug.selectedTheme', theme);
-      }, function(error){
+      }, function(error) {
         vm.$log.error('Error when try to "getThemeBySlug"', error);
       });
     }
+
+    if (vm._filtredByQuery) {
+      vm.query = vm._filtredByQuery;
+    }
+
+    if (vm._filtredByThemeSlug || vm._filtredByQuery) {
+      vm.filtredPrograms = vm.getFiltredPrograms();
+      vm.loadingFilter = false;
+    }
   };
   InicioPageController.prototype.showAllPrograms = function($event) {
@@ -170,7 +199,7 @@
   InicioPageController.prototype.getFiltredPrograms = function() {
     var vm = this;
-    if(!vm.programs){
+    if (!vm.programs) {
       vm.$log.warn('No programs loaded yet. Abort.');
       return null;
     }
@@ -179,9 +208,9 @@
     var output = input;
     var query = vm.query;
     var selectedTheme = vm.selectedTheme;
-    
+
     var filter = vm.$filter('filter');
-    
+
     if (selectedTheme) {
       output = _filterByCategory(output, selectedTheme);
     }
@@ -190,7 +219,7 @@
       output = filter(output, query, false);
     }
-    if(!query && !selectedTheme){
+    if (!query && !selectedTheme) {
       output = _balanceByCategory(output);
     }
-<div class="page--inicio">
-  <section class="section-video" role="main">
+<div class="page--inicio" role="main">
+  <section class="section-video">
     <div class="container">
       <div class="row">
         <div class="col-sm-10 col-sm-offset-1">
@@ -80,7 +80,7 @@
               <br/>
             </div>
           </div>
-          <div ng-if="pageInicio.themes">
+          <div ng-if="pageInicio.themes && !vm.loadingFilter">
             <category-list categories="pageInicio.themes" selected-category="pageInicio.selectedTheme"></category-list>
           </div>
           <div ng-if="!pageInicio.themes && pageInicio.loadingThemes">
@@ -123,7 +123,7 @@
           </div>
           <div class="row">
-            <div class="col-sm-12" ng-if="pageInicio.programs">
+            <div class="col-sm-12" ng-if="pageInicio.filtredPrograms && !vm.loadingFilter">
               <article-grid articles="pageInicio.filtredPrograms"></article-grid>
             </div>
             <div ng-if="!pageInicio.programs && pageInicio.loadingPrograms">
@@ -0,0 +1,136 @@
+<div class="container">
+	<div class="row">
+		<div class="col-sm-11 col-sm-offset-1">
+			<h2>Mapa do Site</h2>
+			<p>Uma visão geral do conteúdo disponível no site.</p>
+		</div>
+	</div>
+</div>
+
+<div class="page--mapa">
+	<div class="container">
+		<div class="row margin-mapa">
+			<div class="col-sm-11 col-sm-offset-1">
+				<h3 class="font-mapa">Sobre o Dialoga</h3>
+
+				<div class="row margin-mapa">
+					<h3 class="font-mapa">Programas</h3>
+					<div class="col-sm-6">
+						<h4 class="font-mapa">Ttulo do tema</h4>
+						<ul>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+						</ul>
+						<h4 class="font-mapa">Ttulo do tema</h4>
+						<ul>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+						</ul>
+						<h4 class="font-mapa">Ttulo do tema</h4>
+						<ul>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+							<li>Titulo do programa</li>
+						</ul>
+					</div>
+				</div>
+				<div class="row margin-mapa">
+					<h3 class="font-mapa">Propostas</h3>
+					<div class="col-sm-6">
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+					</div>
+				</div>
+				<div class="row margin-mapa">
+					<h3 class="font-mapa">Ranking</h3>
+					<div class="col-sm-6">
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+					</div>
+				</div>
+				<div class="row margin-mapa">
+					<h3 class="font-mapa">Dúvidas e sugestões</h3>
+					<div class="col-sm-6">
+						<h4 class="font-mapa"></h4>
+						<ol>
+							<li>O que é o Dialoga Brasil?</li>
+							<li>O que são Programas?</li>
+							<li>O que são Propostas</li>
+							<li>Quem pode criar propostas e votar nelas?</li>
+							<li>O que acontece com as melhores propostas?</li>
+						</ol>
+					</div>
+				</div>
+				<div class="row margin-mapa">
+					<h3 class="font-mapa">Entrar</h3>
+					<div class="col-sm-6">
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li></li>
+						</ul>
+					</div>
+				</div>
+				<div class="row margin-mapa">
+
+
+					<h3 class="font-mapa">Dialoga nas redes</h3>
+					<div class="col-sm-6">
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li>Rede 1</li>
+							<li>Rede 2</li>
+							<li>Rede 3</li>
+							<li>Rede 4</li>
+						</ul>
+					</div>
+				</div>
+				<div class="row margin-mapa">
+
+					<h3 class="font-mapa">Compartilhar</h3>
+					<div class="col-sm-6">
+						<h4 class="font-mapa"></h4>
+						<ul>
+							<li>Rede 1</li>
+							<li>Rede 2</li>
+							<li>Rede 3</li>
+							<li>Rede 4</li>
+						</ul>
+					</div>
+				</div>
+
+			</div>
+		</div>
+		<button type="button" class="btn btn-link" ui-sref="inicio">retornar à página inicial</button>
@@ -0,0 +1,14 @@
+.page--mapa {
+    background-color: #f9f9f9;
+
+    .font-mapa {
+        color: $defaultblue;
+        font-weight: 600;
+    }
+
+    .margin-mapa {
+        margin-left: 0px;
+        margin-right: 0px;
+    }
+
+}
@@ -6,13 +6,14 @@
     .controller('ProgramaContentPageController', ProgramaContentPageController);
   /** @ngInject */
-  function ProgramaContentPageController(DialogaService, $state, $scope, $rootScope, $element, $log) {
+  function ProgramaContentPageController(DialogaService, $state, $location, $scope, $rootScope, $element, $log) {
     $log.debug('ProgramaContentPageController');
     var vm = this;
     vm.DialogaService = DialogaService;
     vm.$state = $state;
+    vm.$location = $location;
     vm.$scope = $scope;
     vm.$rootScope = $rootScope;
     vm.$element = $element;
@@ -28,6 +29,7 @@
     vm.article = null;
     vm.category = null;
+    vm.search = vm.$location.search();
     vm.error = false;
   };
@@ -68,15 +70,33 @@
         vm.$log.error(error);
       });
-      // get random proposal
-      vm.DialogaService.getProposalsByTopicId(vm.article.id, {
-        'order': 'random()',
-        'limit': '1'
-      }, function(data){
-        vm.randomProposal = data.articles[0];
-      }, function (error) {
+      if(vm.search.proposal_id){
+        var proposalUrlId = vm.search.proposal_id;
+        vm.DialogaService.getProposalById(proposalUrlId, {
+          'limit': '1'
+        }, _handleSuccessGetProposal, _handleErrorGetProposal);
+
+      }else{
+        // get random proposal
+        vm.DialogaService.getProposalsByTopicId(vm.article.id, {
+          'order': 'random()',
+          'limit': '1'
+        }, _handleSuccessGetProposal, _handleErrorGetProposal);
+      }
+
+      function _handleSuccessGetProposal(data){
+        if(data && data.articles){
+          vm.randomProposal = data.articles[0];
+        }
+
+        if(data && data.article){
+          vm.randomProposal = data.article;
+        }
+      }
+
+      function _handleErrorGetProposal(error){
         vm.$log.error(error);
-      });
+      }
       vm.loading = false;
     }, function(error) {
@@ -64,7 +64,7 @@
                   </div>
                   <div class="col-xs-12" ng-if="pageProgramaContent.randomProposal">
                     <h3 class="color-theme-fg">Propostas nesse programa</h3>
-                    <proposal-box proposal="pageProgramaContent.randomProposal" topic="pageProgramaContent.article" category="pageProgramaContent.category" vote="false" ></proposal-box>
+                    <proposal-box proposal="pageProgramaContent.randomProposal" topic="pageProgramaContent.article" category="pageProgramaContent.category" vote="true" focus="{{pageProgramaContent.search.proposal_id}}" ></proposal-box>
                   </div>
                   <div class="col-xs-12" ng-if="!pageProgramaContent.randomProposal && !(pageProgramaContent.proposalsTopRated && pageProgramaContent.proposalsTopRated.length > 0)">
                     <h3>Programas sem propostas</h3>
@@ -57,6 +57,10 @@
         vertical-align: middle;
     }
+    .program-preview--abstract h2 {
+        font-size: 40px;
+    }
+
     h2,
     h3{
         font-weight: bold;
@@ -11,33 +11,36 @@
     .controller('PropostasPageController', PropostasPageController);
   /** @ngInject */
-  function PropostasPageController(DialogaService, $log) {
+  function PropostasPageController(DialogaService, $scope, $location, $filter, $log) {
     var vm = this;
     vm.DialogaService = DialogaService;
+    vm.$scope = $scope;
+    vm.$location = $location;
+    vm.$filter = $filter;
     vm.$log = $log;
     vm.init();
+    vm.loadData();
+    vm.attachListeners();
+
     $log.debug('PropostasPageController');
   }
   PropostasPageController.prototype.init = function () {
     var vm = this;
-    vm.article = null;
     vm.themes = null;
     vm.selectedTheme = null;
     vm.proposals = null;
     vm.filtredProposals = null;
     vm.query = null;
+    vm.search = vm.$location.search();
     vm.loading = null;
     vm.error = null;
-
-    vm.loadData();
   };
-
   PropostasPageController.prototype.loadData = function () {
     var vm = this;
@@ -49,10 +52,12 @@
       vm.proposals = data.articles;
       vm.filtredProposals = vm.proposals;
       vm.loadingProposals = false;
+      vm.loading = false;
     }, function (error) {
       vm.error = error;
       vm.$log.error(error);
       vm.loadingProposals = false;
+      vm.loading = false;
     });
     // load themes
@@ -60,10 +65,117 @@
     vm.DialogaService.getThemes(function(themes){
       vm.themes = themes;
       vm.loadingThemes = false;
+      vm.loading = false;
     }, function (error) {
       vm.error = error;
       vm.$log.error(error);
       vm.loadingThemes = false;
+      vm.loading = false;
+    });
+  };
+
+  PropostasPageController.prototype.attachListeners = function() {
+    var vm = this;
+
+    vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) {
+      vm.selectedTheme = selectedCategory;
+    });
+
+    vm.$scope.$watch('pagePropostas.selectedTheme', function(newValue/*, oldValue*/) {
+      vm.search.tema = newValue ? newValue.slug : null;
+      vm.$location.search('tema', vm.search.tema);
+      vm.filtredProposals = vm.getFiltredProposals();
     });
+
+    vm.$scope.$watch('pagePropostas.query', function(newValue/*, oldValue*/) {
+      vm.search.filtro = newValue ? newValue : null;
+      vm.$location.search('filtro', vm.search.filtro);
+      vm.filtredProposals = vm.getFiltredProposals();
+    });
+  };
+
+  PropostasPageController.prototype.filter = function() {
+    var vm = this;
+
+    if (vm.search && vm.search.tema) {
+      var slug = vm.search.tema;
+      vm.$log.debug('filter by theme', slug);
+
+      vm.DialogaService.getThemeBySlug(slug, function(theme){
+        vm.selectedTheme = theme;
+        vm.$log.debug('getThemeBySlug.slug', slug);
+        vm.$log.debug('getThemeBySlug.selectedTheme', theme);
+      }, function(error){
+        vm.$log.error('Error when try to "getThemeBySlug"', error);
+      });
+    }
   };
+
+  PropostasPageController.prototype.showAllPrograms = function($event) {
+    var vm = this;
+    $event.stopPropagation();
+
+    vm.resetFilterValues();
+
+    vm._showAllFlag = true;
+
+    vm.filtredPrograms = vm.getFiltredPrograms();
+  };
+
+  PropostasPageController.prototype.resetFilterValues = function() {
+    var vm = this;
+
+    vm.query = null;
+    vm.selectedTheme = null;
+  };
+
+  PropostasPageController.prototype.getFiltredProposals = function() {
+    var vm = this;
+
+    if(!vm.proposals){
+      vm.$log.warn('No proposals loaded yet. Abort.');
+      return null;
+    }
+
+    var input = vm.proposals;
+    var output = input;
+    var query = vm.query;
+    var selectedTheme = vm.selectedTheme;
+
+    var filter = vm.$filter('filter');
+
+    if (selectedTheme) {
+      output = _filterByCategory(output, selectedTheme);
+    }
+
+    if (query) {
+      output = filter(output, query, false);
+    }
+
+    // if(!query && !selectedTheme && vm._showAllFlag){
+    //   output = _balanceByCategory(output);
+    // }
+
+    return output;
+  };
+
+  function _filterByCategory (input, category) {
+    input = input || [];
+
+    if (!category) {
+      // no filter
+      return input;
+    }
+
+    var out = [];
+    for (var i = 0; i < input.length; i++) {
+      var proposal = input[i];
+      if (proposal.parent.categories[0].slug === category.slug) {
+        out.push(proposal);
+      }
+    }
+
+    return out;
+  }
+
 })();
@@ -7,7 +7,26 @@
 </div>
 <div class="page--propostas">
-  <section class="section--info">
+
+  <section class="section-info" ng-if="pagePropostas.loading || pagePropostas.error">
+    <div class="container">
+      <div class="row">
+        <div class="col-md-12">
+          <div ng-if="pagePropostas.loading && !pagePropostas.error">
+            <div class="alert alert-info" role="alert">Carregando conteúdo...</div>
+          </div>
+
+          <div ng-if="pagePropostas.error">
+            <div class="alert alert-danger" role="alert">
+              Erro ao carregar o conteúdo principal.
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+
+  <section class="section--header" ng-if="pagePropostas.proposals || pagePropostas.themes">
     <div class="container">
       <div class="row">
         <div class="col-sm-12">
@@ -16,7 +35,8 @@
       </div>
     </div>
   </section>
-  <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.proposals">
+
+  <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.proposals || pagePropostas.themes">
     <div class="container">
       <div id="lista-de-propostas" class="row">
         <div class="col-sm-4 col-md-3">
@@ -52,7 +72,7 @@
           </div>
         </div>
         <div class="col-sm-8 col-md-9">
-          <div class="row hidden-xs">
+          <div class="row hidden-xs" ng-if="pagePropostas.proposals">
             <div class="col-xs-12">
               <div class="input-group input-group-lg input-group-search">
                 <label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
@@ -68,10 +88,11 @@
               </div>
             </div>
           </div>
-          <div class="row">
+
+          <div class="row" ng-if="pagePropostas.proposals">
             <div class="col-sm-12">
               <header class="header">
-                <h2>Total de Propostas as propostas: "<span>{{::pagePropostas.proposals.length}} propostas</span>"</h2>
+                <h2>Total de Propostas: "<b>{{pagePropostas.filtredProposals.length}} propostas</b>"</h2>
               </header>
             </div>
           </div>
@@ -0,0 +1,5 @@
+.page--propostas {
+    .proposal-box--middle {
+        background-color: #fff;
+    }
+}
@@ -16,7 +16,7 @@
 			</div>
 		</div>
 	</section>
-	<section class="section--articles section-gray section-space-up" ng-if="pageRanking.proposals">
+	<section class="section--articles section-gray section-space-up" ng-if="pagePropostas.proposals">
 		<div class="container">
 			<div id="lista-de-propostas" class="row">
 				<div class="col-sm-4 col-md-3">
@@ -24,9 +24,9 @@
 						<div class="col-xs-12">
 							<div class="input-group input-group-lg input-group-search">
 								<label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
-								<input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pageRanking.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >
+								<input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >
 								<span class="input-group-btn">
-									<button type="button" class="btn btn-default" ng-click="pageRanking.search()">
+									<button type="button" class="btn btn-default" ng-click="pagePropostas.search()">
 										<span class="icon-circle icon-small color-theme-common-bg">
 											<span class="glyphicon glyphicon-search"></span>
 										</span>
@@ -37,15 +37,15 @@
 							<br/>
 						</div>
 					</div>
-					<div ng-if="pageRanking.themes">
-						<category-list categories="pageRanking.themes" selected-category="pageRanking.selectedTheme"></category-list>
+					<div ng-if="pagePropostas.themes">
+						<category-list categories="pagePropostas.themes" selected-category="pagePropostas.selectedTheme"></category-list>
 					</div>
-					<div ng-if="!pageRanking.themes && pageRanking.loadingThemes">
+					<div ng-if="!pagePropostas.themes && pagePropostas.loadingThemes">
 						<div class="alert alert-info" role="alert">
 							Carregando temas.
 						</div>
 					</div>
-					<div ng-if="!pageRanking.themes && pageRanking.themesError">
+					<div ng-if="!pagePropostas.themes && pagePropostas.themesError">
 						<div class="alert alert-danger" role="alert">
 							Não foi possível carregar a lista de temas neste momento.
 						</div>
@@ -56,9 +56,9 @@
 						<div class="col-xs-12">
 							<div class="input-group input-group-lg input-group-search">
 								<label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
-								<input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pageRanking.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >
+								<input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >
 								<span class="input-group-btn">
-									<button type="button" class="btn btn-default" ng-click="pageRanking.search()">
+									<button type="button" class="btn btn-default" ng-click="pagePropostas.search()">
 										<span class="icon-circle icon-small color-theme-common-bg">
 											<span class="glyphicon glyphicon-search"></span>
 										</span>
@@ -71,21 +71,21 @@
 					<div class="row">
 						<div class="col-sm-12">
 							<header class="header">
-								<h2>Total de Propostas as propostas: "<span>{{::pageRanking.proposals.length}} propostas</span>"</h2>
+								<h2>Total de Propostas: "<span>{{pagePropostas.filtredProposals.length}} propostas</span>"</h2>
 							</header>
 						</div>
 					</div>
 					<div class="row">
-						<div class="col-sm-12" ng-if="pageRanking.proposals">
-							<proposal-list proposals="pageRanking.filtredProposals"></proposal-list>
+						<div class="col-sm-12" ng-if="pagePropostas.proposals">
+							<proposal-list proposals="pagePropostas.filtredProposals"></proposal-list>
 						</div>
-						<div ng-if="!pageRanking.proposals && pageRanking.loadingProposals">
+						<div ng-if="!pagePropostas.proposals && pagePropostas.loadingProposals">
 							<div class="alert alert-info" role="alert">
 								Carregando propostas.
 							</div>
 						</div>
-						<div ng-if="!pageRanking.proposals && pageRanking.proposalsError">
+						<div ng-if="!pagePropostas.proposals && pagePropostas.proposalsError">
 							<div class="alert alert-danger" role="alert">
 								Não foi possível carregar a lista de propostas neste momento.
 							</div>
	@@ -42,7 +42,6 @@		@@ -42,7 +42,6 @@
42	AuthUserController.prototype.onClickLogout = function (){	42	AuthUserController.prototype.onClickLogout = function (){
43	var vm = this;	43	var vm = this;
44		44
45	- // TODO: emit event?
46	vm.AuthService.logout();	45	vm.AuthService.logout();
47	};	46	};
48		47
	@@ -65,7 +65,7 @@		@@ -65,7 +65,7 @@
65	templateUrl: 'app/components/category-list/category-list.html',	65	templateUrl: 'app/components/category-list/category-list.html',
66	scope: {	66	scope: {
67	categories: '=',	67	categories: '=',
68	- selectedCategory: '@'	68	+ selectedCategory: '='
69	},	69	},
70	controller: CategoryListController,	70	controller: CategoryListController,
71	controllerAs: 'vm',	71	controllerAs: 'vm',
	@@ -22,7 +22,7 @@		@@ -22,7 +22,7 @@
22	<li ui-sref-active="active"><a ui-sref="duvidas">Dúvidas</a></li>	22	<li ui-sref-active="active"><a ui-sref="duvidas">Dúvidas</a></li>
23	<li role="separator" class="divider hidden-xs hidden-sm"><span>\|</span></li>	23	<li role="separator" class="divider hidden-xs hidden-sm"><span>\|</span></li>
24	<li class="dropdown">	24	<li class="dropdown">
25	- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span class="icon icon-social-share-small"></span></a>	25	+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a>
26	<social-share class="dropdown-menu dropdown-menu-right"></social-share>	26	<social-share class="dropdown-menu dropdown-menu-right"></social-share>
27	<!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">	27	<!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">
28	<li>	28	<li>
	@@ -2,26 +2,27 @@		@@ -2,26 +2,27 @@
2	'use strict';	2	'use strict';
3		3
4	angular	4	angular
5	- .module('dialoga')
6	- .directive('proposalList', proposalList);	5	+ .module('dialoga')
		6	+ .directive('proposalList', proposalList);
7		7
8	/** @ngInject */	8	/** @ngInject */
9	function proposalList() {	9	function proposalList() {
10		10
11	/** @ngInject */	11	/** @ngInject */
12	- function ProposalListController(ArticleService, $scope, $element, $timeout, $log) {	12	+ function ProposalListController(ArticleService, $state, $scope, $element, $timeout, $log) {
13	$log.debug('ProposalListController');	13	$log.debug('ProposalListController');
14		14
15	var vm = this;	15	var vm = this;
16	vm.ArticleService = ArticleService;	16	vm.ArticleService = ArticleService;
		17	+ vm.$state = $state;
17	vm.$scope = $scope;	18	vm.$scope = $scope;
18	vm.$element = $element;	19	vm.$element = $element;
19	vm.$timeout = $timeout;	20	vm.$timeout = $timeout;
20	vm.$log = $log;	21	vm.$log = $log;
21		22
22	vm.init();	23	vm.init();
23	-
24	vm.loadData();	24	vm.loadData();
		25	+ vm.attachListeners();
25	}	26	}
26		27
27	ProposalListController.prototype.init = function () {	28	ProposalListController.prototype.init = function () {
	@@ -36,9 +37,27 @@		@@ -36,9 +37,27 @@
36	vm.per_page = 5;	37	vm.per_page = 5;
37	}	38	}
38		39
		40	+ vm.initPorposalList();
		41	+ };
		42	+
		43	+ ProposalListController.prototype.initPorposalList = function () {
		44	+ var vm = this;
		45	+
		46	+ vm.currentPageIndex = 0;
		47	+
39	vm.proposalsPerPage = vm.getProposalsPerPage(0);	48	vm.proposalsPerPage = vm.getProposalsPerPage(0);
40		49
41	vm.proposalsLength = vm.proposals.length;	50	vm.proposalsLength = vm.proposals.length;
		51	+
		52	+
		53	+ if ((vm.proposalsLength % vm.per_page) === 0) {
		54	+ vm.pages = vm.proposalsLength / vm.per_page;
		55	+ } else{
		56	+ vm.pages = (vm.proposalsLength / vm.per_page) + 1;
		57	+ }
		58	+
		59	+ // vm.arraypages = new Array(Math.ceil(vm.pages));
		60	+ vm.arraypages = new Array(Math.floor(vm.pages));
42	};	61	};
43		62
44	ProposalListController.prototype.loadData = function () {	63	ProposalListController.prototype.loadData = function () {
	@@ -51,6 +70,14 @@		@@ -51,6 +70,14 @@
51	}, 1000);	70	}, 1000);
52	};	71	};
53		72
		73	+ ProposalListController.prototype.attachListeners = function () {
		74	+ var vm = this;
		75	+
		76	+ vm.$scope.$watch('vm.proposals', function(/newValue, oldValue/) {
		77	+ vm.initPorposalList();
		78	+ });
		79	+ };
		80	+
54	ProposalListController.prototype.getProposalsPerPage = function (pageIndex) {	81	ProposalListController.prototype.getProposalsPerPage = function (pageIndex) {
55	var vm = this;	82	var vm = this;
56		83
	@@ -62,7 +89,28 @@		@@ -62,7 +89,28 @@
62		89
63	ProposalListController.prototype.showPage = function (pageIndex) {	90	ProposalListController.prototype.showPage = function (pageIndex) {
64	var vm = this;	91	var vm = this;
		92	+
		93	+ if (pageIndex < 0) {
		94	+ pageIndex = 0;
		95	+ }
		96	+
		97	+ if (pageIndex > (vm.arraypages.length-1)) {
		98	+ pageIndex = vm.arraypages.length-1;
		99	+ }
		100	+
65	vm.proposalsPerPage = vm.getProposalsPerPage(pageIndex);	101	vm.proposalsPerPage = vm.getProposalsPerPage(pageIndex);
		102	+ vm.currentPageIndex = pageIndex;
		103	+ };
		104	+
		105	+ ProposalListController.prototype.showContent = function (proposal) {
		106	+ var vm = this;
		107	+
		108	+ vm.$state.go('programa-conteudo', {
		109	+ slug: proposal.parent.slug,
		110	+ proposal_id: proposal.id
		111	+ }, {
		112	+ location: true
		113	+ });
66	};	114	};
67		115
68	function attachPopover(){	116	function attachPopover(){
	@@ -79,4 +79,42 @@		@@ -79,4 +79,42 @@
79	background-color: #eaeaea;	79	background-color: #eaeaea;
80	}	80	}
81	}	81	}
		82	+
		83	+ .btn-pagination {
		84	+ background-color: transparent;
		85	+ border: none;
		86	+ border-radius: 100%;
		87	+ font-weight: bold;
		88	+ font-size: 20px;
		89	+ padding: 0px 8px;
		90	+ width: 28px;
		91	+ height: 28px;
		92	+ text-decoration: underline;
		93	+ color: $defaultblue;
		94	+ }
		95	+
		96	+ .pagination-icon {
		97	+ color: $defaultblue;
		98	+ }
		99	+
		100	+ .pagination > .active > a,
		101	+ .pagination > .active > a:hover,
		102	+ .pagination > .active > a:focus,
		103	+ .pagination > .active > span,
		104	+ .pagination > .active > span:hover,
		105	+ .pagination > .active > span:focus {
		106	+ background-color: $defaultblue;
		107	+ text-decoration: none;
		108	+
		109	+ }
		110	+
		111	+ .pagination > .disabled > span,
		112	+ .pagination > .disabled > span:hover,
		113	+ .pagination > .disabled > span:focus,
		114	+ .pagination > .disabled > a,
		115	+ .pagination > .disabled > a:hover,
		116	+ .pagination > .disabled > a:focus {
		117	+ background-color: transparent;
		118	+ }
		119	+
82	}	120	}
@@ -0,0 +1,136 @@		@@ -0,0 +1,136 @@
	1	+<div class="container">
	2	+ <div class="row">
	3	+ <div class="col-sm-11 col-sm-offset-1">
	4	+ <h2>Mapa do Site</h2>
	5	+ <p>Uma visão geral do conteúdo disponível no site.</p>
	6	+ </div>
	7	+ </div>
	8	+</div>
	9	+
	10	+<div class="page--mapa">
	11	+ <div class="container">
	12	+ <div class="row margin-mapa">
	13	+ <div class="col-sm-11 col-sm-offset-1">
	14	+ <h3 class="font-mapa">Sobre o Dialoga</h3>
	15	+
	16	+ <div class="row margin-mapa">
	17	+ <h3 class="font-mapa">Programas</h3>
	18	+ <div class="col-sm-6">
	19	+ <h4 class="font-mapa">Ttulo do tema</h4>
	20	+ <ul>
	21	+ <li>Titulo do programa</li>
	22	+ <li>Titulo do programa</li>
	23	+ <li>Titulo do programa</li>
	24	+ <li>Titulo do programa</li>
	25	+ </ul>
	26	+ <h4 class="font-mapa">Ttulo do tema</h4>
	27	+ <ul>
	28	+ <li>Titulo do programa</li>
	29	+ <li>Titulo do programa</li>
	30	+ <li>Titulo do programa</li>
	31	+ <li>Titulo do programa</li>
	32	+ </ul>
	33	+ <h4 class="font-mapa">Ttulo do tema</h4>
	34	+ <ul>
	35	+ <li>Titulo do programa</li>
	36	+ <li>Titulo do programa</li>
	37	+ <li>Titulo do programa</li>
	38	+ <li>Titulo do programa</li>
	39	+ </ul>
	40	+ </div>
	41	+ </div>
	42	+ <div class="row margin-mapa">
	43	+ <h3 class="font-mapa">Propostas</h3>
	44	+ <div class="col-sm-6">
	45	+ <h4 class="font-mapa"></h4>
	46	+ <ul>
	47	+ <li></li>
	48	+ </ul>
	49	+ <h4 class="font-mapa"></h4>
	50	+ <ul>
	51	+ <li></li>
	52	+ </ul>
	53	+ <h4 class="font-mapa"></h4>
	54	+ <ul>
	55	+ <li></li>
	56	+ </ul>
	57	+ </div>
	58	+ </div>
	59	+ <div class="row margin-mapa">
	60	+ <h3 class="font-mapa">Ranking</h3>
	61	+ <div class="col-sm-6">
	62	+ <h4 class="font-mapa"></h4>
	63	+ <ul>
	64	+ <li></li>
	65	+ </ul>
	66	+ <h4 class="font-mapa"></h4>
	67	+ <ul>
	68	+ <li></li>
	69	+ </ul>
	70	+ <h4 class="font-mapa"></h4>
	71	+ <ul>
	72	+ <li></li>
	73	+ </ul>
	74	+ </div>
	75	+ </div>
	76	+ <div class="row margin-mapa">
	77	+ <h3 class="font-mapa">Dúvidas e sugestões</h3>
	78	+ <div class="col-sm-6">
	79	+ <h4 class="font-mapa"></h4>
	80	+ <ol>
	81	+ <li>O que é o Dialoga Brasil?</li>
	82	+ <li>O que são Programas?</li>
	83	+ <li>O que são Propostas</li>
	84	+ <li>Quem pode criar propostas e votar nelas?</li>
	85	+ <li>O que acontece com as melhores propostas?</li>
	86	+ </ol>
	87	+ </div>
	88	+ </div>
	89	+ <div class="row margin-mapa">
	90	+ <h3 class="font-mapa">Entrar</h3>
	91	+ <div class="col-sm-6">
	92	+ <h4 class="font-mapa"></h4>
	93	+ <ul>
	94	+ <li></li>
	95	+ </ul>
	96	+ <h4 class="font-mapa"></h4>
	97	+ <ul>
	98	+ <li></li>
	99	+ </ul>
	100	+ <h4 class="font-mapa"></h4>
	101	+ <ul>
	102	+ <li></li>
	103	+ </ul>
	104	+ </div>
	105	+ </div>
	106	+ <div class="row margin-mapa">
	107	+
	108	+
	109	+ <h3 class="font-mapa">Dialoga nas redes</h3>
	110	+ <div class="col-sm-6">
	111	+ <h4 class="font-mapa"></h4>
	112	+ <ul>
	113	+ <li>Rede 1</li>
	114	+ <li>Rede 2</li>
	115	+ <li>Rede 3</li>
	116	+ <li>Rede 4</li>
	117	+ </ul>
	118	+ </div>
	119	+ </div>
	120	+ <div class="row margin-mapa">
	121	+
	122	+ <h3 class="font-mapa">Compartilhar</h3>
	123	+ <div class="col-sm-6">
	124	+ <h4 class="font-mapa"></h4>
	125	+ <ul>
	126	+ <li>Rede 1</li>
	127	+ <li>Rede 2</li>
	128	+ <li>Rede 3</li>
	129	+ <li>Rede 4</li>
	130	+ </ul>
	131	+ </div>
	132	+ </div>
	133	+
	134	+ </div>
	135	+ </div>
	136	+ <button type="button" class="btn btn-link" ui-sref="inicio">retornar à página inicial</button>
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+.page--mapa {
	2	+ background-color: #f9f9f9;
	3	+
	4	+ .font-mapa {
	5	+ color: $defaultblue;
	6	+ font-weight: 600;
	7	+ }
	8	+
	9	+ .margin-mapa {
	10	+ margin-left: 0px;
	11	+ margin-right: 0px;
	12	+ }
	13	+
	14	+}
	@@ -64,7 +64,7 @@		@@ -64,7 +64,7 @@
64	</div>	64	</div>
65	<div class="col-xs-12" ng-if="pageProgramaContent.randomProposal">	65	<div class="col-xs-12" ng-if="pageProgramaContent.randomProposal">
66	<h3 class="color-theme-fg">Propostas nesse programa</h3>	66	<h3 class="color-theme-fg">Propostas nesse programa</h3>
67	- <proposal-box proposal="pageProgramaContent.randomProposal" topic="pageProgramaContent.article" category="pageProgramaContent.category" vote="false" ></proposal-box>	67	+ <proposal-box proposal="pageProgramaContent.randomProposal" topic="pageProgramaContent.article" category="pageProgramaContent.category" vote="true" focus="{{pageProgramaContent.search.proposal_id}}" ></proposal-box>
68	</div>	68	</div>
69	<div class="col-xs-12" ng-if="!pageProgramaContent.randomProposal && !(pageProgramaContent.proposalsTopRated && pageProgramaContent.proposalsTopRated.length > 0)">	69	<div class="col-xs-12" ng-if="!pageProgramaContent.randomProposal && !(pageProgramaContent.proposalsTopRated && pageProgramaContent.proposalsTopRated.length > 0)">
70	<h3>Programas sem propostas</h3>	70	<h3>Programas sem propostas</h3>
	@@ -11,33 +11,36 @@		@@ -11,33 +11,36 @@
11	.controller('PropostasPageController', PropostasPageController);	11	.controller('PropostasPageController', PropostasPageController);
12		12
13	/** @ngInject */	13	/** @ngInject */
14	- function PropostasPageController(DialogaService, $log) {	14	+ function PropostasPageController(DialogaService, $scope, $location, $filter, $log) {
15	var vm = this;	15	var vm = this;
16		16
17	vm.DialogaService = DialogaService;	17	vm.DialogaService = DialogaService;
		18	+ vm.$scope = $scope;
		19	+ vm.$location = $location;
		20	+ vm.$filter = $filter;
18	vm.$log = $log;	21	vm.$log = $log;
19		22
20	vm.init();	23	vm.init();
		24	+ vm.loadData();
		25	+ vm.attachListeners();
		26	+
21	$log.debug('PropostasPageController');	27	$log.debug('PropostasPageController');
22	}	28	}
23		29
24	PropostasPageController.prototype.init = function () {	30	PropostasPageController.prototype.init = function () {
25	var vm = this;	31	var vm = this;
26		32
27	- vm.article = null;
28	vm.themes = null;	33	vm.themes = null;
29	vm.selectedTheme = null;	34	vm.selectedTheme = null;
30	vm.proposals = null;	35	vm.proposals = null;
31	vm.filtredProposals = null;	36	vm.filtredProposals = null;
32	vm.query = null;	37	vm.query = null;
		38	+ vm.search = vm.$location.search();
33		39
34	vm.loading = null;	40	vm.loading = null;
35	vm.error = null;	41	vm.error = null;
36	-
37	- vm.loadData();
38	};	42	};
39		43
40	-
41	PropostasPageController.prototype.loadData = function () {	44	PropostasPageController.prototype.loadData = function () {
42	var vm = this;	45	var vm = this;
43		46
	@@ -49,10 +52,12 @@		@@ -49,10 +52,12 @@
49	vm.proposals = data.articles;	52	vm.proposals = data.articles;
50	vm.filtredProposals = vm.proposals;	53	vm.filtredProposals = vm.proposals;
51	vm.loadingProposals = false;	54	vm.loadingProposals = false;
		55	+ vm.loading = false;
52	}, function (error) {	56	}, function (error) {
53	vm.error = error;	57	vm.error = error;
54	vm.$log.error(error);	58	vm.$log.error(error);
55	vm.loadingProposals = false;	59	vm.loadingProposals = false;
		60	+ vm.loading = false;
56	});	61	});
57		62
58	// load themes	63	// load themes
	@@ -60,10 +65,117 @@		@@ -60,10 +65,117 @@
60	vm.DialogaService.getThemes(function(themes){	65	vm.DialogaService.getThemes(function(themes){
61	vm.themes = themes;	66	vm.themes = themes;
62	vm.loadingThemes = false;	67	vm.loadingThemes = false;
		68	+ vm.loading = false;
63	}, function (error) {	69	}, function (error) {
64	vm.error = error;	70	vm.error = error;
65	vm.$log.error(error);	71	vm.$log.error(error);
66	vm.loadingThemes = false;	72	vm.loadingThemes = false;
		73	+ vm.loading = false;
		74	+ });
		75	+ };
		76	+
		77	+ PropostasPageController.prototype.attachListeners = function() {
		78	+ var vm = this;
		79	+
		80	+ vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) {
		81	+ vm.selectedTheme = selectedCategory;
		82	+ });
		83	+
		84	+ vm.$scope.$watch('pagePropostas.selectedTheme', function(newValue/, oldValue/) {
		85	+ vm.search.tema = newValue ? newValue.slug : null;
		86	+ vm.$location.search('tema', vm.search.tema);
		87	+ vm.filtredProposals = vm.getFiltredProposals();
67	});	88	});
		89	+
		90	+ vm.$scope.$watch('pagePropostas.query', function(newValue/, oldValue/) {
		91	+ vm.search.filtro = newValue ? newValue : null;
		92	+ vm.$location.search('filtro', vm.search.filtro);
		93	+ vm.filtredProposals = vm.getFiltredProposals();
		94	+ });
		95	+ };
		96	+
		97	+ PropostasPageController.prototype.filter = function() {
		98	+ var vm = this;
		99	+
		100	+ if (vm.search && vm.search.tema) {
		101	+ var slug = vm.search.tema;
		102	+ vm.$log.debug('filter by theme', slug);
		103	+
		104	+ vm.DialogaService.getThemeBySlug(slug, function(theme){
		105	+ vm.selectedTheme = theme;
		106	+ vm.$log.debug('getThemeBySlug.slug', slug);
		107	+ vm.$log.debug('getThemeBySlug.selectedTheme', theme);
		108	+ }, function(error){
		109	+ vm.$log.error('Error when try to "getThemeBySlug"', error);
		110	+ });
		111	+ }
68	};	112	};
		113	+
		114	+ PropostasPageController.prototype.showAllPrograms = function($event) {
		115	+ var vm = this;
		116	+ $event.stopPropagation();
		117	+
		118	+ vm.resetFilterValues();
		119	+
		120	+ vm._showAllFlag = true;
		121	+
		122	+ vm.filtredPrograms = vm.getFiltredPrograms();
		123	+ };
		124	+
		125	+ PropostasPageController.prototype.resetFilterValues = function() {
		126	+ var vm = this;
		127	+
		128	+ vm.query = null;
		129	+ vm.selectedTheme = null;
		130	+ };
		131	+
		132	+ PropostasPageController.prototype.getFiltredProposals = function() {
		133	+ var vm = this;
		134	+
		135	+ if(!vm.proposals){
		136	+ vm.$log.warn('No proposals loaded yet. Abort.');
		137	+ return null;
		138	+ }
		139	+
		140	+ var input = vm.proposals;
		141	+ var output = input;
		142	+ var query = vm.query;
		143	+ var selectedTheme = vm.selectedTheme;
		144	+
		145	+ var filter = vm.$filter('filter');
		146	+
		147	+ if (selectedTheme) {
		148	+ output = _filterByCategory(output, selectedTheme);
		149	+ }
		150	+
		151	+ if (query) {
		152	+ output = filter(output, query, false);
		153	+ }
		154	+
		155	+ // if(!query && !selectedTheme && vm._showAllFlag){
		156	+ // output = _balanceByCategory(output);
		157	+ // }
		158	+
		159	+ return output;
		160	+ };
		161	+
		162	+ function _filterByCategory (input, category) {
		163	+ input = input \|\| [];
		164	+
		165	+ if (!category) {
		166	+ // no filter
		167	+ return input;
		168	+ }
		169	+
		170	+ var out = [];
		171	+ for (var i = 0; i < input.length; i++) {
		172	+ var proposal = input[i];
		173	+ if (proposal.parent.categories[0].slug === category.slug) {
		174	+ out.push(proposal);
		175	+ }
		176	+ }
		177	+
		178	+ return out;
		179	+ }
		180	+
69	})();	181	})();
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+.page--propostas {
	2	+ .proposal-box--middle {
	3	+ background-color: #fff;
	4	+ }
	5	+}