From 249714ee10b5b9684fd2521589e9ec9a148c14cb Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Wed, 1 Jan 2020 22:09:37 +0100
Subject: [PATCH] Small simplification to events and orga display
---
app/views/events/show.html.haml | 3 ---
app/views/orgas/show.html.haml | 7 +++++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index 4b15ed394..29c2eed51 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -12,8 +12,6 @@
= render 'aside' if [controller_name, action_name] == %w[events show]
-%h3= t '.dateAndPlace'
-
%p= display_date @event
%p.full_address
@@ -38,7 +36,6 @@
href: 'https://osm.org/search?query=' + @event.full_address }
= image_tag 'osm_logo.svg', alt: 'OSM logo', width: '32px'
-%h3= Event.human_attribute_name :description
.description
= description sanitize @event.description,
tags: %w[p h1 h2 h3 h4 br table tr th td ul ol li a strong b em i img sub sup span],
diff --git a/app/views/orgas/show.html.haml b/app/views/orgas/show.html.haml
index 4d9a609ec..19b13688b 100644
--- a/app/views/orgas/show.html.haml
+++ b/app/views/orgas/show.html.haml
@@ -7,7 +7,7 @@
= title @orga.name
= render partial: '/orgas/favicon', locals: { orga: @orga }
-= render 'aside' if controller.controller_name == 'orgas'
+= render 'aside' if [controller_name, action_name] == %w[orgas show]
%p.full_address
- if @orga.place_name.present?
@@ -23,13 +23,16 @@
.orga#map{ data: { url: maps_path(format: :json).to_s,
latitude: @orga.latitude.to_s, longitude: @orga.longitude.to_s } }
-%h3= Orga.human_attribute_name :description
.description
= description sanitize @orga.description,
tags: %w[p h1 h2 h3 h4 br table tr th td ul ol li a strong b em i img sub sup span],
attributes: %w[href src width height style title]
%dl
+ %dd
+ %h3
+ %em.fa.fa-info-circle
+ = t '.infos'
- if @orga.department.present?
%dt.department
%em.fa.fa-puzzle-piece
--
GitLab