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

Merge branch 'master' into desktop_harry 

Conflicts:
	app/assets/stylesheets/style.css.erb
This commit is contained in:
Christophe Vilayphiou 2012-04-06 19:02:39 +08:00
parent 8471120c63 253f4bcb54
commit f65bb9b323
5 changed files with 903 additions and 857 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/new_admin.js
View File

@ -11,4 +11,5 @@
//= require jquery.tinyscrollbar.min
//= require orbit-1.0
//= require tinymce-jquery
//= require tinymce_orbit
//= require tinymce_orbit
//= require orbit-bar-search

20
app/assets/javascripts/orbit-bar-search.js Normal file
View File

@ -0,0 +1,20 @@
$(document).on('click', '.orbit-bar-search', function (){
if ($(this).parents('.search').hasClass('visible')){
$(this).parents('.search').stop().animate({
'width':'28px',
});
$(this).parents('.search').css({
'background-color': 'transparent',
});
$(this).parents('.search').removeClass('visible');
}
else{
$(this).parents('.search').stop().animate({
'width':'265px',
});
$(this).parents('.search').css({
'background-color': 'rgba(0, 0, 0, 0.5)',
});
$(this).parents('.search').addClass('visible');
}
});

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

File diff suppressed because it is too large Load Diff

1
app/helpers/application_helper.rb
View File

@ -152,6 +152,7 @@ module ApplicationHelper
javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
javascripts << "<script type='text/javascript' src='/assets/event.js'></script>\n"
page.design.javascripts.each do |js|

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

@ -15,6 +15,7 @@
</div>
<ul class="nav">
<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>
<li><a class="orbit-bar-desktop" href="#">Desktop</a></li>
</ul>
<ul class="nav pull-right">
<li class="dropdown language">
@ -25,6 +26,13 @@
<% end %>
</ul>
</li>
<li class="search clear">
<a class="orbit-bar-search" href="#">search</a>
<form class="navbar-search" action="">
<input class="search-query span3" type="text" placeholder="<%= t(:search_nccu) %>">
</form>
</li>
<% if user_signed_in? %>
<li class="dropdown active">
<a class="orbit-bar-account" href="#" data-toggle="dropdown">
@ -94,9 +102,6 @@
</li>
<% end %>
</ul>
<form class="navbar-search span6" action="">
<input class="search-query span4" type="text" placeholder="<%= t(:search_nccu) %>">
</form>
</div>
</div>
</header>