Download as
Browse Code »

Commit 2cc9647242ae25686eeedcbd64720dd8b736de07

Authored by Leandro Santos
1 parent e1885b86
Exists in new-theme

Adicionando menu da pagina principal

Showing 21 changed files with 48 additions and 19 deletions   Show diff stats
cabecalho.css
  Diff comments   View file @2cc9647
... ... @@ -789,17 +789,17 @@ text-decoration: none;
789 789 /****************** Painel de Controle ******************/
790 790  
791 791 .btn_home {
792   - margin-right: 14px;
793   - float: right;
  792 + margin-right: 14px;
  793 + float: right;
794 794 line-height: 40px;
795 795 }
796 796  
797 797 .btn_home a{
798   - display: inline-block;
799   - text-decoration: none;
800   - margin-left: 5px;
801   - width: 35px;
802   - background: url("images/logo.png") no-repeat left center transparent;
  798 + display: inline-block;
  799 + text-decoration: none;
  800 + margin-left: 5px;
  801 + width: 227px;
  802 + background: url("images/logo-voce.png") no-repeat left center transparent;
803 803 }
804 804  
805 805 /*Botão Painel de controle*/
... ... @@ -1097,6 +1097,11 @@ float: right;
1097 1097 display: none;
1098 1098 }
1099 1099  
  1100 +#user #homepage-link:hover {
  1101 + background: url(images/barra-menu-control-hover.png) no-repeat 10px center;
  1102 + margin-left: 0px;
  1103 +}
  1104 +
1100 1105 #control_panel_bar .control-panel a {
1101 1106 margin: 0;
1102 1107 border: 0;
... ... @@ -1125,7 +1130,7 @@ float: right;
1125 1130 }
1126 1131  
1127 1132 /*--------------------------------------------------------------
1128   -2.2 - Header
  1133 +Header: Leandro
1129 1134 --------------------------------------------------------------*/
1130 1135 header { margin:0 auto; height: 195px; border-bottom:1px solid #eaeaea; }
1131 1136 #logo { margin-top:55px; float:left; }
... ...
header.html.erb
  Diff comments   View file @2cc9647
... ... @@ -59,6 +59,8 @@
59 59 <br/>
60 60 </div>
61 61  
  62 +<% if controller_name != 'home' %>
  63 +
62 64 <div id="top-bar" class="top" >
63 65 <div class="btn_control_panel btn_control" title="Painel de Controle" alt="menu">
64 66 <div class="layout_user">
... ... @@ -75,6 +77,8 @@
75 77 </div>
76 78 <!-- FIM Nova Barra de usuário -->
77 79  
  80 +<% else %>
  81 +
78 82 <header>
79 83  
80 84 <div id="header-left">
... ... @@ -85,10 +89,11 @@
85 89  
86 90 <div id="header-right">
87 91 <div id="header-right-1">
88   - <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>
89   - <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>
90   - <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>
91   - <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>
  92 +
  93 + <%= 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') %>
  94 + <%= 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') %>
  95 + <%= 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') %>
  96 + <%= 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')%>
92 97 </div><!-- #header-right-1 -->
93 98  
94 99 <div id="header-right-2">
... ... @@ -96,11 +101,19 @@
96 101  
97 102 <div id="tile-user">
98 103  
99   - <% if false %>
  104 + <% if logged_in? %>
  105 + <span class='not-logged-in'>
  106 + <div class="tile-avatar"> <%= link_to(profile_image(current_person), current_person.url) %></div>
  107 + <div class="tile-username"><%= _('Hello,') %> <br/><%= current_person.name %> </div>
  108 + <span class='tile-title'>
  109 + <%= admin_link %>
  110 + <span> <%= _('or') %> </span>
  111 + <%= link_to(_('Logout'), :controller => :account, :action => :logout) %>
  112 + </span>
100 113 <% else %>
101 114 <span class='not-logged-in'>
102   - <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>
103   - <div class="tile-username">Hello<br>Guest</div>
  115 + <div class="tile-avatar"> <%= image_tag("/designs/themes/participa2-theme/images/avatar.gif") %></div>
  116 + <div class="tile-username"><%= _('Hello') %> <br/><%= _('Guest') %> </div>
104 117 <span class='tile-title'>
105 118 <%= thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
106 119 <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
... ... @@ -120,11 +133,14 @@
120 133 </div><!-- .tile2 -->
121 134  
122 135 <div class="header-right-2-bottom">
123   - <%= 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')%>
124   - <%= 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')%>
  136 + <% if logged_in? %>
  137 + <%= 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') %>
  138 + <%= 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') %>
  139 + <% end %>
125 140 </div><!-- .header-right-2-bottom -->
126 141 </div><!-- .header-right-2 -->
127 142 </div><!-- #header-right -->
128 143  
129 144  
130 145 </header>
  146 +<% end %>
... ...
images/503-logo.jpg
View file @e1885b8

9.42 KB
images/503-small.jpg
View file @e1885b8

70.1 KB
images/503.jpg
View file @e1885b8

174 KB
images/avatar.gif 0 → 100644
View file @2cc9647

6.19 KB
images/barra-menu-control-hover.png 0 → 100644
View file @2cc9647

163 Bytes
images/bg-bloco-de-trilhas.png
View file @e1885b8

245 KB
images/brasil.png
View file @e1885b8

14 KB
images/logo-PS-barra.png
View file @e1885b8

2.17 KB
images/logo-participa.png
View file @e1885b8

19.6 KB
images/logo-ps.png
View file @e1885b8

2.29 KB
images/logo-voce.png 0 → 100644
View file @2cc9647

6.76 KB
images/marca-participacao-social.png
View file @e1885b8

2.06 KB
images/tile-activities.png 0 → 100644
View file @2cc9647

1.39 KB
images/tile-forum.png 0 → 100644
View file @2cc9647

1.66 KB
images/tile-groups.png 0 → 100644
View file @2cc9647

1.5 KB
images/tile-info.png 0 → 100644
View file @2cc9647

1.39 KB
images/usuario_participa.png
View file @e1885b8

4.96 KB
style-edit.css
  Diff comments   View file @2cc9647
... ... @@ -87,8 +87,6 @@ body, th, td, input {
87 87 z-index: 9;
88 88 }
89 89  
90   -#user #top-search {display: none;visibility:hidden;}
91   -
92 90 #user a {
93 91 position: relative;
94 92 color: #888a85;
... ...
style.css
  Diff comments   View file @2cc9647
... ... @@ -78,6 +78,11 @@ width: 80%;
78 78 width: 62%;
79 79 }
80 80  
  81 +.controller-home .box-1{
  82 + margin: 0;
  83 + width: 70%;
  84 +}
  85 +
81 86 .box-1 .blocks,
82 87 .no-boxes .blocks {
83 88 width: auto;
... ... @@ -93,6 +98,11 @@ margin: 0;
93 98 vertical-align: top;
94 99 width: 20%;
95 100 }
  101 +
  102 +.controller-home .box-2{
  103 + width: 30%;
  104 +}
  105 +
96 106 .box-3{
97 107 min-width: 20%;
98 108 }
... ...