diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 166eca82e..069a97a8b 100644 Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 498eb27a7..8532ba86c 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -21,4 +21,5 @@ + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 285caed39..37dde64ba 100644 Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 02c11f23e..aeda5c384 100644 Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss new file mode 100644 index 000000000..f35811ecf --- /dev/null +++ b/app/assets/stylesheets/admin.scss @@ -0,0 +1,153 @@ +// Table of Contents +// +// 01. Global styles +// 02. Sidebar +// 03. List elements +// + +// 01. Global styles +// - - - - - - - - - - - - - - - - - - - - - - - - - + +body.admin { + background: white; + + h2 { + font-size: rem-calc(24); + font-weight: bold; + } + + form { + .button { + margin-top: 0; + } + } + + .button.secondary { + margin-right: rem-calc(12); + } + + .button.create { + background: #EFD90C; + color: $text; + + &:hover { + background: #BDAB09; + } + } + + .admin-content { + margin-top: rem-calc(24); + } + + .is-featured { + margin-top: rem-calc(36); + } +} + +// 02. Sidebar +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.admin-sidebar { + margin-left: rem-calc(-15); + margin-top: rem-calc(-48); + + ul { + list-style-type: none; + margin-left: 0; + padding: 0; + + [class^="icon-"] { + display: inline-block; + font-size: rem-calc(24); + padding-right: rem-calc(24); + padding-top: rem-calc(4); + } + + li { + background: #2E343F; + border-bottom: 1px solid #292f39; + border-top: 1px solid #353c49; + margin: 0; + outline: 0; + + &:first-child { + background: #2B3139; + color: rgba(255,255,255,0.3); + padding: rem-calc(24) rem-calc(12); + text-transform: uppercase; + } + + &.active{ + background: #373D47; + + a:not(.button) { + color: white; + } + } + } + + li a:not(.button) { + color: rgba(255,255,255,0.3); + line-height: rem-calc(48); + padding-left: rem-calc(12); + vertical-align: top; + + &:hover { + color: white; + } + } + } +} + +// 03. List elements +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.admin-list { + list-style-type: none; + margin: 0; + + form { + clear: both; + + .checkbox { + font-size: rem-calc(12); + } + } + + li { + border-bottom: 1px solid #E7E9EC; + font-size: rem-calc(14); + min-height: rem-calc(72); + padding: rem-calc(12); + + &:first-child { + border-top: 1px solid #E7E9EC; + } + + &:nth-child(odd) { + background: #F0F2F6; + } + } + + .tag { + float: left; + font-size: rem-calc(18); + padding: 0; + } + + .button { + margin: 0; + } +} + +.delete { + border-bottom: 1px dotted #CF2A0E; + color: #F04124; + font-size: rem-calc(11); + margin-right: rem-calc(12); + + &:hover, &:active, &:focus { + border: 0; + color: #cf2a0e; + } +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 61b911aa6..48bfdc7b4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -6,6 +6,7 @@ @import "fonts"; @import "icons"; @import "variables"; +@import "admin"; @import "participacion"; @import "debates"; @import "c3"; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index cfebe4e83..616c037cd 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -79,3 +79,6 @@ .icon-star:before { content: "n"; } +.icon-eye:before { + content: "p"; +} diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 88410238b..5ade5615a 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -1,7 +1,42 @@ -
    -
  • <%= link_to t('admin.menu.settings'), admin_settings_path %>
    • -
  • <%= link_to t('admin.menu.debate_topics'), admin_tags_path %>
    • -
  • <%= link_to t('admin.menu.hidden_debates'), admin_debates_path %>
    • -
  • <%= link_to t('admin.menu.hidden_comments'), admin_comments_path %>
    • -
  • <%= link_to t('admin.menu.officials'), admin_officials_path %>
    • -
+ diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 796ba5ebc..9c52d8834 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -1,12 +1,18 @@ -

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

+

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

-
    +
      <% @comments.each do |comment| %>
    • - <%= comment.body %> - - <%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment), - method: :put, data: { confirm: t("admin.actions.confirm") } %> +
      +
      + <%= comment.body %> +
      +
      + <%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment), + method: :put, data: { confirm: t("admin.actions.confirm") }, + class: "button radius tiny success right" %> +
      +
      • <% end %> -
    \ No newline at end of file +
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 688e1d062..e7e1e5753 100644 --- a/app/views/admin/debates/index.html.erb +++ b/app/views/admin/debates/index.html.erb @@ -1,11 +1,13 @@ -

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

+

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

-
    +
      <% @debates.each do |debate| %> - <%= link_to admin_debate_path(debate) do %> -
    • - <%= link_to debate.title, admin_debate_path(debate) %> -
      • - <% end %> +
    • + <%= link_to debate.title, admin_debate_path(debate) %> + + <%= link_to t("admin.actions.restore"), restore_admin_debate_path(debate), + method: :put, data: { confirm: t("admin.actions.confirm") }, + class: "button radius tiny success right" %> +
      • <% end %> -
    \ 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 65bf3554d..e740baf47 100644 --- a/app/views/admin/debates/show.html.erb +++ b/app/views/admin/debates/show.html.erb @@ -1,11 +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 f272df1f3..d8090aa41 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -1,26 +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") %> + +
+
+ <%= f.label :name, t("admin.tags.name.placeholder") %> + <%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false %> +
+ +
+ <%= f.label :featured do %> + <%= f.check_box :featured, label: false %> + <%= t("admin.tags.mark_as_featured") %> + <% end %> +
+
+ + <%= f.submit(class: "button radius create") %> + <% end %> -

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

+

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

-
    +
      <% @tags.each do |tag| %>
    • - <%= tag.name %> + <%= tag.name %> - <%= form_for(tag, url: admin_tag_path(tag), as: :tag, html: { id: "edit_tag_#{tag.id}"}) do |f| %> - <%= f.check_box :featured, label: false, id: "tag_featured_#{tag.id}" %> - <%= t("admin.tags.mark_as_featured") %> - <%= f.submit(class: "button radius tiny") %> - <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: 'button tiny alert' %> + <%= form_for(tag, + url: admin_tag_path(tag), + as: :tag, + html: { id: "edit_tag_#{tag.id}", class: "text-right"}) do |f| %> + + <%= f.label :featured do %> + <%= f.check_box :featured, label: false, id: "tag_featured_#{tag.id}", class: "left" %> + <%= t("admin.tags.mark_as_featured") %> + <% end %> + + <%= f.submit(class: "button radius tiny success") %> +
      + <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "delete" %> <% end %> -
      • <% end %> -
    \ No newline at end of file +
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 %> ] -
- <%= link_to t("layouts.header.participation"), root_path, class: "selected" %> | - <%= link_to t("layouts.header.external_link_transparency"), "#" %> | - <%= link_to t("layouts.header.external_link_opendata"), "#" %> | - <%= link_to t("layouts.header.external_link_blog"), "#" %> -
@@ -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 %>
  • <%= t("layouts.header.menu") %>
    • diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 1d4157a8f..79ae8fcd9 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -12,25 +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 d5cc7da64..76bd55598 100644 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -34,6 +34,8 @@ en: debates: index: title: Hidden debates + show: + back: Back restore: success: The debate has been restored officials: diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index a3602fa05..4889f4813 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -34,6 +34,8 @@ es: debates: index: title: Debates ocultos + show: + back: Volver restore: success: El debate ha sido permitido officials: