From 9eeed489eb7cc272978decd1c837779ceff45772 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Sat, 23 Oct 2021 17:27:09 +0200
Subject: [PATCH] better layout
---
.../admin/communication/application_controller.rb | 9 +++++++--
.../communication/website/application_controller.rb | 5 -----
.../admin/communication/websites_controller.rb | 6 ------
app/views/admin/communication/websites/show.html.erb | 5 +++--
app/views/admin/layouts/application.html.erb | 1 +
5 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/app/controllers/admin/communication/application_controller.rb b/app/controllers/admin/communication/application_controller.rb
index f9e5ff572..0468b4e77 100644
--- a/app/controllers/admin/communication/application_controller.rb
+++ b/app/controllers/admin/communication/application_controller.rb
@@ -1,6 +1,11 @@
class Admin::Communication::ApplicationController < Admin::ApplicationController
def breadcrumb
- super
- add_breadcrumb Communication.model_name.human
+ if @website
+ short_breadcrumb
+ breadcrumb_for @website
+ else
+ super
+ add_breadcrumb Communication.model_name.human
+ end
end
end
diff --git a/app/controllers/admin/communication/website/application_controller.rb b/app/controllers/admin/communication/website/application_controller.rb
index 351e872c3..7c1f26e8b 100644
--- a/app/controllers/admin/communication/website/application_controller.rb
+++ b/app/controllers/admin/communication/website/application_controller.rb
@@ -3,11 +3,6 @@ class Admin::Communication::Website::ApplicationController < Admin::Communicatio
protected
- def breadcrumb
- short_breadcrumb
- breadcrumb_for @website, website_id: nil
- end
-
def default_url_options
return {} unless params.has_key? :website_id
{
diff --git a/app/controllers/admin/communication/websites_controller.rb b/app/controllers/admin/communication/websites_controller.rb
index 4a96cf0be..84a2eb91c 100644
--- a/app/controllers/admin/communication/websites_controller.rb
+++ b/app/controllers/admin/communication/websites_controller.rb
@@ -60,12 +60,6 @@ class Admin::Communication::WebsitesController < Admin::Communication::Applicati
protected
- def breadcrumb
- super
- add_breadcrumb Communication::Website.model_name.human(count: 2), admin_communication_websites_path
- breadcrumb_for @website
- end
-
def website_params
params.require(:communication_website).permit(:name, :domain, :repository, :access_token, :about_type, :about_id)
end
diff --git a/app/views/admin/communication/websites/show.html.erb b/app/views/admin/communication/websites/show.html.erb
index 4b9d3c502..50efde949 100644
--- a/app/views/admin/communication/websites/show.html.erb
+++ b/app/views/admin/communication/websites/show.html.erb
@@ -1,8 +1,9 @@
<% content_for :title, @website %>
-<p>
+<% content_for :title_right do %>
<%= link_to @website.domain_url, @website.domain_url, target: :_blank %>
-</p>
+<% end %>
+
<p>
<%= I18n.t("activerecord.attributes.communication/website.about_#{@website.about_type}") %>
diff --git a/app/views/admin/layouts/application.html.erb b/app/views/admin/layouts/application.html.erb
index f0cef5d55..003a54d20 100644
--- a/app/views/admin/layouts/application.html.erb
+++ b/app/views/admin/layouts/application.html.erb
@@ -31,6 +31,7 @@
<%= render 'admin/application/top' %>
<main class="content">
<div class="container-fluid p-0">
+ <p class="float-end pt-2"><%= yield :title_right %></p>
<h1><%= yield :title %></h1>
<%= yield %>
</div>
--
GitLab