diff --git a/vedia.rb b/vedia.rb
index 736c25b..ecba199 100644
--- a/vedia.rb
+++ b/vedia.rb
@@ -76,9 +76,7 @@ enable :sessions
MajorityJudgment.values = settings.values
get '/' do
- require_login
- @votes = Vote.all
- erb :home
+ redirect '/votes'
end
get '/style.css' do
@@ -266,12 +264,18 @@ post '/admin/votes/:id/delete' do
redirect '/admin'
end
+get '/votes' do
+ require_login
+ @votes = Vote.all
+ erb :votes
+end
+
get '/votes/new' do
require_login
erb :votes_new
end
-post '/votes' do
+post '/votes/new' do
require_login
@vote = Vote.create(secure_id: SecureRandom.hex(8),
title: params[:title],
diff --git a/views/home.erb b/views/home.erb
deleted file mode 100644
index 30678dd..0000000
--- a/views/home.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
<%= _("Home") %>
-
-<%= _("Votes") %>
-
-
- <% @votes.reverse.each do |vote| %>
- -
- <%= vote.title %>
- <% case vote.state
- when 'draft' %>
- <% if vote.users.exists?(current_user.id) %><%= _("(Draft, organized by you)") %>
- <% else %><%= _("(Draft)") %>
- <% end %>
- <% when 'open' %>
- <% if vote.users.exists?(current_user.id) %><%= _("(Open, organized by you)") %>
- <% else %><%= _("(Open)") %>
- <% end %>
- <% when 'closed' %>
- <% if vote.users.exists?(current_user.id) %><%= _("(Closed, organized by you)") %>
- <% else %><%= _("(Closed)") %>
- <% end %>
- <% end %>
-
- <% end %>
-
-
-
diff --git a/views/layout.erb b/views/layout.erb
index 88e9a37..5512363 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -27,7 +27,7 @@
-
- <%= _("Inici") %>
+ <%= _("Votes") %>
-
<% if is_admin %>
diff --git a/views/votes_edit.erb b/views/votes_edit.erb
index 779d11b..b4ddc38 100644
--- a/views/votes_edit.erb
+++ b/views/votes_edit.erb
@@ -1,6 +1,6 @@
<%= @vote.title %>
-Draft
+Draft
<%= markdown(@vote.description) %>
diff --git a/views/votes_new.erb b/views/votes_new.erb
index 505289d..381eed8 100644
--- a/views/votes_new.erb
+++ b/views/votes_new.erb
@@ -1,6 +1,6 @@
<%= _("New vote") %>
-