developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for orbit_bar

This commit is contained in:
Christophe Vilayphiou 2012-02-21 14:28:05 +08:00
parent ba4d71a026
commit 22d9741ac8
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/orbit-1.0.js
View File

@ -20,7 +20,7 @@ $(document).ready(function(){
$('.bar-login .dropdown-menu').hide(); $('.bar-login .dropdown-menu').hide();
}); });
$(document).on('click', '.dropdown-menu', function(e) { $(document).on('click', '.bar-login .dropdown-menu', function(e) {
e.stopPropagation(); e.stopPropagation();
$('.bar-login .dropdown-menu').show(); $('.bar-login .dropdown-menu').show();
}); });

13
app/assets/stylesheets/style.css.erb
View File

@ -106,8 +106,9 @@
height: 34px; height: 34px;
padding: 3px; padding: 3px;
text-indent: inherit; text-indent: inherit;
min-width: 120px; min-width: 125px;
width: auto !important; width: auto !important;
text-align: left;
} }
#orbit-bar .nav span.member-name { #orbit-bar .nav span.member-name {
display: inline-block; display: inline-block;
@ -115,6 +116,11 @@
line-height: 34px; line-height: 34px;
padding: 0 10px; padding: 0 10px;
} }
#orbit-bar .nav img.member-img {
display: inline-block;
float: left;
max-width: 34px;
}
#orbit-bar .account-menu { #orbit-bar .account-menu {
right: 5px; right: 5px;
} }
@ -186,6 +192,11 @@
font-size:16px; font-size:16px;
text-align: center; text-align: center;
} }
#orbit-bar .bar-login .dropdown-menu .register {
color: #FFFFFF;
margin: 0 15px;
width: 188px;
}
#main-sidebar { #main-sidebar {
background: url(<%= asset_path 'background.jpg' %>) repeat left top; background: url(<%= asset_path 'background.jpg' %>) repeat left top;
width: 155px; width: 155px;

5
app/views/layouts/_orbit_bar.html.erb
View File

@ -21,7 +21,8 @@
<% if user_signed_in? %> <% if user_signed_in? %>
<li class="dropdown active clear"> <li class="dropdown active clear">
<a class="orbit-bar-account" href="#" data-toggle="dropdown"> <a class="orbit-bar-account" href="#" data-toggle="dropdown">
<img src="images/menber-pic.png" /> <!-- <img src="images/menber-pic.png" /> -->
<%= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
<span class="member-name"><%= current_user.name %></span> <span class="member-name"><%= current_user.name %></span>
</a> </a>
<ul class="dropdown-menu account-menu"> <ul class="dropdown-menu account-menu">
@ -73,9 +74,9 @@
</label> </label>
</li> </li>
<li class="divider"><span><%= t(:or_lower) %></span></li> <li class="divider"><span><%= t(:or_lower) %></span></li>
<li><%= link_to content_tag(:button, t(:register), :class => 'btn btn-danger'), new_user_registration_path, :style => "padding:0px;" %></li>
<% end %> <% end %>
</ul> </ul>
<%= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
</div> </div>
</li> </li>
<% end %> <% end %>