diff --git a/views/layout.erb b/views/layout.erb index 8f974f6..fe6b590 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -5,6 +5,7 @@ <%= _("Vote") %> + <% if current_user %> diff --git a/views/votes_show_closed.erb b/views/votes_show_closed.erb index 4ca8b71..ba053f8 100644 --- a/views/votes_show_closed.erb +++ b/views/votes_show_closed.erb @@ -16,7 +16,8 @@ <%= user.email %> <% @vote.candidates.each do |candidate| %> <% if rating = @vote.ratings.find { |rating| rating.user == user and rating.candidate == candidate } %> - <%= settings.values.select { |e| e[:id] == rating.value }.first[:label] %> + <% value = settings.values.select { |e| e[:id] == rating.value }.first %> + <%= value[:label] %> <% end %> <% end %> @@ -39,7 +40,8 @@ <%= i %> <%= candidate.name %> - <%= settings.values.select { |e| e[:id] == candidate.mj.mj }.first[:label] %> + <% value = settings.values.select { |e| e[:id] == candidate.mj.mj }.first %> + <%= value[:label] %> <%= candidate.mj.proponents %> <%= candidate.mj.opponents %> diff --git a/views/votes_show_open.erb b/views/votes_show_open.erb index f2e0449..4e8cd49 100644 --- a/views/votes_show_open.erb +++ b/views/votes_show_open.erb @@ -12,11 +12,11 @@
  • <%= candidate.name %>

    <%= candidate.description %>

    -
      +
    +
  • <% end %> diff --git a/vote.rb b/vote.rb index e9e2475..c70ec7f 100644 --- a/vote.rb +++ b/vote.rb @@ -71,6 +71,11 @@ get '/' do erb :home end +get '/style.css' do + content_type 'text/css' + erb :style, :layout => false +end + get '/signup' do erb :signup end