Download as
Browse Code »

Commit fca004bb068eaf1eb6f28ae48f5ee52db0608e85

Authored by Leonardo Merlin
1 parent 9be4713a
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Update event list

Showing 3 changed files with 25 additions and 6 deletions   Show diff stats
src/app/components/article-service/article.service.js
  Diff comments   View file @fca004b
... ... @@ -145,7 +145,7 @@
145 145  
146 146 var url = service.apiCommunities + community_id + '/articles';
147 147 var paramsExtended = angular.extend({
148   - 'fields[]': ['id', 'slug', 'title', 'abstract', 'body', 'categories', 'created_at', 'start_date', 'end_date', 'hits'],
  148 + // 'fields[]': ['id', 'slug', 'title', 'abstract', 'body', 'categories', 'created_at', 'start_date', 'end_date', 'hits'],
149 149 'content_type':'Event'
150 150 }, params);
151 151  
... ...
src/app/components/event-list/event-list.html
  Diff comments   View file @fca004b
... ... @@ -46,17 +46,28 @@
46 46 <!-- <thead></thead> -->
47 47 <tbody>
48 48 <tr ng-repeat="event in vm.events">
49   - <td>
  49 + <td width="50%">
  50 + <span class="glyphicon glyphicon-calendar"></span>
50 51 <span class="date">{{event.start_date | date : "dd/MM/yyyy"}}</span>
51 52 <span class="separator">-</span>
  53 + <span class="glyphicon glyphicon-time"></span>
52 54 <span class="time">{{event.start_date | date : "HH:mm"}}</span>
53 55 <span class="separator">-</span>
54   - <span class="description">[DESCRIÇÃO]</span>
  56 + <span class="description">{{::event.title}}</span>
  57 + </td>
  58 + <td align="center">
  59 + <span class="theme">{{::event.categories[0].name}}</span>
  60 + </td>
  61 + <td align="right">
  62 + <b>(?)</b>
  63 + <br/>
  64 + <span>Inscritos</span>
  65 + </td>
  66 + <td align="left">
55 67 <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe('EVENT_ID')">
56 68 Inscreva-se
57 69 <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>
58 70 </button>
59   - <span class="subscribers">123 inscritos</span>
60 71 </td>
61 72 </tr>
62 73 </tbody>
... ...
src/app/components/event-list/event-list.scss
  Diff comments   View file @fca004b
... ... @@ -11,7 +11,7 @@
11 11  
12 12 .event-list--panel {
13 13 height: 310px;
14   - padding: 20px;
  14 + padding: 0px;
15 15 margin: 20px 0;
16 16 line-height: 20px;
17 17 transition: .3s linear all;
... ... @@ -43,6 +43,10 @@
43 43 // }
44 44 }
45 45  
  46 + &--table{
  47 + margin-bottom: 0;
  48 + }
  49 +
46 50 .event-tab--trigger {
47 51 $event-tab-height: 130px;
48 52 width: 150px;
... ... @@ -101,7 +105,7 @@
101 105  
102 106 .table-responsive {
103 107 width: 100%;
104   - height: 240px;
  108 + height: 280px;
105 109 overflow-y: scroll;
106 110  
107 111 .btn {
... ... @@ -116,6 +120,10 @@
116 120 tr:last-child > td {
117 121 border-bottom: 1px solid #ccc;
118 122 }
  123 +
  124 + td {
  125 + vertical-align: middle;
  126 + }
119 127 }
120 128  
121 129 .event-tab--icon {
... ...