Merge pull request #121 from lilliealbert/master

Add link to GitHub issues to nav bar
railsbridge · Mar 18, 2013 · dde1cf1 · dde1cf1
2 parents a1349ea + 9f638e3
commit dde1cf1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/app/assets/stylesheets/_header.css.scss b/app/assets/stylesheets/_header.css.scss
@@ -3,7 +3,7 @@
     background: #333;
   }
 
-  .nav li a {
+  .nav li a { 
     color: white;
     text-shadow: none;
     margin-right: 20px;
@@ -14,6 +14,20 @@
     }
   }
 
+  .nav-blurb {
+    color: white;
+    font-size: 12px;
+    text-shadow: none;
+    margin-left: 15px;
+    line-height: 12px;
+    position: relative;
+    top: -20px;
+    a {
+      color: white;
+      text-decoration: underline;
+    }
+  }
+
   .app-name {
     background-color: $red-color;
     color: white;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -14,6 +14,9 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <a class="app-name" href=<%= events_path %>><%= render 'shared/logo' %></a>
+        <% if user_signed_in? %>
+          <span class="nav-blurb">Found a bug? Or some unexpected behavior? <a href="https://github.com/railsbridge/bridge_troll/issues">Let us know</a>!</span>
+        <% end %>
         <ul class="nav pull-right">
           <%= render :partial => "devise/menu/login_items" %>
         </ul>

diff --git a/db/schema.rb b/db/schema.rb
@@ -33,8 +33,8 @@
     t.string   "time_zone"
     t.integer  "meetup_volunteer_event_id"
     t.integer  "meetup_student_event_id"
-    t.text     "volunteer_details"
     t.string   "public_email"
+    t.text     "volunteer_details"
   end
 
   create_table "locations", :force => true do |t|