Update the proposal-box for issue #60

Leonardo Merlin
1 parent 6e5fa2b1
Showing 3 changed files with 44 additions and 24 deletions Show diff stats
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
@@ -90,17 +90,6 @@
       }, 10);
     };
-    ProposalBoxController.prototype.showContent = function(slug) {
-      var vm = this;
-
-      vm.$state.go('programa', {
-        slug: slug,
-        proposal_id: vm.proposal.id
-      }, {
-        location: true
-      });
-    };
-
     ProposalBoxController.prototype.canVote = function() {
       var vm = this;
@@ -145,16 +145,18 @@
       <div class="proposal-box--content-inner">{{vm.proposal.abstract}}</div>
     </div>
     <div ng-hide="vm.showVote" class="proposal-box--join">
-      <button
+      <a 
       class="btn btn-link color-theme-common-fg"
       ng-if="vm.archived === false"
-      ng-click="vm.showContent(vm.topic.slug)"
-      >Participe</button>
-      <button
+      ui-sref="programa({slug: vm.topic.slug, proposal_id: vm.proposal.id})"
+      ui-sref-opts="{location: true}"
+      >Participe</a>
+      <a
       class="btn btn-link color-theme-common-fg"
       ng-if="vm.archived === true"
-      ng-click="vm.showContent(vm.topic.slug)"
-      >Ir para o programa</button>
+      ui-sref="programa({slug: vm.topic.slug, proposal_id: vm.proposal.id})"
+      ui-sref-opts="{location: true}"
+      >Ir para o programa</a>
     </div>
     <div ng-show="vm.showVote" class="proposal-box--actions text-center">
       <div class="row">
@@ -185,7 +187,7 @@
       </div>
     </div>
   </div>
-  <div class="proposal-box--bottom text-center">
+  <div class="proposal-box--bottom text-center" ng-class="{archived: vm.archived}">
     <div class="proposal-box--share">
       <span>COMPARTILHE ESTA <b>PROPOSTA</b></span>
       <div class="dropdown">
@@ -198,11 +200,25 @@
           class="dropdown-menu dropdown-menu-right"></social-share>
       </div>
     </div>
-    <div class="proposal-box--ranking">
-      <div class="proposal-box--ranking-inner">
-        <span class="icon icon-small icon-ranking" aria-hidden="true"></span>
-        <span>Colocação nos resultados:</span>
-        <span>{{vm.proposal.ranking_position}}º</span>
+
+    <div ng-if="vm.archived === true">
+      <div class="proposal-box--archived color-theme-bg-complementar-2">
+        <div class="proposal-box--archived-inner">
+          <a ui-sref="programa({slug: vm.topic.slug, proposal_id: vm.proposal.id})" ui-sref-opts="{location: true}">
+            Veja as respostas e compromissos assumidos
+            <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+          </a>
+        </div>
+      </div>
+    </div>
+
+    <div ng-if="vm.archived === false">
+      <div class="proposal-box--ranking">
+        <div class="proposal-box--ranking-inner">
+          <span class="icon icon-small icon-ranking" aria-hidden="true"></span>
+          <span>Colocação nos resultados:</span>
+          <span>{{vm.proposal.ranking_position}}º</span>
+        </div>
       </div>
     </div>
   </div>
@@ -39,6 +39,12 @@
 		border-bottom-right-radius: 5px;
 		// overflow: hidden;
         border-bottom: 5px solid #dadada;
+
+        @each $category, $color in $categories {
+            .#{$category} &.archived {
+                border-bottom-color: map-get($categories-complementary-2, $category);
+            }
+        }
 	}
 	&--theme {
@@ -60,7 +66,8 @@
         .contraste & { background-color: #000 !important; outline: 1px solid #eee; }
     }
-    &--ranking {
+    &--ranking,
+    &--archived {
         font-weight: bold;
         padding: 10px 0;
         background-color: #dadada;
@@ -68,6 +75,14 @@
         .contraste & { background-color: #111 !important; outline: 1px solid #eee; }
     }
+    &--archived {
+        text-transform: uppercase;
+        font-size: 12px;
+        line-height: 23px;
+        
+        a { color: #fff; }
+    }
+
     .action-label {
         margin-top: 10px;
     }
	@@ -90,17 +90,6 @@		@@ -90,17 +90,6 @@
90	}, 10);	90	}, 10);
91	};	91	};
92		92
93	- ProposalBoxController.prototype.showContent = function(slug) {
94	- var vm = this;
95	-
96	- vm.$state.go('programa', {
97	- slug: slug,
98	- proposal_id: vm.proposal.id
99	- }, {
100	- location: true
101	- });
102	- };
103	-
104	ProposalBoxController.prototype.canVote = function() {	93	ProposalBoxController.prototype.canVote = function() {
105	var vm = this;	94	var vm = this;
106		95