You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/01/14 00:13:19 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default/resources/live/css page.css
gregor 2004/01/13 15:13:19
Modified: src/webapp global-sitemap.xmap
src/webapp/lenya resources.xmap
Added: src/webapp/lenya/pubs/default/resources/authoring/css
page.css
src/webapp/lenya/pubs/default/resources/live/css page.css
Removed: src/webapp/lenya/pubs/default/resources/css page.css
Log:
improve serving of static resources:
* take area into account
* extend out of the box mime types
Revision Changes Path
1.34 +1 -1 cocoon-lenya/src/webapp/global-sitemap.xmap
Index: global-sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/global-sitemap.xmap,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- global-sitemap.xmap 7 Jan 2004 13:59:19 -0000 1.33
+++ global-sitemap.xmap 13 Jan 2004 23:13:19 -0000 1.34
@@ -835,7 +835,7 @@
<!-- {publication-id}/{area}/{file} -->
<map:match pattern="*/*/**">
<map:act type="resource-exists-enhanced">
- <map:parameter name="url" value="lenya/pubs/{1}/resources/{3}"/>
+ <map:parameter name="url" value="lenya/pubs/{1}/resources/{2}/{3}"/>
<map:parameter name="type" value="file"/>
<map:mount uri-prefix="" src="lenya/resources.xmap" check-reload="true" reload-method="synchron"/>
</map:act>
1.1 cocoon-lenya/src/webapp/lenya/pubs/default/resources/authoring/css/page.css
Index: page.css
===================================================================
/*
Document : page
Created on : 11. April 2003, 11:13
Author : andreas
Description:
Purpose of the stylesheet follows.
*/
/* page */
#page {
padding: 0px;
margin: 0px;
}
/* tabs */
#tabs {
border-bottom: solid 5px #DDBBBB;
color: Maroon;
}
#tabs a {
text-decoration: none;
color: Maroon;
}
#tabs table {
font-family: Verdana, Arial, Sans-serif;
font-size: 80%;
}
#tabs td {
vertical-align: bottom;
}
#tabs div {
white-space: nowrap;
}
.tab {
padding: .2em .5em;
background-color: #FFEEEE;
border: solid 1px #BB9999;
}
.tab-selected {
padding: .2em .5em;
background-color: #FFCCCC;
border: solid 1px #BB9999;
border-bottom: solid 1px #DDBBBB;
}
.tab-separator {
border-bottom: solid 1px #BB9999;
}
.tab-pre-separator {
width: 25px;
border-bottom: solid 1px #BB9999;
}
td.tab-post-separator {
width: 100%;
}
/* menu */
#menu {
font-family: Verdana, Arial, Sans-serif;
background-color: #DDBBBB;
border: solid 1px #BB9999;
border-left: none;
border-top: none;
color: Maroon;
padding: 0px 0px 5px 25px;
}
#menu a {
text-decoration: none;
color: Maroon;
}
#menu a:hover {
text-decoration: underline;
}
.menublock-1, .menublock-selected-1 {
padding: 0px;
border-top: solid 1px #DDBBBB;
background: #FFCCCC;
}
.menublock-1 a { }
.menublock-1 a:visited { }
.menublock-1 .menublock-2 { display: none; }
.menublock-selected-1 .menuitem-1 { background-color: #FFEEEE; }
.menublock-1 .menuitem-1 { }
.menuitem-1 { padding: 5px 5px 5px 5px; font-size: 80%; }
.menuitem-2 { padding: 2px 5px 2px 25px; font-size: 80%; }
.menuitem-selected-2 { padding: 2px 5px 2px 25px; font-size: 80%; color: black; }
.menuitem-2 a { }
.menuitem-selected-1 {
background-color: #FFEEEE;
padding: 5px 5px 5px 5px;
font-size: 80%;
}
.menuitem-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
.menuitem-selected-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
/* breadcrumb */
#breadcrumb {
padding: 3px 0px 3px 30px;
background-color: #FFEEEE;
border-top: solid 1px #BB9999;
border-bottom: solid 1px #BB9999;
font-family: Verdana, Arial, Sans-serif;
font-size: 80%;
}
#breadcrumb a {
text-decoration: none;
color: Maroon;
}
/* body */
#body {
border: none;
padding: 1em;
margin-left: 10px;
font-family: Verdana, Arial, Sans-serif;
}
#main {
/*
float: left;
width: 80%;
*/
}
h1 { font-size: 140%; }
h2 { font-size: 100%; }
h3 { font-size: 80%; }
p { font-size: 80%; }
li { font-size: 80%; }
.crossheading { font-weight: bold; font-size: 110%; }
table.simple {
border-collapse: collapse;
/*
background-color: #909090;
border-color: #909090;
*/
width: auto;
}
td.simple {
font-size: 80%;
padding: 3px;
background-color: White;
border: solid 1px Navy;
vertical-align: top;
}
img.simple {
}
#publication-title {
font-family: verdana, arial, sans-serif;
font-weight: bold;
font-size: 20px;
vertical-align: bottom;
padding-left: 25px;
padding-bottom: 15px;
color: Maroon;
}
#project-logo {
padding: 10px 20px 0px 0px;
text-align: right;
}
.media {
text-align: center;
padding: 10px;
}
.caption {
padding: 5px;
text-align: center;
font-style: italic;
font-size: 80%;
}
.abstract {
font-weight: bold;
}
h1 {
font-size: 120%;
color: Maroon;
}
h2 {
font-size: 100%;
color: Maroon;
border-bottom: solid 1px #BB9999;
margin-top: 30px;
}
1.8 +197 -18 cocoon-lenya/src/webapp/lenya/resources.xmap
Index: resources.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/resources.xmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- resources.xmap 8 Oct 2003 22:47:45 -0000 1.7
+++ resources.xmap 13 Jan 2004 23:13:19 -0000 1.8
@@ -28,10 +28,9 @@
<map:read src="lenya/resources/images/{3}.{4}" mime-type="image/{4}" />
</map:match>
- <!-- Lenya Publications -->
-
- <!-- matches pub-id/area/css/**.css -->
- <map:match pattern="*/*/css/**.css">
+ <!-- Lenya Publications -->
+ <!-- matches pub-id/area/css/*.css -->
+ <map:match pattern="*/*/css/*.css">
<map:read src="pubs/{1}/resources/css/{3}.css" mime-type="text/css" />
</map:match>
@@ -40,31 +39,211 @@
<map:read src="pubs/{1}/resources/javascript/{3}.js" mime-type="application/javascript" />
</map:match>
- <!-- matches pub-id/area/images/**.jpg -->
- <map:match pattern="*/*/images/**.jpg">
- <map:read src="pubs/{1}/resources/images/{3}.jpg" mime-type="image/jpeg" />
+ <!-- matches pub-id/area/**.jpg -->
+ <map:match pattern="*/*/**.jpg">
+ <map:read src="pubs/{1}/resources/{2}/{3}.jpg" mime-type="image/jpeg" />
</map:match>
- <!-- matches pub-id/area/images/**.ext -->
- <map:match pattern="*/*/images/**.*">
- <map:read src="pubs/{1}/resources/images/{3}.{4}" mime-type="image/{4}" />
+ <!-- matches pub-id/area/**.gif -->
+ <map:match pattern="*/*/**.gif">
+ <map:read src="pubs/{1}/resources/{2}/{3}.gif" mime-type="image/gif" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.png -->
+ <map:match pattern="*/*/**.png">
+ <map:read src="pubs/{1}/resources/{2}/{3}.png" mime-type="image/png" />
</map:match>
<!-- matches pub-id/area/**.tar.gz -->
<map:match pattern="*/*/**.tar.gz">
- <map:read src="pubs/{1}/resources/{3}.tar.gz" mime-type="application/x-gtar" />
+ <map:read src="pubs/{1}/resources/{2}/{3}.tar.gz" mime-type="application/x-gtar" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.pdf -->
+ <map:match pattern="*/*/**.pdf">
+ <map:read src="pubs/{1}/resources/{2}/{3}.pdf" mime-type="application/pdf" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.doc -->
+ <map:match pattern="*/*/**.doc">
+ <map:read src="pubs/{1}/resources/{2}/{3}.doc" mime-type="application/msword" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.dot -->
+ <map:match pattern="*/*/**.dot">
+ <map:read src="pubs/{1}/resources/{2}/{3}.dot" mime-type="application/msword" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.rtf -->
+ <map:match pattern="*/*/**.rtf">
+ <map:read src="pubs/{1}/resources/{2}/{3}.rtf" mime-type="application/rtf" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.txt -->
+ <map:match pattern="*/*/**.txt">
+ <map:read src="pubs/{1}/resources/{2}/{3}.txt" mime-type="text/plain" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.asc -->
+ <map:match pattern="*/*/**.asc">
+ <map:read src="pubs/{1}/resources/{2}/{3}.asc" mime-type="text/plain" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.ascii -->
+ <map:match pattern="*/*/**.ascii">
+ <map:read src="pubs/{1}/resources/{2}/{3}.ascii" mime-type="text/plain" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.xls -->
+ <map:match pattern="*/*/**.xls">
+ <map:read src="pubs/{1}/resources/{2}/{3}.xls" mime-type="application/vnd.ms-excel" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.xlt -->
+ <map:match pattern="*/*/**.xlt">
+ <map:read src="pubs/{1}/resources/{2}/{3}.xlt" mime-type="application/vnd.ms-excel" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.ppt -->
+ <map:match pattern="*/*/**.ppt">
+ <map:read src="pubs/{1}/resources/{2}/{3}.ppt" mime-type="application/vnd.ms-powerpoint" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.pot -->
+ <map:match pattern="*/*/**.pot">
+ <map:read src="pubs/{1}/resources/{2}/{3}.pot" mime-type="application/vnd.ms-powerpoint" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.swf -->
+ <map:match pattern="*/*/**.swf">
+ <map:read src="pubs/{1}/resources/{2}/{3}.swf" mime-type="application/x-shockwave-flash" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.tif -->
+ <map:match pattern="*/*/**.tif">
+ <map:read src="pubs/{1}/resources/{2}/{3}.tif" mime-type="image/tiff" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.eps -->
+ <map:match pattern="*/*/**.eps">
+ <map:read src="pubs/{1}/resources/{2}/{3}.eps" mime-type="application/postscript" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.pct -->
+ <map:match pattern="*/*/**.pct">
+ <map:read src="pubs/{1}/resources/{2}/{3}.pct" mime-type="application/x-ms-word" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.m3u -->
+ <map:match pattern="*/*/**.m3u">
+ <map:read src="pubs/{1}/resources/{2}/{3}.m3u" mime-type="application/x-mpegurl" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.kar -->
+ <map:match pattern="*/*/**.kar">
+ <map:read src="pubs/{1}/resources/{2}/{3}.kar" mime-type="audio/midi" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.mid -->
+ <map:match pattern="*/*/**.mid">
+ <map:read src="pubs/{1}/resources/{2}/{3}.mid" mime-type="audio/midi" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.smf -->
+ <map:match pattern="*/*/**.smf">
+ <map:read src="pubs/{1}/resources/{2}/{3}.smf" mime-type="application/vnd.stardivision.math" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.mp3 -->
+ <map:match pattern="*/*/**.mp3">
+ <map:read src="pubs/{1}/resources/{2}/{3}.mp3" mime-type="audio/mpeg" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.swa -->
+ <map:match pattern="*/*/**.swa">
+ <map:read src="pubs/{1}/resources/{2}/{3}.swa" mime-type="audio/x-swa" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.mpg -->
+ <map:match pattern="*/*/**.mpg">
+ <map:read src="pubs/{1}/resources/{2}/{3}.mpg" mime-type="video/mpeg" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.mpv -->
+ <map:match pattern="*/*/**.mpv">
+ <map:read src="pubs/{1}/resources/{2}/{3}.mpv" mime-type="video/mpeg" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.mp4 -->
+ <map:match pattern="*/*/**.mp4">
+ <map:read src="pubs/{1}/resources/{2}/{3}.mp4" mime-type="video/mpeg" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.mov -->
+ <map:match pattern="*/*/**.mov">
+ <map:read src="pubs/{1}/resources/{2}/{3}.mov" mime-type="video/quicktime" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.bin -->
+ <map:match pattern="*/*/**.bin">
+ <map:read src="pubs/{1}/resources/{2}/{3}.bin" mime-type="application/mac-binhex40" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.sea -->
+ <map:match pattern="*/*/**.sea">
+ <map:read src="pubs/{1}/resources/{2}/{3}.sea" mime-type="application/sea" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.hqx -->
+ <map:match pattern="*/*/**.hqx">
+ <map:read src="pubs/{1}/resources/{2}/{3}.hqx" mime-type="application/mac-binhex40" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.sit -->
+ <map:match pattern="*/*/**.sit">
+ <map:read src="pubs/{1}/resources/{2}/{3}.sit" mime-type="application/x-stuffit" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.zip -->
+ <map:match pattern="*/*/**.zip">
+ <map:read src="pubs/{1}/resources/{2}/{3}.zip" mime-type="application/zip" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.jmx -->
+ <map:match pattern="*/*/**.jmx">
+ <map:read src="pubs/{1}/resources/{2}/{3}.jmx" mime-type="application/x-ms-word" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.jcl -->
+ <map:match pattern="*/*/**.jcl">
+ <map:read src="pubs/{1}/resources/{2}/{3}.jcl" mime-type="application/x-ms-word" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.qz -->
+ <map:match pattern="*/*/**.qz">
+ <map:read src="pubs/{1}/resources/{2}/{3}.qz" mime-type="application/x-ms-word" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.jbc -->
+ <map:match pattern="*/*/**.jbc">
+ <map:read src="pubs/{1}/resources/{2}/{3}.jbc" mime-type="application/x-ms-word" />
+ </map:match>
+
+ <!-- matches pub-id/area/**.jmt -->
+ <map:match pattern="*/*/**.jmt">
+ <map:read src="pubs/{1}/resources/{2}/{3}.jmt" mime-type="application/x-ms-word" />
</map:match>
- <!-- matches pub-id/area/pdf/**.pdf -->
- <map:match pattern="*/*/pdf/**.pdf">
- <map:read src="pubs/{1}/resources/pdf/{3}.pdf" mime-type="application/pdf" />
+ <!-- matches pub-id/area/**.cfg -->
+ <map:match pattern="*/*/**.cfg">
+ <map:read src="pubs/{1}/resources/{2}/{3}.cfg" mime-type="application/x-ms-word" />
</map:match>
- <!-- matches pub-id/area/flash/**.swf -->
- <map:match pattern="*/*/flash/**.swf">
- <map:read src="pubs/{1}/resources/flash/{3}.swf" mime-type="application/x-shockwave-flash" />
+<!-- matches pub-id/area/**.* this fallback may not work very well, but better than a 404
+ <map:match pattern="*/*/**.*">
+ <map:read src="pubs/{1}/resources/{2}/{3}.*" mime-type="application/x-ms-word" />
</map:match>
-
+-->
</map:pipeline>
</map:pipelines>
</map:sitemap>
1.1 cocoon-lenya/src/webapp/lenya/pubs/default/resources/live/css/page.css
Index: page.css
===================================================================
/*
Document : page
Created on : 11. April 2003, 11:13
Author : andreas
Description:
Purpose of the stylesheet follows.
*/
/* page */
#page {
padding: 0px;
margin: 0px;
}
/* tabs */
#tabs {
border-bottom: solid 5px #DDBBBB;
color: Maroon;
}
#tabs a {
text-decoration: none;
color: Maroon;
}
#tabs table {
font-family: Verdana, Arial, Sans-serif;
font-size: 80%;
}
#tabs td {
vertical-align: bottom;
}
#tabs div {
white-space: nowrap;
}
.tab {
padding: .2em .5em;
background-color: #FFEEEE;
border: solid 1px #BB9999;
}
.tab-selected {
padding: .2em .5em;
background-color: #FFCCCC;
border: solid 1px #BB9999;
border-bottom: solid 1px #DDBBBB;
}
.tab-separator {
border-bottom: solid 1px #BB9999;
}
.tab-pre-separator {
width: 25px;
border-bottom: solid 1px #BB9999;
}
td.tab-post-separator {
width: 100%;
}
/* menu */
#menu {
font-family: Verdana, Arial, Sans-serif;
background-color: #DDBBBB;
border: solid 1px #BB9999;
border-left: none;
border-top: none;
color: Maroon;
padding: 0px 0px 5px 25px;
}
#menu a {
text-decoration: none;
color: Maroon;
}
#menu a:hover {
text-decoration: underline;
}
.menublock-1, .menublock-selected-1 {
padding: 0px;
border-top: solid 1px #DDBBBB;
background: #FFCCCC;
}
.menublock-1 a { }
.menublock-1 a:visited { }
.menublock-1 .menublock-2 { display: none; }
.menublock-selected-1 .menuitem-1 { background-color: #FFEEEE; }
.menublock-1 .menuitem-1 { }
.menuitem-1 { padding: 5px 5px 5px 5px; font-size: 80%; }
.menuitem-2 { padding: 2px 5px 2px 25px; font-size: 80%; }
.menuitem-selected-2 { padding: 2px 5px 2px 25px; font-size: 80%; color: black; }
.menuitem-2 a { }
.menuitem-selected-1 {
background-color: #FFEEEE;
padding: 5px 5px 5px 5px;
font-size: 80%;
}
.menuitem-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
.menuitem-selected-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
/* breadcrumb */
#breadcrumb {
padding: 3px 0px 3px 30px;
background-color: #FFEEEE;
border-top: solid 1px #BB9999;
border-bottom: solid 1px #BB9999;
font-family: Verdana, Arial, Sans-serif;
font-size: 80%;
}
#breadcrumb a {
text-decoration: none;
color: Maroon;
}
/* body */
#body {
border: none;
padding: 1em;
margin-left: 10px;
font-family: Verdana, Arial, Sans-serif;
}
#main {
/*
float: left;
width: 80%;
*/
}
h1 { font-size: 140%; }
h2 { font-size: 100%; }
h3 { font-size: 80%; }
p { font-size: 80%; }
li { font-size: 80%; }
.crossheading { font-weight: bold; font-size: 110%; }
table.simple {
border-collapse: collapse;
/*
background-color: #909090;
border-color: #909090;
*/
width: auto;
}
td.simple {
font-size: 80%;
padding: 3px;
background-color: White;
border: solid 1px Navy;
vertical-align: top;
}
img.simple {
}
#publication-title {
font-family: verdana, arial, sans-serif;
font-weight: bold;
font-size: 20px;
vertical-align: bottom;
padding-left: 25px;
padding-bottom: 15px;
color: Maroon;
}
#project-logo {
padding: 10px 20px 0px 0px;
text-align: right;
}
.media {
text-align: center;
padding: 10px;
}
.caption {
padding: 5px;
text-align: center;
font-style: italic;
font-size: 80%;
}
.abstract {
font-weight: bold;
}
h1 {
font-size: 120%;
color: Maroon;
}
h2 {
font-size: 100%;
color: Maroon;
border-bottom: solid 1px #BB9999;
margin-top: 30px;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org