From a1a5950b9ae7d5c37dacb575f60c6078f35f7e85 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@gmail.com>
Date: Thu, 17 Sep 2015 13:35:17 -0300
Subject: [PATCH] Small fixes (at PR)

---
 src/app/components/event-list/event-list.html         |  2 +-
 src/app/components/navbar/navbar.html                 | 70 ++++++++++++++++++++++++++++------------------------------------------
 src/app/components/proposal-stats/proposal-stats.html | 12 ++++++------
 src/app/components/social-share/social-share.scss     |  1 +
 src/app/pages/auth/signin.html                        |  2 ++
 src/app/pages/programas/programas.html                |  2 +-
 6 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/src/app/components/event-list/event-list.html b/src/app/components/event-list/event-list.html
index 24bf0a5..3e79272 100644
--- a/src/app/components/event-list/event-list.html
+++ b/src/app/components/event-list/event-list.html
@@ -13,7 +13,7 @@
           </div>
           <div class="col-sm-6 text-right">
             <h2 class="event-bar--trigger-toggle text-right">
-              <span><b>18</b> bate papos <b>agendados</b></span>
+              <span><b>{{vm.events.length}}</b> bate papos <b>agendados</b></span>
               <span ng-if="vm.isCollapsed" class="glyphicon glyphicon-menu-down" aria-hidden="true"></span>
               <span ng-if="!vm.isCollapsed" class="glyphicon glyphicon-menu-up" aria-hidden="true"></span>
             </h2>
diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html
index aed1d74..f851e32 100644
--- a/src/app/components/navbar/navbar.html
+++ b/src/app/components/navbar/navbar.html
@@ -9,7 +9,6 @@
       </button>
       <a class="navbar-brand" ui-sref="inicio">
         <img src="/assets/images/logo.png" alt="Dialoga Brasil | O país fica melhor quando você participa" />
-        <!-- <span class="glyphicon glyphicon-home"></span> Início -->
       </a>
     </div>
 
@@ -24,53 +23,40 @@
         <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" arrow-class="social-share--arrow"></social-share>
-          <!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">
-            <li>
-              <a socialshare
-                socialshare-provider="facebook"
-                socialshare-url="http://dialoga.gov.br"
-                socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
-                title="Compartilhar no Facebook">
-                <span class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
-                <span class="sr-only">Compartilhar no Facebook</span>
-              </a>
-            </li>
-            <li>
-              <a socialshare
-                socialshare-provider="twitter"
-                socialshare-url="http://dialoga.gov.br"
-                socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
-                socialshare-hastags="dialogabrasil"
-                title="Compartilhar no Twitter">
-                <span class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
-                <span class="sr-only">Compartilhar no Twitter</span>
-              </a>
-            </li>
-            <li>
-              <a socialshare
-                socialshare-provider="gplus"
-                socialshare-url="http://dialoga.gov.br"
-                socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."
-                title="Compartilhar no Google Plus">
-                <span class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>
-                <span class="sr-only">Compartilhar no Google Plus</span>
-              </a>
-            </li>
-            <li>
-              <a href="mailto:contato@dialoga.gov.br?subject=Conheça o Dialoga Brasil" title="Enviar por email">
-                <span class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>
-                <span class="sr-only">Enviar por email</span>
-              </a>
-            </li>
-          </ul> -->
         </li>
       </ul>
     </div>
   </nav>
+
   <div id="dialoga-nas-redes">
     <div class="text text-right">
-      <p>DIALOGA<br>NAS REDES</p>
+      <p>DIALOGA<br><b>NAS REDES</b></p>
     </div>
-    <social-share></social-share>
+    <ul class="social-share list-inline">
+      <li>
+        <a href="https://www.facebook.com/DialogaBrasil" target="_blank">
+          <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
+          <span class="sr-only">Visitar perfil no Facebook</span>
+        </a>
+      </li>
+      <li>
+        <a href="https://twitter.com/dialogabrasil" target="_blank">
+          <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
+          <span class="sr-only">Visitar perfil no Twitter</span>
+        </a>
+      </li>
+      <li>
+        <a href="https://www.youtube.com/channel/UCtjaJwOWwGu2legqFVAzhIA" target="_blank">
+          <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-youtube"><span class="icon icon-social-youtube"></span></span>
+          <span class="sr-only">Visitar canal no Youtube</span>
+        </a>
+      </li>
+      <li>
+        <a href="https://www.flickr.com/photos/dialogabrasil" target="_blank">
+          <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-flickr"><span class="icon icon-social-flickr"></span></span>
+          <span class="sr-only">Visitar canal no Flickr</span>
+        </a>
+      </li>
+    </ul>
   </div>
 </div>
diff --git a/src/app/components/proposal-stats/proposal-stats.html b/src/app/components/proposal-stats/proposal-stats.html
index 323084a..44dc447 100644
--- a/src/app/components/proposal-stats/proposal-stats.html
+++ b/src/app/components/proposal-stats/proposal-stats.html
@@ -1,16 +1,16 @@
 <div class="proposal-stats">
   <ul class="list-inline">
-    <li class="proposal-stats-views">
-      <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
-      <span>{{proposal.hits}}</span>
+    <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 class="proposal-stats-views">
+      <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+      <span>{{proposal.hits}}</span>
     </li>
   </ul>
 </div>
diff --git a/src/app/components/social-share/social-share.scss b/src/app/components/social-share/social-share.scss
index 00a0c91..af61042 100644
--- a/src/app/components/social-share/social-share.scss
+++ b/src/app/components/social-share/social-share.scss
@@ -16,6 +16,7 @@
         margin: 0;
         width: 45px;
         text-align: center;
+        transform: scale(0.9);
 
         & > a {
             padding: 0;
diff --git a/src/app/pages/auth/signin.html b/src/app/pages/auth/signin.html
index 16ff106..762b979 100644
--- a/src/app/pages/auth/signin.html
+++ b/src/app/pages/auth/signin.html
@@ -21,6 +21,8 @@
               <div class="row">
                 <div class="col-sm-4"></div>
                 <div class="col-sm-8 text-center-sm">
+                  <!-- <div ng-if="pageSignin.redirect > 0">
+                  </div> -->
                   <div ng-if="pageSignin.countdown > 0">
                     <p>
                       Você será redirecionado em menos de <b>{{pageSignin.countdown}} segundos</b>...
diff --git a/src/app/pages/programas/programas.html b/src/app/pages/programas/programas.html
index a28b12a..856483e 100644
--- a/src/app/pages/programas/programas.html
+++ b/src/app/pages/programas/programas.html
@@ -11,7 +11,7 @@
     <div class="container">
       <div class="row">
         <div class="col-sm-12">
-          <h1>Programas de governo</h1>
+          <h1>Programas</h1>
         </div>
       </div>
     </div>
--
libgit2 0.21.2