Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/models/communication/website.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ class Communication::Website < ApplicationRecord
include WithScreenshot
include WithSecurity
include WithShowcase
include WithStatusBadge
include WithStyle
include WithTheme
include WithTimeZone
Expand Down
11 changes: 11 additions & 0 deletions app/models/communication/website/with_status_badge.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module Communication::Website::WithStatusBadge
extend ActiveSupport::Concern

def status_badge?
kelmscott_active? || deployment_status_badge.present?
end

def status_badge_url
kelmscott_active? ? kelmscott_badge_url : deployment_status_badge
end
end
38 changes: 18 additions & 20 deletions app/views/admin/communication/websites/show/_badge.html.erb
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
<% if website.repository.present? %>
<ul class="list-unstyled list-inline">
<% if website.kelmscott_active? %>
<li class="list-inline-item">
<%= image_tag website.kelmscott_badge_url, alt: '' %>
</li>
<% if can?(:kelmscott_publish, website) %>
<% if website.status_badge? %>
<li class="list-inline-item">
<%= link_to t('admin.communication.website.kelmscott_publish.button'),
kelmscott_publish_admin_communication_website_path(website),
method: :post,
class: 'action' %>
<%= image_tag website.status_badge_url, alt: '' %>
</li>
<% end %>
<% if website.kelmscott_active? %>
<% if can?(:kelmscott_publish, website) %>
<li class="list-inline-item">
<%= link_to t('admin.communication.website.kelmscott_publish.button'),
kelmscott_publish_admin_communication_website_path(website),
method: :post,
class: 'action' %>
</li>
<% end %>
<li class="list-inline-item">
<%= link_to t('admin.communication.website.kelmscott_publish.show_logs'),
website.kelmscott_url,
target: :_blank,
class: 'action' %>
</li>
<% end %>
<li class="list-inline-item">
<%= link_to t('admin.communication.website.kelmscott_publish.show_logs'),
website.kelmscott_url,
target: :_blank,
class: 'action' %>
</li>
<% elsif website.deployment_status_badge.present? %>
<li class="list-inline-item">
<%= image_tag website.deployment_status_badge, alt: '' %>
</li>
<% end %>
<li class="list-inline-item">
<%= link_to t('admin.communication.website.show_repository'),
website.repository_url,
Expand Down
3 changes: 1 addition & 2 deletions app/views/server/websites/_list.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
target: :_blank,
class: 'action' if website.repository.present? %>
</td>
<td><%= image_tag website.deployment_status_badge,
alt: '' if website.deployment_status_badge.present? %></td>
<td><%= image_tag website.status_badge_url, alt: '' if website.status_badge? %></td>
<td class="js-version">
<%= website.theme_version %>
<%= link_to t('server_admin.websites.buttons.theme.sync'),
Expand Down
Loading