diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 8ea2b27af..bb8e30d07 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -1,5 +1,28 @@ - + diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 1555fda0c..9c52d8834 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -1,14 +1,18 @@ -
-

<%= t("admin.comments.index.title") %>

+

<%= t("admin.comments.index.title") %>

- -
+ diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index ffc8a281a..8cea6ce36 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -1 +1,5 @@ -

<%= t("admin.dashboard.index.title") %>

+

<%= t("admin.dashboard.index.title") %>

+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.

+ +

Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.

diff --git a/app/views/admin/debates/index.html.erb b/app/views/admin/debates/index.html.erb index ce07205b3..e7e1e5753 100644 --- a/app/views/admin/debates/index.html.erb +++ b/app/views/admin/debates/index.html.erb @@ -1,13 +1,13 @@ -
-

<%= t("admin.debates.index.title") %>

+

<%= t("admin.debates.index.title") %>

- -
\ No newline at end of file + diff --git a/app/views/admin/debates/show.html.erb b/app/views/admin/debates/show.html.erb index aaa22eec9..e740baf47 100644 --- a/app/views/admin/debates/show.html.erb +++ b/app/views/admin/debates/show.html.erb @@ -1,13 +1,12 @@ -
-

<%= t("admin.debates.index.title") %>

+

<%= t("admin.debates.index.title") %>

-
-
<%= @debate.title %>
-
<%= @debate.description %>
+

<%= @debate.title %>

-
- <%= link_to t('admin.actions.restore'), restore_admin_debate_path(@debate), - method: :put, data: { confirm: t('admin.actions.confirm') } %> -
-
-
\ No newline at end of file +
<%= @debate.description %>
+ +<%= link_to t("admin.debates.show.back"), admin_debates_path, + class: "button radius small secondary" %> + +<%= link_to t("admin.actions.restore"), restore_admin_debate_path(@debate), + method: :put, data: { confirm: t("admin.actions.confirm") }, + class: "button radius small success" %> diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index 4dbbed167..d8090aa41 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -1,29 +1,46 @@ -
-

<%= t("admin.tags.index.add_tag") %>

+

<%= t("admin.tags.index.add_tag") %>

- <%= form_for(@tag, url: admin_tags_path, as: :tag) do |f| %> - <%= f.text_field :name, placeholder: t("admin.tags.name.placeholder") %> - <%= f.check_box :featured, label: false %> - <%= t("admin.tags.mark_as_featured") %> - <%= f.submit(class: "button radius small") %> - <% end %> +<%= form_for(@tag, url: admin_tags_path, as: :tag) do |f| %> +
+
+ <%= f.label :name, t("admin.tags.name.placeholder") %> + <%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false %> +
-

<%= t("admin.tags.index.title") %>

+ +
-
+ <%= f.submit(class: "button radius tiny success") %> +
+ <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "delete" %> + <% end %> + + <% end %> + diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index b88dcded4..ffd7d34f4 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -10,12 +10,6 @@ <% end %> ] - @@ -25,7 +19,7 @@
  • <%= link_to root_path do %> <%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %> - <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> | <%= t("layouts.header.participation") %> + <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> | <%= t("admin.dashboard.index.title") %> <% end %>
  • diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index c754951f2..79ae8fcd9 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -12,22 +12,26 @@ <%= csrf_meta_tags %> - + <%= render 'layouts/admin_header' %> - <% if notice %> -

    <%= notice %>

    - <% end %> +
    - <% if alert %> -

    <%= alert %>

    - <% end %> +
    + <%= side_menu %> +
    -
    - <%= side_menu %> +
    + <% if notice %> +
    <%= notice %>
    + <% end %> + + <% if alert %> +
    <%= alert %>
    + <% end %> + + <%= yield %> +
    - - <%= yield %> - - \ No newline at end of file + diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 42c6d375c..3f922f5eb 100644 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -27,6 +27,7 @@ en: debates: index: title: Hidden debates + show: + back: Back restore: success: The debate has been restored - diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 71062c25b..58a23bcde 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -27,5 +27,7 @@ es: debates: index: title: Debates ocultos + show: + back: Volver restore: success: El debate ha sido permitido