From 63247968b8507938c87799862485a18af7f9bb9c Mon Sep 17 00:00:00 2001
From: Manuel <109959820+ManuelMoeri@users.noreply.github.com>
Date: Tue, 11 Jun 2024 10:01:58 +0200
Subject: [PATCH] bug/691-css-bughunt (#725)

* Add spacing to profile boxes

* Fix spacing of profile

* Reverse removing of flash styling

* Add info message to profile

* Improve no rated skills sentences

---------

Co-authored-by: Robin Steiner <robin95@bluewin.ch>
---
 app/views/layouts/application.html.haml            | 7 ++++---
 app/views/people/_core_competences.html.haml       | 2 +-
 app/views/people/_cv.html.haml                     | 4 ++++
 app/views/people/_profile.html.haml                | 2 +-
 app/views/people/person_relations/_index.html.haml | 2 +-
 config/locales/de.yml                              | 1 +
 config/locales/en.yml                              | 1 +
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d70e6108a..cfbe451fc 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -69,8 +69,9 @@
                 %a.nav-link.cursor-pointer.ps-2.pe-2{href: skills_path} Skillset
       %div.container-fluid
         %div.row.d-flex.justify-content-center
-          #flash= render partial: 'layouts/flash', collection: [:notice, :alert], as: :level
-          %span
-            = yield :actions
+          = render partial: 'layouts/flash', collection: [:notice, :alert], as: :level
+          - content_for(:actions) do
+            %span
+              = yield :actions
           = content_for?(:content) ? yield(:content) : yield
           = turbo_frame_tag "remote_modal", target: "_top"
\ No newline at end of file
diff --git a/app/views/people/_core_competences.html.haml b/app/views/people/_core_competences.html.haml
index a8ccffae5..9b046f5be 100644
--- a/app/views/people/_core_competences.html.haml
+++ b/app/views/people/_core_competences.html.haml
@@ -1,4 +1,4 @@
-%div.border.border-secondary-subtle.border-1.d-flex.flex-column#core-competences{"data-scroll-target": "scrollItem"}
+%div.border.border-secondary-subtle.border-1.d-flex.flex-column.mb-3#core-competences{"data-scroll-target": "scrollItem"}
   %div.profile-header.mw-100.border-bottom
     Kernkompetenzen
   %div.d-flex.flex-column.ms-5.mt-3.mb-3
diff --git a/app/views/people/_cv.html.haml b/app/views/people/_cv.html.haml
index 9e7e723aa..303be0ec6 100644
--- a/app/views/people/_cv.html.haml
+++ b/app/views/people/_cv.html.haml
@@ -1,6 +1,10 @@
 = render 'scroll_to_menu', items: %w[personal-data core-competences educations advanced-trainings activities projects], translate: true do
   = link_to image_tag("export.svg") + "Export", export_cv_person_path(@person), data: { turbo_frame: "remote_modal" }
 %div.w-100{data: { "scroll-target": "parent"}}
+  - if @person.people_skills.count == 0
+    %span
+      %p.alert.alert-info= t('profile.no_skills_rated_msg')
+
   = render('profile')
   = render('core_competences')
   = render('people/person_relations/index', list: @person.educations.list, id: "educations")
diff --git a/app/views/people/_profile.html.haml b/app/views/people/_profile.html.haml
index ba3e946cf..5146af558 100644
--- a/app/views/people/_profile.html.haml
+++ b/app/views/people/_profile.html.haml
@@ -1,4 +1,4 @@
-%div#personal-data{"data-scroll-target": "scrollItem"}
+%div.mb-3#personal-data{"data-scroll-target": "scrollItem"}
   %div.profile-header.mw-100.border-bottom
     Personalien
   %div.mt-4
diff --git a/app/views/people/person_relations/_index.html.haml b/app/views/people/person_relations/_index.html.haml
index 331a6e8b6..3b1ba3662 100644
--- a/app/views/people/person_relations/_index.html.haml
+++ b/app/views/people/person_relations/_index.html.haml
@@ -1,4 +1,4 @@
-%div.border.border-secondary-subtle.border-1.d-flex.flex-column{id: id, "data-scroll-target": "scrollItem"}
+%div.border.border-secondary-subtle.border-1.d-flex.flex-column.mb-3{id: id, "data-scroll-target": "scrollItem"}
     %div.profile-header.mw-100.border-bottom
         = "#{t "activerecord.models.#{name_of_obj(list)}"} (#{list.count})"
     %div.d-flex.flex-column.ms-5.mt-3.mb-3
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0164a33e4..47cd00551 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -20,6 +20,7 @@ de:
     activities: Stationen
     projects: Projekte
     updated_at: Zuletzt bearbeitet
+    no_skills_rated_msg: Dieses Profil hat noch keine bewerteten Skills. Gehe zum Skills Tab und bewerte die für dich relevanten Skills.
   attributes:
     year_from: Jahr von
     year_to: Jahr bis
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 908b5fad7..ae3c50e22 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,6 +33,7 @@ en:
     activities: Activities
     projects: Projects
     updated_at: Zuletzt bearbeitet
+    no_skills_rated_msg: This profile doesn't have any rated skills yet, head to the Skills Tab and rate some of the skills relevant to you.
   skills:
     header:
       all: All