Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
This commit is contained in:
commit
1e43349eb8
24 files changed
+1125
-1011
No files matched your search
@@ -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>
|
||||
Reference in new issue
Block a user