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

diff --git a/layouts/default.xml b/layouts/default.xml
index 901b0c3..b432c54 100644
--- a/layouts/default.xml
+++ b/layouts/default.xml
@@ -17,17 +17,41 @@
   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
+    lic = find_license(@item[:license])
+%>  <license>
+    <identifier><%= File::basename(lic.identifier.without_ext) %></identifier>
+    <name><%= lic[:title] %></name>
+    <uri><%= item_uri(lic) %></uri>
+    <modification-allowed><%=
+      lic[:"modification-allowed"] == true ? "yes" : "no"
+    %></modification-allowed>
+  </license>
+<% end
+%>  <source>
     <file><%= item_source(@item) %></file>
     <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>
+  <html xmlns="<%= Xmlns['xhtml'] %>">
+<% if !doc_header then
+%>    <h1><%= @item.fetch(:header, @item[:title]) %></h1>
+<% end %><%= doc_str
+%>  </html>
 </document>
