Download as
Browse Code »

Commit 9098b4a1672f6425c74d7684f48f53ae06551dd2

Authored by Leonardo Merlin
1 parent 859336d1
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

Small fixes from client

Showing 13 changed files with 137 additions and 102 deletions   Show diff stats
src/app/components/app-footer/app-footer.html
  Diff comments   View file @9098b4a
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 <div class="container"> 2 <div class="container">
3 <div class="row"> 3 <div class="row">
4 <div class="col-xs-12 text-center"> 4 <div class="col-xs-12 text-center">
5 - <a id="termos-de-uso" ui-sref="termos-de-uso">Termos de uso</a>  
6 <a href="#header" style="position:absolute;right:0;top:-10px;" ng-click="scrollTo('#header')">Voltar para o topo</a> 5 <a href="#header" style="position:absolute;right:0;top:-10px;" ng-click="scrollTo('#header')">Voltar para o topo</a>
7 </div> 6 </div>
8 </div> 7 </div>
src/app/components/event-list/event-list.html
  Diff comments   View file @9098b4a
@@ -66,9 +66,9 @@ @@ -66,9 +66,9 @@
66 </div> 66 </div>
67 </div> 67 </div>
68 </div> 68 </div>
69 - <div class="visible-xs" ng-show="!vm.isCollapsed">  
70 - <div class="minimize color-theme-common-bg" ng-click="vm.toggleView()">  
71 - <div class="row"> 69 + <div class="container visible-xs" ng-show="!vm.isCollapsed">
  70 + <div class="minimize" ng-click="vm.toggleView()">
  71 + <div class="row color-theme-common-bg">
72 <div class="col-xs-6"> 72 <div class="col-xs-6">
73 <button type="button" class="btn btn-link" ng-click="">MINIMIZAR</button> 73 <button type="button" class="btn btn-link" ng-click="">MINIMIZAR</button>
74 </div> 74 </div>
src/app/components/navbar/navbar.html
  Diff comments   View file @9098b4a
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li> 23 <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li>
24 <li class="dropdown"> 24 <li class="dropdown">
25 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a> 25 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a>
26 - <social-share class="dropdown-menu dropdown-menu-right"></social-share> 26 + <social-share class="dropdown-menu dropdown-menu-right" arrow-class="social-share--arrow"></social-share>
27 <!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social"> 27 <!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">
28 <li> 28 <li>
29 <a socialshare 29 <a socialshare
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 </nav> 69 </nav>
70 <div id="dialoga-nas-redes"> 70 <div id="dialoga-nas-redes">
71 <div class="text text-right"> 71 <div class="text text-right">
72 - <p>Dialoga<br>Nas Redes</p> 72 + <p>DIALOGA<br>NAS REDES</p>
73 </div> 73 </div>
74 <social-share></social-share> 74 <social-share></social-share>
75 </div> 75 </div>
src/app/components/proposal-box/proposal-box.html
  Diff comments   View file @9098b4a
@@ -116,7 +116,6 @@ @@ -116,7 +116,6 @@
116 <div ng-hide="vm.canVote" class="proposal-box--join"> 116 <div ng-hide="vm.canVote" class="proposal-box--join">
117 <button class="btn btn-link color-theme-common-fg" ng-click="vm.showContent(vm.topic.slug)"> 117 <button class="btn btn-link color-theme-common-fg" ng-click="vm.showContent(vm.topic.slug)">
118 Participe 118 Participe
119 - <span class="glyphicon glyphicon-menu-right color-theme-common-fg" aria-hidde="true"></span>  
120 </button> 119 </button>
121 </div> 120 </div>
122 <div ng-show="vm.canVote" class="proposal-box--actions text-center"> 121 <div ng-show="vm.canVote" class="proposal-box--actions text-center">
src/app/components/proposal-stats/proposal-stats.html
  Diff comments   View file @9098b4a
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
4 <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span> 4 <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
5 <span>{{proposal.hits}}</span> 5 <span>{{proposal.hits}}</span>
6 </li> 6 </li>
7 - <li class="proposal-stats-up">  
8 - <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>  
9 - <span>{{proposal.votes_for}}</span>  
10 - </li>  
11 <li class="proposal-stats-down"> 7 <li class="proposal-stats-down">
12 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> 8 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
13 <span>{{proposal.votes_against}}</span> 9 <span>{{proposal.votes_against}}</span>
14 </li> 10 </li>
  11 + <li class="proposal-stats-up">
  12 + <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
  13 + <span>{{proposal.votes_for}}</span>
  14 + </li>
15 </ul> 15 </ul>
16 </div> 16 </div>
src/app/components/social-share/social-share.directive.js
  Diff comments   View file @9098b4a
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 url: '=', 14 url: '=',
15 image: '=', 15 image: '=',
16 text: '=', 16 text: '=',
  17 + arrowClass: '@',
17 }, 18 },
18 controller: SocialShareController, 19 controller: SocialShareController,
19 controllerAs: 'vm', 20 controllerAs: 'vm',
src/app/components/social-share/social-share.html
  Diff comments   View file @9098b4a
  1 +<div ng-if="vm.arrowClass">
  2 + <div ng-class="vm.arrowClass"></div>
  3 +</div>
1 <ul class="social-share list-inline"> 4 <ul class="social-share list-inline">
2 <li> 5 <li>
3 <a href="#" role="button" 6 <a href="#" role="button"
src/app/components/social-share/social-share.scss
  Diff comments   View file @9098b4a
1 .social-share { 1 .social-share {
2 - min-width: 200px; 2 + min-width: 205px;
3 padding: 5px; 3 padding: 5px;
4 - height: 47px; 4 + height: 50px;
5 5
6 &:after { 6 &:after {
7 clear: both; 7 clear: both;
@@ -25,5 +25,46 @@ @@ -25,5 +25,46 @@
25 // margin-left: 5px; 25 // margin-left: 5px;
26 } 26 }
27 } 27 }
  28 +
  29 + .dropdown-menu & {
  30 +
  31 + // .dropdown-menu .social-share
  32 + background-color: #E0E0E0;
  33 + border-radius: 5px;
  34 +
  35 + @media screen and (max-width: $screen-xs) {
  36 + background-color: #fff;
  37 + }
  38 +
  39 + li {
  40 + margin: 0 2px;
  41 +
  42 + &:first-child { margin-left: 0;}
  43 + &:last-child { margin-right: 0;}
  44 + }
  45 + }
28 } 46 }
29 47
  48 +.social-share--arrow {
  49 + position: absolute;
  50 + width: 0;
  51 + height: 0;
  52 + border-color: transparent;
  53 + border-style: solid;
  54 +
  55 + .dropdown-menu-right & {
  56 + top: -10px;
  57 + right: 20px;
  58 + border-width: 0 10px 10px;
  59 + border-bottom-color: #E0E0E0;
  60 + }
  61 +
  62 + @media screen and (max-width: $screen-xs) {
  63 + display: none;
  64 + }
  65 +}
  66 +
  67 +.dropdown-menu {
  68 + box-shadow: none;
  69 + border: none;
  70 +}
src/app/index.route.js
  Diff comments   View file @9098b4a
@@ -137,19 +137,7 @@ @@ -137,19 +137,7 @@
137 } 137 }
138 } 138 }
139 }) 139 })
140 - .state('termos-de-uso', {  
141 - url: '/termos-de-uso',  
142 - ncyBreadcrumb: {label: 'Termos de Uso'},  
143 - controller: 'ArticlePageController',  
144 - views: {  
145 - 'main': {  
146 - templateUrl: 'app/pages/article/article.html',  
147 - controller: 'ArticlePageController',  
148 - controllerAs: 'pageArticle'  
149 - }  
150 - }  
151 - })  
152 - .state('mapa-do-site', { 140 + .state('mapa-do-site', {
153 url: '/mapa-do-site', 141 url: '/mapa-do-site',
154 ncyBreadcrumb: {label: 'Mapa do Site'}, 142 ncyBreadcrumb: {label: 'Mapa do Site'},
155 views: { 143 views: {
src/app/pages/auth/recover.html
  Diff comments   View file @9098b4a
1 -<div class="container">  
2 - <div class="row">  
3 - <div class="col-sm-12">  
4 - <h2>Esqueci minha senha</h2>  
5 - <h5>  
6 - Calma, podemos ajudar! Informe o seu e-mail que a gente envia um link de alteração.  
7 - </h5>  
8 - </div>  
9 - </div>  
10 -</div>  
11 -<section role="main" class="section-gray"> 1 +<div class="page--recover">
12 <div class="container"> 2 <div class="container">
13 <div class="row"> 3 <div class="row">
14 - <div ng-if="pageSignin.currentUser">  
15 - <div class="row">  
16 - <div class="col-sm-8 col-sm-offset-2">  
17 - <h3>Você está logado!</h3>  
18 - <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>  
19 - </div>  
20 - </div> 4 + <div class="col-sm-12">
  5 + <h2>Esqueci minha senha</h2>
  6 + <h5>
  7 + Calma, podemos ajudar! Informe o seu e-mail que a gente envia um link de alteração.
  8 + </h5>
21 </div> 9 </div>
22 - <div ng-if="!pageSignin.currentUser">  
23 - <br>  
24 - <div class="col-sm-8 col-sm-offset-2">  
25 - <div class="row">  
26 - <div class="col-md-12">  
27 - <form name="recoverPassForm" ng-submit="pageSignin.login(pageSignin.credentials)">  
28 - <div class="form-group">  
29 - <label for="inputUsername">E-mail*</label>  
30 - <input type="email" id="inputUsername" name="inputUsername" class="form-control input-lg" ng-class="{ 'has-error' : recoverPassForm.inputUsername.$invalid && recoverPassForm.inputUsername.$touched }" ng-model="pageSignin.credentials.username" required />  
31 - <validation-messages field=" recoverPassForm.inputUsername"/>  
32 - </div>  
33 - <div class="form-group">  
34 - <div class="input-group">  
35 - <label for="inputPassword">Digite o texto desta imagem</label>  
36 - <br>  
37 - <span>Aqui vai um CAPTCHA</span> 10 + </div>
  11 + </div>
  12 + <section role="main" class="section-gray">
  13 + <div class="container">
  14 + <div class="row">
  15 + <div ng-if="pageSignin.successRecoverMessage">
  16 + <div class="col-sm-8 col-sm-offset-2">
  17 + <div class="feedback-message">
  18 + <show-message
  19 + type="'success'"
  20 + title="pageSignin.successRecoverMessageTitle || 'Pronto!'"
  21 + message="pageSignin.successRecoverMessage"
  22 + ></show-message>
  23 + </div>
  24 + </div>
  25 + </div>
  26 + <div ng-if="!pageSignin.currentUser">
  27 + <br>
  28 + <div class="col-sm-8 col-sm-offset-2">
  29 + <div class="row" ng-if="pageSignin.errorRecoverMessage">
  30 + <div class="col-sm-12">
  31 + <div class="alert alert-danger">{{pageSignin.errorRecoverMessage}}</div>
  32 + <div ng-if="vm.internalError">
  33 + <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
  34 + <p>Caso o problema persista, entre em contato!</p>
  35 + <p><a ui-sref="duvidas">Ir para página de contato</a></p>
  36 + </div>
  37 + </div>
  38 + </div>
  39 + <div class="row">
  40 + <div class="col-md-12">
  41 + <form name="recoverPassForm" ng-submit="pageSignin.submitRecover(pageSignin.credentials)">
  42 + <div class="form-group">
  43 + <label for="inputUsername">E-mail*</label>
  44 + <input type="email" id="inputUsername" name="inputUsername" class="form-control input-lg" ng-class="{ 'has-error' : recoverPassForm.inputUsername.$invalid && recoverPassForm.inputUsername.$touched }" ng-model="pageSignin.credentials.username" required />
  45 + <validation-messages field=" recoverPassForm.inputUsername"></validation-messages>
38 </div> 46 </div>
39 - </div>  
40 - <div class="form-group">  
41 - <button class="btn btn-lg btn-block btn-submit" type="submit">Solicitar alteração de senha</button>  
42 - </div>  
43 - </form> 47 + <div class="form-group">
  48 + <div id="serpro_captcha" class="captcha">
  49 + </div>
  50 + <div class="captcha">
  51 + Digite os caracteres acima:
  52 + </div>
  53 + <div class="captcha">
  54 + <input type="text" name="captcha_text" id="captcha_text" aria-label="Escreva os caracteres do captcha aqui" ng-model="pageSignin.signup.captcha_text" ng-minlength="" ng-maxlength="" required>
  55 + <validation-messages field="signupForm.captcha_text"></validation-messages>
  56 + </div>
  57 + </div>
  58 + <div class="form-group">
  59 + <button class="btn btn-lg btn-submit" type="submit">Solicitar alteração de senha</button>
  60 + </div>
  61 + </form>
  62 + </div>
44 </div> 63 </div>
45 </div> 64 </div>
  65 + <br>
46 </div> 66 </div>
47 - <br>  
48 </div> 67 </div>
49 </div> 68 </div>
50 - </div>  
51 -</section> 69 + </section>
  70 +</div>
src/app/pages/programas/programa.html
  Diff comments   View file @9098b4a
@@ -121,6 +121,14 @@ @@ -121,6 +121,14 @@
121 </div> 121 </div>
122 <div class="proposal-extended-section-content"> 122 <div class="proposal-extended-section-content">
123 <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list> 123 <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list>
  124 + <div class="row">
  125 + <div class="col-xs-12">
  126 + <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link">
  127 + <span ng-if="pagePrograma.proposals.length > 1">Veja todas as {{pagePrograma.proposals.length}} propostas</span>
  128 + <span ng-if="pagePrograma.proposals.length === 1">Ir para a página de ranking</span>
  129 + </a>
  130 + </div>
  131 + </div>
124 </div> 132 </div>
125 </div> 133 </div>
126 </section> 134 </section>
src/app/pages/programas/programas.scss
  Diff comments   View file @9098b4a
@@ -21,6 +21,16 @@ @@ -21,6 +21,16 @@
21 background-position: center; 21 background-position: center;
22 background-size: cover; 22 background-size: cover;
23 background-repeat: no-repeat; 23 background-repeat: no-repeat;
  24 +
  25 +
  26 +
  27 + @media screen and (max-width: $screen-xs) {
  28 + // height: 15px;
  29 +
  30 + // .video {
  31 + // height: 290px;
  32 + // }
  33 + }
24 } 34 }
25 35
26 .program-preview--icon { 36 .program-preview--icon {
src/app/pages/propostas/ranking.html
  Diff comments   View file @9098b4a
@@ -20,23 +20,6 @@ @@ -20,23 +20,6 @@
20 <div class="container"> 20 <div class="container">
21 <div id="lista-de-propostas" class="row"> 21 <div id="lista-de-propostas" class="row">
22 <div class="col-sm-4 col-md-3"> 22 <div class="col-sm-4 col-md-3">
23 - <div class="row visible-xs">  
24 - <div class="col-xs-12">  
25 - <div class="input-group input-group-lg input-group-search">  
26 - <label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>  
27 - <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >  
28 - <span class="input-group-btn">  
29 - <button type="button" class="btn btn-default" ng-click="pagePropostas.search()">  
30 - <span class="icon-circle icon-small color-theme-common-bg">  
31 - <span class="glyphicon glyphicon-search"></span>  
32 - </span>  
33 - <span class="sr-only">Buscar</span>  
34 - </button>  
35 - </span>  
36 - </div>  
37 - <br/>  
38 - </div>  
39 - </div>  
40 <div ng-if="pagePropostas.themes"> 23 <div ng-if="pagePropostas.themes">
41 <category-list categories="pagePropostas.themes" selected-category="pagePropostas.selectedTheme" disable-unselect="true"></category-list> 24 <category-list categories="pagePropostas.themes" selected-category="pagePropostas.selectedTheme" disable-unselect="true"></category-list>
42 </div> 25 </div>
@@ -55,26 +38,10 @@ @@ -55,26 +38,10 @@
55 </div> 38 </div>
56 </div> 39 </div>
57 <div class="col-sm-8 col-md-9"> 40 <div class="col-sm-8 col-md-9">
58 - <div class="row hidden-xs">  
59 - <div class="col-xs-12">  
60 - <div class="input-group input-group-lg input-group-search">  
61 - <label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>  
62 - <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >  
63 - <span class="input-group-btn">  
64 - <button type="button" class="btn btn-default" ng-click="pagePropostas.search()">  
65 - <span class="icon-circle icon-small color-theme-common-bg">  
66 - <span class="glyphicon glyphicon-search"></span>  
67 - </span>  
68 - <span class="sr-only">Buscar</span>  
69 - </button>  
70 - </span>  
71 - </div>  
72 - </div>  
73 - </div>  
74 <div class="row"> 41 <div class="row">
75 <div class="col-sm-12"> 42 <div class="col-sm-12">
76 <header class="header"> 43 <header class="header">
77 - <h2>Total de Propostas: "<span>{{pagePropostas.filtredProposals.length}} propostas</span>"</h2> 44 + <h2 style="margin-top:0;">Total de Propostas: "<span>{{pagePropostas.filtredProposals.length}} propostas</span>"</h2>
78 </header> 45 </header>
79 </div> 46 </div>
80 </div> 47 </div>