diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb index 0bf9b39919ba15414a0903b9607c934194726eae..a2a437a7686688de9cc98168010cb3f72c58fee8 100644 --- a/app/controllers/admin/university/organizations_controller.rb +++ b/app/controllers/admin/university/organizations_controller.rb @@ -61,7 +61,7 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio params.require(:university_organization) .permit( :name, :long_name, :slug, :description, :active, :sirene, :kind, - :address, :zipcode, :city, :country, + :address, :zipcode, :city, :country, :text, :url, :phone, :email, :logo, :logo_delete ) end diff --git a/app/views/admin/university/organizations/_form.html.erb b/app/views/admin/university/organizations/_form.html.erb index 26ec8a20f2b35fbec887f943185827efd7d6420c..79afc2abb2d1a72863101caa20adbe5452061d85 100644 --- a/app/views/admin/university/organizations/_form.html.erb +++ b/app/views/admin/university/organizations/_form.html.erb @@ -1,49 +1,89 @@ <%= simple_form_for [:admin, organization] do |f| %> <div class="row"> - <div class="col-md-6"> + <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 %> + <%= f.input :description %> + <%= f.input :text, as: :summernote %> + </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 %> + </div> + <div class="col-md-6"> + <%= f.input :url %> + <%= f.input :phone %> + <%= f.input :email %> + </div> + </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 :sirene %> + </div> + </div> + </div> + </div> + </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 :long_name %> - <%= f.input :kind, include_blank: false %> <%= f.input :active %> - <%= f.input :sirene %> - <%= f.input :description %> - <%= f.input :logo, - as: :single_deletable_file, - input_html: { accept: '.jpg,.jpeg,.png,.svg' }, - preview: 200, - resize: 1, - direct_upload: true %> </div> </div> - </div> - <div class="col-md-6"> <div class="card flex-fill w-100"> <div class="card-header"> <h5 class="card-title mb-0"> - <%= University::Organization.human_attribute_name('contact_informations') %> + <%= University::Organization.human_attribute_name('logo') %> </h5> </div> <div class="card-body"> - <%= f.input :address %> - <%= f.input :zipcode %> - <%= f.input :city %> - <%= f.input :country %> - <%= f.input :url %> - <%= f.input :phone %> - <%= f.input :email %> + <%= f.input :logo, + as: :single_deletable_file, + label: false, + input_html: { accept: '.jpg,.jpeg,.png,.svg' }, + preview: 200, + resize: 1, + direct_upload: true %> </div> </div> + </div> </div> <% content_for :action_bar_right do %> diff --git a/app/views/admin/university/organizations/static.html.erb b/app/views/admin/university/organizations/static.html.erb index 4145cbf6a18281a20a9eccf3616b8dd01314597f..23a054ad3afe176f78d9216f810c8fa6e17e2765 100644 --- a/app/views/admin/university/organizations/static.html.erb +++ b/app/views/admin/university/organizations/static.html.erb @@ -19,3 +19,4 @@ logo: "<%= @about.logo.blob.id %>" description: > <%= prepare_text_for_static @about.description %> --- +<%= prepare_html_for_static @about.text, @about.university %> diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml index c6bde4b0abbbe3c786309fe985f13507c6aee6f6..c1c51b8b236ea5ab0e15ccd5f3f5321bf9132b2a 100644 --- a/config/locales/university/en.yml +++ b/config/locales/university/en.yml @@ -49,6 +49,18 @@ en: name: Name long_name: Long name description: Description (SEO) + text: Text + contact: Contact information + legal: Legal information + address: Address + zipcode: Zipcode + city: City + country: Country + url: Website + phone: Telephone + email: Email + kind: Kind + sirene: Legal identification number university/organization/import: file: File (.csv) university/role: diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml index 7d9c2c564b567871da0ae85e913c714dbdc96e72..83d0e3e8359af3f591e562afd8e5213f72df9615 100644 --- a/config/locales/university/fr.yml +++ b/config/locales/university/fr.yml @@ -50,6 +50,18 @@ fr: name: Nom long_name: Nom complet description: Description (SEO) + text: Texte + contact: Informations de contact + legal: Informations légales + address: Adresse + zipcode: Code postal + city: Ville + country: Pays + url: Site Web + phone: Téléphone + email: Email + kind: Type + sirene: Numéro de SIRENE university/organization/import: file: Fichier (.csv) university/role: