From 52aa653871a13e85a612361651148890bc990a12 Mon Sep 17 00:00:00 2001
From: Sidney Ricardo Medeiros <sidneyrmedeiros@gmail.com>
Date: Fri, 19 Sep 2014 12:29:25 -0300
Subject: [PATCH] Adjustments of notification balloons. Translation options inserted. General corrections.

---
 cabecalho-cinza-theme.css | 15 ++++++++++-----
 cadastro.css              | 15 ++++++++++-----
 footer.html.erb           | 24 ++----------------------
 header.html.erb           | 37 ++++++++++---------------------------
 4 files changed, 32 insertions(+), 59 deletions(-)

diff --git a/cabecalho-cinza-theme.css b/cabecalho-cinza-theme.css
index 91e33a5..362e71a 100644
--- a/cabecalho-cinza-theme.css
+++ b/cabecalho-cinza-theme.css
@@ -136,6 +136,7 @@ background-repeat: no-repeat;
 
 #portal-siteactions li {
   display: inline;
+  margin: 0 5px 0 0;
 }
 
 #portal-siteactions li a:hover {
@@ -165,9 +166,11 @@ background-repeat: no-repeat;
 }
 
 #siteaction-accessibility,
-#siteaction-contraste {
+#siteaction-contraste,
+li#siteaction-mapadosite {
   margin: 0px 15px 0px 0px;
 }
+
 /* */
 
 /* Top links */
@@ -282,11 +285,13 @@ width: 13em;
 }
 
 #content input.searchField {
-margin-bottom: 1em;
+  margin-bottom: 1em;
 }
+
+/* Removendo css de campo de busca especifico do firefox
 input.searchField {
--moz-appearance: searchfield;
-}
+ -moz-appearance: searchfield;
+}*/
 
 #header input.searchButton {
   background-image: url("images/search-button.png");
@@ -633,7 +638,7 @@ color:#000000;
    max-width: 960px;
    margin: 0 auto;
    text-align: left;
-   padding: 19px;
+   padding: 5px;
 }
 
 #footer-license p {
diff --git a/cadastro.css b/cadastro.css
index acdf319..073a5a3 100644
--- a/cadastro.css
+++ b/cadastro.css
@@ -47,7 +47,7 @@ color: #4A4A4A;
 /*padding: 7px 7% 10px 3%; */
 /*height: 30px !important;*/
 	width: 50%;
-	float:center;
+	/*center:float;*/
 	margin:3px 2px 3px 0px;
 }
 
@@ -64,8 +64,8 @@ color: #4A4A4A;
 }
 
 #signup-login {
-  width:188px;
-  margin-bottom:5px;
+    width:188px;
+    margin-bottom:5px;
 }
 
 #signup-form .formfield input,
@@ -77,8 +77,13 @@ color: #4A4A4A;
 #signup-form small#password-confirmation-balloon,
 #signup-form small#email-balloon,
 #signup-form small#name-balloon{
-  left:90%;
+    left:100%;
 }
+/*
+#signup-form a#add_new_institution {
+    margin-left: 252px;
+}
+*/
 
 /*#content a.button.with-text {
 	line-height: 50px !important;
@@ -156,4 +161,4 @@ margin:10px;
 #institution_dialog .formfield.type-text:hover,
 #institution_dialog .formfield.type-radio:hover {
 	background: url(images/hdot2.gif) repeat-x bottom #f1e5dc;
-}
\ No newline at end of file
+}
diff --git a/footer.html.erb b/footer.html.erb
index 10c246e..0c41afc 100644
--- a/footer.html.erb
+++ b/footer.html.erb
@@ -104,28 +104,8 @@
 
 
    <!-- fim div#wrapper -->
-   <!-- scripts principais -->
-
-    <noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
-    <noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
-   <script src="{{ STATIC_URL }}js/template.js" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
-   <script src="{{ STATIC_URL }}third-party/jplayer/jquery.jplayer.min.js" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
-   <script type="text/javascript">
-   //<![CDATA[
-   jQuery(document).ready(function(){
-      urls = {mp3:"http://tv1-lnx-04.grupotv1.com/portalmodelo/conteudos-de-marcacao/audio-1-titulo-do-audio-1/audio-1-nome-do-audio.mp3"};
-      playAudio("#jquery_jplayer_1", urls, "mp3", "jplayer/");
-   });
-   //]]>
-   </script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
-   <!-- Script do portal Brasil deve ficar preferencialmente no rodape para nao atrasar o carregamento da pagina principal -->
-   <script src="http://barra.brasil.gov.br/barra.js?cor=verde" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
 
     <!--fim footer colab01-->
-    
-
-
-
 
 
 <div id="footer-content">
@@ -146,6 +126,6 @@
   </div><!-- end id="footer-license" -->
 </div>
 
-<!-- <script type="text/javascript" src="http://barra.brasil.gov.br/barra.js?cor=verde"></script> -->
-<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript"></script>
+ <!-- Script do portal Brasil deve ficar preferencialmente no rodape para nao atrasar o carregamento da pagina principal -->
+   <script src="http://barra.brasil.gov.br/barra.js?cor=verde" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
 
diff --git a/header.html.erb b/header.html.erb
index bca6b2f..fda4d50 100644
--- a/header.html.erb
+++ b/header.html.erb
@@ -38,15 +38,7 @@
           </a>
         </li>
       </ul>
-	<!--<div class="span6 language-and-actions-container"> -->
-              <!-- <ul id="language" class="pull-left">
-                  <li class="language-en">
-                  <a href="#">ENGLISH</a>
-                  </li>
-                  <li class="language-es">
-                  <a href="#">ESPAÑOL</a>
-                  </li>
-               </ul> -->
+
 
       <ul id="portal-siteactions">
         <li id="siteaction-accessibility">
@@ -58,18 +50,16 @@
         <li id="siteaction-mapadosite">
           <a href="/search">Mapa do Site</a>
         </li>
+        
+                <li id="siteaction-languages-pt">
+           <a href="?lang=pt" title="Português">Português</a>
+        </li>        
+                <li id="siteaction-languages-en">
+          <a href="?lang=en" title="English">English</a>
+        </li>
       </ul>
 	
-<!--<div class="language-and-actions-container">
-               <ul id="language" class="pull-left">
-                  <li class="language-en">
-                  <a href="#">ENGLISH</a>
-                  </li>
-                  <li class="language-es">
-                  <a href="#">ESPAÑOL</a>
-                  </li>
-               </ul>
-</div> -->
+
       <div id="logo">
  
 	<a title="Software Público" href="/">
@@ -112,7 +102,6 @@
     </div>
       
     </div>
-
  
   </div>
 </div>
@@ -140,8 +129,7 @@
 
         </li>
 
-    </ul>
-    
+    </ul> 
 
 </div>
 
@@ -152,10 +140,5 @@
   <!--
 <div id="barra-psocial">
 
-
-<div id="participa-languages">
-    <a href="?lang=pt" class="flag-pt" title="Português"><span>Português</span></a>
-    <a href="?lang=en" class="flag-en" title="English"><span>English</span></a>
-  </div> 
 </div>-->
 
--
libgit2 0.21.2