diff --git a/src/app/components/article-service/article.service.js b/src/app/components/article-service/article.service.js index ba4306f..2130389 100644 --- a/src/app/components/article-service/article.service.js +++ b/src/app/components/article-service/article.service.js @@ -177,9 +177,12 @@ var url = service.apiArticles + proposal_id + '/vote'; var paramsExtended = angular.extend({ private_token: $rootScope.currentUser.private_token + // private_token: 'e2198fdbcc20409f082829b4b5c0848e' }, params); - UtilService.post(url, paramsExtended).then(function(response){ + var encodedParams = angular.element.param(paramsExtended); + + UtilService.post(url, encodedParams).then(function(response){ cbSuccess(response); }).catch(function(error){ cbError(error); diff --git a/src/app/components/proposal-box/proposal-box.directive.js b/src/app/components/proposal-box/proposal-box.directive.js index 369e80a..0bf002a 100644 --- a/src/app/components/proposal-box/proposal-box.directive.js +++ b/src/app/components/proposal-box/proposal-box.directive.js @@ -41,7 +41,7 @@ vm.$scope.$on('proposal-box:proposal-loaded', function(event, data){ if(data.success){ - vm.STATE = null; + vm.STATE = null; } if(data.error){ @@ -57,11 +57,11 @@ if(data.success) { vm.STATE = vm.VOTE_STATUS.SUCCESS; } - + if(data.error) { vm.STATE = vm.VOTE_STATUS.ERROR; } - + vm.message = data.message; }); @@ -123,6 +123,15 @@ vm.$log.debug('Sending vote'); }; + ProposalBoxController.prototype.getSocialUrl = function () { + var vm = this; + + return vm.$state.href('programa', { + slug: vm.topic.slug, + proposal_id: vm.proposal.id, + }); + }; + var directive = { restrict: 'E', templateUrl: 'app/components/proposal-box/proposal-box.html', @@ -141,7 +150,6 @@ bindToController: true }; - return directive; } diff --git a/src/app/components/proposal-box/proposal-box.html b/src/app/components/proposal-box/proposal-box.html index b23cea6..e3250fa 100644 --- a/src/app/components/proposal-box/proposal-box.html +++ b/src/app/components/proposal-box/proposal-box.html @@ -1,24 +1,60 @@
- -
-
-
-
-
-
-
-
-
-
-
- - -
+
+
+
+
+
+
+
+
+
+
+ +
-
-
-

{{vm.message}}

+
+
+
+ +
@@ -28,40 +64,40 @@
-
-
-
-
-
-
-
-

Você precisa estar logado para votar na proposta

-
-

- - Clique aqui para ir para a página de login -

-
+
+
+
+
+
+
+
+
+

Você precisa estar logado para votar na proposta

+
+

+ + Clique aqui para ir para a página de login +

-
-
-
-
-
-
-
-
-

Carregando...

-
-
-

Erro ao carregar nova proposta proposta.

-

{{vm.errorOnSkip}}

-
+
+
+
+
+
+
+
+
+
+

Carregando...

+
+
+

Erro ao carregar nova proposta proposta.

+

{{vm.errorOnSkip}}

@@ -69,63 +105,63 @@
-
-
{{vm.category.name}}
-
{{vm.topic.title}}
+
+
+
{{vm.category.name}}
+
{{vm.topic.title}}
+
+
+
+
{{vm.proposal.abstract}}
+
+
+
-
-
-
{{vm.proposal.abstract}}
-
-
- -
-
-
-
-
-
- -
-
Apoio
+
+
+
+
+
+
+
Apoio
-
- +
+ -
-
-
- -
-
Não Apoio
+
+
+
+
+
+
Não Apoio
-
- +
+ diff --git a/src/app/components/proposal-box/proposal-box.scss b/src/app/components/proposal-box/proposal-box.scss index 435d2ec..bd65aa5 100644 --- a/src/app/components/proposal-box/proposal-box.scss +++ b/src/app/components/proposal-box/proposal-box.scss @@ -81,6 +81,8 @@ z-index: 1000; background-color: #f5f5f5; background-color: rgba(245, 245, 245, 0.9); + border: 7px solid #5E769C; + border-radius: 5px; .row { height: 100%; } .inside { position: relative; } @@ -92,8 +94,42 @@ line-height: 24px; padding: 10px 30px; } + + .message-icon { + .glyphicon { + top: 8px; + } + } } + .feedback { + padding: 20px; + + &--title { + font-size: 22px; + font-weight: bold; + } + + &--message { + font-size: 14px; + font-weight: normal; + line-height: 20px; + margin-top: 48px; + } + + .icon-circle { + &.play { + background-color: #5e769c; + } + + .glyphicon { + top: 12px; + color: #fff; + } + } + } + + .action { .glyphicon { color: #fff; diff --git a/src/app/components/social-share/social-share.directive.js b/src/app/components/social-share/social-share.directive.js index 3463bcf..115bef6 100644 --- a/src/app/components/social-share/social-share.directive.js +++ b/src/app/components/social-share/social-share.directive.js @@ -11,6 +11,9 @@ restrict: 'E', templateUrl: 'app/components/social-share/social-share.html', scope: { + url: '=', + image: '=', + text: '=', }, controller: SocialShareController, controllerAs: 'vm', diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index 4a34db0..898c13c 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -66,7 +66,7 @@ vm.$rootScope.contentTitle = vm.article.title; // set the banner image with full image path - if (!vm.banner) { + if (!vm.banner && vm.article.image) { vm.banner = { src: vm.PATH.image + vm.article.image.url, alt: 'Imagem de destaque do conteúdo' @@ -208,12 +208,12 @@ value: value }, function(response) { vm.$log.debug('response', response); - + response.success = true; vm.$scope.$broadcast('proposal-box:vote-response', response); }, function(error) { vm.$log.error('error', error); - + error.error = true; vm.$scope.$broadcast('proposal-box:vote-response', error); }); -- libgit2 0.21.2