From ce665e0ee21dec786be958f1d0ef5dbef74b7a03 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Tue, 24 Jan 2023 12:09:11 +0100
Subject: [PATCH] fix organizations form
---
.../university/organizations/_form.html.erb | 165 ++++++++----------
1 file changed, 77 insertions(+), 88 deletions(-)
diff --git a/app/views/admin/university/organizations/_form.html.erb b/app/views/admin/university/organizations/_form.html.erb
index 2332c6f6e..213edbf43 100644
--- a/app/views/admin/university/organizations/_form.html.erb
+++ b/app/views/admin/university/organizations/_form.html.erb
@@ -3,99 +3,88 @@
<%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
<div class="row">
- <div class="col-md-8">
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h5 class="card-title mb-0"><%= t('content') %></h5>
- </div>
- <div class="card-body">
- <%= f.input :name %>
- <%= render 'admin/application/summary/form', f: f, about: organization %>
- <%= f.input :text,
- as: :summernote,
- input_html: {
- data: { 'summernote-config' => 'mini-list' }
- } %>
- </div>
- </div>
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h5 class="card-title mb-0">
- <%= University::Organization.human_attribute_name('contact') %>
- </h5>
- </div>
- <div class="card-body">
- <div class="row">
- <div class="col-md-6">
- <%= f.input :address %>
- <%= f.input :zipcode %>
- <%= f.input :city %>
- <%= f.input :country, input_html: { class: 'form-select' } %>
- </div>
- <div class="col-md-6">
- <%= f.input :url %>
- <%= f.input :phone %>
- <%= f.input :email %>
- <%= f.input :linkedin %>
- <%= f.input :twitter %>
- <%= f.input :mastodon %>
- </div>
+ <div class="col-xl-8">
+ <%= osuny_panel t('content') do %>
+ <%= f.input :name %>
+ <%= render 'admin/application/summary/form', f: f, about: organization %>
+ <%= f.input :text,
+ as: :summernote,
+ input_html: {
+ data: { 'summernote-config' => 'mini-list' }
+ } %>
+ <% end %>
+ <%= osuny_panel University::Organization.human_attribute_name('contact') do %>
+ <div class="row pure__row--small">
+ <div class="col-xl-6">
+ <%= f.input :address %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :zipcode %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :city %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :country, input_html: { class: 'form-select' } %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :url %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :phone %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :email %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :linkedin %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :twitter %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :mastodon %>
</div>
</div>
- </div>
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h5 class="card-title mb-0">
- <%= University::Organization.human_attribute_name('legal') %>
- </h5>
- </div>
- <div class="card-body">
- <div class="row">
- <div class="col-md-6">
- <%= f.input :long_name %>
- </div>
- <div class="col-md-6">
- <%= f.input :kind, include_blank: false %>
- <%= f.input :siren %>
- </div>
+ <% end %>
+ <%= osuny_panel University::Organization.human_attribute_name('legal') do %>
+ <div class="row pure__row--small">
+ <div class="col-xl-6">
+ <%= f.input :long_name %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :kind, include_blank: false %>
+ </div>
+ <div class="col-xl-6">
+ <%= f.input :siren %>
</div>
</div>
- </div>
+ <% end %>
</div>
- <div class="col-md-4">
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h5 class="card-title mb-0"><%= t('informations') %></h5>
- </div>
- <div class="card-body">
- <%= f.input :slug,
- as: :string,
- input_html: organization.persisted? ? {} : {
- class: 'js-slug-input',
- data: { source: '#university_organization_name' }
- } %>
- <%= f.input :active %>
- </div>
- </div>
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h5 class="card-title mb-0"><%= t 'university.organization.logo' %></h5>
- </div>
- <div class="card-body">
- <%= f.input :logo,
- as: :single_deletable_file,
- input_html: { accept: '.jpg,.jpeg,.png,.svg' },
- preview: 200,
- resize: false,
- direct_upload: true %>
- <%= f.input :logo_on_dark_background,
- as: :single_deletable_file,
- input_html: { accept: '.jpg,.jpeg,.png,.svg' },
- preview: 200,
- resize: false,
- direct_upload: true %>
- </div>
- </div>
+ <div class="col-xl-4">
+ <%= osuny_panel University::Organization.human_attribute_name('legal') do %>
+ <%= f.input :slug,
+ as: :string,
+ input_html: organization.persisted? ? {} : {
+ class: 'js-slug-input',
+ data: { source: '#university_organization_name' }
+ } %>
+ <%= f.input :active %>
+ <% end %>
+ <%= osuny_panel University::Organization.human_attribute_name('legal') do %>
+ <%= f.input :logo,
+ as: :single_deletable_file,
+ input_html: { accept: '.jpg,.jpeg,.png,.svg' },
+ preview: 200,
+ resize: false,
+ direct_upload: true %>
+ <%= f.input :logo_on_dark_background,
+ as: :single_deletable_file,
+ input_html: { accept: '.jpg,.jpeg,.png,.svg' },
+ preview: 200,
+ resize: false,
+ direct_upload: true %>
+ <% end %>
<%= render 'admin/application/meta_description/form', f: f, about: organization %>
</div>
</div>
--
GitLab