Download as
Browse Code »

Commit 559e728d58b4d5789cfb7a44e0a7d9fe1b2166ad

Authored by Leonardo Merlin
2 parents d869320b f69ffc79
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'merlin' into staging

Showing 6 changed files with 15 additions and 10 deletions   Show diff stats
src/app/components/event-list/event-list.directive.js
  Diff comments   View file @559e728
... ... @@ -40,9 +40,15 @@
40 40 vm.isCollapsed = !vm.isCollapsed;
41 41 };
42 42  
43   - EventListController.prototype.subscribe = function (event_id) {
  43 + EventListController.prototype.subscribe = function (event) {
44 44 var vm = this;
45 45  
  46 + if(event.isOld){
  47 + vm.$log.debug('Event already happened. Abort.');
  48 + return;
  49 + }
  50 +
  51 + var event_id = event.id;
46 52 vm.$log.debug('event_id', event_id);
47 53  
48 54 if(!vm.$rootScope.currentUser){
... ...
src/app/components/event-list/event-list.html
  Diff comments   View file @559e728
... ... @@ -40,22 +40,22 @@
40 40 </span>
41 41 </div>
42 42 <div class="col-xs-12 col-sm-4 col-md-5 vcenter">
43   - <span class="description">{{::event.title}}</span>
  43 + <span class="description">{{::event.title.split('-')[0]}}</span>
44 44 </div>
45 45 <!-- <div class="col-xs-12 col-sm-4 col-md-3 text-center vcenter">
46 46 <span class="theme">{{::event.categories[0].name}}</span>
47 47 </div> -->
48 48 <div class="col-xs-12 col-sm-4 col-md-4 text-right vcenter" style="padding-right: 20px;">
49 49 <div class="row">
50   - <div class="col-xs-6 text-right" ng-class="{'col-xs-12': event.isOld}">
  50 + <div class="col-xs-6 text-right">
51 51 <div ng-if="event.followers_count > 50">
52 52 <b>{{::event.followers_count}}</b>
53 53 <br/>
54 54 <span>Inscritos</span>
55 55 </div>
56 56 </div>
57   - <div class="col-xs-6" ng-if="!event.isOld">
58   - <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe(event.id)">
  57 + <div class="col-xs-6">
  58 + <button type="button" class="btn color-theme-common-bg btn-disabled" disabled ng-click="vm.subscribe(event)">
59 59 Inscreva-se
60 60 <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>
61 61 </button>
... ...
src/app/components/event-list/event-list.scss
  Diff comments   View file @559e728
... ... @@ -31,7 +31,7 @@
31 31  
32 32 .row-level-1 {
33 33 // height: 48px;
34   - line-height: 30px;
  34 + line-height: 20px;
35 35 padding: 5px 0;
36 36 border-bottom: 1px solid #ccc;
37 37 }
... ...
src/app/components/proposal-box/proposal-box.html
  Diff comments   View file @559e728
... ... @@ -94,9 +94,8 @@
94 94 <div ng-show="!vm.errorOnSkip">
95 95 <p>Carregando...</p>
96 96 </div>
97   - <div ng-show="!vm.errorOnSkip">
  97 + <div ng-show="vm.errorOnSkip">
98 98 <p>Erro ao carregar nova proposta proposta.</p>
99   - <p>{{vm.errorOnSkip}}</p>
100 99 </div>
101 100 </div>
102 101 </div>
... ...
src/app/components/proposal-carousel/proposal-carousel.html
  Diff comments   View file @559e728
... ... @@ -20,7 +20,7 @@
20 20 <div class="inner">{{::proposal.abstract}}</div>
21 21 </div>
22 22 </div>
23   - <div class="join">
  23 + <div class="join" ng-show="vm.activeIndex === $index">
24 24 <button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
25 25 Participe
26 26 <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
... ...
src/app/components/social-share/social-share.html
  Diff comments   View file @559e728
... ... @@ -7,7 +7,7 @@
7 7 socialshare
8 8 socialshare-provider="facebook"
9 9 socialshare-type="feed"
10   - socialshare-via="476168325877872"
  10 + socialshare-via="687948707977695"
11 11 socialshare-url="http://dialoga.gov.br"
12 12 socialshare-redirect-uri="https://dialoga.gov.br/"
13 13 socialshare-media="http://dialoga.gov.br/images/logo.png"
... ...