updating theme

Victor Costa
1 parent e51719af
Showing 7 changed files with 41 additions and 17 deletions Show diff stats
cabecalho.css
header.html.erb
images/logo.png
style-core.css
style.css
theme.js
user_menu.html.erb
@@ -680,7 +680,6 @@ a.btn_control_panel:hover ul li{display: block;}
 	 visibility: visible;
 }
 #user .logged-in a#homepage-link {
-	display: block;
 	visibility: visible;
 }
@@ -695,8 +694,6 @@ a.btn_control_panel:hover ul li{display: block;}
 #user .logged-in span {display: none;}
 #user .logged-in a {
-    display: block;
-    margin-bottom: 10px;
 	width: auto;
 }
@@ -739,7 +736,7 @@ a.btn_control_panel:hover ul li{display: block;}
 	display: block;
 	background: none;
 	display: block;
-	padding: 5px 5px 5px 15px;
+	padding: 5px 5px 5px 5px;
 	text-align: left;
 	width: auto;
 	border-radius: 0;
@@ -892,6 +889,11 @@ text-decoration: none;
 	display: inline-block;
 	text-decoration: none;
 	margin-left: 5px;
+  width: 35px;
+  height: 35px;
+	background: url("images/logo.png") no-repeat left center transparent;
+  position: relative;
+  top: -10px;
 }
 /*Botão Painel de controle*/
@@ -1187,4 +1189,13 @@ float: right;
 	 text-align: left;
 }
-
+#user #homepage-link {
+  background: url(images/barra-menu-control.png) no-repeat 10px center;
+  margin-left: 0px;
+}
+#user #homepage-link i {
+  display: none;
+}
+#user #homepage-link strong {
+  padding: 10px 0 10px 35px;
+}
-<%= theme_include "user_menu" %>
+<% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
+<%= theme_include "user_menu", :locals => {:person => user.person} if user %>
 <!-- Nova Barra de usuário -->
@@ -31,7 +32,7 @@
 			<li>
 	 <a href="?lang=en" class="flag flag-en" title="English"><span>English</span></a>
 			</li>
-	<li class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">Logo do Portal</a></li>
+	<li class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">&nbsp;</a></li>
 		</ul>
 	</div>
 #wrap-2 #user {
   display: none;
 }
+
+#user .logged-in a.ctrl-panel {
+  display: none;
+}
@@ -11,6 +11,10 @@ font-family: Arial, sans-serif;
 #wrap-2 {background-color:#ebeff2;}
+#wrap-1 {
+  min-width: 800px;
+}
+
 #site-title {
 	position: relative;
 	top: 0;
 (function($) {
   // Run code
-        
-  $(".btn_control .logged-in").click(function(){
+
+  $('.btn_control .logged-in #homepage-link').on('click', function(event){
+      event.preventDefault();
+  });
+
+  $(".btn_control .logged-in #homepage-link").click(function(){
     $("#wrap-0").toggleClass("menu");
 	 $("#wrap-1").toggleClass("menu");
 	 $("#theme-footer").toggleClass("menu");
@@ -2,9 +2,9 @@
 	<div id="navigation-control">
 		<div class="perfil">
 			<ul class="profile_menu">
-				<li class="name"><h1 class="title">Nome do usuário</h1></li>
-				<li class="picture"><img src="/images/icons-app/person-big.png?1392299707"/></li>
-				<li class="user_status online"><span>&#9679;</span> Disponível</li>
+				<li class="name"><h1 class="title"><%= person.name %></h1></li>
+				<li class="picture"><%= profile_image(person, :big) %></li>
+				<!--<li class="user_status online"><span>&#9679;</span> Disponível</li>-->
 			</ul>
 		</div>
 		<%#= render :partial => 'layouts/user' %>
@@ -15,13 +15,13 @@
 						<li>Quick Post</li>
 					</ul>
 				</li>
-				<li class="activity_menu_item">Agenda<span>&#9660;</span></li>
+				<li class="activity_menu_item"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li>
 				<li class="activity_menu_item">Artigos Recentes<span>&#9660;</span></li>
-				<li class="activity_menu_item">Network<span>&#9660;</span></li>
-				<li class="activity_menu_item">Mural<span>&#9660;</span></li>
+				<li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li>
+				<li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li>
 				<li class="activity_menu_item">Galeria<span>&#9660;</span></li>
-				<li class="activity_menu_item">Amigos<span>&#9660;</span></li>
-				<li class="activity_menu_item">Comunidades<span>&#9660;</span></li>
+				<li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li>
+				<li class="activity_menu_item"><%= link_to _("Communities"), url_for(:controller => :profile, :action => :communities, :profile => person.identifier) %></li>
 			</ul>
 		</div>
  	</div>
1	#wrap-2 #user {	1	#wrap-2 #user {
2	display: none;	2	display: none;
3	}	3	}
		4	+
		5	+#user .logged-in a.ctrl-panel {
		6	+ display: none;
		7	+}