Skip to content
Snippets Groups Projects
Unverified Commit f047412e authored by Sébastien Gaya's avatar Sébastien Gaya
Browse files

Merge branch 'main' of github.com:noesya/osuny

parents ada35b2a e94e0d6e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 137 additions and 121 deletions
app/assets/javascripts/admin/plugins/notyf.js
+ 32
− 29
View file @ f047412e
/*global Notyf */
var notyfAlerts = document.getElementsByClassName('js-notyf-alert'),
notyfNotices = document.getElementsByClassName('js-notyf-notice'),
notyf = new Notyf();
window.addEventListener('DOMContentLoaded', function () {
'use strict';
var notyfAlerts = document.getElementsByClassName('js-notyf-alert'),
notyfNotices = document.getElementsByClassName('js-notyf-notice'),
notyf = new Notyf();
if (notyfAlerts.length > 0) {
notyf.open({
type: 'error',
position: {
x: 'center',
y: 'bottom'
},
message: notyfAlerts[0].innerText,
duration: 9000,
ripple: true,
dismissible: true
});
}
if (notyfNotices.length > 0) {
notyf.open({
type: 'success',
position: {
x: 'center',
y: 'bottom'
},
message: notyfNotices[0].innerText,
duration: 9000,
ripple: true,
dismissible: true
});
}
if (notyfAlerts.length > 0) {
notyf.open({
type: 'error',
position: {
x: 'center',
y: 'bottom'
},
message: notyfAlerts[0].innerText,
duration: 9000,
ripple: true,
dismissible: true
});
}
if (notyfNotices.length > 0) {
notyf.open({
type: 'success',
position: {
x: 'center',
y: 'bottom'
},
message: notyfNotices[0].innerText,
duration: 9000,
ripple: true,
dismissible: true
});
}
});
app/assets/javascripts/devise.js 0 → 100644
+ 13
− 0
View file @ f047412e
//= require activestorage
//= require jquery3
//= require jquery_ujs
//= require notyf/notyf.min
//= require simple_form_password_with_hints
//= require simple_form_bs5_file_input
//= require cropperjs/dist/cropper
//= require jquery-cropper/dist/jquery-cropper
//= require gdpr/cookie_consent
//= require_self
//= require_tree ./admin/plugins
window.osuny = {};
app/assets/stylesheets/extranet/_variables.sass
+ 2
− 2
View file @ f047412e
......@@ -9,8 +9,8 @@ $font-size-root: 1rem
$font-size-base: 1.125rem
$h1-font-size: px2rem(60)
$h2-font-size: px2rem(18)
$h3-font-size: px2rem(20)
$h2-font-size: px2rem(24)
$h3-font-size: px2rem(18)
$headings-font-weight: 700
$headings-margin-bottom: px2rem(24)
$small-font-size: px2rem(14)
......
app/assets/stylesheets/extranet/layout/_default.sass
+ 1
− 13
View file @ f047412e
......@@ -4,18 +4,6 @@
padding-left: var(--bs-gutter-x)
.action-show
@include media-breakpoint-up(md)
.top
align-items: stretch
header
align-items: center
display: flex
height: 100%
h1
margin: 0
padding: 0
.biography
padding-right: percentage(3/9)
dl
line-height: px2rem(26)
dt
......@@ -24,4 +12,4 @@
margin-bottom: px2rem(26)
ul
list-style: none
\ No newline at end of file
list-style: none
app/assets/stylesheets/extranet/layout/_nav.sass
+ 1
− 1
View file @ f047412e
......@@ -17,7 +17,7 @@
> .nav-item
margin-left: 20px
&__account
margin-left: 30px
margin-left: 40px
.dropdown-menu
background: transparent
border: 0
......
app/assets/stylesheets/extranet/pages/_experiences.sass
+ 2
− 3
View file @ f047412e
.experiences
&__experience
@include pseudo-bottom-border
\ No newline at end of file
.experience__organization__logo
height: 100%
\ No newline at end of file
app/assets/stylesheets/extranet/pages/_organization.sass
+ 3
− 1
View file @ f047412e
......@@ -10,10 +10,12 @@
border: 1px solid $light-border-color
background: white
padding: 60px
margin-top: -130px
margin-bottom: 50px
aspect-ratio: 1 / 1
@include media-breakpoint-up(md)
&__logo
margin-top: -200px
margin-bottom: 50px
@include media-breakpoint-up(md)
align-items: center
......
app/assets/stylesheets/extranet/pages/_person.sass
+ 4
− 3
View file @ f047412e
.person
line-height: px2rem(24)
position: relative
@include media-breakpoint-up(md)
&__portrait
&__portrait
margin-top: -130px
margin-bottom: 50px
@include media-breakpoint-up(md)
margin-top: -200px
margin-bottom: 50px
app/views/extranet/cohorts/_index.cards.html.erb
+ 3
− 4
View file @ f047412e
......@@ -4,13 +4,12 @@
<div class="col-md-4 col-xl-3">
<article class="card mb-5">
<div class="card-body">
<h2><%= link_to cohort.program, cohort, class: 'stretched-link' %></h2>
<p><%= cohort.academic_year.year %></p>
<p class="small">
<h2 class="mb-0"><%= link_to cohort.academic_year.year, cohort, class: 'stretched-link' %></h2>
<p class="small mb-0">
<%= cohort.people.count %>
<%= University::Person::Alumnus.model_name.human(count: cohort.people.count).downcase %>
</p>
<p class="text-end mb-0">
<p class="text-end mb-n2">
<i class="bi bi-arrow-right"></i>
</p>
</div>
......
app/views/extranet/experiences/_experience.html.erb
+ 20
− 23
View file @ f047412e
<%
edit ||= false
%>
<li class="experiences__experience row py-3">
<div class="col-md-4">
<p><b><%= experience.description %></b></p>
<p class="mb-0">
<%= "#{experience.from_year} —" if experience.from_year %>
<%= experience.to_year || t('today') %>
</p>
<%= link_to University::Person::Experience.human_attribute_name('edit'),
edit_experience_path(experience),
class: 'btn btn-sm btn-secondary mt-2' if edit %>
</div>
<% if experience.organization.present? %>
<li class="experiences__experience py-4 border-top">
<div class="row">
<div class="col-md-6">
<p><%= link_to experience.organization, experience.organization %></p>
<% if experience.organization.url %>
<p class="mb-0"><small><%= link_to experience.organization.url, experience.organization.url %></small></p>
<% end %>
<p class="mb-0">
<b><%= experience.description %></b><br>
<%= "#{experience.from_year} —" if experience.from_year %>
<%= experience.to_year || t('today') %>
</p>
<%= link_to University::Person::Experience.human_attribute_name('edit'),
edit_experience_path(experience),
class: 'btn btn-sm btn-secondary mt-2' if edit %>
</div>
<div class="col-md-2">
<% if experience.organization.logo.attached? %>
<div class="col-md-6 text-end">
<% if experience.organization.present? %>
<%= link_to experience.organization do %>
<%= kamifusen_tag experience.organization.logo, height: 80, class: 'img-fluid' %>
<% if experience.organization.logo.attached? %>
<%= kamifusen_tag experience.organization.logo, width: 100, class: 'img-fluid experience__organization__logo' %>
<% else %>
<p class="text-end><%= link_to experience.organization, experience.organization %></p>
<% end %>
<% end %>
<% end %>
<div>
<% end %>
<div>
<% end %>
</div>
</li>
app/views/extranet/layouts/devise.html.erb
+ 1
− 1
View file @ f047412e
......@@ -7,7 +7,7 @@
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<%= stylesheet_link_tag 'admin', media: 'all' %>
<%= javascript_include_tag 'admin' %>
<%= javascript_include_tag 'devise' %>
<%= favicon_link_tag 'favicon.png' %>
</head>
<body class="<%= body_classes %>">
......
app/views/extranet/organizations/show.html.erb
+ 45
− 31
View file @ f047412e
<% content_for :title, @organization %>
<div class="row">
<div class="col-md-9">
<div class="biography mb-5">
<p><%= @organization.text %></p>
<div class="col-md-8 order-2 order-md-1">
<div class="row">
<div class="col-md-9">
<div class="biography mb-5">
<p><%= @organization.text %></p>
</div>
</div>
</div>
<div class="experiences">
<p class="mb-4"><%= t('extranet.organization.experiences', count: @organization.experiences.count) %></p>
<ul class="list-unstyled">
<% if @organization.experiences.any? %>
<div class="experiences">
<p class="mb-4"><%= t('extranet.organization.experiences', count: @organization.experiences.count) %></p>
<ul class="list-unstyled">
<% @organization.experiences.ordered.each do |experience| %>
<li class="mb-3">
<div>
<%= link_to experience.person do %>
<% if experience.person.picture.attached? %>
<%= kamifusen_tag experience.person.picture, width: 200, class: 'img-fluid' %>
<% else %>
<%= image_tag 'extranet/avatar.png', width: 200, class: 'img-fluid' %>
<% end %>
<% end %>
</div>
<div>
<p><b><%= experience.person.name %></b></p>
<p>
<% if experience.description.present? %>
<%= experience.description %><br>
<% end %>
<%= "#{experience.from_year} —" if experience.from_year %>
<%= experience.to_year || t('today') %>
</p>
</div>
</li>
<% end %>
</ul>
</div>
<li class="mb-4">
<article class="row position-relative">
<div class="col-md-3">
<% if experience.person.picture.attached? %>
<%= kamifusen_tag experience.person.picture, width: 400, class: 'img-fluid' %>
<% else %>
<%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid' %>
<% end %>
</div>
<div class="col-md-9 ms-md-n4">
<div class="border-top">
<div class="row pt-4">
<div class="col-md-6">
<p><b><%= link_to experience.person.name, experience.person, class: "stretched-link" %></b></p>
</div>
<div class="col-md-6">
<p class="text-end">
<% if experience.description.present? %>
<%= experience.description %><br>
<% end %>
<%= "#{experience.from_year} —" if experience.from_year %>
<%= experience.to_year || t('today') %>
</p>
</div>
</div>
</div>
</div>
</article>
</li>
<% end %>
</ul>
</div>
<% end %>
</div>
<div class="col-md-3">
<div class="offset-md-1 col-md-3 order-1 order-md-2">
<%= kamifusen_tag @organization.logo, width: 400, class: 'img-fluid organization__logo' if @organization.logo.attached? %>
<dl>
......
app/views/extranet/persons/_person.html.erb
+ 3
− 3
View file @ f047412e
<article class="mb-4 person">
<div class="row g-3">
<div class="col-3 col-md-12 mb-2">
<article class="person mb-4">
<div class="row gx-3">
<div class="col-3 col-md-12 mb-md-2">
<% if person.best_picture.attached? %>
<%= kamifusen_tag person.best_picture, width: 400, class: 'img-fluid',
sizes: {
......
app/views/extranet/persons/show.html.erb
+ 6
− 6
View file @ f047412e
<% content_for :title, @person %>
<div class="row">
<div class="col-md-8">
<div class="col-md-8 order-2 order-md-1">
<div class="row">
<div class="col-md-9">
<div class="biography mb-5">
......@@ -9,12 +9,12 @@
</div>
</div>
</div>
<p class="mb-4"><%= t('extranet.experiences.title') %></p>
<%= render 'extranet/experiences/list', person: @person %>
<% if @person.experiences.any? %>
<p class="mb-4"><%= t('extranet.experiences.title') %></p>
<%= render 'extranet/experiences/list', person: @person %>
<% end %>
</div>
<div class="offset-md-1 col-md-3">
<div class="offset-md-1 col-md-3 order-1 order-md-2">
<%= kamifusen_tag @person.best_picture, width: 400, class: 'img-fluid person__portrait' if @person.best_picture.attached? %>
<%= render 'extranet/persons/details', person: @person %>
</div>
......
app/views/layouts/devise.html.erb
+ 1
− 1
View file @ f047412e
......@@ -7,7 +7,7 @@
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<%= stylesheet_link_tag 'admin', media: 'all' %>
<%= javascript_include_tag 'admin' %>
<%= javascript_include_tag 'devise' %>
<%= favicon_link_tag 'favicon.png' %>
</head>
<body class="<%= body_classes %>">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment