diff --git a/Gemfile b/Gemfile
index a17a1b4feaa363a3efcab35bd805bc80bcd27ba0..d1dcc7abb68214b3853785bbb7fbb64b8aa95575 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'delayed_job_web'
gem 'devise'
gem 'devise-i18n'
gem 'enum_help'
-gem 'faceted_search'#, path: '../faceted_search'
+gem 'faceted_search'#, path: '../../noesya/faceted_search'
gem 'front_matter_parser'
gem 'gdpr'
gem 'gitlab'
diff --git a/Gemfile.lock b/Gemfile.lock
index c439c791862a04136887912cbf0baf09fa416cdb..9c65198d9fbe0cdf5b4f19bc1e52fad4de795441 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -557,4 +557,4 @@ RUBY VERSION
ruby 2.7.6p219
BUNDLED WITH
- 2.3.22
+ 2.3.12
diff --git a/app/assets/stylesheets/extranet/layout/_nav.sass b/app/assets/stylesheets/extranet/layout/_nav.sass
index 6b09310279f28577920477ea2966769e9dbad313..67397e7f9f293108b86e00176abc5eda122dfe4c 100644
--- a/app/assets/stylesheets/extranet/layout/_nav.sass
+++ b/app/assets/stylesheets/extranet/layout/_nav.sass
@@ -16,6 +16,8 @@
.navbar-nav
> .nav-item
margin-left: 20px
+ &__account
+ margin-left: 30px
.dropdown-menu
background: transparent
border: 0
@@ -26,6 +28,16 @@
line-height: px2rem(28)
padding-right: 0
text-transform: uppercase
+ .dropdown-toggle
+ &::after
+ width: 6px
+ height: 6px
+ border-bottom: 1px solid black
+ border-left: 0
+ border-right: 1px solid black
+ border-top: 0
+ transform: rotate(45deg)
+
@include media-breakpoint-up(md)
.navbar-nav
li:last-child .nav-link
diff --git a/app/assets/stylesheets/extranet/layout/_typography.sass b/app/assets/stylesheets/extranet/layout/_typography.sass
index 3d575d96286e0075fc32985fa8204af70d9dec43..f00c87184c4b8b02f6a29b3fcf1fa9cab7bb527e 100644
--- a/app/assets/stylesheets/extranet/layout/_typography.sass
+++ b/app/assets/stylesheets/extranet/layout/_typography.sass
@@ -24,7 +24,7 @@ h1
font-weight: 500
line-height: 125%
@include media-breakpoint-up(md)
- max-width: 75vw
+ max-width: 70vw
@include media-breakpoint-down(md)
font-size: px2rem(30)
a
diff --git a/app/assets/stylesheets/extranet/pages/_home.sass b/app/assets/stylesheets/extranet/pages/_home.sass
index e7e821e8dc52c84ff93c71db32c9a6815aa19d46..7eeea3bfec5797ed89fa2a2b61e728443f725849 100644
--- a/app/assets/stylesheets/extranet/pages/_home.sass
+++ b/app/assets/stylesheets/extranet/pages/_home.sass
@@ -1,4 +1,6 @@
.home-index
+ h1
+ margin-bottom: 60px
.experiences
ul
padding-left: 0
diff --git a/app/views/extranet/application/_nav.html.erb b/app/views/extranet/application/_nav.html.erb
index 52d86c85c1e63ad08d5f333111893629baade757..df6f594d50ee82f9f51db2bdcdebf1cd1bd8a01c 100644
--- a/app/views/extranet/application/_nav.html.erb
+++ b/app/views/extranet/application/_nav.html.erb
@@ -9,10 +9,15 @@
<div class="collapse navbar-collapse" id="menu">
<%= render_navigation context: :extranet %>
<ul class="navbar-nav navbar-nav__account">
- <li class="nav-item dropdown">
- <%= link_to t('extranet.account.my'), "#", class: "nav-link dropdown-toggle", data: { "bs-toggle": "dropdown" }, aria: { expanded: false } %>
- <ul class="dropdown-menu dropdown-menu-end">
+ <li class="nav-item dropdown<%= ' active' if '/account'.in?(request.path) %>">
+ <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+ <i class="bi bi-person-circle"></i>
+ <%= t('extranet.account.my') %>
+ </a>
+ <ul class="dropdown-menu dropdown-menu-end text-end">
<li><%= link_to current_user.to_s, account_path, class: "dropdown-item" %></li>
+ <li><%= link_to t('extranet.account.edit'), edit_account_path, class: "dropdown-item" %></li>
+ <li><%= link_to t('extranet.account.edit_personal_data'), edit_personal_data_path, class: "dropdown-item" %></li>
<li><%= link_to t('extranet.account.logout'), destroy_user_session_path, method: :delete, class: "dropdown-item" %></li>
</ul>
</li>
diff --git a/app/views/extranet/cohorts/show.html.erb b/app/views/extranet/cohorts/show.html.erb
index 7611ad700d15093eab9ab1aa3d0c8b925411a9ab..40cfbb77a73c085cb546d9a1a41bef48684878c2 100644
--- a/app/views/extranet/cohorts/show.html.erb
+++ b/app/views/extranet/cohorts/show.html.erb
@@ -1,6 +1,6 @@
<% content_for :title, @cohort %>
<% content_for :header_right do %>
- <%= @count %>
+ <%= @cohort.people.count %>
<%= University::Person::Alumnus.model_name.human(count: @cohort.people.count).downcase %>
<% end %>
diff --git a/app/views/extranet/home/index.html.erb b/app/views/extranet/home/index.html.erb
index d5cb990124856e90feda79f2fdbff1e769384872..632830267fe34c66941201172c9bc5342711a73d 100644
--- a/app/views/extranet/home/index.html.erb
+++ b/app/views/extranet/home/index.html.erb
@@ -1,7 +1,7 @@
<% content_for :title, current_context %>
<% content_for :header do %>
<h1>
- Bienvenue sur l’extranet <%= current_context %>.<br>
+ Bienvenue sur l’extranet <%= current_context %>.
Retrouvez les <%= link_to University::Person::Alumnus.model_name.human(count: 2).downcase, university_persons_path %>,
<% if current_extranet.should_show_years? %>
recherchez par <%= link_to Education::AcademicYear.model_name.human(count: 2).downcase, education_academic_years_path %>,
diff --git a/app/views/extranet/persons/_person.html.erb b/app/views/extranet/persons/_person.html.erb
index 7264e5ea750191a639c50f2136f686965e2669da..fa2cc098dd3ec799b7f13a1b33e98bec2ca8615f 100644
--- a/app/views/extranet/persons/_person.html.erb
+++ b/app/views/extranet/persons/_person.html.erb
@@ -1,14 +1,19 @@
<article class="mb-4 person">
- <% if person.best_picture.attached? %>
- <%= kamifusen_tag person.best_picture, width: 400, class: 'img-fluid mb-2',
- sizes: {
- '(max-width: 576px)': '400px',
- '(max-width: 991px)': '200px'
- } %>
- <% else %>
- <%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid mb-2' %>
- <% end %>
- <%= link_to person, class: 'stretched-link' do %>
- <%= person.first_name %> <%= person.last_name %>
- <% end %>
+ <div class="row g-3">
+ <div class="col-3 col-md-12 mb-2">
+ <% if person.best_picture.attached? %>
+ <%= kamifusen_tag person.best_picture, width: 400, class: 'img-fluid',
+ sizes: {
+ '(max-width: 576px)': '400px',
+ '(max-width: 991px)': '200px'
+ } %>
+ <% else %>
+ <%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid' %>
+ <% end %>
+ </div>
+ <div class="col-9 col-md-12">
+ <%= link_to person, class: 'stretched-link' do %>
+ <%= person.first_name %> <%= person.last_name %>
+ <% end %>
+ </div>
</article>
diff --git a/app/views/extranet/persons/show.html.erb b/app/views/extranet/persons/show.html.erb
index 6608ebc0a104df87faef648ada56417573346cb4..9a91380eebee7e75393779e42ff6925b73a38a79 100644
--- a/app/views/extranet/persons/show.html.erb
+++ b/app/views/extranet/persons/show.html.erb
@@ -1,16 +1,20 @@
<% content_for :title, @person %>
<div class="row">
- <div class="col-md-9">
- <div class="biography">
- <p><%= @person&.biography %></p>
+ <div class="col-md-8">
+ <div class="row">
+ <div class="col-md-9">
+ <div class="biography mb-5">
+ <%= @person&.biography %>
+ </div>
+ </div>
</div>
<p class="mb-4"><%= t('extranet.experiences.title') %></p>
<%= render 'extranet/experiences/list', person: @person %>
</div>
- <div class="col-md-3">
+ <div class="offset-md-1 col-md-3">
<%= kamifusen_tag @person.best_picture, width: 400, class: 'img-fluid person__portrait' if @person.best_picture.attached? %>
<%= render 'extranet/persons/details', person: @person %>
</div>
diff --git a/config/routes/extranet.rb b/config/routes/extranet.rb
index 2b49444cb43c26e6d315edb6eeee77fe8b8b0104..513a41e598bdd6beb6cf57492ceb8862faf4c389 100644
--- a/config/routes/extranet.rb
+++ b/config/routes/extranet.rb
@@ -12,7 +12,7 @@ get 'account/edit' => 'extranet/account#edit', as: :edit_account
patch 'account' => 'extranet/account#update'
scope :account do
resources :experiences, controller: 'extranet/experiences', except: [:index, :show]
+ get 'personal_data' => 'extranet/personal_data#edit', as: :edit_personal_data
+ patch 'personal_data' => 'extranet/personal_data#update', as: :personal_data
end
-get 'personal_data/edit' => 'extranet/personal_data#edit', as: :edit_personal_data
-patch 'personal_data' => 'extranet/personal_data#update', as: :personal_data
root to: 'extranet/home#index'