svn commit: r1759203 - in /forrest/trunk/main/webapp: locationmap-skins.xml resources.xmap sitemap.xmap

[s***@apache.org]

Author: sjur
Date: Mon Sep 5 07:19:30 2016
New Revision: 1759203

URL: http://svn.apache.org/viewvc?rev=1759203&view=rev
Log:
Bare-bones support for css.map files used in bootstrat (ie the fleece skin). At leas this stops the browser from complaining about 404 on these files.

Modified:
forrest/trunk/main/webapp/locationmap-skins.xml
forrest/trunk/main/webapp/resources.xmap
forrest/trunk/main/webapp/sitemap.xmap

Modified: forrest/trunk/main/webapp/locationmap-skins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skins.xml?rev=1759203&r1=1759202&r2=1759203&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skins.xml (original)
+++ forrest/trunk/main/webapp/locationmap-skins.xml Mon Sep 5 07:19:30 2016
@@ -50,6 +50,13 @@
<location src="{forrest:forrest.context}/skins/common/css/{1}.css" />
</select>
</match>
+ <match pattern="skin.cssmap.**">
+ <select>
+ <location src="{properties:skins-dir}{forrest:forrest.skin}/css/{1}.css.map" />
+ <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/css/{1}.css.map" />
+ <location src="{forrest:forrest.context}/skins/common/css/{1}.css.map" />
+ </select>
+ </match>
<match pattern="skin.fonts.**">
<select>
<location src="{properties:skins-dir}{forrest:forrest.skin}/fonts/{1}" />

Modified: forrest/trunk/main/webapp/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?rev=1759203&r1=1759202&r2=1759203&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources.xmap (original)
+++ forrest/trunk/main/webapp/resources.xmap Mon Sep 5 07:19:30 2016
@@ -160,6 +160,10 @@ $Revision: 1.13 $
<map:match pattern="**css/**.css">
<map:read src="{lm:project.css.{2}}" mime-type="text/css" />
</map:match>
+<!-- skin-level css.map -->
+ <map:match pattern="**skin/**.css.map">
+ <map:read src="{lm:skin.cssmap.{2}}" mime-type="text/css" />
+ </map:match>
<!-- skin-level fonts -->
<map:match pattern="**fonts/**.woff2">
<map:read src="{lm:skin.fonts.{2}.woff2}" mime-type="font/woff2" />

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=1759203&r1=1759202&r2=1759203&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Mon Sep 5 07:19:30 2016
@@ -496,7 +496,9 @@ $Revision: 1.12 $
</map:when>
</map:select>
</map:match>
+
<!-- Default matches -->
+
<!-- (HTML rendered from doc-v13 intermediate format -->
<map:match pattern="**body-*.html">
<map:generate src="cocoon:/{1}{2}.xml"/>
@@ -513,6 +515,7 @@ $Revision: 1.12 $
<map:parameter name="notoc" value="false"/>
</map:call>
</map:match>
+
<map:match pattern="**menu-*.html">
<map:generate src="cocoon:/{1}book-{2}.html"/>
<map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>
@@ -604,6 +607,9 @@ $Revision: 1.12 $
<map:match pattern="**.css">
<map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
</map:match>
+ <map:match pattern="**.css.map">
+ <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+ </map:match>
<map:match pattern="**images**">
<map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
</map:match>