From 9098b4a1672f6425c74d7684f48f53ae06551dd2 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Tue, 15 Sep 2015 17:19:39 -0300
Subject: [PATCH] Small fixes from client

---
 src/app/components/app-footer/app-footer.html             |   1 -
 src/app/components/event-list/event-list.html             |   6 +++---
 src/app/components/navbar/navbar.html                     |   4 ++--
 src/app/components/proposal-box/proposal-box.html         |   1 -
 src/app/components/proposal-stats/proposal-stats.html     |   8 ++++----
 src/app/components/social-share/social-share.directive.js |   1 +
 src/app/components/social-share/social-share.html         |   3 +++
 src/app/components/social-share/social-share.scss         |  45 +++++++++++++++++++++++++++++++++++++++++++--
 src/app/index.route.js                                    |  14 +-------------
 src/app/pages/auth/recover.html                           | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 src/app/pages/programas/programa.html                     |   8 ++++++++
 src/app/pages/programas/programas.scss                    |  10 ++++++++++
 src/app/pages/propostas/ranking.html                      |  35 +----------------------------------
 13 files changed, 137 insertions(+), 102 deletions(-)

diff --git a/src/app/components/app-footer/app-footer.html b/src/app/components/app-footer/app-footer.html
index 1dfd6ca..3309d42 100644
--- a/src/app/components/app-footer/app-footer.html
+++ b/src/app/components/app-footer/app-footer.html
@@ -2,7 +2,6 @@
   <div class="container">
     <div class="row">
       <div class="col-xs-12 text-center">
-        <a id="termos-de-uso" ui-sref="termos-de-uso">Termos de uso</a>
         <a href="#header" style="position:absolute;right:0;top:-10px;" ng-click="scrollTo('#header')">Voltar para o topo</a>
       </div>
     </div>
diff --git a/src/app/components/event-list/event-list.html b/src/app/components/event-list/event-list.html
index 275120a..498223e 100644
--- a/src/app/components/event-list/event-list.html
+++ b/src/app/components/event-list/event-list.html
@@ -66,9 +66,9 @@
         </div>
       </div>
     </div>
-    <div class="visible-xs" ng-show="!vm.isCollapsed">
-      <div class="minimize color-theme-common-bg" ng-click="vm.toggleView()">
-        <div class="row">
+    <div class="container visible-xs" ng-show="!vm.isCollapsed">
+      <div class="minimize" ng-click="vm.toggleView()">
+        <div class="row color-theme-common-bg">
           <div class="col-xs-6">
             <button type="button" class="btn btn-link" ng-click="">MINIMIZAR</button>
           </div>
diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html
index 15ad2e7..aed1d74 100644
--- a/src/app/components/navbar/navbar.html
+++ b/src/app/components/navbar/navbar.html
@@ -23,7 +23,7 @@
         <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li>
         <li class="dropdown">
           <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>
-          <social-share class="dropdown-menu dropdown-menu-right"></social-share>
+          <social-share class="dropdown-menu dropdown-menu-right" arrow-class="social-share--arrow"></social-share>
           <!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">
             <li>
               <a socialshare
@@ -69,7 +69,7 @@
   </nav>
   <div id="dialoga-nas-redes">
     <div class="text text-right">
-      <p>Dialoga<br>Nas Redes</p>
+      <p>DIALOGA<br>NAS REDES</p>
     </div>
     <social-share></social-share>
   </div>
diff --git a/src/app/components/proposal-box/proposal-box.html b/src/app/components/proposal-box/proposal-box.html
index 1f58090..98cb830 100644
--- a/src/app/components/proposal-box/proposal-box.html
+++ b/src/app/components/proposal-box/proposal-box.html
@@ -116,7 +116,6 @@
     <div ng-hide="vm.canVote" class="proposal-box--join">
       <button class="btn btn-link color-theme-common-fg" ng-click="vm.showContent(vm.topic.slug)">
         Participe
-        <span class="glyphicon glyphicon-menu-right color-theme-common-fg" aria-hidde="true"></span>
       </button>
     </div>
     <div ng-show="vm.canVote" class="proposal-box--actions text-center">
diff --git a/src/app/components/proposal-stats/proposal-stats.html b/src/app/components/proposal-stats/proposal-stats.html
index 7393809..323084a 100644
--- a/src/app/components/proposal-stats/proposal-stats.html
+++ b/src/app/components/proposal-stats/proposal-stats.html
@@ -4,13 +4,13 @@
       <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
       <span>{{proposal.hits}}</span>
     </li>
-    <li class="proposal-stats-up">
-      <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
-      <span>{{proposal.votes_for}}</span>
-    </li>
     <li class="proposal-stats-down">
       <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
       <span>{{proposal.votes_against}}</span>
     </li>
+    <li class="proposal-stats-up">
+      <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
+      <span>{{proposal.votes_for}}</span>
+    </li>
   </ul>
 </div>
diff --git a/src/app/components/social-share/social-share.directive.js b/src/app/components/social-share/social-share.directive.js
index 115bef6..4f5ae0b 100644
--- a/src/app/components/social-share/social-share.directive.js
+++ b/src/app/components/social-share/social-share.directive.js
@@ -14,6 +14,7 @@
         url: '=',
         image: '=',
         text: '=',
+        arrowClass: '@',
       },
       controller: SocialShareController,
       controllerAs: 'vm',
diff --git a/src/app/components/social-share/social-share.html b/src/app/components/social-share/social-share.html
index e58ef49..7993e7d 100644
--- a/src/app/components/social-share/social-share.html
+++ b/src/app/components/social-share/social-share.html
@@ -1,3 +1,6 @@
+<div ng-if="vm.arrowClass">
+  <div ng-class="vm.arrowClass"></div>
+</div>
 <ul class="social-share list-inline">
   <li>
     <a href="#" role="button"
diff --git a/src/app/components/social-share/social-share.scss b/src/app/components/social-share/social-share.scss
index 30a7b0b..00a0c91 100644
--- a/src/app/components/social-share/social-share.scss
+++ b/src/app/components/social-share/social-share.scss
@@ -1,7 +1,7 @@
 .social-share {
-    min-width: 200px;
+    min-width: 205px;
     padding: 5px;
-    height: 47px;
+    height: 50px;
 
     &:after {
         clear: both;
@@ -25,5 +25,46 @@
             // margin-left: 5px;
         }
     }
+
+    .dropdown-menu & {
+
+        // .dropdown-menu .social-share
+        background-color: #E0E0E0;
+        border-radius: 5px;
+
+        @media screen and (max-width: $screen-xs) {
+            background-color: #fff;
+        }
+
+        li {
+            margin: 0 2px;
+
+            &:first-child { margin-left: 0;}
+            &:last-child { margin-right: 0;}
+        }
+    }
 }
 
+.social-share--arrow {
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+
+    .dropdown-menu-right & {
+        top: -10px;
+        right: 20px;
+        border-width: 0 10px 10px;
+        border-bottom-color: #E0E0E0;
+    }
+
+    @media screen and (max-width: $screen-xs) {
+        display: none;
+    }
+}
+
+.dropdown-menu {
+    box-shadow: none;
+    border: none;
+}
diff --git a/src/app/index.route.js b/src/app/index.route.js
index 7ef3136..6f4093f 100644
--- a/src/app/index.route.js
+++ b/src/app/index.route.js
@@ -137,19 +137,7 @@
           }
         }
       })
-      .state('termos-de-uso', {
-        url: '/termos-de-uso',
-        ncyBreadcrumb: {label: 'Termos de Uso'},
-        controller: 'ArticlePageController',
-        views: {
-          'main': {
-            templateUrl: 'app/pages/article/article.html',
-            controller: 'ArticlePageController',
-            controllerAs: 'pageArticle'
-          }
-        }
-      })
-     .state('mapa-do-site', {
+      .state('mapa-do-site', {
         url: '/mapa-do-site',
         ncyBreadcrumb: {label: 'Mapa do Site'},
         views: {
diff --git a/src/app/pages/auth/recover.html b/src/app/pages/auth/recover.html
index 76e1676..92164f5 100644
--- a/src/app/pages/auth/recover.html
+++ b/src/app/pages/auth/recover.html
@@ -1,51 +1,70 @@
-<div class="container">
-	<div class="row">
-		<div class="col-sm-12">
-			<h2>Esqueci minha senha</h2>
-			<h5>
-				Calma, podemos ajudar! Informe o seu e-mail que a gente envia um link de alteração.
-			</h5>
-		</div>
-	</div>
-</div>
-<section role="main" class="section-gray">
+<div class="page--recover">
 	<div class="container">
 		<div class="row">
-			<div ng-if="pageSignin.currentUser">
-				<div class="row">
-					<div class="col-sm-8 col-sm-offset-2">
-						<h3>Você está logado!</h3>
-						<button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
-					</div>
-				</div>
+			<div class="col-sm-12">
+				<h2>Esqueci minha senha</h2>
+				<h5>
+					Calma, podemos ajudar! Informe o seu e-mail que a gente envia um link de alteração.
+				</h5>
 			</div>
-			<div ng-if="!pageSignin.currentUser">
-				<br>
-				<div class="col-sm-8 col-sm-offset-2">
-					<div class="row">
-						<div class="col-md-12">
-							<form name="recoverPassForm" ng-submit="pageSignin.login(pageSignin.credentials)">
-								<div class="form-group">
-									<label for="inputUsername">E-mail*</label>
-									<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 />
-									<validation-messages field=" recoverPassForm.inputUsername"/>
-								</div>
-								<div class="form-group">
-									<div class="input-group">
-										<label for="inputPassword">Digite o texto desta imagem</label>
-										<br>
-										<span>Aqui vai um CAPTCHA</span>
+		</div>
+	</div>
+	<section role="main" class="section-gray">
+		<div class="container">
+			<div class="row">
+	      <div ng-if="pageSignin.successRecoverMessage">
+					<div class="col-sm-8 col-sm-offset-2">
+		        <div class="feedback-message">
+		          <show-message
+		          type="'success'"
+		          title="pageSignin.successRecoverMessageTitle || 'Pronto!'"
+		          message="pageSignin.successRecoverMessage"
+		          ></show-message>
+		        </div>
+		      </div>
+	      </div>
+				<div ng-if="!pageSignin.currentUser">
+					<br>
+					<div class="col-sm-8 col-sm-offset-2">
+		        <div class="row" ng-if="pageSignin.errorRecoverMessage">
+		          <div class="col-sm-12">
+		            <div class="alert alert-danger">{{pageSignin.errorRecoverMessage}}</div>
+		            <div ng-if="vm.internalError">
+		              <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
+		              <p>Caso o problema persista, entre em contato!</p>
+		              <p><a ui-sref="duvidas">Ir para página de contato</a></p>
+		            </div>
+		          </div>
+		        </div>
+						<div class="row">
+							<div class="col-md-12">
+								<form name="recoverPassForm" ng-submit="pageSignin.submitRecover(pageSignin.credentials)">
+									<div class="form-group">
+										<label for="inputUsername">E-mail*</label>
+										<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 />
+										<validation-messages field=" recoverPassForm.inputUsername"></validation-messages>
 									</div>
-								</div>
-								<div class="form-group">
-									<button class="btn btn-lg btn-block btn-submit" 	type="submit">Solicitar alteração de senha</button>
-								</div>
-							</form>
+	                <div class="form-group">
+	                  <div id="serpro_captcha" class="captcha">
+	                  </div>
+	                  <div class="captcha">
+	                    Digite os caracteres acima:
+	                  </div>
+	                  <div class="captcha">
+	                    <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>
+	                    <validation-messages field="signupForm.captcha_text"></validation-messages>
+	                  </div>
+	                </div>
+									<div class="form-group">
+										<button class="btn btn-lg btn-submit" type="submit">Solicitar alteração de senha</button>
+									</div>
+								</form>
+							</div>
 						</div>
 					</div>
+					<br>
 				</div>
-				<br>
 			</div>
 		</div>
-	</div>
-</section>
+	</section>
+</div>
diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html
index 49e2f57..35c05ab 100644
--- a/src/app/pages/programas/programa.html
+++ b/src/app/pages/programas/programa.html
@@ -121,6 +121,14 @@
         </div>
         <div class="proposal-extended-section-content">
           <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list>
+          <div class="row">
+            <div class="col-xs-12">
+              <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link">
+                <span ng-if="pagePrograma.proposals.length > 1">Veja todas as {{pagePrograma.proposals.length}} propostas</span>
+                <span ng-if="pagePrograma.proposals.length === 1">Ir para a página de ranking</span>
+              </a>
+            </div>
+          </div>
         </div>
       </div>
     </section>
diff --git a/src/app/pages/programas/programas.scss b/src/app/pages/programas/programas.scss
index e262e00..dd84a55 100644
--- a/src/app/pages/programas/programas.scss
+++ b/src/app/pages/programas/programas.scss
@@ -21,6 +21,16 @@
         background-position: center;
         background-size: cover;
         background-repeat: no-repeat;
+
+
+
+        @media screen and (max-width: $screen-xs) {
+            // height: 15px;
+
+            // .video {
+            //     height: 290px;
+            // }
+        }
     }
 
     .program-preview--icon {
diff --git a/src/app/pages/propostas/ranking.html b/src/app/pages/propostas/ranking.html
index 6294aab..e8a0bb8 100644
--- a/src/app/pages/propostas/ranking.html
+++ b/src/app/pages/propostas/ranking.html
@@ -20,23 +20,6 @@
 		<div class="container">
 			<div id="lista-de-propostas" class="row">
 				<div class="col-sm-4 col-md-3">
-					<div class="row visible-xs">
-						<div class="col-xs-12">
-							<div class="input-group input-group-lg input-group-search">
-								<label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
-								<input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >
-								<span class="input-group-btn">
-									<button type="button" class="btn btn-default" ng-click="pagePropostas.search()">
-										<span class="icon-circle icon-small color-theme-common-bg">
-											<span class="glyphicon glyphicon-search"></span>
-										</span>
-										<span class="sr-only">Buscar</span>
-									</button>
-								</span>
-							</div>
-							<br/>
-						</div>
-					</div>
 					<div ng-if="pagePropostas.themes">
 						<category-list categories="pagePropostas.themes" selected-category="pagePropostas.selectedTheme" disable-unselect="true"></category-list>
 					</div>
@@ -55,26 +38,10 @@
 					</div>
 				</div>
 				<div class="col-sm-8 col-md-9">
-					<div class="row hidden-xs">
-						<div class="col-xs-12">
-							<div class="input-group input-group-lg input-group-search">
-								<label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
-								<input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas" >
-								<span class="input-group-btn">
-									<button type="button" class="btn btn-default" ng-click="pagePropostas.search()">
-										<span class="icon-circle icon-small color-theme-common-bg">
-											<span class="glyphicon glyphicon-search"></span>
-										</span>
-										<span class="sr-only">Buscar</span>
-									</button>
-								</span>
-							</div>
-						</div>
-					</div>
 					<div class="row">
 						<div class="col-sm-12">
 							<header class="header">
-								<h2>Total de Propostas: "<span>{{pagePropostas.filtredProposals.length}} propostas</span>"</h2>
+								<h2 style="margin-top:0;">Total de Propostas: "<span>{{pagePropostas.filtredProposals.length}} propostas</span>"</h2>
 							</header>
 						</div>
 					</div>
--
libgit2 0.21.2