Skip to content

Commit 0de9fcc

Browse files
committed
switch to haml layout, added login/logout menu items
1 parent 748245c commit 0de9fcc

5 files changed

Lines changed: 25 additions & 14 deletions

File tree

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ gem 'jnunemaker-validatable', '>= 1.8.4' # Required by mm-devise
2121
gem 'devise', '>= 1.2'
2222
gem 'mm-devise', '>= 1.2'
2323

24+
gem "semantic_menu", :git => "git://github.com/michaek/semantic_menu.git"
25+
2426
# Use unicorn as the web server
2527
gem 'unicorn'
2628

Gemfile.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
GIT
2+
remote: git://github.com/michaek/semantic_menu.git
3+
revision: 5298f586467cc9a91e85befcca673b8406c8846f
4+
specs:
5+
semantic_menu (0.1.0)
6+
17
GEM
28
remote: http://rubygems.org/
39
specs:
@@ -197,6 +203,7 @@ DEPENDENCIES
197203
rails (= 3.1.0.rc6)
198204
rspec-rails
199205
sass-rails (~> 3.1.0.rc)
206+
semantic_menu!
200207
sqlite3
201208
uglifier
202209
unicorn

app/views/layouts/application.html.erb

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
!!!
2+
%html
3+
%head
4+
%title Hackety Hack!
5+
= stylesheet_link_tag "application"
6+
= javascript_include_tag "application"
7+
= csrf_meta_tags
8+
%body
9+
= render "shared/menu/user"
10+
= yield
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
= semantic_menu do |root|
2+
- if current_user
3+
= current_user.email
4+
- root.add "Log Out", destroy_user_session_path, :method => :delete
5+
- else
6+
- root.add "Log In", new_user_session_path

0 commit comments

Comments
 (0)