From 7b24e73999bbe5bbb9509848ad4b33d31cb196e9 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 19 Sep 2016 13:36:42 +0200 Subject: [PATCH] Adds content to edit and show views --- app/views/admin/poll/polls/edit.html.erb | 37 +++++++++++++++++++- app/views/admin/poll/polls/index.html.erb | 6 ++-- app/views/admin/poll/polls/show.html.erb | 42 ++++++++++++++++++++++- config/locales/admin.en.yml | 15 ++++++-- config/locales/admin.es.yml | 13 +++++++ 5 files changed, 106 insertions(+), 7 deletions(-) diff --git a/app/views/admin/poll/polls/edit.html.erb b/app/views/admin/poll/polls/edit.html.erb index ca0a8dc14..68eb7cc3b 100644 --- a/app/views/admin/poll/polls/edit.html.erb +++ b/app/views/admin/poll/polls/edit.html.erb @@ -1 +1,36 @@ -poll edit \ No newline at end of file +<%= render 'shared/back_link' %> + +

<%= t("admin.polls.edit.title") %>

+ +
+
+
+ + +
+ +
+ + +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ +
\ No newline at end of file diff --git a/app/views/admin/poll/polls/index.html.erb b/app/views/admin/poll/polls/index.html.erb index 8ba763356..2f7744c97 100644 --- a/app/views/admin/poll/polls/index.html.erb +++ b/app/views/admin/poll/polls/index.html.erb @@ -7,7 +7,7 @@ <%= t("admin.polls.index.no_polls") %> - + @@ -20,7 +20,7 @@ diff --git a/app/views/admin/poll/polls/show.html.erb b/app/views/admin/poll/polls/show.html.erb index 61c9d5afb..9b4971214 100644 --- a/app/views/admin/poll/polls/show.html.erb +++ b/app/views/admin/poll/polls/show.html.erb @@ -1 +1,41 @@ -poll show \ No newline at end of file +<%= render "shared/back_link" %> +
+ +

Votación de propuestas 2016

+<%= link_to t("admin.actions.edit"), "#", class: "button hollow float-right" %> +

(REFNUM)

+

Próximamente (15/12/2016 - 15/02/2017)

+<%= link_to t("admin.polls.show.add_booth"), "#", class: "button success" %> + + +
+ <%= t("admin.polls.show.no_booths") %> +
+ + +

<%= t("admin.polls.show.booths_title") %>

+ +
- <%= link_to "Votación de propuestas 2016", "#" %> + <%= link_to "Votación de propuestas 2016 (REFNUM)", "3" %> @@ -28,7 +28,7 @@
(15/12/2016 - 15/02/2017)
- <%= link_to t("admin.actions.edit"), "#", class: "button hollow" %> + <%= link_to t("admin.actions.edit"), "3/edit", class: "button hollow" %>
+ + + + + + + + + + + + + + +
<%= t("admin.polls.show.name") %><%= t("admin.polls.show.location") %> 
+ + <%= link_to "Urna Moncloa (REFNUM)", "#" %> + + + C/ Isaac Peral, 25. 28003, Madrid + + <%= link_to t("admin.actions.edit"), "#", class: "button hollow" %> +
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 9e267714d..1141aedf3 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -33,8 +33,6 @@ en: editing: Edit banner form: submit_button: Save changes - errors: - form: errors: form: error: @@ -168,6 +166,19 @@ en: open_date: "Open date" close_date: "Close date" submit_button: "Create poll" + edit: + title: "Edit poll" + name: "Name" + reference: "Reference number" + open_date: "Open date" + close_date: "Close date" + submit_button: "Update poll" + show: + no_booths: "There is no booths in this poll." + add_booth: "Add booth" + booths_title: "List of booths" + name: "Name" + location: "Location" officials: edit: destroy: Remove 'Official' status diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index a711be773..de22029e0 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -166,6 +166,19 @@ es: open_date: "Fecha de apertura" close_date: "Fecha de cierre" submit_button: "Crear votación" + edit: + title: "Editar votación" + name: "Nombre" + reference: "Número de referencia" + open_date: "Fecha de apertura" + close_date: "Fecha de cierre" + submit_button: "Actualizar votación" + show: + no_booths: "No hay urnas en esta votación." + add_booth: "Añadir urna" + booths_title: "Listado de urnas" + name: "Nombre" + location: "Ubicación" officials: edit: destroy: Eliminar condición de 'Cargo Público'