Adicionando menu da pagina principal

Leandro Santos
1 parent e1885b86
Showing 21 changed files with 48 additions and 19 deletions Show diff stats
cabecalho.css
header.html.erb
images/503-logo.jpg
images/503-small.jpg
images/503.jpg
images/avatar.gif
images/barra-menu-control-hover.png
images/bg-bloco-de-trilhas.png
images/brasil.png
images/logo-PS-barra.png
images/logo-participa.png
images/logo-ps.png
images/logo-voce.png
images/marca-participacao-social.png
images/tile-activities.png
images/tile-forum.png
images/tile-groups.png
images/tile-info.png
images/usuario_participa.png
style-edit.css
@@ -789,17 +789,17 @@ text-decoration: none;
 /****************** Painel de Controle ******************/
 .btn_home {
-	margin-right: 14px;
-	float: right;
+  margin-right: 14px;
+  float: right;
   line-height: 40px;
 }
 .btn_home a{
-	display: inline-block;
-	text-decoration: none;
-	margin-left: 5px;
-  width: 35px;
-	background: url("images/logo.png") no-repeat left center transparent;
+  display: inline-block;
+  text-decoration: none;
+  margin-left: 5px;
+  width: 227px;
+  background: url("images/logo-voce.png") no-repeat left center transparent;
 }
 /*Botão Painel de controle*/
@@ -1097,6 +1097,11 @@ float: right;
   display: none;
 }
+#user #homepage-link:hover {
+  background: url(images/barra-menu-control-hover.png) no-repeat 10px center;
+  margin-left: 0px;
+}
+
 #control_panel_bar .control-panel a {
   margin: 0;
   border: 0;
@@ -1125,7 +1130,7 @@ float: right;
 }
 /*--------------------------------------------------------------
-2.2 - Header
+Header: Leandro
 --------------------------------------------------------------*/
 header { margin:0 auto; height: 195px; border-bottom:1px solid #eaeaea; }
 #logo { margin-top:55px; float:left; }
@@ -59,6 +59,8 @@
   <br/> 
 </div>
+<% if controller_name != 'home' %>
+
 <div id="top-bar" class="top" >
   <div class="btn_control_panel btn_control" title="Painel de Controle" alt="menu">
     <div class="layout_user">
@@ -75,6 +77,8 @@
 </div>
 <!-- FIM Nova Barra de usuário -->
+<% else %> 
+
 <header>
   <div id="header-left">
@@ -85,10 +89,11 @@
   <div id="header-right">
     <div id="header-right-1">
-      <a class="tile tile-forum" href="http://www.demo1.diaboliquedesign.com/4/forum"><img src="http://www.demo1.diaboliquedesign.com/4/wp-content/themes/OneCommunity/images/tile-forum.png" alt="FORUM"><span class="tile-title">FORUM</span></a>
-      <a class="tile tile-groups" href="http://www.demo1.diaboliquedesign.com/4/groups"><img src="http://www.demo1.diaboliquedesign.com/4/wp-content/themes/OneCommunity/images/tile-groups.png" alt="GROUPS"><span class="tile-title">GROUPS</span></a>
-      <a class="tile tile-help" href="http://www.demo1.diaboliquedesign.com/4/about-us"><img src="http://www.demo1.diaboliquedesign.com/4/wp-content/themes/OneCommunity/images/tile-info.png" alt="ABOUT US"><span class="tile-title">ABOUT US</span></a>
-      <a class="tile tile-activities" href="http://www.demo1.diaboliquedesign.com/4/activity"><img src="http://www.demo1.diaboliquedesign.com/4/wp-content/themes/OneCommunity/images/tile-activities.png" alt="ACTIVITY"><span class="tile-title">ACTIVITY</span></a>
+
+      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-forum.png") + "<span class='tile-title'>" + _('CONTENT') + "</span>", {:controller => 'search', :action => 'contents', :filter => 'more_recent'}, :class => 'tile tile-forum') %>
+      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-groups.png") + "<span class='tile-title'>" + _('GROUPS') + "</span>", {:controller => 'search', :action => 'communities', :filter => 'more_active'}, :class => 'tile tile-groups') %>
+      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-info.png") + "<span class='tile-title'>" + _('ABOUT US') + "</span>", {:profile => 'save-organic-food'}, :class => 'tile tile-info') %>
+      <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-members.png") + "<span class='tile-title'>" + _('MEMBERS') + "</span>", {:controller => 'search', :action => 'people', :filter => 'more_recent'}, :class => 'tile tile-users')%>
     </div><!-- #header-right-1 -->
     <div id="header-right-2">
@@ -96,11 +101,19 @@
         <div id="tile-user">
-        <% if false %>
+        <% if logged_in? %>
+          <span class='not-logged-in'>
+            <div class="tile-avatar"> <%= link_to(profile_image(current_person), current_person.url) %></div>
+            <div class="tile-username"><%= _('Hello,') %> <br/><%= current_person.name %> </div>
+            <span class='tile-title'>
+              <%= admin_link %>
+              <span> <%= _('or') %> </span>
+              <%= link_to(_('Logout'), :controller => :account, :action => :logout) %>
+            </span>
         <% else %>
           <span class='not-logged-in'>
-            <div class="tile-avatar"><img src="http://www.demo1.diaboliquedesign.com/4/wp-content/themes/OneCommunity/images/avatar.gif" alt="Avatar" width="88" height="88"></div>
-            <div class="tile-username">Hello<br>Guest</div>
+            <div class="tile-avatar"> <%= image_tag("/designs/themes/participa2-theme/images/avatar.gif") %></div>
+            <div class="tile-username"><%= _('Hello') %> <br/><%= _('Guest') %> </div>
             <span class='tile-title'>
               <%= thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
               <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
@@ -120,11 +133,14 @@
       </div><!-- .tile2 -->
       <div class="header-right-2-bottom">
-        <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-members.png") + "<span class='tile-title'>" + _('Members') + "</span>", {:controller => 'search', :action => 'people', :filter => 'more_recent'}, :class => 'tile tile-users')%>
-        <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-blog.png") + "<span class='tile-title'>" + _('Blog') + "</span>", {:controller => 'search', :action => 'people', :filter => 'more_recent'}, :class => 'tile tile-blog')%>
+        <% if logged_in? %>
+          <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-activities.png") + "<span class='tile-title'>" + _('ACTIVITY') + "</span>", {:controller => 'profile', :profile => current_person.identifier, :anchor => 'profile-network'}, :class => 'tile tile-activities') %>
+          <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-blog.png") + "<span class='tile-title'>" + _('BLOG') + "</span>", {:controller => 'profile', :profile => current_person.identifier}, :class => 'tile tile-blog') %>
+        <% end %>
       </div><!-- .header-right-2-bottom -->
     </div><!-- .header-right-2 -->
   </div><!-- #header-right -->
 </header>
+<% end %>
@@ -87,8 +87,6 @@ body, th, td, input {
   z-index: 9;
 }
-#user #top-search {display: none;visibility:hidden;}
-
 #user a {
   position: relative;
   color: #888a85;
@@ -78,6 +78,11 @@ width: 80%;
   width: 62%;
 }
+.controller-home .box-1{
+  margin: 0;
+  width: 70%;
+}
+
 .box-1 .blocks,
 .no-boxes .blocks {
   width: auto;
@@ -93,6 +98,11 @@ margin: 0;
 vertical-align: top;
 width: 20%;
 }
+
+.controller-home .box-2{
+  width: 30%;
+}
+
 .box-3{
 min-width: 20%;
 }