Skip to content

Commit

Permalink
Merge pull request #2 from tevic/master
Browse files Browse the repository at this point in the history
Sorry for the late merge, have been absent.
  • Loading branch information
marc-an-be committed Sep 23, 2012
2 parents ab32429 + 086ae50 commit dab4446
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
@@ -0,0 +1,2 @@
*.db
Gemfile.lock
7 changes: 7 additions & 0 deletions Gemfile
@@ -0,0 +1,7 @@
source :rubygems

gem 'sinatra'
gem 'sqlite3'
gem 'dm-sqlite-adapter'
gem 'data_mapper'
gem 'haml'
2 changes: 1 addition & 1 deletion pilltracker.rb
Expand Up @@ -66,7 +66,7 @@ class Event
- @events.each do |event|
%li
%img{:style => 'float:left;margin:1em;',
:src => event.type == 'took' ? 'pills.png' : 'stethoscope.png'}
:src => event.type == 'took' ? '/pills.png' : '/stethoscope.png'}
%div&= event.time.strftime("%Y-%m-%d %H:%M")
%div&= "#{event.type}: #{event.description}"

Expand Down

0 comments on commit dab4446

Please sign in to comment.