X-Git-Url: https://git.draconx.ca/gitweb/homepage.git/blobdiff_plain/79dfd09162d1c4e201eccec188057c0e9ded2260..HEAD:/layouts/default.xml

diff --git a/layouts/default.xml b/layouts/default.xml
index 949290a..2f78b3d 100644
--- a/layouts/default.xml
+++ b/layouts/default.xml
@@ -2,7 +2,7 @@
 <!--
   Nick's web site: Intermediate document structure.
 
-  Copyright Â© 2016-2020 Nick Bowler
+  Copyright Â© 2016-2022 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
@@ -27,23 +27,16 @@
     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>
+  <title><%= @item.fetch(:title, doc_header) %></title><%=
+render '/copyright.xml' %><%
+find_images.each do |item| %>
+  <image>
+    <title><%= item[:attrname] || item[:title] %></title>
+    <uri><%= item_uri(item, rep: :info) %></uri><%=
+render '/copyright.xml', :item => item, :indent => 4
+%>  </image><%
+end %>
+  <source>
 <% if @item.raw_filename %>
     <file><%= item_source(@item) %></file>
 <% elsif File.basename(@item.identifier) == "index.lst" %>
@@ -71,9 +64,13 @@
 %>  <article>
 <%= attribute_to_time(@item[:published]).strftime \
 "    <published>%Y-%m-%d</published>\n" if @item[:published]
+%><%= attribute_to_time(@item[:updated]).strftime \
+"    <updated>%Y-%m-%d</updated>\n" if @item[:updated]
 %>  </article>
 <% end
-%>  <html xmlns="<%= Xmlns['xhtml'] %>">
+%>  <html xmlns="<%= Xmlns['xhtml'] %>" id="<%=
+  "page" + @item.identifier.without_ext.gsub(/[^[:alnum:]]/, "_")
+%>">
 <% if !doc_header then
 %>    <h1><%= @item.fetch(:header, @item[:title]) %></h1>
 <% end %><%= doc_str
