ttl2html 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536529ac6440329179bab71d30e570dc92efb464526f5a0a019c59823f67098c
-  data.tar.gz: 4f251ed59bc227e77f80fe3ea88ea1e14e99c10ece1bb7b156d0b19f98518663
+  metadata.gz: 7971e142aa8344f4ef07bea779f430a94a986014768c1876dcb4ab0e56c0c788
+  data.tar.gz: aa5cca9ebcc358b4f2697f68a86ce2edf998f83bbe4c67e2c11512cdf2a7e5f6
 SHA512:
-  metadata.gz: 7e760bdb6848470e2e2327803e7f527684fa8e703f053cd0fda5eadc374bcaa7aeb837064f018a353f2e7c80b4845994db26106c8b139cdde9bf4e6c501f1254
-  data.tar.gz: 7cb13bd5ae523ef8ac62c843f27f1ce5f65efd70e035c35f35b6062e104b5c89e87d19c8ac4e7778ca0ce6b9881e1bbca92c5c34cda37793cc96add9679d66ff
+  metadata.gz: 7f1d25cb74cdbbf69b6b7826edcdea833bc9286f9035a03a85c4f925553364da6c7a1f2713da767a75076a4c8ebc3ac064e639e04ed0c5625607f96cc2a52254
+  data.tar.gz: 04435256e3234d30eb7942e64a627cb6bf3e32dbe8e440f2f69711a62da4c14fc5d222d9cddc56bc11eebcd3708c8e27ea1ca0bd31e570b8be3654e8adac1eab

data/lib/ttl2html/template.rb

@@ -160,8 +160,12 @@ module TTL2HTML
     end
     def html_title(param)
       titles = []
-      titles << param[:title]
-      titles << param[:site_title]
+      if @template.start_with? "about.html"
+        titles << t("about.title", title: param[:site_title])
+      else
+        titles << param[:title]
+        titles << param[:site_title]
+      end
       titles.compact.join(" - ")
     end
     def shorten_title(title, length = 140)

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "1.3.2"
+TTL2HTML::VERSION = "1.3.3"

data/lib/ttl2html.rb

@@ -321,10 +321,29 @@ module TTL2HTML
           license[:icon] = license_data["http://xmlns.com/foaf/0.1/thumbnail"]&.first
           license[:label] = license_data["http://www.w3.org/2000/01/rdf-schema#label"]
         end
+        if data["http://purl.org/dc/terms/publisher"]
+          publisher_data = @data[data["http://purl.org/dc/terms/publisher"].first]
+          email = publisher_data["http://xmlns.com/foaf/0.1/mbox"]&.first
+          contact = { email: email }
+          name = publisher_data["http://xmlns.com/foaf/0.1/name"]
+          contact[:name] = name if name
+          members = []
+          if publisher_data["http://xmlns.com/foaf/0.1/member"]
+            publisher_data["http://xmlns.com/foaf/0.1/member"].each do |member|
+              member_data = @data[member]
+              members << {
+                name: member_data["http://xmlns.com/foaf/0.1/name"],
+                org: member_data["http://www.w3.org/2006/vcard/ns#organization-name"]
+              }
+            end
+            contact[:members] = members
+          end
+        end
         result = {
           uri: toplevel.to_s,
           description: data["http://purl.org/dc/terms/description"],
           license: license,
+          contact: contact,
         }
       end
       result

data/locales/en.yml

@@ -6,6 +6,9 @@ en:
     versions: Versions
     version-release: "Version %{version} released."
     version-triples: "%{triples} triples"
+    contact: Contact
+    contact-contribution: "This dataset was developed by %{name}"
+    contact-email: "For dataset inquiries, please contact at <a href=\"%{email}\">%{email}</a>"
   default:
     details: Details
     inverse_data: Referred resources

data/locales/ja.yml

@@ -5,6 +5,9 @@ ja:
     versions: 更新履歴
     version-release: "バージョン%{version}を公開。"
     version-triples: "%{triples}トリプル"
+    contact: 連絡先
+    contact-contribution: "本データセットは %{name} が開発したものです"
+    contact-email: "データセットに関する問い合わせは <a href=\"%{email}\">%{email}</a> までお問い合わせください。"
   default:
     details: 詳細情報
     inverse_data: 被参照情報

data/templates/about.html.erb

@@ -41,4 +41,27 @@
         </div>
       </div>
       <%- end -%>
+      <%- if param[:toplevel] and param[:toplevel][:contact] -%>
+      <div class="row">
+        <div class="col-md">
+          <h2 id="contact"><%=h t("about.contact") %></h2>
+          <%- if param[:toplevel][:contact][:name] -%>
+          <p><%=h t("about.contact-contribution", name: get_language_literal(param[:toplevel][:contact][:name])) %></p>
+          <%- end -%>
+          <%- if param[:toplevel][:contact][:members] -%>
+          <ul>
+          <%- param[:toplevel][:contact][:members].each do |member| -%>
+            <li><%=h get_language_literal(member[:name]) %>
+            <%- if member[:org] -%>
+            (<%=h get_language_literal(member[:org]) %>)
+            <%- end -%>
+          <%- end -%>
+          </ul>
+          <%- end -%>
+          <%- if param[:toplevel][:contact][:email] -%>
+          <p><%= t("about.contact-email", email: param[:toplevel][:contact][:email]) %></p>
+          <%- end -%>
+        </div>
+      </div>
+      <%- end -%>
     </div>

data/templates/layout.html.erb

@@ -6,22 +6,31 @@
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
+    <%- if param[:css_file] -%>
+    <link rel="stylesheet" href="<%=h relative_path(param[:css_file]) %>">
+    <%- end -%>
+    <%- if param[:custom_css] -%>
+    <style type="text/css"><%=h param[:custom_css] %></style>
+    <%- end -%>
     <title><%=h html_title(param) %></title>
     <meta name="twitter:card" content="summary">
     <meta name="twitter:title" content="<%=h html_title(param) %>">
   </head>
   <body>
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+    <nav class="navbar navbar-expand-lg navbar-light">
+      <%- if param[:logo] -%>
+      <a class="navbar-brand" href="/"><img src="<%=h relative_path(param[:logo]) %>" height="30"></a>
+      <%- end -%>
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
-          <li class="nav-item<%= ' class="active"' if param[:active] == :home %>">
-            <a class="navbar-brand" href="/">Home</a>
+          <li class="nav-item<%= ' active' if @template == "index.html.erb" %>">
+            <a class="nav-link" href="/">Home</a>
           </li>
-          <li class="nav-item<%= ' class="active"' if param[:active] == :about %>">
-            <a class="navbar-brand" href="/about">About</a>
+          <li class="nav-item<%= ' active' if @template == "about.html.erb" %>">
+            <a class="nav-link" href="/about">About</a>
           </li>
         </ul>
       </div>
@@ -30,7 +39,15 @@
     <hr>
     <footer>
       <%- if param[:uri] -%>
-      <p class="text-right"><a href="<%=h relative_path(param[:turtle_uri]) %>"><img src="https://www.w3.org/RDF/icons/rdf_flyer.24" alt="<%=h t("layout.rdf-data") %>"></a></p>
+      <p class="float-right"><a href="<%=h relative_path(param[:turtle_uri]) %>"><img src="https://www.w3.org/RDF/icons/rdf_flyer.24" alt="<%=h t("layout.rdf-data") %>"></a></p>
+      <%- end -%>
+      <%- if param[:admin_name] -%>
+      <p>
+        <%- if param[:copyright_year] -%>
+        &copy; <%=h param[:copyright_year] %>
+        <%- end -%>
+        <%=h param[:admin_name] %>
+      </p>
       <%- end -%>
     </footer>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Masao Takaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri