Skip to content

Commit

Permalink
Merge pull request #646 from theodi/feature-tweak-nav
Browse files Browse the repository at this point in the history 
Tweak nav to match main website
  • Loading branch information
@pezholio
pezholio committed Apr 12, 2016
2 parents 9a684ca + 8fdb3c4 commit e9af732
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 60 deletions.
4 changes: 3 additions & 1 deletion app/assets/stylesheets/odi-bootstrap.css
View file
Expand Up @@ -7930,7 +7930,9 @@ hr.heavy {

#mainnav .navbar-inner li a:hover,
#mainnav .navbar-inner li button:hover {
color: #00b7ff;
color: #fff;
background-color: #000;
text-shadow: none;
}

#mainnav .navbar-inner li form {
Expand Down
6 changes: 6 additions & 0 deletions app/views/devise/registrations/new.html.erb
View file
Expand Up @@ -9,6 +9,12 @@
This won't take longer than a couple of minutes!
</p>

<% if individual? %>
<p class="lead">
Want to sign up as an organisation instead? <a href="http://theodi.org/odi-supporter">Join here</a>
</p>
<% end %>
<%= hidden_field_tag(:free, params[:free]) if params[:free].present? %>
<%= f.hidden_field :coupon, value: params[:coupon] if params[:coupon].present? %>
<%= f.hidden_field :coupon, value: params[:member][:coupon] if params[:member] && params[:member][:coupon].present? %>
Expand Down
69 changes: 10 additions & 59 deletions app/views/layouts/application.html.erb
View file
Expand Up @@ -20,8 +20,9 @@
<a class='brand' href='http://theodi.org/'>
<%= image_tag "logo-header.png", alt: "Logo" %>
</a>
<ul class="nav pull-right">
<ul class="nav pull-right">
<li><a href="http://theodi.org/contact">Contact us</a></li>
<li><a href="http://theodi.org/newsletters">Newsletters</a></li>
<% if current_member %>
<li><%= link_to "My Account", member_path(current_member) %></li>
<li><%= link_to "Sign out", member_session_path, :method => :delete %></li>
Expand All @@ -45,64 +46,14 @@
<div class="navbar navbar-static-top" id="mainnav">
<div class="container">
<div class="navbar-inner">
<ul class="nav navbar-nav main-nav pull-right">
<li class="dropdown">
<a href="http://theodi.org/about">
About
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="http://theodi.org/about-us">About the ODI</a></li>
<li><a href="http://theodi.org/team">People</a></li>
<li><a href="http://theodi.org/jobs">Jobs</a></li>
<li><a href="http://theodi.org/procurement">Procurement</a></li>
<li><a href="http://theodi.org/culture">Data as culture</a></li>
<li><a href="http://theodi.org/space">Space</a></li>
<li><a href="http://theodi.org/faq">FAQ</a></li>
<li><a href="http://dashboards.theodi.org/">Dashboards</a></li>
</ul>
</li>
<li class="dropdown">
<a href="http://theodi.org/get-involved">
Get involved
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="http://theodi.org/join-us">Membership</a></li>
<li><a href="http://directory.theodi.org/members">Our members</a></li>
<li><a href="http://theodi.org/start-ups">Start-ups</a></li>
<li><a href="https://certificates.theodi.org/">Open Data Certificates</a></li>
<li><a href="http://theodi.org/nodes">Nodes</a></li>
<li><a href="http://theodi.org/challenge-series">Challenge series</a></li>
<li><a href="http://theodi.org/consultation-responses">Consultation responses</a></li>
</ul>
</li>
<li class="dropdown">
<a href="http://theodi.org/learning">
Learning
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="http://theodi.org/courses">Courses</a></li>
<li><a href="http://theodi.org/lunchtime-lectures">Friday lunchtime lectures</a></li>
<li><a href="http://theodi.org/guides">Guides</a></li>
<li><a href="http://theodi.org/case-studies">Case studies</a></li>
</ul>
</li>
<li class="dropdown">
<a href="http://theodi.org/events">
What's happening
</a>
</li>
<li class="dropdown last">
<a href="http://theodi.org/news">
News
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="http://theodi.org/newsroom">Newsroom</a></li>
</ul>
</li>
<ul class="nav navbar-nav main-nav">
<li class="dropdown"><a href="http://theodi.org/news">News &amp; blog</a></li>
<li class="dropdown"><a href="http://theodi.org/get-involved">Get involved</a></li>
<li class="dropdown"><a href="http://theodi.org/our-network">Our global network</a></li>
<li class="dropdown"><a href="http://theodi.org/events">Events</a></li>
<li class="dropdown"><a href="http://theodi.org/our-focus">Our focus</a></li>
<li class="dropdown"><a href="http://theodi.org/publications">Publications</a></li>
<li class="dropdown last"><a href="http://theodi.org/about">About the ODI</a></li>
</ul>
</div>
</div>
Expand Down

0 comments on commit e9af732

Please sign in to comment.