From 3b4724ae4006538a5f17a332f26beef71afa2c39 Mon Sep 17 00:00:00 2001
From: 98287028191 <nslmjl_2014*>
Date: Thu, 17 Dec 2015 16:12:15 -0200
Subject: [PATCH] Retirado o botão de remover da página ranking

---
 src/app/components/category-list/category-list.directive.js | 17 ++++++++++++++---
 src/app/components/category-list/category-list.html         |  3 +--
 src/app/pages/auth/new-password.html                        |  3 ++-
 src/app/pages/auth/newPassword.controller.js                |  2 +-
 src/app/pages/ranking/ranking.controller.js                 |  4 ++--
 src/app/pages/ranking/ranking.html                          |  4 +++-
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/app/components/category-list/category-list.directive.js b/src/app/components/category-list/category-list.directive.js
index 01c5844..496fe70 100644
--- a/src/app/components/category-list/category-list.directive.js
+++ b/src/app/components/category-list/category-list.directive.js
@@ -9,23 +9,33 @@
   function categoryList() {
 
     /** @ngInject */
-    function CategoryListController($rootScope, $element, $log) {
+    function CategoryListController($rootScope, $location, $element, $log) {
       $log.debug('CategoryListController');
 
       // alias
       var vm = this;
-
+      
       // dependencies
       vm.$rootScope = $rootScope;
+      vm.$location = $location;
       vm.$element = $element;
       vm.$log = $log;
 
+
       // initialization
       vm.init();
     }
 
     CategoryListController.prototype.init = function() {
       var vm = this;
+      vm.pathUrl = vm.$location.$$path;
+      //var pathUrl = String(window.location.pathname)
+      vm.escodeRemover = true;
+
+      // Disable button remove of page ranking
+      if(vm.pathUrl=="/ranking"){
+        vm.escodeRemover = false;
+      }
 
       // Default values
       if(!vm.isCollapsed){
@@ -47,12 +57,13 @@
 
     CategoryListController.prototype.selectCategory = function(category, $event) {
       var vm = this;
-
+      
       // prevent glitch
       $event.stopPropagation();
 
       if (category !== vm.selectedCategory) {
         vm.selectedCategory = category;
+
       }else{
 
         if(vm._disableUnselect()){
diff --git a/src/app/components/category-list/category-list.html b/src/app/components/category-list/category-list.html
index 26d057f..d66726a 100644
--- a/src/app/components/category-list/category-list.html
+++ b/src/app/components/category-list/category-list.html
@@ -5,7 +5,6 @@
       <!-- <span class="visible-xs"><b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span></span> -->
       <b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span>
     </h3>
-
     <!-- <div class="list-group ng-hide" ng-show="!vm.isCollapsed" ng-class="vm.selectedCategory.slug"> -->
     <div class="list-group" ng-class="vm.selectedCategory.slug">
       <button type="button" class="list-group-item category-list--item"
@@ -17,7 +16,7 @@
         <span class="category-list--icon icon" aria-hidden="true" ng-class="'icon-tema-' + category.slug + '-small'"></span>
         <span class="category-list--label">{{::category.name}}</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>
+        <span ng-if="vm.escodeRemover" class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span>
         <div ng-if="category.archived" class="category-list--icon-archived">
           <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
         </div>
diff --git a/src/app/pages/auth/new-password.html b/src/app/pages/auth/new-password.html
index 5604385..d8ad5b5 100644
--- a/src/app/pages/auth/new-password.html
+++ b/src/app/pages/auth/new-password.html
@@ -31,7 +31,8 @@
                         novalidate
                         name="newPasswordForm"
                         ng-submit="newPasswordForm.$valid && pageNewPassword.submitNewPassword($event, newPasswordForm)">
-                            <input type="hidden" id="code" name="code" value="{{::pageNewPassword.token}}" />
+
+
                             <div class="row">
                                 <div class="col-md-6">
                                     <div class="form-group">
diff --git a/src/app/pages/auth/newPassword.controller.js b/src/app/pages/auth/newPassword.controller.js
index d2feec1..828f967 100644
--- a/src/app/pages/auth/newPassword.controller.js
+++ b/src/app/pages/auth/newPassword.controller.js
@@ -43,7 +43,7 @@
 
     // get form data
     var data = {
-      code: newPasswordForm.code,
+      code: vm.token,
       newPassword: newPasswordForm.newPassword.$modelValue,
       newPasswordConfirmation: newPasswordForm.newPasswordConfirmation.$modelValue
     };
diff --git a/src/app/pages/ranking/ranking.controller.js b/src/app/pages/ranking/ranking.controller.js
index f088d2b..f69df83 100644
--- a/src/app/pages/ranking/ranking.controller.js
+++ b/src/app/pages/ranking/ranking.controller.js
@@ -37,8 +37,8 @@
     vm.query = null;
     vm.search = vm.$location.search();
     //Remove "X" from the theme at the ranking page
-    // vm.slug = vm.$location.$$path;
-    // console.log(vm.$location.$$path);
+    vm.slug = vm.$location.$$path;
+    console.log("aqui",vm.$location.$$path);
 
     if (vm.search.tema) {
       vm._filtredByThemeSlug = vm.search.tema;
diff --git a/src/app/pages/ranking/ranking.html b/src/app/pages/ranking/ranking.html
index d68921d..ec156be 100644
--- a/src/app/pages/ranking/ranking.html
+++ b/src/app/pages/ranking/ranking.html
@@ -40,9 +40,11 @@
 		<div class="container">
 			<div id="lista-de-propostas" class="row">
 				<div class="col-sm-4 col-md-3">
+				<!-- Banner lateral de temas -->
 					<div ng-if="pageRanking.themes">
-						<category-list categories="pageRanking.themes" selected-category="pageRanking.selectedTheme" disable-unselect="true"></category-list>
+						<category-list categories="pageRanking.themes" selected-category="" disable-unselect="true"></category-list>
 					</div>
+
 					<div ng-if="pageRanking.filtredPrograms && pageRanking.selectedProgram" class="topics-select--wrapper">
 						<topics-select topics="pageRanking.filtredPrograms" selected-topic="pageRanking.selectedProgram"></topics-select>
 					</div>
--
libgit2 0.21.2