From 7f0d233bce1f782220e9dd6749008a300ab80468 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 19 Sep 2016 18:32:21 +0200 Subject: [PATCH] Add views for admin booths --- app/views/admin/poll/booths/edit.html.erb | 29 ++++++++++++++- app/views/admin/poll/booths/index.html.erb | 9 ++--- app/views/admin/poll/booths/new.html.erb | 29 ++++++++++++++- app/views/admin/poll/booths/show.html.erb | 41 +++++++++++++++++++++- app/views/admin/poll/polls/index.html.erb | 4 +-- config/locales/admin.en.yml | 20 +++++++++++ config/locales/admin.es.yml | 13 +++++++ 7 files changed, 136 insertions(+), 9 deletions(-) diff --git a/app/views/admin/poll/booths/edit.html.erb b/app/views/admin/poll/booths/edit.html.erb index 4f66c61cd..e48db9cdd 100644 --- a/app/views/admin/poll/booths/edit.html.erb +++ b/app/views/admin/poll/booths/edit.html.erb @@ -1 +1,28 @@ -booth edit \ No newline at end of file +<%= render 'shared/back_link' %> + +

<%= t("admin.booths.edit.title") %>: <%= t("admin.booths.edit.subtitle") %>

+ +
+
+
+ + +
+ +
+ + +
+ +
+ + "> +
+
+ +
+
+ +
+
+
diff --git a/app/views/admin/poll/booths/index.html.erb b/app/views/admin/poll/booths/index.html.erb index 3af66c042..2e9a2f70b 100644 --- a/app/views/admin/poll/booths/index.html.erb +++ b/app/views/admin/poll/booths/index.html.erb @@ -14,8 +14,9 @@
<%= t("admin.booths.index.no_booths") %>
+ - +<%= link_to t("admin.booths.index.add_booth"), new_admin_poll_booth_path, class: "button success" %> @@ -35,10 +36,10 @@ C/ Isaac Peral, 25. 28003, Madrid -
- <%= link_to t("admin.actions.edit"), "/edit", class: "button hollow" %> - <%= link_to t("admin.booths.index.add_officer"), "/edit", class: "button success" %> + <%= link_to t("admin.actions.edit"), "#", class: "button hollow" %> + <%= link_to t("admin.booths.index.add_officer"), "#", class: "button success" %>
\ No newline at end of file + diff --git a/app/views/admin/poll/booths/new.html.erb b/app/views/admin/poll/booths/new.html.erb index ebcb88bd4..e83d2f47c 100644 --- a/app/views/admin/poll/booths/new.html.erb +++ b/app/views/admin/poll/booths/new.html.erb @@ -1 +1,28 @@ -booth new \ No newline at end of file +<%= render 'shared/back_link' %> + +

<%= t("admin.booths.new.title") %>: <%= t("admin.booths.new.subtitle") %>

+ +
+
+
+ + +
+ +
+ + +
+ +
+ + "> +
+
+ +
+
+ +
+
+
diff --git a/app/views/admin/poll/booths/show.html.erb b/app/views/admin/poll/booths/show.html.erb index 791a97e48..8a5c2fd99 100644 --- a/app/views/admin/poll/booths/show.html.erb +++ b/app/views/admin/poll/booths/show.html.erb @@ -1 +1,40 @@ -booth show \ No newline at end of file +<%= render 'shared/back_link' %> +
+ +

Urna Moncloa (REFNUM)

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

<%= t("admin.booths.show.location") %>: C/ Isaac Peral, 25. 28003, Madrid

+ +

<%= t("admin.booths.show.officers_list") %>

+ + +
+ <%= t("admin.booths.show.no_officers") %> +
+ + +<%= link_to t("admin.booths.show.add_officer"), "#", class: "button success" %> + + + <%# @officers.each do |officer| %> + + + + + + <%# end %> +
+ <%# officer.name %> + Admin + + admin@consul.dev + <%# officer.email %> + + <%= link_to t('admin.poll_officers.officer.delete'), "#", class: "button hollow alert" %> + <%# link_to t('admin.poll_officers.officer.delete'), + admin_poll_officer_path(Poll.last, officer), + method: :delete, + class: "button hollow alert" + %> +
\ 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 2f7744c97..c260ab255 100644 --- a/app/views/admin/poll/polls/index.html.erb +++ b/app/views/admin/poll/polls/index.html.erb @@ -20,7 +20,7 @@ - <%= link_to "Votación de propuestas 2016 (REFNUM)", "3" %> + <%= link_to "Votación de propuestas 2016 (REFNUM)", "polls/3" %> @@ -28,7 +28,7 @@
(15/12/2016 - 15/02/2017) - <%= link_to t("admin.actions.edit"), "3/edit", class: "button hollow" %> + <%= link_to t("admin.actions.edit"), "polls/3/edit", class: "button hollow" %> diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 4c058992d..40822778f 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -185,9 +185,29 @@ en: select_poll: "Select a poll" title_list: "List of booths of poll %{poll}" no_booths: "There is no booths in this poll." + add_booth: "Add booth" name: "Name" location: "Location" add_officer: "Add officer" + new: + title: "Poll %{poll}" + subtitle: "New booth" + name: "Name" + reference: "Reference number" + location: "Location" + submit_button: "Create booth" + edit: + title: "Poll %{poll}" + subtitle: "Edit booth" + name: "Name" + reference: "Reference number" + location: "Location" + submit_button: "Update booth" + show: + location: "Location" + add_officer: "Add officer" + officers_list: "List of officers" + no_officers: "There is no officers in this booth." officials: edit: destroy: Remove 'Official' status diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 22fef3006..4c807e454 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -185,9 +185,22 @@ es: select_poll: "Selecciona una votación" title_list: "Lista de urnas de la votación %{poll}" no_booths: "No hay urnas en esta votación." + add_booth: "Añadir urna" name: "Nombre" location: "Ubicación" add_officer: "Añadir presidente" + new: + title: "Votación %{poll}" + subtitle: "Nueva urna" + name: "Nombre" + reference: "Número de referencia" + location: "Ubicación" + submit_button: "Crear urna" + show: + location: "Ubicación" + add_officer: "Añadir presidente de mesa" + officers_list: "Lista de presidentes de mesa" + no_officers: "No hay presidentes de mesa en esta urna." officials: edit: destroy: Eliminar condición de 'Cargo Público'