X-Git-Url: http://git.draconx.ca/gitweb/homepage.git/blobdiff_plain/1dc021529f88ca4f1ebfed76ffe6378272a23032..79dfd09162d1c4e201eccec188057c0e9ded2260:/layouts/default.xml

diff --git a/layouts/default.xml b/layouts/default.xml
index 901b0c3..949290a 100644
--- a/layouts/default.xml
+++ b/layouts/default.xml
@@ -2,7 +2,7 @@
 <!--
   Nick's web site: Intermediate document structure.
 
-  Copyright Â© 2016-2018 Nick Bowler
+  Copyright Â© 2016-2020 Nick Bowler
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,17 +17,65 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <https://www.gnu.org/licenses/>
 -->
-<document>
-  <title><%= @item[:title] %></title>
-  <source>
+<%
+  doc_str = yield()
+  doc = Nokogiri::XML(sprintf("<html xmlns='%s'>%s</html>",
+                              Xmlns['xhtml'], doc_str))
+
+  doc_header = nil
+  if !doc.xpath("//xhtml:h1", Xmlns).empty? then
+    doc_header = doc.xpath("string(//xhtml:h1)", Xmlns)
+  end
+%><document>
+  <title><%= @item.fetch(:title, doc_header) %></title>
+<% [@item.fetch(:copyright, [])].flatten.each do |copyright|
+%>  <copyright><%= copyright %></copyright>
+<% end
+  if @item[:license] then
+    licref = @item[:license].split
+    lic = find_license(licref[0])
+%>  <license>
+    <identifier><%= File::basename(lic.identifier.without_ext) %></identifier>
+    <name><%= [lic[:title], licref[1..-1]].compact.join(" ").strip %></name>
+    <uri><%= item_uri(lic) %></uri>
+    <modification-allowed><%=
+      lic[:"modification-allowed"] == true ? "yes" : "no"
+    %></modification-allowed>
+  </license>
+<% end
+%>  <source>
+<% if @item.raw_filename %>
     <file><%= item_source(@item) %></file>
-    <revision><%= item.fetch(:gitrev) %></revision>
+<% elsif File.basename(@item.identifier) == "index.lst" %>
+    <dir><%= "content" + File.dirname(@item.identifier) %></dir>
+<% end %>
+    <revision><%= @item.fetch(:gitrev) %></revision>
     <compiletime><%=
       Time.now.gmtime.strftime "%Y-%m-%d %H:%M UTC"
     %></compiletime>
   </source>
-  <html xmlns="http://www.w3.org/1999/xhtml">
-    <h1><%= @item.fetch(:header, @item[:title]) %></h1>
-    <%= yield() %>
-  </html>
+  <hierarchy><% breadcrumbs_trail().compact.each do |item|
+    next if item == @item || item[:"breadcrumb-ignore"] %>
+    <parent>
+      <name><%=
+        if item == @items["/index.*"] then
+          "Entrance"
+        else
+          item[:title]
+        end
+      %></name>
+      <uri><%= item_uri(item) %></uri>
+    </parent><% end %>
+  </hierarchy>
+<% if @item[:kind] == "article" then
+%>  <article>
+<%= attribute_to_time(@item[:published]).strftime \
+"    <published>%Y-%m-%d</published>\n" if @item[:published]
+%>  </article>
+<% end
+%>  <html xmlns="<%= Xmlns['xhtml'] %>">
+<% if !doc_header then
+%>    <h1><%= @item.fetch(:header, @item[:title]) %></h1>
+<% end %><%= doc_str
+%>  </html>
 </document>
