You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/11/13 17:43:44 UTC

svn commit: r1541606 - in /incubator/marmotta/site/trunk/content: markdown/sesame.md.vm templates/custom-site.vm

Author: jakob
Date: Wed Nov 13 16:43:44 2013
New Revision: 1541606

URL: http://svn.apache.org/r1541606
Log:
minor updates to the template, fixing errors by validator.w3c.org

Modified:
    incubator/marmotta/site/trunk/content/markdown/sesame.md.vm
    incubator/marmotta/site/trunk/content/templates/custom-site.vm

Modified: incubator/marmotta/site/trunk/content/markdown/sesame.md.vm
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/markdown/sesame.md.vm?rev=1541606&r1=1541605&r2=1541606&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/markdown/sesame.md.vm (original)
+++ incubator/marmotta/site/trunk/content/markdown/sesame.md.vm Wed Nov 13 16:43:44 2013
@@ -1,4 +1,7 @@
-<head><title>Sesame Tools</title></head> <!-- awaiting for https://jira.codehaus.org/browse/DOXIA-472 -->
+<head>
+<title>Sesame Tools</title><!-- awaiting for https://jira.codehaus.org/browse/DOXIA-472 -->
+<meta name="keywords" content="Sesame, Tools, OpenRDF, RDF, Facading" />
+</head>
 
 # Sesame Tools
 

Modified: incubator/marmotta/site/trunk/content/templates/custom-site.vm
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/templates/custom-site.vm?rev=1541606&r1=1541605&r2=1541606&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/templates/custom-site.vm (original)
+++ incubator/marmotta/site/trunk/content/templates/custom-site.vm Wed Nov 13 16:43:44 2013
@@ -771,26 +771,32 @@
     <meta charset="${outputEncoding}" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 ## put meta together
+    <link rel="schema.dcterms" href="http://purl.org/dc/terms/" />
 #foreach( $author in $authors )
     <meta name="author" content="$author" />
 #end
 #if ( $dateCreation )
-    <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
+    ## yes, i know this is ugly!
+    #set ( $dF = "$StringUtils.substring($dateCreation, 0, 4)-$StringUtils.substring($dateCreation, 4, 6)-$StringUtils.substring($dateCreation, 6, 8)" )
+    <meta name="dcterms.created" content="$dF" />
 #end
 #if ( $dateRevision )
-    <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
+    ## yes, i know this is ugly!
+    #set ( $dF = "$StringUtils.substring($dateRevision, 0, 4)-$StringUtils.substring($dateRevision, 4, 6)-$StringUtils.substring($dateRevision, 6, 8)" )
+    <meta name="dcterms.modified" content="$dF" />
 #end
 #if ( $locale )
-    <meta http-equiv="Content-Language" content="$locale.language" />
+##    <meta http-equiv="Content-Language" content="$locale.language" />
 #end
     <title>$title</title>
 #if ( $decoration.custom.getChild( 'meta' ) )
   #set ( $c_meta = $decoration.custom.getChild( 'meta' ) )
   #if ( $c_meta.getChild( 'description' ) )
-    <meta name="description" content="$c_meta.getChild( 'description' ).getValue()" />
+    <meta name="description" content="$c_meta.getChild( 'description' ).getValue() - $!shortTitle" />
   #end
   #if ( $c_meta.getChild( 'keywords' ) )
-    <meta name="keywords" content="$c_meta.getChild( 'keywords' ).getValue()" />
+    #set ( $c_kw_extra = $StringUtils.join( $StringUtils.split( 'Sesame Tools' ), ', ') )
+    <meta name="keywords" content="$c_meta.getChild( 'keywords' ).getValue(), $!c_kw_extra" />
   #end
 #end
     <link rel="stylesheet" href="$relativePath/css/apache-maven-fluido-1.3.0.min.css" />
@@ -1081,8 +1087,9 @@
             Copyright &copy;#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )
         </p>
 
-        #if ( $decoration.body.footer )
-            $decoration.body.footer
+        #foreach ( $item in $decoration.body.footer.getChildren() )
+            #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
+            $StringUtils.replace( $item.toString(), $documentHeader, "" )
         #end
 
         #ohloh()