made navbar black, added hover show/hide of edit fucntions

morenoh149 · morenoh149 · commit 421e2a44d528 · 2013-08-20T18:33:07.000-07:00
diff --git a/app/assets/javascripts/statuses.js.coffee b/app/assets/javascripts/statuses.js.coffee
@@ -1,3 +1,7 @@
 # Place all the behaviors and hooks related to the matching controller here.
 # All this logic will automatically be available in application.js.
 # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
+
+$ ->
+  $('.status').hover (event) ->
+    $(this).toggleClass("hover")
diff --git a/app/assets/stylesheets/statuses.css.scss b/app/assets/stylesheets/statuses.css.scss
@@ -1,3 +1,20 @@
 // Place all the styles related to the statuses controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.status {
+  border-bottom: solid 1px #ccc;
+  padding: 5px 0;
+}
+
+.status p {
+  margin: 4px 0;
+}
+
+.status .admin {
+  display: none;
+}
+
+.status.hover .admin {
+  display: inline;
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -17,7 +17,7 @@
 </head>
 <body>
 
-  <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <nav class="navbar navbar-default navbar-fixed-top navbar-inverse" role="navigation">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -33,35 +33,6 @@
     <div class="collapse navbar-collapse navbar-ex1-collapse">
       <ul class="nav navbar-nav">
         <li><%= link_to "All statuses", statuses_path %></li>
-        <li><a href="#">Link</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li><a href="#">Separated link</a></li>
-            <li><a href="#">One more separated link</a></li>
-          </ul>
-        </li>
-      </ul>
-      <form class="navbar-form navbar-left" role="search">
-        <div class="form-group">
-          <input type="text" class="form-control" placeholder="Search">
-        </div>
-        <button type="submit" class="btn btn-default">Submit</button>
-      </form>
-      <ul class="nav navbar-nav navbar-right">
-        <li><a href="#">Link</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </li>
       </ul>
     </div><!-- /.navbar-collapse -->
   </nav>
diff --git a/app/views/statuses/index.html.erb b/app/views/statuses/index.html.erb
@@ -7,9 +7,9 @@
     <strong><%= status.name %></strong>
     <p><%= status.content %></p>
     <div class="meta">
-      <%= link_to "Show", status %>
+      <%= link_to "created #{time_ago_in_words(status.created_at)} ago", status %>
       <span class="admin">
-        <%= link_to "Edit", edit_status_path(status) %> |
+        | <%= link_to "Edit", edit_status_path(status) %> |
         <%= link_to "Delete", status, method: :delete,
         data: { confirm: "Are you sure you want to delete this status?" } %>
       </span>
