From 28a658319918fe62eb2cfb3e2d36c817871cf9ab Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:04:14 +0200 Subject: [PATCH 1/9] removes untranslated texts on admin dashboard index --- app/views/admin/dashboard/index.html.erb | 87 ------------------------ 1 file changed, 87 deletions(-) diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index 2a2ed1c56..3d56b1f14 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -10,90 +10,3 @@

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

-

Desde aquí puedes administrar el sistema, a través de las siguientes acciones:

- -
- -
From 8ed791e86023b14a12c0acbee25aecb01ee9306b Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:04:52 +0200 Subject: [PATCH 2/9] includes description text on admin dashboard index --- app/views/admin/dashboard/index.html.erb | 6 ++++++ config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 3 files changed, 8 insertions(+) diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index 3d56b1f14..94f7c767b 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -7,6 +7,12 @@ <%= t("admin.menu.stats") %> <% end %> +
+ <%= link_to root_path do %> + <%= t("admin.dashboard.index.back") + " " + setting['org_name'] %> + <% end %> +

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

+

<%= t("admin.dashboard.index.description", org: setting['org_name']) %>

diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 91b493ffa..ca9a543e9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -216,6 +216,7 @@ en: index: back: Go back to title: Administration + description: Welcome to the %{org} admin panel. debates: index: filter: Filter diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 2db094999..7d768e4d9 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -216,6 +216,7 @@ es: index: back: Volver a title: Administración + description: Bienvenido al panel de administración de %{org}. debates: index: filter: Filtro From 90f2b848562a1cc212f39a30967a2edc43c86036 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:05:46 +0200 Subject: [PATCH 3/9] improves admin header layout --- app/views/layouts/_admin_header.html.erb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index bd4f09074..c7dba228f 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -2,31 +2,27 @@
<%= render 'shared/locale_switcher' %> - <%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], - root_path, class: "float-right back-web" %>
- <%= link_to setting['org_name'], namespaced_root_path, class: "logo show-for-small-only" %> - <%= t("application.menu")%> -
+

- <%= link_to namespaced_root_path, class: "hide-for-small-only" do %> - <%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %> + <%= link_to namespaced_root_path do %> <%= setting['org_name'] %> -  | <%= namespaced_header_title %> +
<%= namespaced_header_title %> <% end %>

+
    From 3e2c639137d1132231892e33122ad0ca8a513522 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:30:06 +0200 Subject: [PATCH 4/9] moves stats and setting links to header into a partial --- app/views/admin/dashboard/index.html.erb | 9 --------- app/views/admin/shared/_admin_shortcuts.html.erb | 11 +++++++++++ app/views/layouts/_admin_header.html.erb | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 app/views/admin/shared/_admin_shortcuts.html.erb diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index 94f7c767b..e73a37b57 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -1,12 +1,3 @@ -<%= link_to admin_settings_path, class: "button float-right" do %> - - <%= t("admin.menu.settings") %> -<% end %> - -<%= link_to admin_stats_path, class: "button float-right" do %> - - <%= t("admin.menu.stats") %> -<% end %>
    <%= link_to root_path do %> <%= t("admin.dashboard.index.back") + " " + setting['org_name'] %> diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb new file mode 100644 index 000000000..5ce0bf9b7 --- /dev/null +++ b/app/views/admin/shared/_admin_shortcuts.html.erb @@ -0,0 +1,11 @@ +
  • + <%= link_to admin_stats_path, title: t("admin.menu.stats") do %> + + + <% end %> +
    • +
  • + <%= link_to admin_settings_path, title: t("admin.menu.settings") do %> + + <% end %> +
    • diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index c7dba228f..e9ccdd998 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -26,6 +26,7 @@
      + <%= render "admin/shared/admin_shortcuts" %> <%= render "shared/admin_login_items" %> <%= render "devise/menu/login_items" %>
    From 3e5b4f2e4498f0ee24eea9b507daf243575bc893 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:38:29 +0200 Subject: [PATCH 5/9] removes important declaration on layout.scss --- app/assets/stylesheets/layout.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7e41026f1..77dccfc6e 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -371,7 +371,11 @@ header { .top-bar-title a { @include logo; - line-height: rem-calc(80) !important; + line-height: rem-calc(80); + + @include breakpoint(medium) { + line-height: rem-calc(80); + } &:hover { text-decoration: none; From 3fe1c21d7f7592e4107294df5ab9ab3ce63408ab Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:42:36 +0200 Subject: [PATCH 6/9] includes new css styles --- app/assets/stylesheets/admin.scss | 114 +++++++++++++++++++++++------- 1 file changed, 90 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 6ac728e2c..48614cd38 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -13,33 +13,96 @@ // 01. Global styles // ----------------- -$admin-color: #cf3638; +$admin-color: #245b80; +$sidebar: #245b80; +$sidebar-hover: #25597c; +$sidebar-active: #f4fcd0; .admin { + h2 { + font-weight: 100; + margin-bottom: $line-height; + text-transform: uppercase; + } + + .back { + float: none; + } + .header { border: 0; } .top-links { - background: darken($admin-color, 15%); - } - - .back-web { - padding-top: $line-height / 4; - text-decoration: underline; + background: #000; } .top-bar { - background: $admin-color !important; + background: #fff !important; + border-bottom: 1px solid #eee; + box-shadow: 0 2px 2px #eee; + color: #000; height: auto; + + span { + padding-top: $line-height / 2; + } + + [class^="icon-"] { + font-size: $base-font-size; + } } .top-bar-title { h1 { margin-bottom: 0; + margin-top: $line-height / 2; + + @include breakpoint(medium) { + margin-left: $line-height / 2; + } + + small { + color: #000; + text-transform: uppercase; + } } + + a { + color: #000 !important; + line-height: $line-height !important; + + @include breakpoint(medium) { + line-height: $line-height !important; + } + } + } + + .top-bar .menu > li { + + @include breakpoint(medium) { + height: auto !important; + padding-top: $line-height / 2; + } + + a { + color: #000 !important; + } + } + + .menu-icon.dark { + + &::after, + &:hover::after { + background: #000 !important; + box-shadow: 0 7px 0 #000, 0 14px 0 #000 !important; + } + } + + .dropdown.menu > .is-dropdown-submenu-parent > a::after { + border-color: #000 transparent transparent; } .fieldset { @@ -54,7 +117,8 @@ $admin-color: #cf3638; } } - th, td { + th, + td { text-align: left; &.text-center { @@ -110,6 +174,7 @@ $admin-color: #cf3638; .menu.simple .active { border-bottom: 2px solid $admin-color; color: $admin-color; + font-weight: bold; } .tabs-panel { @@ -195,6 +260,8 @@ $admin-color: #cf3638; // ----------- .admin-sidebar { + background: $sidebar; + background: linear-gradient(to bottom, #245b80 0%, #488fb5 100%); border-right: 1px solid $border; @include breakpoint(medium) { @@ -208,7 +275,7 @@ $admin-color: #cf3638; padding: 0; [class^="icon-"] { - color: $admin-color; + color: #fff; display: inline-block; font-size: rem-calc(24); line-height: $line-height; @@ -219,39 +286,32 @@ $admin-color: #cf3638; } li { - background: #fff; margin: 0; outline: 0; ul { margin-left: $line-height / 1.5; - border-left: 1px solid $border; + border-left: 1px solid $sidebar-hover; padding-left: $line-height / 2; } - &.section-title { - border-bottom: 1px solid $border; - } - &.active a { - background: #f3f6f7; - border-radius: rem-calc(6); - color: $admin-color; + background: $sidebar-hover; + border-left: 2px solid $sidebar-active; font-weight: bold; } } li a { - color: $text; + color: #fff; display: block; line-height: rem-calc(48); padding-left: rem-calc(12); vertical-align: top; &:hover { - background: #f3f6f7; - border-radius: rem-calc(6); - color: $admin-color; + background: $sidebar-hover; + color: #fff; text-decoration: none; } } @@ -259,7 +319,13 @@ $admin-color: #cf3638; .is-accordion-submenu-parent { > a::after { - border-color: $admin-color transparent transparent; + border: 0; + content: '\61' !important; + font-family: "icons" !important; + height: auto; + position: absolute !important; + right: 30px; + top: 6px !important; } } From 5ffac1d1fbc868f8a7f3f168abbb383b11a8aef6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 14:53:37 +0200 Subject: [PATCH 7/9] =?UTF-8?q?remove=20extra=20line=20break=20?= =?UTF-8?q?=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/shared/_admin_shortcuts.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb index 5ce0bf9b7..7ead6d419 100644 --- a/app/views/admin/shared/_admin_shortcuts.html.erb +++ b/app/views/admin/shared/_admin_shortcuts.html.erb @@ -1,7 +1,6 @@
  • <%= link_to admin_stats_path, title: t("admin.menu.stats") do %> - <% end %>
  • From 1b3292690adf5115081012a526498af01dc6f3eb Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 20 Sep 2017 11:02:13 +0200 Subject: [PATCH 8/9] updates spec of admin logo_header --- spec/features/admin/site_customization/images_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/admin/site_customization/images_spec.rb b/spec/features/admin/site_customization/images_spec.rb index 6d180fe8e..fc81bf246 100644 --- a/spec/features/admin/site_customization/images_spec.rb +++ b/spec/features/admin/site_customization/images_spec.rb @@ -20,7 +20,7 @@ feature "Admin custom images" do end expect(page).to have_css("tr.logo_header img[src*='logo_header.png']") - expect(page).to have_css("img[src*='logo_header.png']", count: 2) # one in the admin form an one in the page header + expect(page).to have_css("img[src*='logo_header.png']", count: 1) end scenario "Upload invalid image" do From 80e24d6c1311e5e0a255631166cc68383b267cbf Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 21 Sep 2017 00:58:39 +0200 Subject: [PATCH 9/9] changes h2 titles upcase to prevent broke specs --- app/assets/stylesheets/admin.scss | 5 ++++- app/views/admin/dashboard/index.html.erb | 4 ++-- config/locales/en/admin.yml | 2 +- config/locales/es/admin.yml | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 48614cd38..964e1348e 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -23,7 +23,10 @@ $sidebar-active: #f4fcd0; h2 { font-weight: 100; margin-bottom: $line-height; - text-transform: uppercase; + + &.title { + text-transform: uppercase; + } } .back { diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index e73a37b57..ca64da28d 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -1,9 +1,9 @@
    <%= link_to root_path do %> - <%= t("admin.dashboard.index.back") + " " + setting['org_name'] %> + <%= t("admin.dashboard.index.back", org: setting['org_name']) %> <% end %>
    -

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

    +

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

    <%= t("admin.dashboard.index.description", org: setting['org_name']) %>

    diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index ca9a543e9..09f9dd84c 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -214,7 +214,7 @@ en: title: Hidden comments dashboard: index: - back: Go back to + back: Go back to %{org} title: Administration description: Welcome to the %{org} admin panel. debates: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 7d768e4d9..ae61b9d58 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -214,7 +214,7 @@ es: title: Comentarios ocultos dashboard: index: - back: Volver a + back: Volver a %{org} title: Administración description: Bienvenido al panel de administración de %{org}. debates: