diff --git a/cabecalho.css b/cabecalho.css index a8c11da..fed4e6a 100644 --- a/cabecalho.css +++ b/cabecalho.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; } diff --git a/header.html.erb b/header.html.erb index fedc0c6..c1799b4 100644 --- a/header.html.erb +++ b/header.html.erb @@ -59,6 +59,8 @@
+<% if controller_name != 'home' %> +
@@ -75,6 +77,8 @@
+<% else %> +
@@ -85,10 +89,11 @@
- FORUMFORUM - GROUPSGROUPS - ABOUT USABOUT US - ACTIVITYACTIVITY + + <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-forum.png") + "" + _('CONTENT') + "", {:controller => 'search', :action => 'contents', :filter => 'more_recent'}, :class => 'tile tile-forum') %> + <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-groups.png") + "" + _('GROUPS') + "", {:controller => 'search', :action => 'communities', :filter => 'more_active'}, :class => 'tile tile-groups') %> + <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-info.png") + "" + _('ABOUT US') + "", {:profile => 'save-organic-food'}, :class => 'tile tile-info') %> + <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-members.png") + "" + _('MEMBERS') + "", {:controller => 'search', :action => 'people', :filter => 'more_recent'}, :class => 'tile tile-users')%>
@@ -96,11 +101,19 @@
- <% if false %> + <% if logged_in? %> + +
<%= link_to(profile_image(current_person), current_person.url) %>
+
<%= _('Hello,') %>
<%= current_person.name %>
+ + <%= admin_link %> + <%= _('or') %> + <%= link_to(_('Logout'), :controller => :account, :action => :logout) %> + <% else %> -
Avatar
-
Hello
Guest
+
<%= image_tag("/designs/themes/participa2-theme/images/avatar.gif") %>
+
<%= _('Hello') %>
<%= _('Guest') %>
<%= thickbox_inline_popup_link('' + _('Login') + '', login_url, 'inlineLoginBox', :id => 'link_login') %> <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %> @@ -120,11 +133,14 @@
- <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-members.png") + "" + _('Members') + "", {:controller => 'search', :action => 'people', :filter => 'more_recent'}, :class => 'tile tile-users')%> - <%= link_to(image_tag("/designs/themes/participa2-theme/images/tile-blog.png") + "" + _('Blog') + "", {: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") + "" + _('ACTIVITY') + "", {: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") + "" + _('BLOG') + "", {:controller => 'profile', :profile => current_person.identifier}, :class => 'tile tile-blog') %> + <% end %>
+<% end %> diff --git a/images/503-logo.jpg b/images/503-logo.jpg deleted file mode 100644 index 9abf016..0000000 Binary files a/images/503-logo.jpg and /dev/null differ diff --git a/images/503-small.jpg b/images/503-small.jpg deleted file mode 100644 index c2c0efa..0000000 Binary files a/images/503-small.jpg and /dev/null differ diff --git a/images/503.jpg b/images/503.jpg deleted file mode 100644 index 5048c71..0000000 Binary files a/images/503.jpg and /dev/null differ diff --git a/images/avatar.gif b/images/avatar.gif new file mode 100644 index 0000000..4b828ca Binary files /dev/null and b/images/avatar.gif differ diff --git a/images/barra-menu-control-hover.png b/images/barra-menu-control-hover.png new file mode 100644 index 0000000..6d1e365 Binary files /dev/null and b/images/barra-menu-control-hover.png differ diff --git a/images/bg-bloco-de-trilhas.png b/images/bg-bloco-de-trilhas.png deleted file mode 100644 index df72b20..0000000 Binary files a/images/bg-bloco-de-trilhas.png and /dev/null differ diff --git a/images/brasil.png b/images/brasil.png deleted file mode 100644 index 0ac6ed2..0000000 Binary files a/images/brasil.png and /dev/null differ diff --git a/images/logo-PS-barra.png b/images/logo-PS-barra.png deleted file mode 100644 index 77c694e..0000000 Binary files a/images/logo-PS-barra.png and /dev/null differ diff --git a/images/logo-participa.png b/images/logo-participa.png deleted file mode 100644 index 436bceb..0000000 Binary files a/images/logo-participa.png and /dev/null differ diff --git a/images/logo-ps.png b/images/logo-ps.png deleted file mode 100644 index a9c6bcb..0000000 Binary files a/images/logo-ps.png and /dev/null differ diff --git a/images/logo-voce.png b/images/logo-voce.png new file mode 100644 index 0000000..1e97efe Binary files /dev/null and b/images/logo-voce.png differ diff --git a/images/marca-participacao-social.png b/images/marca-participacao-social.png deleted file mode 100644 index 4ad05e3..0000000 Binary files a/images/marca-participacao-social.png and /dev/null differ diff --git a/images/tile-activities.png b/images/tile-activities.png new file mode 100644 index 0000000..4928f7d Binary files /dev/null and b/images/tile-activities.png differ diff --git a/images/tile-forum.png b/images/tile-forum.png new file mode 100644 index 0000000..9a2b147 Binary files /dev/null and b/images/tile-forum.png differ diff --git a/images/tile-groups.png b/images/tile-groups.png new file mode 100644 index 0000000..fba0f65 Binary files /dev/null and b/images/tile-groups.png differ diff --git a/images/tile-info.png b/images/tile-info.png new file mode 100644 index 0000000..6482235 Binary files /dev/null and b/images/tile-info.png differ diff --git a/images/usuario_participa.png b/images/usuario_participa.png deleted file mode 100644 index a86a6a3..0000000 Binary files a/images/usuario_participa.png and /dev/null differ diff --git a/style-edit.css b/style-edit.css index 94d52b3..1035e8f 100644 --- a/style-edit.css +++ b/style-edit.css @@ -87,8 +87,6 @@ body, th, td, input { z-index: 9; } -#user #top-search {display: none;visibility:hidden;} - #user a { position: relative; color: #888a85; diff --git a/style.css b/style.css index dd49e44..b584a46 100644 --- a/style.css +++ b/style.css @@ -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%; } -- libgit2 0.21.2