Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ gem 'jnunemaker-validatable', '>= 1.8.4' # Required by mm-devise
gem 'devise', '>= 1.2'
gem 'mm-devise', '>= 1.2'

gem "semantic_menu", :git => "git://github.com/michaek/semantic_menu.git"

# Use unicorn as the web server
gem 'unicorn'

Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
GIT
remote: git://github.com/michaek/semantic_menu.git
revision: 5298f586467cc9a91e85befcca673b8406c8846f
specs:
semantic_menu (0.1.0)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -197,6 +203,7 @@ DEPENDENCIES
rails (= 3.1.0.rc6)
rspec-rails
sass-rails (~> 3.1.0.rc)
semantic_menu!
sqlite3
uglifier
unicorn
3 changes: 3 additions & 0 deletions app/assets/javascripts/users.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# 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/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/users.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the Users controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
2 changes: 2 additions & 0 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class UsersController < ApplicationController
end
2 changes: 2 additions & 0 deletions app/helpers/users_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module UsersHelper
end
14 changes: 0 additions & 14 deletions app/views/layouts/application.html.erb

This file was deleted.

10 changes: 10 additions & 0 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
!!!
%html
%head
%title Hackety Hack!
= stylesheet_link_tag "application"
= javascript_include_tag "application"
= csrf_meta_tags
%body
= render "shared/menu/user"
= yield
6 changes: 6 additions & 0 deletions app/views/shared/menu/_user.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
= semantic_menu do |root|
- if current_user
= current_user.email
- root.add "Log Out", destroy_user_session_path, :method => :delete
- else
- root.add "Log In", new_user_session_path
5 changes: 5 additions & 0 deletions spec/controllers/users_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'spec_helper'

describe UsersController do

end
15 changes: 15 additions & 0 deletions spec/helpers/users_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'spec_helper'

# Specs in this file have access to a helper object that includes
# the UsersHelper. For example:
#
# describe UsersHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# helper.concat_strings("this","that").should == "this that"
# end
# end
# end
describe UsersHelper do
pending "add some examples to (or delete) #{__FILE__}"
end