Download as
Browse Code »

Commit fd95e26edea9bd4c56808548ddd5643ebafced5a

Authored by Victor Costa
1 parent e51719af
Exists in master and in 3 other branches new-theme, production, staging

updating theme

Showing 7 changed files with 41 additions and 17 deletions   Show diff stats
cabecalho.css
  Diff comments   View file @fd95e26
... ... @@ -680,7 +680,6 @@ a.btn_control_panel:hover ul li{display: block;}
680 680 visibility: visible;
681 681 }
682 682 #user .logged-in a#homepage-link {
683   - display: block;
684 683 visibility: visible;
685 684 }
686 685  
... ... @@ -695,8 +694,6 @@ a.btn_control_panel:hover ul li{display: block;}
695 694 #user .logged-in span {display: none;}
696 695  
697 696 #user .logged-in a {
698   - display: block;
699   - margin-bottom: 10px;
700 697 width: auto;
701 698 }
702 699  
... ... @@ -739,7 +736,7 @@ a.btn_control_panel:hover ul li{display: block;}
739 736 display: block;
740 737 background: none;
741 738 display: block;
742   - padding: 5px 5px 5px 15px;
  739 + padding: 5px 5px 5px 5px;
743 740 text-align: left;
744 741 width: auto;
745 742 border-radius: 0;
... ... @@ -892,6 +889,11 @@ text-decoration: none;
892 889 display: inline-block;
893 890 text-decoration: none;
894 891 margin-left: 5px;
  892 + width: 35px;
  893 + height: 35px;
  894 + background: url("images/logo.png") no-repeat left center transparent;
  895 + position: relative;
  896 + top: -10px;
895 897 }
896 898  
897 899 /*Botão Painel de controle*/
... ... @@ -1187,4 +1189,13 @@ float: right;
1187 1189 text-align: left;
1188 1190 }
1189 1191  
1190   -
  1192 +#user #homepage-link {
  1193 + background: url(images/barra-menu-control.png) no-repeat 10px center;
  1194 + margin-left: 0px;
  1195 +}
  1196 +#user #homepage-link i {
  1197 + display: none;
  1198 +}
  1199 +#user #homepage-link strong {
  1200 + padding: 10px 0 10px 35px;
  1201 +}
... ...
header.html.erb
  Diff comments   View file @fd95e26
1   -<%= theme_include "user_menu" %>
  1 +<% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
  2 +<%= theme_include "user_menu", :locals => {:person => user.person} if user %>
2 3  
3 4 <!-- Nova Barra de usuário -->
4 5  
... ... @@ -31,7 +32,7 @@
31 32 <li>
32 33 <a href="?lang=en" class="flag flag-en" title="English"><span>English</span></a>
33 34 </li>
34   - <li class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">Logo do Portal</a></li>
  35 + <li class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">&nbsp;</a></li>
35 36 </ul>
36 37  
37 38 </div>
... ...
images/logo.png 0 → 100644
View file @fd95e26

2.65 KB
style-core.css
  Diff comments   View file @fd95e26
1 1 #wrap-2 #user {
2 2 display: none;
3 3 }
  4 +
  5 +#user .logged-in a.ctrl-panel {
  6 + display: none;
  7 +}
... ...
style.css
  Diff comments   View file @fd95e26
... ... @@ -11,6 +11,10 @@ font-family: Arial, sans-serif;
11 11  
12 12 #wrap-2 {background-color:#ebeff2;}
13 13  
  14 +#wrap-1 {
  15 + min-width: 800px;
  16 +}
  17 +
14 18 #site-title {
15 19 position: relative;
16 20 top: 0;
... ...
theme.js
  Diff comments   View file @fd95e26
1 1 (function($) {
2 2 // Run code
3   -
4   - $(".btn_control .logged-in").click(function(){
  3 +
  4 + $('.btn_control .logged-in #homepage-link').on('click', function(event){
  5 + event.preventDefault();
  6 + });
  7 +
  8 + $(".btn_control .logged-in #homepage-link").click(function(){
5 9 $("#wrap-0").toggleClass("menu");
6 10 $("#wrap-1").toggleClass("menu");
7 11 $("#theme-footer").toggleClass("menu");
... ...
user_menu.html.erb
  Diff comments   View file @fd95e26
... ... @@ -2,9 +2,9 @@
2 2 <div id="navigation-control">
3 3 <div class="perfil">
4 4 <ul class="profile_menu">
5   - <li class="name"><h1 class="title">Nome do usuário</h1></li>
6   - <li class="picture"><img src="/images/icons-app/person-big.png?1392299707"/></li>
7   - <li class="user_status online"><span>&#9679;</span> Disponível</li>
  5 + <li class="name"><h1 class="title"><%= person.name %></h1></li>
  6 + <li class="picture"><%= profile_image(person, :big) %></li>
  7 + <!--<li class="user_status online"><span>&#9679;</span> Disponível</li>-->
8 8 </ul>
9 9 </div>
10 10 <%#= render :partial => 'layouts/user' %>
... ... @@ -15,13 +15,13 @@
15 15 <li>Quick Post</li>
16 16 </ul>
17 17 </li>
18   - <li class="activity_menu_item">Agenda<span>&#9660;</span></li>
  18 + <li class="activity_menu_item"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li>
19 19 <li class="activity_menu_item">Artigos Recentes<span>&#9660;</span></li>
20   - <li class="activity_menu_item">Network<span>&#9660;</span></li>
21   - <li class="activity_menu_item">Mural<span>&#9660;</span></li>
  20 + <li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li>
  21 + <li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li>
22 22 <li class="activity_menu_item">Galeria<span>&#9660;</span></li>
23   - <li class="activity_menu_item">Amigos<span>&#9660;</span></li>
24   - <li class="activity_menu_item">Comunidades<span>&#9660;</span></li>
  23 + <li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li>
  24 + <li class="activity_menu_item"><%= link_to _("Communities"), url_for(:controller => :profile, :action => :communities, :profile => person.identifier) %></li>
25 25 </ul>
26 26 </div>
27 27 </div>
... ...