diff --git a/src/app/components/a11y-bar/a11y-bar.html b/src/app/components/a11y-bar/a11y-bar.html index 59acb13..19bb99a 100644 --- a/src/app/components/a11y-bar/a11y-bar.html +++ b/src/app/components/a11y-bar/a11y-bar.html @@ -4,27 +4,27 @@
@@ -33,13 +33,13 @@
diff --git a/src/app/components/a11y-bar/a11y-bar.scss b/src/app/components/a11y-bar/a11y-bar.scss index 37c3705..b596e5b 100644 --- a/src/app/components/a11y-bar/a11y-bar.scss +++ b/src/app/components/a11y-bar/a11y-bar.scss @@ -2,7 +2,12 @@ font-size: 12px; padding: 5px 0; span { - background-color: #eee; - padding: 0 3px; + color: #fff; + padding: 0 5px; + } + + .action-links { + text-transform: uppercase; + border-bottom: 1px dotted #262626; } } diff --git a/src/app/components/auth-user/auth-user.html b/src/app/components/auth-user/auth-user.html index ac64ca4..cc12d6a 100644 --- a/src/app/components/auth-user/auth-user.html +++ b/src/app/components/auth-user/auth-user.html @@ -8,7 +8,7 @@
diff --git a/src/app/components/auth-user/auth-user.scss b/src/app/components/auth-user/auth-user.scss index b6400c2..0f5a44f 100644 --- a/src/app/components/auth-user/auth-user.scss +++ b/src/app/components/auth-user/auth-user.scss @@ -1,3 +1,5 @@ .auth-user { - + button { + font-weight: bold; + } } diff --git a/src/app/components/proposal-ranking/proposal-ranking-carousel.scss b/src/app/components/proposal-ranking/proposal-ranking-carousel.scss index 5663233..fdee02b 100644 --- a/src/app/components/proposal-ranking/proposal-ranking-carousel.scss +++ b/src/app/components/proposal-ranking/proposal-ranking-carousel.scss @@ -4,26 +4,29 @@ .proposal-ranking--carousel { background-color: #f1f1f1; + border-radius: 5px; + overflow: hidden; &-top { position: relative; color: #fff; font-weight: bold; - font-size: 18px; - padding: 5px 10px; + font-size: 25px; + padding: 20px 15px; &-triggers { position: absolute; - right: 5px; - top: 5px; + right: 15px; + top: 20px; - li { + button { border: 1px solid #fff; border-radius: 100%; width: 15px; height: 15px; margin-right: 5px; + background-color: transparent; cursor: pointer; @@ -37,6 +40,12 @@ &-middle { position: relative; padding: 25px 30px; + cursor: pointer; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; .content { position: relative; @@ -65,6 +74,10 @@ z-index: 10; &-icon { + position: absolute; + top: 10px; + right: 15px; + .glyphicon { position: relative; top: -2px; diff --git a/src/app/components/proposal-ranking/proposal-ranking.directive.js b/src/app/components/proposal-ranking/proposal-ranking.directive.js index 0db6c99..8440b56 100644 --- a/src/app/components/proposal-ranking/proposal-ranking.directive.js +++ b/src/app/components/proposal-ranking/proposal-ranking.directive.js @@ -26,7 +26,7 @@ // initial values var vm = this; - vm.activeIndex = 1; + vm.activeIndex = 0; vm.loading = false; if(angular.isDefined(vm.limit) && angular.isString(vm.limit)){ @@ -59,14 +59,14 @@ votes_for: 1780 },{ id: 935, - abstract: 'Magni sunt ut molestiae. A porro et quod saepe placeat amet nihil. Aut ut id voluptatem doloribus quia.', + abstract: 'Aut fuga magni adipisci. Recusandae ipsum distinctio omnis ut illum. Magni sunt ut molestiae.', effective_support: 0.1572052401746725, hits: 8602, votes_against: 7005, votes_for: 8728 },{ id: 1008, - abstract: 'Cum quas assumenda nihil delectus eos. Minus fugit velit voluptatem nisi nam esse ut id.', + abstract: 'Recusandae ipsum distinctio omnis ut illum. Magni sunt ut molestiae. Aut fuga magni adipisci.', effective_support: 0.1572052401746725, hits: 9181, votes_against: 612, @@ -82,10 +82,22 @@ }, 2000); }; + ProposalRankingController.prototype.swipeLeft = function () { + var vm = this; + + vm.activeIndex = (vm.activeIndex < vm.limit - 1) ? ++vm.activeIndex : 0; + }; + + ProposalRankingController.prototype.swipeRight = function () { + var vm = this; + + vm.activeIndex = (vm.activeIndex > 0) ? --vm.activeIndex : vm.limit - 1; + }; + ProposalRankingController.prototype.switchProposal = function (index) { var vm = this; - if(index > 0 && index <= vm.limit) { + if(index >= 0 && index < vm.limit) { vm.activeIndex = index; }else{ vm.$log.warn('[switchProposal] "index" not handled:', index); diff --git a/src/app/components/proposal-ranking/proposal-ranking.html b/src/app/components/proposal-ranking/proposal-ranking.html index f0cb59f..31d7e41 100644 --- a/src/app/components/proposal-ranking/proposal-ranking.html +++ b/src/app/components/proposal-ranking/proposal-ranking.html @@ -1,28 +1,37 @@
-
-
-
- 1º - Lugar -
-
-
    -
  • -
  • -
  • -
-
+
+
+ Carregando...
-
-
-

Lorem ipsum dolor sit amet, an qui alia constituam. Forensibus scripserit pri at, sit et dolorum ancillae. Ad sea quas utamur salutandi, illud veritus propriae mea ut. Ius no timeam intellegat liberavisse, eum suscipit pertinax ad. Illum graeci postulant et pro, at clita facete quo, cibo liber ad pri.

+
+
+
+ {{::($index+1)}}º + Lugar +
+
+
    +
  • + +
    • +
+
-
1º
-
-
-
- Veja as propostas mais vortadas - +
+
+
+
{{::proposal.abstract}}
+
+
+ {{::($index+1)}}º +
+
+
+
+
Veja as propostas mais vortadas
+
+ +
diff --git a/src/app/components/proposal-related/proposal-related.directive.js b/src/app/components/proposal-related/proposal-related.directive.js index e69de29..7329bb0 100644 --- a/src/app/components/proposal-related/proposal-related.directive.js +++ b/src/app/components/proposal-related/proposal-related.directive.js @@ -0,0 +1,100 @@ +(function() { + 'use strict'; + + angular + .module('dialoga') + .directive('proposalRelated', proposalRelated); + + /** @ngInject */ + function proposalRelated() { + + /** @ngInject */ + function ProposalRelatedController(ArticleService, $scope, $element, $timeout, $log) { + $log.debug('ProposalRelatedController'); + + var vm = this; + vm.ArticleService = ArticleService; + vm.$scope = $scope; + vm.$element = $element; + vm.$timeout = $timeout; + vm.$log = $log; + + vm.init(); + } + + ProposalRelatedController.prototype.init = function () { + // initial values + var vm = this; + + vm.activeIndex = 1; + vm.loading = false; + + if(angular.isDefined(vm.limit) && angular.isString(vm.limit)){ + vm.limit = parseInt(vm.limit); + }else{ + vm.limit = 3; + } + + vm.loadData(); + }; + + ProposalRelatedController.prototype.loadData = function () { + // async values + var vm = this; + + vm.loading = true; + + // simulate delay + vm.$timeout(function(){ + vm.loading = false; + + // Fake Data + // vm.proposals = vm.ArticleService.getProposals(); + vm.proposals = [{ + id: 4159, + abstract: 'Ut odio unde porro in. Aut fuga magni adipisci. Recusandae ipsum distinctio omnis ut illum.', + effective_support: 0.1572052401746725, + hits: 4159, + votes_against: 3779, + votes_for: 1780 + },{ + id: 935, + abstract: 'Magni sunt ut molestiae. A porro et quod saepe placeat amet nihil. Aut ut id voluptatem doloribus quia.', + effective_support: 0.1572052401746725, + hits: 8602, + votes_against: 7005, + votes_for: 8728 + },{ + id: 1008, + abstract: 'Cum quas assumenda nihil delectus eos. Minus fugit velit voluptatem nisi nam esse ut id.', + effective_support: 0.1572052401746725, + hits: 9181, + votes_against: 612, + votes_for: 1786 + }]; + + if(vm.display === 'list'){ + // wait until DOM be created + vm.$timeout(function(){ + attachPopover.call(vm); + }, 20); + } + }, 2000); + }; + + var directive = { + restrict: 'E', + templateUrl: 'app/components/proposal-related/proposal-related.html', + scope: { + article: '=' + }, + controller: ProposalRelatedController, + controllerAs: 'vm', + bindToController: true + }; + + + return directive; + } + +})(); diff --git a/src/app/components/proposal-related/proposal-related.html b/src/app/components/proposal-related/proposal-related.html index e69de29..f04764e 100644 --- a/src/app/components/proposal-related/proposal-related.html +++ b/src/app/components/proposal-related/proposal-related.html @@ -0,0 +1,3 @@ +
+ Proposta +
-- libgit2 0.21.2