Commit c284597bd36741242f2bc841d0d81e796702d0c6
Exists in
master
and in
8 other branches
Merge branch 'merlin' into rafael
Showing
4 changed files
with
28 additions
and
7 deletions
Show diff stats
src/app/components/article-service/article.service.js
| @@ -145,7 +145,7 @@ | @@ -145,7 +145,7 @@ | ||
| 145 | 145 | ||
| 146 | var url = service.apiCommunities + community_id + '/articles'; | 146 | var url = service.apiCommunities + community_id + '/articles'; |
| 147 | var paramsExtended = angular.extend({ | 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 | 'content_type':'Event' | 149 | 'content_type':'Event' |
| 150 | }, params); | 150 | }, params); |
| 151 | 151 |
src/app/components/event-list/event-list.html
| @@ -46,17 +46,28 @@ | @@ -46,17 +46,28 @@ | ||
| 46 | <!-- <thead></thead> --> | 46 | <!-- <thead></thead> --> |
| 47 | <tbody> | 47 | <tbody> |
| 48 | <tr ng-repeat="event in vm.events"> | 48 | <tr ng-repeat="event in vm.events"> |
| 49 | - <td> | 49 | + <td width="50%"> |
| 50 | + <span class="glyphicon glyphicon-calendar"></span> | ||
| 50 | <span class="date">{{event.start_date | date : "dd/MM/yyyy"}}</span> | 51 | <span class="date">{{event.start_date | date : "dd/MM/yyyy"}}</span> |
| 51 | <span class="separator">-</span> | 52 | <span class="separator">-</span> |
| 53 | + <span class="glyphicon glyphicon-time"></span> | ||
| 52 | <span class="time">{{event.start_date | date : "HH:mm"}}</span> | 54 | <span class="time">{{event.start_date | date : "HH:mm"}}</span> |
| 53 | <span class="separator">-</span> | 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 | <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe('EVENT_ID')"> | 67 | <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe('EVENT_ID')"> |
| 56 | Inscreva-se | 68 | Inscreva-se |
| 57 | <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> | 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 | </button> | 70 | </button> |
| 59 | - <span class="subscribers">123 inscritos</span> | ||
| 60 | </td> | 71 | </td> |
| 61 | </tr> | 72 | </tr> |
| 62 | </tbody> | 73 | </tbody> |
src/app/components/event-list/event-list.scss
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | .event-list--panel { | 12 | .event-list--panel { |
| 13 | height: 310px; | 13 | height: 310px; |
| 14 | - padding: 20px; | 14 | + padding: 0px; |
| 15 | margin: 20px 0; | 15 | margin: 20px 0; |
| 16 | line-height: 20px; | 16 | line-height: 20px; |
| 17 | transition: .3s linear all; | 17 | transition: .3s linear all; |
| @@ -43,6 +43,10 @@ | @@ -43,6 +43,10 @@ | ||
| 43 | // } | 43 | // } |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | + &--table{ | ||
| 47 | + margin-bottom: 0; | ||
| 48 | + } | ||
| 49 | + | ||
| 46 | .event-tab--trigger { | 50 | .event-tab--trigger { |
| 47 | $event-tab-height: 130px; | 51 | $event-tab-height: 130px; |
| 48 | width: 150px; | 52 | width: 150px; |
| @@ -101,7 +105,7 @@ | @@ -101,7 +105,7 @@ | ||
| 101 | 105 | ||
| 102 | .table-responsive { | 106 | .table-responsive { |
| 103 | width: 100%; | 107 | width: 100%; |
| 104 | - height: 240px; | 108 | + height: 280px; |
| 105 | overflow-y: scroll; | 109 | overflow-y: scroll; |
| 106 | 110 | ||
| 107 | .btn { | 111 | .btn { |
| @@ -116,6 +120,10 @@ | @@ -116,6 +120,10 @@ | ||
| 116 | tr:last-child > td { | 120 | tr:last-child > td { |
| 117 | border-bottom: 1px solid #ccc; | 121 | border-bottom: 1px solid #ccc; |
| 118 | } | 122 | } |
| 123 | + | ||
| 124 | + td { | ||
| 125 | + vertical-align: middle; | ||
| 126 | + } | ||
| 119 | } | 127 | } |
| 120 | 128 | ||
| 121 | .event-tab--icon { | 129 | .event-tab--icon { |
src/app/components/navbar/navbar.scss
| @@ -68,6 +68,7 @@ | @@ -68,6 +68,7 @@ | ||
| 68 | 68 | ||
| 69 | @media screen and (max-width: $screen-md) { | 69 | @media screen and (max-width: $screen-md) { |
| 70 | margin-top: 5px; | 70 | margin-top: 5px; |
| 71 | + text-align: right; | ||
| 71 | } | 72 | } |
| 72 | } | 73 | } |
| 73 | 74 | ||
| @@ -77,7 +78,8 @@ | @@ -77,7 +78,8 @@ | ||
| 77 | @media screen and (max-width: $screen-md) { | 78 | @media screen and (max-width: $screen-md) { |
| 78 | border: none; | 79 | border: none; |
| 79 | background-color: #eee; | 80 | background-color: #eee; |
| 80 | - padding: 10px 0 10px 0px; | 81 | + padding: 10px 30px 10px 0px; |
| 82 | + border-right: 3px solid #77BB34; | ||
| 81 | } | 83 | } |
| 82 | } | 84 | } |
| 83 | 85 |