[dryad] r5694 committed - Deploying new solution for static page to prevent the 404 error.

1 view
Skip to first unread message

dr...@googlecode.com

unread,
Sep 14, 2012, 4:38:52 PM9/14/12
to dryad-...@googlegroups.com
Revision: 5694
Author: fabio.bo...@gmail.com
Date: Fri Sep 14 13:38:18 2012
Log: Deploying new solution for static page to prevent the 404 error.
http://code.google.com/p/dryad/source/detail?r=5694

Added:
/trunk/dryad/dspace/config/pages
/trunk/dryad/dspace/config/pages/about.xml
/trunk/dryad/dspace/config/pages/collectionPolicy.xml
/trunk/dryad/dspace/config/pages/depositFAQ.xml
/trunk/dryad/dspace/config/pages/depositing.xml
/trunk/dryad/dspace/config/pages/dryadlab.xml
/trunk/dryad/dspace/config/pages/dryaduk.xml
/trunk/dryad/dspace/config/pages/error.xml
/trunk/dryad/dspace/config/pages/factSheet.xml
/trunk/dryad/dspace/config/pages/jdap.xml
/trunk/dryad/dspace/config/pages/maintenance.xml
/trunk/dryad/dspace/config/pages/members.xml
/trunk/dryad/dspace/config/pages/publicationBlackout.xml
/trunk/dryad/dspace/config/pages/searching.xml
/trunk/dryad/dspace/config/pages/updates.xml
/trunk/dryad/dspace/config/pages/using.xml
/trunk/dryad/dspace/modules/xmlui/src/main/resources/aspects/StaticPage

/trunk/dryad/dspace/modules/xmlui/src/main/resources/aspects/StaticPage/sitemap.xmap
Modified:
/trunk/dryad/dspace/config/xmlui.xconf

/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/aspect/dryadinfo/Navigation.java
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/Dryad.xsl

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/about.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/collectionPolicy.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/depositFAQ.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/depositing.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/dryadlab.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/dryaduk.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/error.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/factSheet.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/jdap.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/maintenance.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/members.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/publicationBlackout.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/searching.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/updates.xhtml

/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/using.xhtml

=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/about.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <xref rend="embed" target="about.xhtml"/>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">About Dryad</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/collectionPolicy.xml Fri Sep 14
13:38:18 2012
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+
+ <xref rend="embed" target="collectionPolicy.xhtml"/>
+
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Dryad Collection Policy</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/depositFAQ.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <xref rend="embed" target="depositFAQ.xhtml"/>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Depositing Data to Dryad</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/depositing.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <xref rend="embed" target="depositing.xhtml"/>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/dryadlab.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <xref rend="embed" target="dryadlab.xhtml"/>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">DryadLab</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/dryaduk.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <xref rend="embed" target="dryaduk.xhtml"/>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">DryadUK</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/error.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <xref rend="embed" target="error.xhtml"/>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">System error</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/factSheet.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+ <xref rend="embed" target="factSheet.xhtml"/>
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Dryad Fact Sheet</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/jdap.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+ <xref rend="embed" target="jdap.xhtml"/>
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Data Archiving Policy</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/maintenance.xml Fri Sep 14 13:38:18
2012
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+ <xref rend="embed" target="maintenance.xhtml"/>
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">About Dryad</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/members.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+
+ <xref rend="embed" target="members.xhtml"/>
+
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Dryad Members</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/publicationBlackout.xml Fri Sep 14
13:38:18 2012
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+
+ <xref rend="embed" target="publicationBlackout.xhtml"/>
+
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Restricted Access</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/searching.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+
+ <xref rend="embed" target="searching.xhtml"/>
+
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Searching Dryad</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/updates.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+
+ <xref rend="embed" target="updates.xhtml"/>
+
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">New Dryad Content</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++ /trunk/dryad/dspace/config/pages/using.xml Fri Sep 14 13:38:18 2012
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1"
xmlns:xi="http://www.w3.org/2003/XInclude">
+ <body>
+ <div id="included.content" n="foo" rend="primary">
+
+ <xref rend="embed" target="using.xhtml"/>
+
+ </div>
+ </body>
+ <xi:include href="navigation.xml"/>
+ <meta>
+ <userMeta/>
+ <pageMeta>
+ <metadata element="title">Using Data in Dryad</metadata>
+ <trail target="/">Dryad Digital Repository</trail>
+ </pageMeta>
+ <repositoryMeta/>
+ </meta>
+</document>
=======================================
--- /dev/null
+++
/trunk/dryad/dspace/modules/xmlui/src/main/resources/aspects/StaticPage/sitemap.xmap
Fri Sep 14 13:38:18 2012
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ The contents of this file are subject to the license and copyright
+ detailed in the LICENSE and NOTICE files at the root of the source
+ tree and available online at
+
+ http://www.dspace.org/license/
+
+-->
+
+<!--
+The XML Test Aspect is just a simple playground for viewing XML source
+in various configurations.
+
+ -->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:components>
+
+
+
+ </map:components>
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:generate/>
+
+
+ <map:match type="wildcard" pattern="pages/**">
+ <map:act type="DSpacePropertyFileReader">
+ <map:parameter name="dspace.dir" value="dspace.dir" />
+ <map:transform type="Include"
src="file://{dspace.dir}/config/pages/{../1}.xml" />
+ </map:act>
+ </map:match>
+
+ <map:serialize type="xml"/>
+
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
=======================================
--- /trunk/dryad/dspace/config/xmlui.xconf Thu Jun 14 19:49:32 2012
+++ /trunk/dryad/dspace/config/xmlui.xconf Fri Sep 14 13:38:18 2012
@@ -75,14 +75,12 @@
<aspect name="Dryad Browse" path="resource://aspects/DryadBrowse/" />

<aspect name="Dryad Information" path="resource://aspects/DryadInfo/"
/>
-

+ <aspect name="Versioning Aspect"
path="resource://aspects/Versioning/" />

- <aspect name="Versioning Aspect"
path="resource://aspects/Versioning/" />
+ <aspect name="AME" path="resource://aspects/AME/" />

- <aspect name="AME" path="resource://aspects/AME/" />
-
-
+ <aspect name="StaticPage" path="resource://aspects/StaticPage/"/>


<!--
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/aspect/dryadinfo/Navigation.java
Fri Jul 20 10:09:24 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/aspect/dryadinfo/Navigation.java
Fri Sep 14 13:38:18 2012
@@ -62,40 +62,40 @@


@Override
- public void addPageMeta(PageMeta pageMeta) throws SAXException,
- WingException, UIException, SQLException, IOException,
- AuthorizeException {
- super.addPageMeta(pageMeta);
-
- // We do this here because this is on every page
- String port = ConfigurationManager.getProperty("dspace.port");
- String nodeName = ConfigurationManager.getProperty("dryad.home");
-
- // If we're using Apache, we may not have the real port in serverPort
- if (port != null) {
- pageMeta.addMetadata("request", "realServerPort").addContent(port);
- }
- else {
- pageMeta.addMetadata("request", "realServerPort").addContent("80");
- }
-
- if (nodeName != null) {
- pageMeta.addMetadata("dryad", "node").addContent(nodeName);
- }
- }
+ public void addPageMeta(PageMeta pageMeta) throws SAXException,
+ WingException, UIException, SQLException, IOException,
+ AuthorizeException {
+ super.addPageMeta(pageMeta);

- public void addOptions(Options options) throws SAXException,
WingException,
+ // We do this here because this is on every page
+ String port = ConfigurationManager.getProperty("dspace.port");
+ String nodeName = ConfigurationManager.getProperty("dryad.home");
+
+ // If we're using Apache, we may not have the real port in
serverPort
+ if (port != null) {
+
pageMeta.addMetadata("request", "realServerPort").addContent(port);
+ }
+ else {
+
pageMeta.addMetadata("request", "realServerPort").addContent("80");
+ }
+
+ if (nodeName != null) {
+ pageMeta.addMetadata("dryad", "node").addContent(nodeName);
+ }
+ }
+
+ public void addOptions(Options options) throws SAXException,
WingException,
UIException, SQLException, IOException, AuthorizeException
{
List info = options.addList("DryadInfo");
-
+
info.setHead("Information");
- info.addItemXref(contextPath + "/depositing", "Depositing Data");
- info.addItemXref(contextPath + "/using", "Using Data");
- info.addItemXref(contextPath + "/members", "Dryad Members");
- info.addItemXref(contextPath + "/jdap", "Journal Archiving
Policy");
- info.addItemXref(contextPath + "/about", "About Dryad");
+ info.addItemXref(contextPath + "/pages/depositing", "Depositing
Data");
+ info.addItemXref(contextPath + "/pages/using", "Using Data");
+ info.addItemXref(contextPath + "/pages/members", "Dryad Members");
+ info.addItemXref(contextPath + "/pages/jdap", "Journal Archiving
Policy");
+ info.addItemXref(contextPath + "/pages/about", "About Dryad");
info.addItemXref("http://blog.datadryad.org", "Dryad Blog");
- info.addItemXref("http://wiki.datadryad.org", "Dryad Documentation");
+ info.addItemXref("http://wiki.datadryad.org", "Dryad
Documentation");
}
}
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/Dryad.xsl
Mon Jul 30 11:16:25 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/Dryad.xsl
Fri Sep 14 13:38:18 2012
@@ -31,7 +31,17 @@
-->
<xsl:variable name="meta"
select="/dri:document/dri:meta/dri:pageMeta/dri:metadata"/>
<xsl:variable name="pageName"
select="$meta[@element='request'][@qualifier='URI']"/>
- <xsl:variable name="doc" select="document(concat('pages/',
$pageName, '.xhtml'))"/>
+ <!--xsl:variable name="doc" select="document(concat('pages/',
$pageName, '.xhtml'))"/-->
+
+
+ <xsl:template match="dri:xref[@rend='embed']">
+        <xsl:variable name="url" select="concat('pages/',@target)"
/>
+        <xsl:copy-of select="document(string($url))/html/*"/>
+    </xsl:template>
+
+
+
+


<!-- Overwriting the default DSpace dri:body template to check for
pages -->
@@ -45,27 +55,27 @@
</div>
</xsl:if>
<xsl:choose>
- <xsl:when test="$doc">
- <xsl:copy-of select="$doc//div[@id='ds-body']/*"/>
- <!-- hint 'error=' is used to indicate we should
append a feedback form -->
- <xsl:if
test="$meta[@qualifier='queryString'][starts-with(., 'error=')]">
- <div style="margin-top: 20px;">
- <xsl:variable name="report_text">
- <xsl:call-template
name="parse-query-param">
- <xsl:with-param
name="param-name">body</xsl:with-param>
- </xsl:call-template>
- </xsl:variable>
- <form action="/feedback" method="post"
onsubmit="javascript:tSubmit(this);">
- <input name="email" type="hidden"
value="he...@datadryad.org"/>
- <textarea name="comments"
onfocus="javascript:tFocus(this);" cols="60" rows="15">
- <xsl:value-of
select="decoder:decode($report_text)"/>
- </textarea>
- <br/>
- <input name="submit" type="submit"
value="Send Feedback"/>
- </form>
- </div>
- </xsl:if>
- </xsl:when>
+ <!--<xsl:when test="$doc">-->
+ <!--<xsl:copy-of
select="$doc//div[@id='ds-body']/*"/>-->
+ <!--&lt;!&ndash; hint 'error=' is used to indicate we
should append a feedback form &ndash;&gt;-->
+ <!--<xsl:if
test="$meta[@qualifier='queryString'][starts-with(., 'error=')]">-->
+ <!--<div style="margin-top: 20px;">-->
+ <!--<xsl:variable name="report_text">-->
+ <!--<xsl:call-template
name="parse-query-param">-->
+ <!--<xsl:with-param
name="param-name">body</xsl:with-param>-->
+ <!--</xsl:call-template>-->
+ <!--</xsl:variable>-->
+ <!--<form action="/feedback" method="post"
onsubmit="javascript:tSubmit(this);">-->
+ <!--<input name="email" type="hidden"
value="he...@datadryad.org"/>-->
+ <!--<textarea name="comments"
onfocus="javascript:tFocus(this);" cols="60" rows="15">-->
+ <!--<xsl:value-of
select="decoder:decode($report_text)"/>-->
+ <!--</textarea>-->
+ <!--<br/>-->
+ <!--<input name="submit" type="submit"
value="Send Feedback"/>-->
+ <!--</form>-->
+ <!--</div>-->
+ <!--</xsl:if>-->
+ <!--</xsl:when>-->
<xsl:otherwise>
<xsl:apply-templates/>
</xsl:otherwise>
@@ -257,9 +267,9 @@
<xsl:variable name="file_page_title"
select="$meta[@element='title' and @qualifier='package']"/>
<title>
<xsl:choose>
- <xsl:when test="$doc">
- <xsl:value-of select="$doc/html/head/title"/>
- </xsl:when>
+ <!--<xsl:when test="$doc">-->
+ <!--<xsl:value-of
select="$doc/html/head/title"/>-->
+ <!--</xsl:when>-->
<xsl:when test="$file_page_title">
<i18n:text>xmlui.dryad.page_title</i18n:text>
<xsl:value-of
@@ -501,10 +511,10 @@
</xsl:attribute>
<xsl:apply-templates/>
</a>
- &gt;
- <xsl:if test="position()=last() and $doc">
- <xsl:value-of select="$doc/html/head/title"/>
- </xsl:if>
+ <!--&gt;-->
+ <!--<xsl:if test="position()=last() and $doc">-->
+ <!--<xsl:value-of
select="$doc/html/head/title"/>-->
+ <!--</xsl:if>-->
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates/>
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/about.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/about.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
-<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> --> <html >
- <head> <title>About Dryad</title> </head> <body> <div id="ds-body">
+<html>
+ <head> <title>About Dryad</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style></head>
+ <body>
+ <div id="ds-body">

<h1>About Dryad</h1>

=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/collectionPolicy.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/collectionPolicy.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -6,6 +6,9 @@
<html>
<head>
<title>Dryad Collection Policy</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/depositFAQ.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/depositFAQ.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-->
<html>
<head>
<title>Depositing Data to Dryad</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px;
top: 155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/depositing.xhtml
Thu Aug 23 12:19:01 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/depositing.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -6,6 +6,9 @@
<html>
<head>
<title>Depositing to Dryad</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px;
top: 155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/dryadlab.xhtml
Thu Jun 14 19:49:32 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/dryadlab.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,8 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
-<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> --> <html >
- <head> <title>DryadLab</title> </head> <body> <div id="ds-body">
+<!--
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+-->
+<html>
+ <head> <title>DryadLab</title> <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style>
+ </head>
+ <body> <div id="ds-body">

<h1>DryadLab</h1>

=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/dryaduk.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/dryaduk.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,26 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- USE THIS DOCTYPE TO VALIDATE THE PAGE WHEN EDITING -->
+<!--?xml version="1.0" encoding="UTF-8"?-->
+<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-->
-
-<!-- USE THIS DOCTYPE WHEN CHANGES ARE COMMITTED TO DRYAD -->
-<!-- Declare some useful HTML entities to support any references in this
page. -->
-<!DOCTYPE dryadHTML [
- <!ENTITY nbsp "&#160;">
- <!ENTITY quot "&#34;"> <!-- quotation mark, U+0022 ISOnum -->
- <!ENTITY amp "&#38;#38;"> <!-- ampersand, U+0026 ISOnum -->
- <!ENTITY lt "&#38;#60;"> <!-- less-than sign, U+003C ISOnum -->
- <!ENTITY gt "&#62;"> <!-- greater-than sign, U+003E ISOnum -->
- <!ENTITY apos "&#39;"> <!-- apostrophe = APL quote, U+0027 ISOnum -->
-]>
-
-
-
<html>
<head>
<title>DryadUK</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/error.xhtml
Thu Jan 20 13:15:58 2011
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/error.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-->
<html>
<head>
<title>System error</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px;
top: 155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/factSheet.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/factSheet.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -6,6 +6,9 @@
<html>
<head>
<title>Dryad Fact Sheet</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/jdap.xhtml
Thu Aug 23 12:19:01 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/jdap.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-->
<html>
<head>
<title>Data Archiving Policy</title>
- </head>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px;
top: 155px;}
+ </style>
+ </head>
<body>
<div id="ds-body">
<h2>Joint Data Archiving Policy (JDAP)</h2>
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/maintenance.xhtml
Thu Dec 9 11:30:53 2010
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/maintenance.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -6,6 +6,9 @@
<html>
<head>
<title>About Dryad</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/members.xhtml
Fri Jul 20 12:43:57 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/members.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -6,6 +6,9 @@
<html>
<head>
<title>Dryad Members</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/publicationBlackout.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/publicationBlackout.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-->
<html>
<head>
@@ -13,8 +13,11 @@
<script type="text/javascript" src="/themes/Dryad/lib/utils.js">
</script>
<script type="text/javascript"
src="/themes/Dryad/lib/jquery.tooltip.js"> </script>
<script type="text/javascript">var gaJsHost = (("https:" ==
document.location.protocol) ? "https://ssl." : "http://www.");document.write(unescape("%3Cscript
src='" + gaJsHost + "google-analytics.com/ga.js'
type='text/javascript'%3E%3C/script%3E"));</script>
- <script type="text/javascript">try {var pageTracker =
_gat._getTracker("UA-16949847-1");pageTracker._trackPageview();} catch(err)
{}</script>
-
+ <script type="text/javascript">try {var pageTracker =
_gat._getTracker("UA-16949847-1");pageTracker._trackPageview();} catch(err)
{}</script>
+
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px;
top: 155px;}
+ </style>
</head>
<body>
<div id="ds-body">
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/searching.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/searching.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -6,7 +6,10 @@
<html>
<head>
<title>Searching Dryad</title>
- </head>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px;
top: 155px;}
+ </style>
+ </head>
<body>
<div id="ds-body">
<h1>Searching</h1>
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/updates.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/updates.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-->
<html>
<head>
<title>New Dryad Content</title>
- </head>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px;
top: 155px;}
+ </style>
+ </head>
<body>
<div id="ds-body">
<h1>New Dryad Content</h1>
=======================================
---
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/using.xhtml
Wed Apr 11 13:34:23 2012
+++
/trunk/dryad/dspace/modules/xmlui/src/main/webapp/themes/Dryad/pages/using.xhtml
Fri Sep 14 13:38:18 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--?xml version="1.0" encoding="UTF-8"?-->
<!-- We have to comment out the DTD to run, but use it to validate when
editing -->
<!--
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -6,6 +6,9 @@
<html>
<head>
<title>Using Data in Dryad</title>
+ <style type="text/css">
+ div#ds-body { margin: 5px 0 10px 165px;padding-right: 10px; top:
155px;}
+ </style>
</head>
<body>
<div id="ds-body">
Reply all
Reply to author
Forward
0 new messages