some layout changes

xronos-ch · Dec 14, 2024 · 64c8460 · 64c8460
1 parent 509bd45
commit 64c8460
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 51 deletions.
diff --git a/app/views/sites/show.html.erb b/app/views/sites/show.html.erb
@@ -65,10 +65,12 @@
         </div>
       </div>
   </section>
-
-  <section id="site-external-links" class="bg-light">
-    <div class="container my-5">
-      <h2>Linked data</h2>
+
+  <section id="site-external-links" class="bg-white my-5">
+      <div class="card border-0 shadow-sm">
+        <div class="card-header bg-white text-muted">
+          <h3 class="mb-0">
+            <i class="bi-link-45deg"></i> Linked Data</h3>
       <% if @site.wikidata_link.present? %>
         <% if can? :manage, WikidataLink %>
           <%= floating_button edit_wikidata_link_path(@site.wikidata_link),
@@ -89,7 +91,6 @@
           </ul>
         <% end %>
       <% end %>
-    </div>
   </section>
 
   <% unless @c14s.nil? %>

diff --git a/app/views/wikidata_links/_wikidata_link.html.erb b/app/views/wikidata_links/_wikidata_link.html.erb
@@ -1,57 +1,57 @@
 <% item = @wikidata_link.item %>
 
 <%= turbo_frame_tag @wikidata_link do %>
-  <div class="row">
-
-    <div class="col-lg">
-      <dl>
-
-        <div class="row my-2">
-          <dt class="col-sm">
-            <%= simple_icon "wikidata" %>
-            Wikidata
-          </dt>
-          <dd class="col-sm text-sm-end">
-            <%= link_to @wikidata_link.qcode, @wikidata_link.url, title: "#{@wikidata_link.title} - Wikidata" %>
-            <% if item.present? %>(<%= item.label("en") %>)<% end %>
-          </dd>
-        </div>
-
-        <% if item.present? %>
-
-          <% if item.sitelink_url("enwiki").present? %>
+<div class="card-body">
+      <div class="row">
+        <div class="col-lg">
+          <dl>
             <div class="row my-2">
               <dt class="col-sm">
-                <%= simple_icon "wikipedia" %>
-                Wikipedia 
+                <%= simple_icon "wikidata" %>
+                Wikidata
               </dt>
               <dd class="col-sm text-sm-end">
-                <span class="badge text-bg-info">en</span>
-                <%= link_to item.sitelink_title("enwiki"), item.sitelink_url, title: "#{item.sitelink_title} - Wikipedia" %>
+                <%= link_to @wikidata_link.qcode, @wikidata_link.url, title: "#{@wikidata_link.title} - Wikidata" %>
+                <% if item.present? %>(<%= item.label("en") %>)<% end %>
               </dd>
             </div>
-          <% end %>
 
-          <% if item.sitelink_url("commonswiki").present? %>
-            <div class="row my-2">
-              <dt class="col-sm">
-                <%= simple_icon "wikimediacommons" %>
-                Wikimedia Commons
-              </dt>
-              <dd class="col-sm text-sm-end"><%= link_to item.sitelink_title("commonswiki"), item.sitelink_url("commonswiki"), title: "#{item.sitelink_title('commonswiki')} - Wikimedia Commons" %></dd>
-            </div>
-          <% end %>
+            <% if item.present? %>
+              <% if item.sitelink_url("enwiki").present? && item.sitelink_title("enwiki").present? %>
+                <div class="row my-2">
+                  <dt class="col-sm">
+                    <%= simple_icon "wikipedia" %>
+                    Wikipedia
+                  </dt>
+                  <dd class="col-sm text-sm-end">
+                    <span class="badge text-bg-info">en</span>
+                    <%= link_to item.sitelink_title("enwiki"), item.sitelink_url("enwiki"), title: "#{item.sitelink_title('enwiki')} - Wikipedia" %>
+                  </dd>
+                </div>
+              <% end %>
+
+              <% if item.sitelink_url("commonswiki").present? && item.sitelink_title("commonswiki").present? %>
+                <div class="row my-2">
+                  <dt class="col-sm">
+                    <%= simple_icon "wikimediacommons" %>
+                    Wikimedia Commons
+                  </dt>
+                  <dd class="col-sm text-sm-end">
+                    <%= link_to item.sitelink_title("commonswiki"), item.sitelink_url("commonswiki"), title: "#{item.sitelink_title('commonswiki')} - Wikimedia Commons" %>
+                  </dd>
+                </div>
+              <% end %>
+            <% end %>
+          </dl>
+        </div>
 
+        <% if item.wikipedia_extract.present? %>
+          <div class="col-lg">
+            <div class="alert alert-light shadow-sm">
+              <%= render item.wikipedia_extract %>
+            </div>
+          </div>
         <% end %>
-
-      </dl>
-    </div>
-
-    <% if item.wikipedia_extract.present? %>
-      <div class="col-lg">
-        <%= render item.wikipedia_extract %>
       </div>
-    <% end %>
-
-  </div>
+    </div>
 <% end %>
diff --git a/app/views/wikipedia_extracts/_wikipedia_extract.html.erb b/app/views/wikipedia_extracts/_wikipedia_extract.html.erb
@@ -1,6 +1,6 @@
 <figure>
-  <blockquote class="blockquote text-muted"><%= wikipedia_extract.text %></blockquote>
-  <figcaption class="blockquote-footer">
-    from <a href="<%= wikipedia_extract.url %>" target="_blank">Wikipedia</a>, the free encyclopaedia
+  <blockquote class="blockquote text-muted"><small>&laquo;<%= wikipedia_extract.text %>&raquo;</small></blockquote>
+  <figcaption class="blockquote-footer text-end">
+    from <cite title="Source Title"><a href="<%= wikipedia_extract.url %>" target="_blank">Wikipedia</a>, the free encyclopaedia</cite>
   </figcaption>
 </figure>