Permalink
Browse files

Not for Josh, for Sadip FIX# clean up

  • Loading branch information...
swapnilchincholkar committed Apr 27, 2012
1 parent 73b93ff commit ee0888b068632f93082bee509cdb1a1437c09785
@@ -1,21 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require bootstrap
-//= require bootstrap-modal
-//= require_tree .
-
-$(document).ready(function(){
- $('.twitter-image').tooltip({placement: 'bottom'});
-});
@@ -1,6 +1,7 @@
//= require jquery
//= require jquery_ujs
//= require bootstrap
+//= require bootstrap-modal
//= require_tree .
$(document).ready ->
@@ -9,22 +9,19 @@
= yield :head
%body
.navbar.navbar-fixed-top
- .navbar-inner
- .container
- %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
- %span.icon-bar
- %span.icon-bar
- %span.icon-bar
- %a.brand{:href => "#"} IdeaHub
- .nav-collapse
- %ul.nav
- %ul.nav.pull-right
- - if user_signed_in?
- %li= link_to "Ideas", ideas_path, :class => :'pull-right'
- %li= link_to "Sign out", signout_path, :class => :'pull-right'
- - else
- %li
- = link_to "Sign In", signin_path, :class => :'pull-right'
+ .container
+ %a.brand{:href => '/'} IdeaHub
+ .nav-collapse
+ %ul.nav
+ %ul.nav.pull-right
+ - if user_signed_in?
+ %li
+ = link_to "Ideas", ideas_path, :class => :'pull-right'
+ %li
+ = link_to "Sign out", signout_path, class: 'pull-right'
+ - else
+ %li
+ = link_to '', signin_path, class: 'twitter-image pull-right', title: 'Sign in with Twitter'
- if params[:controller] == 'ideas' && params[:action] == 'index'
.grid.clearfix#wrapper
= yield

0 comments on commit ee0888b

Please sign in to comment.