diff -Naur dspace-1.2-source-devel/jsp/browse/authors.jsp dspace-1.2-source-devel/multi/browse/authors.jsp --- dspace-1.2-source-devel/jsp/browse/authors.jsp 2004-03-23 17:21:16.000000000 -0200 +++ dspace-1.2-source-devel/multi/browse/authors.jsp 2004-12-16 15:04:33.000000000 -0200 @@ -1,214 +1,280 @@ -<%-- - - authors.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/03/23 19:21:15 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Display the results of browsing the author index - - - - Attributes to pass in: - - community - pass in if the scope of the browse is a community, or - - a collection within this community - - collection - pass in if the scope of the browse is a collection - - browse.info - the BrowseInfo containing the authors to display - - highlight - Boolean. If true, the focus point of the browse - - is highlighted - - previous.query - The query string to pass to the servlet to get the - - previous page of authors - - next.query - The query string to pass to the servlet to get the next - - page of aitjprs - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.net.URLEncoder" %> -<%@ page import="java.util.List" %> - -<%@ page import="org.dspace.browse.BrowseInfo" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.DCDate" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.core.Utils" %> - -<% - // Get attributes - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); - - BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info"); - - boolean highlight = ((Boolean) request.getAttribute("highlight")).booleanValue(); - - String prevQuery = (String) request.getAttribute("previous.query"); - String nextQuery = (String) request.getAttribute("next.query"); - - // Description of what the user is actually browsing - String scopeName = "All of DSpace"; - if (collection != null) - { - scopeName = collection.getMetadata("name"); - } - else if (community != null) - { - scopeName = community.getMetadata("name"); - } -%> - - - -

Browsing <%= scopeName %> by Author

- -
- - <%-- Browse controls --%> - - - - -
- - - - - - - -
- Jump to:  - 0-9 -<% - for (char c = 'A'; c <= 'Z'; c++) - { -%> - <%= c %> -<% - } -%> -
- or enter first few letters:  -   -
-
- -
- -

Showing authors <%= browseInfo.getOverallPosition() + 1 %>-<%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.

- - <%-- Previous page/Next page --%> - - - - - -
-<% - if (prevQuery != null) - { -%> - Previous page -<% - } -%> - -<% - if (nextQuery != null) - { -%> - Next page -<% - } -%> -
- - - <%-- The authors --%> - -<% - // Row: toggles between Odd and Even - String row = "odd"; - String[] results = browseInfo.getStringResults(); - - for (int i = 0; i < results.length; i++) - { -%> - - - -<% - row = ( row.equals( "odd" ) ? "even" : "odd" ); - } -%> -
RowOddCol"> - <%= Utils.addEntities(results[i]) %> -
- - - <%-- Previous page/Next page --%> - - - - - -
-<% - if (prevQuery != null) - { -%> - Previous page -<% - } -%> - -<% - if (nextQuery != null) - { -%> - Next page -<% - } -%> -
- - -
- -
+<%-- + - authors.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/03/23 19:21:15 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Display the results of browsing the author index + - + - Attributes to pass in: + - community - pass in if the scope of the browse is a community, or + - a collection within this community + - collection - pass in if the scope of the browse is a collection + - browse.info - the BrowseInfo containing the authors to display + - highlight - Boolean. If true, the focus point of the browse + - is highlighted + - previous.query - The query string to pass to the servlet to get the + - previous page of authors + - next.query - The query string to pass to the servlet to get the next + - page of aitjprs + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.net.URLEncoder" %> +<%@ page import="java.util.List" %> + +<%@ page import="org.dspace.browse.BrowseInfo" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.DCDate" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.Utils" %> + +<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> +<%@ page import="org.apache.taglibs.standard.tag.common.fmt.BundleSupport" %> +<%@ page import="java.util.Locale" %> + +<% + // Get attributes + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + + BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info"); + + boolean highlight = ((Boolean) request.getAttribute("highlight")).booleanValue(); + + String prevQuery = (String) request.getAttribute("previous.query"); + String nextQuery = (String) request.getAttribute("next.query"); + +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authors.title"/> + + + + +<%--

Browsing <%= scopeName %> by Author

--%> + + + + + + +<% + if (collection != null) + { + + pageContext.setAttribute("scopeName", collection.getMetadata("name")); %> + + + + + + <% + + } + else if (community != null) + { + pageContext.setAttribute("scopeName", community.getMetadata("name")); %> + + + + + + <% + + } + %> + + +

+ + +
+ + <%-- Browse controls --%> + + + + +
+ <%--allow for greek alphabet also--%> + + + + + + + + + + +
+ <%--Jump to: --%> + + 0-9<% + for (char c = 'Α'; c <= 'Ω'; c++) + { + if (c!='\u03A2') { +%> + <%= c %> +<% + }} +%> +
+<% + for (char c = 'A'; c <= 'Z'; c++) + { +%> + <%= c %> +<% + } +%> +
+ <%--or enter first few letters: --%> +   + <%-- --%> +  "> +
+
+ +
+ + <%--

Showing authors <%= browseInfo.getOverallPosition() + 1 %>-<%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.

--%> +

<%= browseInfo.getOverallPosition() + 1 %>-<%= browseInfo.getOverallPosition() + browseInfo.getResultCount() %> <%= browseInfo.getTotal() %>.

+ + <%-- Previous page/Next page --%> + + + + + +
+<% + if (prevQuery != null) + { +%> + + <%-- Previous page --%> + +<% + } +%> + +<% + if (nextQuery != null) + { +%> + <%-- Next page --%> + +<% + } +%> +
+ + + <%-- The authors --%> + +<% + // Row: toggles between Odd and Even + String row = "odd"; + String[] results = browseInfo.getStringResults(); + + for (int i = 0; i < results.length; i++) + { +%> + + + +<% + row = ( row.equals( "odd" ) ? "even" : "odd" ); + } +%> +
RowOddCol"> + <%= Utils.addEntities(results[i]) %> +
+ + + <%-- Previous page/Next page --%> + + + + + +
+<% + if (prevQuery != null) + { +%> + <%-- Previous page --%> + +<% + } +%> + +<% + if (nextQuery != null) + { +%> + <%-- Next page --%> + +<% + } +%> +
+ + +
+ +
diff -Naur dspace-1.2-source-devel/jsp/browse/items-by-author.jsp dspace-1.2-source-devel/multi/browse/items-by-author.jsp --- dspace-1.2-source-devel/jsp/browse/items-by-author.jsp 2004-03-23 17:22:30.000000000 -0200 +++ dspace-1.2-source-devel/multi/browse/items-by-author.jsp 2004-12-16 15:07:22.000000000 -0200 @@ -1,138 +1,180 @@ -<%-- - - items_by_author.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/03/23 19:22:29 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display items by a particular author - - - - Attributes to pass in: - - - - community - pass in if the scope of the browse is a community, or - - a collection within this community - - collection - pass in if the scope of the browse is a collection - - browse.info - the BrowseInfo containing the items to display - - author - The name of the author - - sort.by.date - Boolean. if true, we're sorting by date, otherwise by - - title. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.net.URLEncoder" %> - -<%@ page import="org.dspace.browse.BrowseInfo" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.core.Utils" %> - -<% - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); - BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info" ); - String author = (String) request.getAttribute("author"); - boolean orderByTitle = ((Boolean) request.getAttribute("order.by.title")).booleanValue(); - - - // Description of what the user is actually browsing - String scopeName = "All of DSpace"; - if (collection != null) - { - scopeName = collection.getMetadata("name"); - } - else if (community != null) - { - scopeName = community.getMetadata("name"); - } - - String pageTitle = "Items for Author " + author; -%> - - - -

Items for Author <%= Utils.addEntities(author) %> in <%= scopeName %>

- - <%-- Sorting controls --%> - - - - - - - - - -
- Return to Browse by Author -
-<% - if (orderByTitle) - { -%> - Sorting by Title - - Sort by Date -<% - } - else - { -%> - Sort by Title - - Sorting by Date -<% - } -%> -
- -

Showing <%= browseInfo.getResultCount() %> items.

- - - <%-- The items --%> -<% - String emphColumn = (orderByTitle ? "title" : "date"); -%> - - - -
+<%-- + - items_by_author.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/03/23 19:22:29 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display items by a particular author + - + - Attributes to pass in: + - + - community - pass in if the scope of the browse is a community, or + - a collection within this community + - collection - pass in if the scope of the browse is a collection + - browse.info - the BrowseInfo containing the items to display + - author - The name of the author + - sort.by.date - Boolean. if true, we're sorting by date, otherwise by + - title. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.net.URLEncoder" %> + +<%@ page import="org.dspace.browse.BrowseInfo" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.Utils" %> + +<% + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info" ); + String author = (String) request.getAttribute("author"); + boolean orderByTitle = ((Boolean) request.getAttribute("order.by.title")).booleanValue(); + String pageTitle = "Items for Author " + author; + +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="items-by-author.title"/> <%= author %> + + + + + + + + + <% + + // Description of what the user is actually browsing + if (collection != null) + { + + pageContext.setAttribute("scopeName", collection.getMetadata("name")); %> + + + + + + <% + + } + else if (community != null) + { + pageContext.setAttribute("scopeName", community.getMetadata("name")); %> + + + + + + <% + + } + + %> + + + <%--

Items for Author "<%= Utils.addEntities(author) %>" in <%= scopeName %>

--%> +

"<%= Utils.addEntities(author) %>"

+ + <%-- Sorting controls --%> + + + + + + + + + +
+ <%-- Return to Browse by Author --%> + +
+<% + if (orderByTitle) + { +%> + <%-- Sorting by Title --%> + + + <%-- Sort by Date --%> + +<% + } + else + { +%> + <%-- Sort by Title --%> + + + <%-- Sorting by Date --%> + +<% + } +%> +
+ + <%--

Showing <%= browseInfo.getResultCount() %> items.

--%> +

<%= browseInfo.getResultCount() %>

+ + + <%-- The items --%> +<% + String emphColumn = (orderByTitle ? "title" : "date"); +%> + + + +
diff -Naur dspace-1.2-source-devel/jsp/browse/items-by-date.jsp dspace-1.2-source-devel/multi/browse/items-by-date.jsp --- dspace-1.2-source-devel/jsp/browse/items-by-date.jsp 2003-12-17 13:42:54.000000000 -0200 +++ dspace-1.2-source-devel/multi/browse/items-by-date.jsp 2004-12-16 15:08:12.000000000 -0200 @@ -1,278 +1,342 @@ -<%-- - - items-by-date.jsp - - - - Version: $Revision: 1.8 $ - - - - Date: $Date: 2003/12/17 15:42:54 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Display the results of browsing a title or date index - - - - Attributes to pass in: - - community - pass in if the scope of the browse is a community, or - - a collection within this community - - collection - pass in if the scope of the browse is a collection - - browse.info - the BrowseInfo containing the items to display - - highlight - Boolean. If true, the focus point of the browse - - is highlighted - - previous.query - The query string to pass to the servlet to get the - - previous page of items - - next.query - The query string to pass to the servlet to get the next - - page of items - - oldest.first - Boolean - if browsing dates, indicates whether oldest - - items are first - - flip.ordering.query - the query string for flipping the order of the - - index between oldest first and most recent first - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.browse.BrowseInfo" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.DCDate" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> - -<% - // Get attributes - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); - - BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info"); - - boolean highlight = ((Boolean) request.getAttribute("highlight")).booleanValue(); - - String prevQuery = (String) request.getAttribute("previous.query"); - String nextQuery = (String) request.getAttribute("next.query"); - - // Browse by date only stuff - boolean oldestFirst = ((Boolean) request.getAttribute("oldest.first")).booleanValue(); - String flipOrderingQuery = (String) request.getAttribute("flip.ordering.query"); - - // Description of what the user is actually browsing - String scopeName = "All of DSpace"; - if (collection != null) - { - scopeName = collection.getMetadata("name"); - } - else if (community != null) - { - scopeName = community.getMetadata("name"); - } -%> - - - -

Browsing <%= scopeName %> by Date

- - <%-- Date browse controls table --%> -
- -<% - if (oldestFirst) - { - // Remember ordering when using browse controls -%> - -<% - } -%> - - - - -
- - - - - - - <%-- HACK: Shouldn't use align here --%> - - -
- Jump to a point in the index: - - - - - -
- Or type in a year: - -
-
- - - <%-- Flip the ordering controls --%> - - - - - - -
-<% - if (oldestFirst) - { -%> - Show Most Recent First -<% - } - else - { -%> - Ordering With Most Recent First -<% - } -%> - -<% - if( oldestFirst ) - { -%> - Ordering With Oldest First -<% - } - else - { -%> - Show Oldest First -<% - } -%> -
-
- -
- -

Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.

- - <%-- Previous page/Next page --%> - - - - - -
-<% - if (prevQuery != null) - { -%> - Previous page -<% - } -%> - -<% - if (nextQuery != null) - { -%> - Next page -<% - } -%> -
- - -<% - String highlightAttribute = "-1"; - if (highlight) - { - highlightAttribute = String.valueOf(browseInfo.getOffset()); - } -%> - - - - <%-- Previous page/Next page --%> - - - - - -
-<% - if (prevQuery != null) - { -%> - Previous page -<% - } -%> - -<% - if (nextQuery != null) - { -%> - Next page -<% - } -%> -
- -
+<%-- + - items-by-date.jsp + - + - Version: $Revision: 1.8 $ + - + - Date: $Date: 2003/12/17 15:42:54 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Display the results of browsing a title or date index + - + - Attributes to pass in: + - community - pass in if the scope of the browse is a community, or + - a collection within this community + - collection - pass in if the scope of the browse is a collection + - browse.info - the BrowseInfo containing the items to display + - highlight - Boolean. If true, the focus point of the browse + - is highlighted + - previous.query - The query string to pass to the servlet to get the + - previous page of items + - next.query - The query string to pass to the servlet to get the next + - page of items + - oldest.first - Boolean - if browsing dates, indicates whether oldest + - items are first + - flip.ordering.query - the query string for flipping the order of the + - index between oldest first and most recent first + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.browse.BrowseInfo" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.DCDate" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> + +<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> +<%@ page import="org.apache.taglibs.standard.tag.common.fmt.BundleSupport" %> +<%@ page import="java.util.Locale" %> + +<% + // Get attributes + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + + BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info"); + + boolean highlight = ((Boolean) request.getAttribute("highlight")).booleanValue(); + + String prevQuery = (String) request.getAttribute("previous.query"); + String nextQuery = (String) request.getAttribute("next.query"); + + // Browse by date only stuff + boolean oldestFirst = ((Boolean) request.getAttribute("oldest.first")).booleanValue(); + String flipOrderingQuery = (String) request.getAttribute("flip.ordering.query"); + +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="items-by-date.title"/> + + + + <%--

Browsing <%= scopeName %> by Date

--%> + + + + + + + + <% + + if (collection != null) + { + + pageContext.setAttribute("scopeName", collection.getMetadata("name")); %> + + + + + + <% + + } + else if (community != null) + { + pageContext.setAttribute("scopeName", community.getMetadata("name")); %> + + + + + + <% + + } + + %> + + + +

+ + <%-- Date browse controls table --%> +
+ +<% + //get Locale first + LocalizationContext locCtxt = null; + locCtxt = BundleSupport.getLocalizationContext(pageContext); + Locale loc = locCtxt.getLocale(); + + + if (oldestFirst) + { + // Remember ordering when using browse controls +%> + +<% + } +%> + + + + +
+ + + + + + + <%-- HACK: Shouldn't use align here --%> + + +
+ <%-- Jump to a point in the index: --%> + + + + + + <%-- --%> + "> +
+ <%-- Or type in a year: --%> + + +
+
+ + + <%-- Flip the ordering controls --%> + + + + + + +
+<% + if (oldestFirst) + { +%> + <%-- Show Most Recent First --%> + +<% + } + else + { +%> + <%-- Ordering With Most Recent First --%> + +<% + } +%> + +<% + if( oldestFirst ) + { +%> + <%-- Ordering With Oldest First --%> + +<% + } + else + { +%> + <%-- Show Oldest First --%> + +<% + } +%> +
+
+ +
+ + <%--

Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> of <%= browseInfo.getTotal() %>.

--%> +

<%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> <%= browseInfo.getTotal() %>.

+ + <%-- Previous page/Next page --%> + + + + + +
+<% + if (prevQuery != null) + { +%> + <%-- Previous page --%> + +<% + } +%> + +<% + if (nextQuery != null) + { +%> + <%-- Next page --%> + +<% + } +%> +
+ + +<% + String highlightAttribute = "-1"; + if (highlight) + { + highlightAttribute = String.valueOf(browseInfo.getOffset()); + } +%> + + + + <%-- Previous page/Next page --%> + + + + + +
+<% + if (prevQuery != null) + { +%> + <%-- Previous page --%> + +<% + } +%> + +<% + if (nextQuery != null) + { +%> + <%-- Next page --%> + +<% + } +%> +
+ +
diff -Naur dspace-1.2-source-devel/jsp/browse/items-by-title.jsp dspace-1.2-source-devel/multi/browse/items-by-title.jsp --- dspace-1.2-source-devel/jsp/browse/items-by-title.jsp 2003-02-21 17:51:48.000000000 -0200 +++ dspace-1.2-source-devel/multi/browse/items-by-title.jsp 2004-12-16 15:08:46.000000000 -0200 @@ -1,198 +1,259 @@ -<%-- - - items-by-title.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2003/02/21 19:51:48 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Display the results of browsing title index - - - - Attributes to pass in: - - community - pass in if the scope of the browse is a community, or - - a collection within this community - - collection - pass in if the scope of the browse is a collection - - browse.info - the BrowseInfo containing the items to display - - highlight - Boolean. If true, the focus point of the browse - - is highlighted - - previous.query - The query string to pass to the servlet to get the - - previous page of items - - next.query - The query string to pass to the servlet to get the next - - page of items - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.browse.BrowseInfo" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.DCDate" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> - - -<% - // Get attributes - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); - - BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info"); - - boolean highlight = ((Boolean) request.getAttribute("highlight")).booleanValue(); - - String prevQuery = (String) request.getAttribute("previous.query"); - String nextQuery = (String) request.getAttribute("next.query"); - - // Description of what the user is actually browsing - String scopeName = "All of DSpace"; - if (collection != null) - { - scopeName = collection.getMetadata("name"); - } - else if (community != null) - { - scopeName = community.getMetadata("name"); - } -%> - - - -

Browsing <%= scopeName %> by Title

- - <%-- Title browse controls table --%> -
- - - - -
- - - - - - - -
- Jump to:  - 0-9 -<% - for (char c = 'A'; c <= 'Z'; c++) - { -%> - <%= c %> -<% - } -%> -
- or enter first few letters:  -   -
-
-
- -
- -

- Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> - of <%= browseInfo.getTotal() %>. -

- - <%-- Previous page/Next page --%> - - - - - -
-<% - if (prevQuery != null) - { -%> - Previous page -<% - } -%> - -<% - if (nextQuery != null) - { -%> - Next page -<% - } -%> -
- -<% - String highlightAttribute = "-1"; - if (highlight) - { - highlightAttribute = String.valueOf(browseInfo.getOffset()); - } -%> - - - - <%-- Previous page/Next page --%> - - - - - -
-<% - if (prevQuery != null) - { -%> - Previous page -<% - } -%> - -<% - if (nextQuery != null) - { -%> - Next page -<% - } -%> -
- -
+<%-- + - items-by-title.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2003/02/21 19:51:48 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Display the results of browsing title index + - + - Attributes to pass in: + - community - pass in if the scope of the browse is a community, or + - a collection within this community + - collection - pass in if the scope of the browse is a collection + - browse.info - the BrowseInfo containing the items to display + - highlight - Boolean. If true, the focus point of the browse + - is highlighted + - previous.query - The query string to pass to the servlet to get the + - previous page of items + - next.query - The query string to pass to the servlet to get the next + - page of items + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.browse.BrowseInfo" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.DCDate" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> + + +<% + // Get attributes + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + + BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info"); + + boolean highlight = ((Boolean) request.getAttribute("highlight")).booleanValue(); + + String prevQuery = (String) request.getAttribute("previous.query"); + String nextQuery = (String) request.getAttribute("next.query"); + +%> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="items-by-title.title"/> + + + + <%--

Browsing <%= scopeName %> by Title

--%> + + + + + + + <% + + if (collection != null) + { + + pageContext.setAttribute("scopeName", collection.getMetadata("name")); %> + + + + + + <% + + } + else if (community != null) + { + pageContext.setAttribute("scopeName", community.getMetadata("name")); %> + + + + + + <% + + } + + %> + + +

+ + <%-- Title browse controls table --%> +
+ + + + +
+ <%--allow for greek alphabet also--%> + + + + + + + + + + + +
+ <%-- Jump to:  --%> + + 0-9<% + for (char c = 'Α'; c <= 'Ω'; c++) + { + if (c!='\u03A2') { + %> + <%= c %> + <% + }} + %> +
<% + for (char c = 'A'; c <= 'Z'; c++) + { + %> + <%= c %> + <% + } + %> +
+ <%-- or enter first few letters:  --%> +   + <%--   --%> +  "> +
+
+
+ +
+ +

+ <%-- Showing items <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> + of <%= browseInfo.getTotal() %>. --%> + <%= browseInfo.getOverallPosition()+1 %>-<%= browseInfo.getOverallPosition()+browseInfo.getResultCount() %> + <%= browseInfo.getTotal() %>. +

+ + <%-- Previous page/Next page --%> + + + + + +
+<% + if (prevQuery != null) + { +%> + <%-- Previous page --%> + +<% + } +%> + +<% + if (nextQuery != null) + { +%> + <%-- Next page --%> + +<% + } +%> +
+ +<% + String highlightAttribute = "-1"; + if (highlight) + { + highlightAttribute = String.valueOf(browseInfo.getOffset()); + } +%> + + + + <%-- Previous page/Next page --%> + + + + + +
+<% + if (prevQuery != null) + { +%> + <%-- Previous page --%> + +<% + } +%> + +<% + if (nextQuery != null) + { +%> + <%-- Next page --%> + +<% + } +%> +
+ +
diff -Naur dspace-1.2-source-devel/jsp/browse/no-results.jsp dspace-1.2-source-devel/multi/browse/no-results.jsp --- dspace-1.2-source-devel/jsp/browse/no-results.jsp 2003-12-04 14:44:54.000000000 -0200 +++ dspace-1.2-source-devel/multi/browse/no-results.jsp 2004-12-16 15:09:19.000000000 -0200 @@ -1,88 +1,126 @@ -<%-- - - no-results.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2003/12/04 16:44:53 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Message indicating that there are no entries in the browse index. - - - - Attributes required: - - community - community the browse was in, or null - - collection - collection the browse was in, or null - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> - -<% - // Retrieve attributes - Community community = (Community) request.getAttribute("community"); - Collection collection = (Collection) request.getAttribute("collection"); - - // Description of what the user is actually browsing, and where link back - String scopeName = "All of DSpace"; - String linkText = "DSpace Home"; - String linkBack = "/"; - - if(collection != null) - { - scopeName = collection.getMetadata("name"); - linkText = collection.getMetadata("name"); - linkBack = "/handle/" + collection.getHandle(); - } - else if(community != null) - { - scopeName = community.getMetadata("name"); - linkText = community.getMetadata("name"); - linkBack = "/handle/" + community.getHandle(); - } -%> - - - -

No Entries in Index

- -

There are no entries in the index for <%= scopeName %>.

- -

<%= linkText %>

- -
+<%-- + - no-results.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2003/12/04 16:44:53 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Message indicating that there are no entries in the browse index. + - + - Attributes required: + - community - community the browse was in, or null + - collection - collection the browse was in, or null + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> + +<% + // Retrieve attributes + Community community = (Community) request.getAttribute("community"); + Collection collection = (Collection) request.getAttribute("collection"); + + // Description of what the user is actually browsing, and where link back + //String scopeName = "All of DSpace"; + String linkText = "DSpace Home"; + String linkBack = "/"; + + if(collection != null) + { + //scopeName = collection.getMetadata("name"); + linkText = collection.getMetadata("name"); + linkBack = "/handle/" + collection.getHandle(); + } + else if(community != null) + { + //scopeName = community.getMetadata("name"); + linkText = community.getMetadata("name"); + linkBack = "/handle/" + community.getHandle(); + } +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="no-results.title"/> + + + + <%--

No Entries in Index

--%> + +

+ + +<%--

There are no entries in the index for <%= scopeName %>.

--%> +

+ <% + if (collection != null) + { + %> + "<%= collection.getMetadata("name")%>". + <% + } + else if (community != null) + { + %> + "<%= community.getMetadata("name")%>". + <% + } + else + { + %> + + <% + } + %> +

+ + +

<%= linkText %>

+ +
diff -Naur dspace-1.2-source-devel/jsp/collection-home.jsp dspace-1.2-source-devel/multi/collection-home.jsp --- dspace-1.2-source-devel/jsp/collection-home.jsp 2004-06-15 17:27:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/collection-home.jsp 2005-02-04 12:12:05.000000000 -0200 @@ -1,276 +1,309 @@ -<%-- - - collection-home.jsp - - - - Version: $Revision: 1.18 $ - - - - Date: $Date: 2004/06/15 20:27:13 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Collection home JSP - - - - Attributes required: - - collection - Collection to render home page for - - community - Community this collection is in - - last.submitted.titles - String[], titles of recent submissions - - last.submitted.urls - String[], corresponding URLs - - logged.in - Boolean, true if a user is logged in - - subscribed - Boolean, true if user is subscribed to this collection - - admin_button - Boolean, show admin 'edit' button - - editor_button - Boolean, show collection editor (edit submitters, item mapping) buttons - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection"%> -<%@ page import="org.dspace.core.Utils"%> -<%@ page import="org.dspace.eperson.Group" %> - - -<% - // Retrieve attributes - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); - Group submitters = (Group) request.getAttribute("submitters"); - - String[] lastSubmittedTitles = (String[]) - request.getAttribute("last.submitted.titles"); - String[] lastSubmittedURLs = (String[]) - request.getAttribute("last.submitted.urls"); - - boolean loggedIn = - ((Boolean) request.getAttribute("logged.in")).booleanValue(); - boolean subscribed = - ((Boolean) request.getAttribute("subscribed")).booleanValue(); - Boolean admin_b = (Boolean)request.getAttribute("admin_button"); - boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); - - Boolean editor_b = (Boolean)request.getAttribute("editor_button"); - boolean editor_button = (editor_b == null ? false : editor_b.booleanValue()); - - - - // Put the metadata values into guaranteed non-null variables - String name = collection.getMetadata("name"); - String intro = collection.getMetadata("introductory_text"); - if (intro == null) - { - intro = ""; - } - String copyright = collection.getMetadata("copyright_text"); - if (copyright == null) - { - copyright = ""; - } - String sidebar = collection.getMetadata("side_bar_text"); - if(sidebar == null) - { - sidebar = ""; - } - - String communityName = community.getMetadata("name"); - String communityLink = "/handle/" + community.getHandle(); - - Bitstream logo = collection.getLogo(); -%> - - - - - - - - - -
-

<%= name %>

-

Collection home page

-
-<% if (logo != null) { %> - Logo -<% } %>
- - <%-- Search/Browse --%> -
- - - - -
- - - - - - - - - - -
- In:  -
- Search for   -
- or browse    -
-
-
- - - - - - - -
-<%-- HACK:
used for Netscape 4.x, which doesn't accept align=center - for a paragraph with a button in it --%> -
-
- - -
-
-
-
- - - - - - -
-<% if (loggedIn && subscribed) - { %> - You are subscribed to this collection. See Subscriptions - - -<% } else { %> - - Subscribe to this collection to receive daily e-mail notification of new additions - - - -<% } %> -
-
- - <%= intro %> - - - -

<%= copyright %>

- - -<% if(admin_button || editor_button ) { %> - - - - -<% } %> - -
- - - - -<% if( admin_button ) { %> - - - -<% } %> - -<% if( editor_button ) { %> - - - -<% if(submitters != null) { %> - - - -<% } %> - - - -
- Admin Tools - -
-
- - - - -
-
-
- - -
-
-
- - -
-
- Admin Help... -
-
-<% } %> - - -

Recent Submissions

-<% - for (int i = 0; i < lastSubmittedTitles.length; i++) - { -%> -

<%= Utils.addEntities(lastSubmittedTitles[i]) %>

-<% - } -%> - <%= sidebar %> -
- -
+<%-- + - collection-home.jsp + - + - Version: $Revision: 1.18 $ + - + - Date: $Date: 2004/06/15 20:27:13 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Collection home JSP + - + - Attributes required: + - collection - Collection to render home page for + - community - Community this collection is in + - last.submitted.titles - String[], titles of recent submissions + - last.submitted.urls - String[], corresponding URLs + - logged.in - Boolean, true if a user is logged in + - subscribed - Boolean, true if user is subscribed to this collection + - admin_button - Boolean, show admin 'edit' button + - editor_button - Boolean, show collection editor (edit submitters, item mapping) buttons + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection"%> +<%@ page import="org.dspace.core.Utils"%> +<%@ page import="org.dspace.eperson.Group" %> + + +<% + // Retrieve attributes + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + Group submitters = (Group) request.getAttribute("submitters"); + + String[] lastSubmittedTitles = (String[]) + request.getAttribute("last.submitted.titles"); + String[] lastSubmittedURLs = (String[]) + request.getAttribute("last.submitted.urls"); + + boolean loggedIn = + ((Boolean) request.getAttribute("logged.in")).booleanValue(); + boolean subscribed = + ((Boolean) request.getAttribute("subscribed")).booleanValue(); + Boolean admin_b = (Boolean)request.getAttribute("admin_button"); + boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); + + Boolean editor_b = (Boolean)request.getAttribute("editor_button"); + boolean editor_button = (editor_b == null ? false : editor_b.booleanValue()); + + + + // Put the metadata values into guaranteed non-null variables + String name = collection.getMetadata("name"); + String intro = collection.getMetadata("introductory_text"); + if (intro == null) + { + intro = ""; + } + String copyright = collection.getMetadata("copyright_text"); + if (copyright == null) + { + copyright = ""; + } + String sidebar = collection.getMetadata("side_bar_text"); + if(sidebar == null) + { + sidebar = ""; + } + + String communityName = community.getMetadata("name"); + String communityLink = "/handle/" + community.getHandle(); + + Bitstream logo = collection.getLogo(); +%> + + + + + <fmt:message key="general.title"/>: + <%= name %> + + + + + + + + +
+

<%= name %>

+ <%--

Collection home page

--%> +

+
+<% if (logo != null) { %> + Logo +<% } %>
+ + <%-- Search/Browse --%> +
+ + + + +
+ + + + + + + + + + +
+ <%--In:  + <%----%> + + + + +
+ <%--Search for  --%> +   "> +
+ <%--or browse   --%> +  "> "> "> +
+
+
+ + + + + + + +
+<%-- HACK:
used for Netscape 4.x, which doesn't accept align=center + for a paragraph with a button in it --%> +
+
+ + <%----%> + "> +
+
+
+
+ + + + + + +
+<% if (loggedIn && subscribed) + { %> + <%--You are subscribed to this collection. See Subscriptions--%> + + + <%----%> + "> +<% } else { %> + + <%--Subscribe to this collection to receive daily e-mail notification of new additions--%> + + + + <%----%> + "> +<% } %> +
+
+ + <%= intro %> + + + +

<%= copyright %>

+ + +<% if(admin_button || editor_button ) { %> + + + + +<% } %> + +
+ + + + +<% if( admin_button ) { %> + + + +<% } %> + +<% if( editor_button ) { %> + + + +<% if(submitters != null) { %> + + + +<% } %> + + + +
+ <%--Admin Tools--%> + + +
+
+ + + + <%----%> + "> +
+
+
+ + <%----%> + "> +
+
+
+ + <%----%> + "> +
+
+ <%--Admin Help...--%> + + + + + + +
+
+<% } %> + + + <%--

Recent Submissions

--%> +

+<% + for (int i = 0; i < lastSubmittedTitles.length; i++) + { +%> +

<%= Utils.addEntities(lastSubmittedTitles[i]) %>

+<% + } +%> + <%= sidebar %> +
+ +
diff -Naur dspace-1.2-source-devel/jsp/community-home.jsp dspace-1.2-source-devel/multi/community-home.jsp --- dspace-1.2-source-devel/jsp/community-home.jsp 2004-06-15 16:40:06.000000000 -0200 +++ dspace-1.2-source-devel/multi/community-home.jsp 2005-02-04 12:17:52.000000000 -0200 @@ -1,274 +1,306 @@ -<%-- - - community-home.jsp - - - - Version: $Revision: 1.13 $ - - - - Date: $Date: 2004/06/15 19:40:05 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Community home JSP - - - - Attributes required: - - community - Community to render home page for - - collections - array of Collections in this community - - subcommunities - array of Sub-communities in this community - - last.submitted.titles - String[] of titles of recently submitted items - - last.submitted.urls - String[] of URLs of recently submitted items - - admin_button - Boolean, show admin 'edit' button - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.core.Utils" %> - -<% - // Retrieve attributes - Community community = (Community) request.getAttribute( "community" ); - Collection[] collections = - (Collection[]) request.getAttribute("collections"); - Community[] subcommunities = - (Community[]) request.getAttribute("subcommunities"); - - String[] lastSubmittedTitles = (String[]) - request.getAttribute("last.submitted.titles"); - String[] lastSubmittedURLs = (String[]) - request.getAttribute("last.submitted.urls"); - Boolean admin_b = (Boolean)request.getAttribute("admin_button"); - boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); - - - // Put the metadata values into guaranteed non-null variables - String name = community.getMetadata("name"); - String intro = community.getMetadata("introductory_text"); - if (intro == null) - { - intro = ""; - } - String copyright = community.getMetadata("copyright_text"); - if (copyright == null) - { - copyright = ""; - } - String sidebar = community.getMetadata("side_bar_text"); - if(sidebar == null) - sidebar = ""; - - Bitstream logo = community.getLogo(); -%> - - - - - - - - -
-

<%= name %>

-

Community home page

-
-<% if (logo != null) { %> - Logo -<% } %>
- - - <%-- Search/Browse --%> -
- - - - -
- - - - - - - - - - -
- In:  -
- Search for   -
- or browse    -
-
-
- - <%= intro %> - -<% - if (collections.length != 0) - { -%> - -

Collections in this community

- - -<% - } -%> - -<% - if (subcommunities.length != 0) - { -%> -

Sub-communities within this community

- - -<% - } -%> - -

<%= copyright %>

- - - <% if(admin_button) // admin edit button - { %> - - - - -
- - - - - - - - - - -
- Admin Tools -
-
- - - -
-
- - -
-
- - - -
-
- Admin Help... -
-
- <% } %> - - - -

Recent Submissions

- -<% - for (int i = 0; i < lastSubmittedTitles.length; i++) - { -%> -

<%= Utils.addEntities(lastSubmittedTitles[i]) %>

-<% - } -%> -

 

- - <%= sidebar %> - -
- - - -
+<%-- + - community-home.jsp + - + - Version: $Revision: 1.13 $ + - + - Date: $Date: 2004/06/15 19:40:05 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Community home JSP + - + - Attributes required: + - community - Community to render home page for + - collections - array of Collections in this community + - subcommunities - array of Sub-communities in this community + - last.submitted.titles - String[] of titles of recently submitted items + - last.submitted.urls - String[] of URLs of recently submitted items + - admin_button - Boolean, show admin 'edit' button + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.core.Utils" %> + +<% + // Retrieve attributes + Community community = (Community) request.getAttribute( "community" ); + Collection[] collections = + (Collection[]) request.getAttribute("collections"); + Community[] subcommunities = + (Community[]) request.getAttribute("subcommunities"); + + String[] lastSubmittedTitles = (String[]) + request.getAttribute("last.submitted.titles"); + String[] lastSubmittedURLs = (String[]) + request.getAttribute("last.submitted.urls"); + Boolean admin_b = (Boolean)request.getAttribute("admin_button"); + boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); + + + // Put the metadata values into guaranteed non-null variables + String name = community.getMetadata("name"); + String intro = community.getMetadata("introductory_text"); + if (intro == null) + { + intro = ""; + } + String copyright = community.getMetadata("copyright_text"); + if (copyright == null) + { + copyright = ""; + } + String sidebar = community.getMetadata("side_bar_text"); + if(sidebar == null) + sidebar = ""; + + Bitstream logo = community.getLogo(); +%> + + + + + + <fmt:message key="general.title"/>: + <%= name %> + + + + + + + + +
+

<%= name %>

+ <%--

Community home page

--%> +

+
+<% if (logo != null) { %> + Logo +<% } %>
+ + + <%-- Search/Browse --%> +
+ + + + +
+ + + + + + + + + + +
+ <%--In:  + <%----%> + + +<% + for (int i = 0; i < collections.length; i++) + { +%> + +<% + } +%> +<% + for (int j = 0; j < subcommunities.length; j++) + { +%> + +<% + } +%> + +
+ <%-- Search for   --%> +   "> +
+ <%--or browse   --%> +  "> "> "> +
+
+
+ + <%= intro %> + +<% + if (collections.length != 0) + { +%> + + <%--

Collections in this community

--%> +

+ + +<% + } +%> + +<% + if (subcommunities.length != 0) + { +%> + <%--

Sub-communities within this community

--%> +

+ + +<% + } +%> + +

<%= copyright %>

+ + + <% if(admin_button) // admin edit button + { %> + + + + +
+ + + + + + + + + + +
+ <%--Admin Tools--%> + +
+
+ + + <%----%> + "> +
+
+ + <%----%> + "> +
+
+ + + <%----%> + "> +
+
+ <%--Admin Help...--%> + + + + + + +
+
+ <% } %> + + + + <%--

Recent Submissions

--%> +

+ +<% + for (int i = 0; i < lastSubmittedTitles.length; i++) + { +%> +

<%= Utils.addEntities(lastSubmittedTitles[i]) %>

+<% + } +%> +

 

+ + <%= sidebar %> + +
+ + + + diff -Naur dspace-1.2-source-devel/jsp/community-list.jsp dspace-1.2-source-devel/multi/community-list.jsp --- dspace-1.2-source-devel/jsp/community-list.jsp 2004-06-29 12:09:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/community-list.jsp 2005-02-04 12:22:02.000000000 -0200 @@ -1,231 +1,261 @@ -<%-- - - community-list.jsp - - - - Version: $Revision: 1.11 $ - - - - Date: $Date: 2004/06/29 15:09:07 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display hierarchical list of communities and collections - - - - Attributes to be passed in: - - communities - array of communities - - collections.map - Map where a keys is a community IDs (Integers) and - - the value is the array of collections in that community - - subcommunities.map - Map where a keys is a community IDs (Integers) and - - the value is the array of subcommunities in that community - - admin_button - Boolean, show admin 'Create Top-Level Community' button - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="java.util.Map" %> -<%@ page import="java.io.IOException" %> -<%@ page import="java.sql.SQLException" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Community[] communities = (Community[]) request.getAttribute("communities"); - Map collectionMap = (Map) request.getAttribute("collections.map"); - Map subcommunityMap = (Map) request.getAttribute("subcommunities.map"); - Boolean admin_b = (Boolean)request.getAttribute("admin_button"); - boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); - boolean showAll = true; -%> - -<%! - JspWriter out = null; - HttpServletRequest request = null; - - void setContext(JspWriter out, HttpServletRequest request) - { - this.out = out; - this.request = request; - } - - void showCommunity(Community c) throws IOException, SQLException - { - out.println( "
  • " ); - out.println( "" + c.getMetadata("name") + ""); - - // Get the collections in this community - Collection[] cols = c.getCollections(); - if (cols.length > 0) - { - out.println(""); - } - - // Get the sub-communities in this community - Community[] comms = c.getSubcommunities(); - if (comms.length > 0) - { - out.println("
      "); - for (int k = 0; k < comms.length; k++) - { - showCommunity(comms[k]); - } - out.println("
    "); - - } - out.println("
    "); - } -%> - - - -<% - if (admin_button) - { -%> - - - - - -
    -

    Communities and Collections

    - -

    Shown below is a list of communities and the collections and sub-communities within them. - Click on a name to view that community or collection home page.

    -
    - - - - -
    - - - - - - - - - - -
    - Admin Tools -
    -
    - - -
    -
    - Admin Help... -
    -
    -
    - -<% - } - else - { -%> -

    Communities and Collections

    - -

    Shown below is a list of communities and the collections and sub-communities within them. - Click on a name to view that community or collection home page.

    -<% - } -%> -
      -<% - if (showAll) - { - setContext(out, request); - for (int i = 0; i < communities.length; i++) - { - showCommunity(communities[i]); - } - } - else - { - for (int i = 0; i < communities.length; i++) - { -%> - -<% - } - } -%> -
    - -
    +<%-- + - community-list.jsp + - + - Version: $Revision: 1.11 $ + - + - Date: $Date: 2004/06/29 15:09:07 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display hierarchical list of communities and collections + - + - Attributes to be passed in: + - communities - array of communities + - collections.map - Map where a keys is a community IDs (Integers) and + - the value is the array of collections in that community + - subcommunities.map - Map where a keys is a community IDs (Integers) and + - the value is the array of subcommunities in that community + - admin_button - Boolean, show admin 'Create Top-Level Community' button + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ page import="java.util.Map" %> +<%@ page import="java.io.IOException" %> +<%@ page import="java.sql.SQLException" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Community[] communities = (Community[]) request.getAttribute("communities"); + Map collectionMap = (Map) request.getAttribute("collections.map"); + Map subcommunityMap = (Map) request.getAttribute("subcommunities.map"); + Boolean admin_b = (Boolean)request.getAttribute("admin_button"); + boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); + boolean showAll = true; +%> + +<%! + JspWriter out = null; + HttpServletRequest request = null; + + void setContext(JspWriter out, HttpServletRequest request) + { + this.out = out; + this.request = request; + } + + void showCommunity(Community c) throws IOException, SQLException + { + out.println( "
  • " ); + out.println( "" + c.getMetadata("name") + ""); + + // Get the collections in this community + Collection[] cols = c.getCollections(); + if (cols.length > 0) + { + out.println(""); + } + + // Get the sub-communities in this community + Community[] comms = c.getSubcommunities(); + if (comms.length > 0) + { + out.println("
      "); + for (int k = 0; k < comms.length; k++) + { + showCommunity(comms[k]); + } + out.println("
    "); + + } + out.println("
    "); + } +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="community-list.title"/> + + + + +<% + if (admin_button) + { +%> + + + + + + + +
    + <%--

    Communities and Collections

    --%> +

    + + <%--

    Shown below is a list of communities and the collections and sub-communities within them. + Click on a name to view that community or collection home page.

    --%> +

    +
    + + + + +
    + + + + + + + + + + +
    + <%--Admin Tools--%> + +
    +
    + + <%----%> + "> +
    +
    + <%--Admin Help...--%> + + + + + + +
    +
    +
    + +<% + } + else + { +%> + <%--

    Communities and Collections

    --%> +

    + + <%--

    Shown below is a list of communities and the collections and sub-communities within them. + Click on a name to view that community or collection home page.

    --%> +

    +<% + } +%> +
      +<% + if (showAll) + { + setContext(out, request); + for (int i = 0; i < communities.length; i++) + { + showCommunity(communities[i]); + } + } + else + { + for (int i = 0; i < communities.length; i++) + { +%> + +<% + } + } +%> +
    + +
    diff -Naur dspace-1.2-source-devel/jsp/components/contact-info.jsp dspace-1.2-source-devel/multi/components/contact-info.jsp --- dspace-1.2-source-devel/jsp/components/contact-info.jsp 2004-05-21 16:27:56.000000000 -0200 +++ dspace-1.2-source-devel/multi/components/contact-info.jsp 2005-02-08 13:13:01.000000000 -0200 @@ -1,62 +1,73 @@ -<%-- - - contact-info.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2004/05/21 19:27:56 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Contact information for the DSpace site. - --%> - -<%@ page import="org.dspace.core.ConfigurationManager" %> - -
    -

    <%= ConfigurationManager.getProperty("dspace.name") %> administration - contact details:

    - - - - - - - - - - -
    By e-mail:"><%= ConfigurationManager.getProperty("mail.admin") %>
    Or telephone:xxx-555-xxxx
    -
    - +<%-- + - contact-info.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2004/05/21 19:27:56 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Contact information for the DSpace site. + --%> + + <%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + +<%@ page import="org.dspace.core.ConfigurationManager" %> + +
    + <%--

    <%= ConfigurationManager.getProperty("dspace.name") %> administration + contact details:

    --%> +

    -

    + + + + <%-- --%> + + + + + <%-- + + + --%> +
    By e-mail:"><%= ConfigurationManager.getProperty("mail.admin") %>
    Or telephone:xxx-555-xxxx
    +
    + diff -Naur dspace-1.2-source-devel/jsp/components/login-form.jsp dspace-1.2-source-devel/multi/components/login-form.jsp --- dspace-1.2-source-devel/jsp/components/login-form.jsp 2002-11-01 15:59:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/components/login-form.jsp 2004-11-23 08:30:09.000000000 -0200 @@ -1,75 +1,80 @@ -<%-- - - login-form.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2002/11/01 17:59:14 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Component which displays a login form and associated information - --%> - - - - - -
    - -

    New user? Click here to register.

    - -

    Please enter your e-mail address and password into the form below.

    - -
    - - - - - - - - - - - - - -
    E-mail Address:
    Password:
    - -
    -
    - -

    Have you forgotten your password?

    -
    +<%-- + - login-form.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2002/11/01 17:59:14 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Component which displays a login form and associated information + --%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + + + --%> +

    + +
    + <%--

    New user? Click here to register.

    --%> +

    .

    + <%--

    Please enter your e-mail address and password into the form below.

    --%> +

    +
    + + + <%-- --%> + + + + + <%-- --%> + + + + + + +
    E-mail Address:
    Password:
    + <%-- --%> + "> +
    +
    + <%--

    Have you forgotten your password?

    diff -Naur dspace-1.2-source-devel/jsp/components/news.jsp dspace-1.2-source-devel/multi/components/news.jsp --- dspace-1.2-source-devel/jsp/components/news.jsp 2002-11-01 15:59:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/components/news.jsp 2004-10-24 05:39:20.000000000 -0200 @@ -1,46 +1,55 @@ -<%-- - - home.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2002/11/01 17:59:14 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - DSpace News. This appears near the top of the home page. - --%> -

    DSpace is Live

    -

    Welcome to our digital repository of My University research!

    -

    More exciting news to appear here.

    +<%-- + - home.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2002/11/01 17:59:14 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - DSpace News. This appears near the top of the home page. + --%> + + <%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%--

    DSpace is Live

    --%> +

    +<%--

    Welcome to our digital repository of My University research!

    --%> +

    +<%--

    More exciting news to appear here.

    --%> +

    diff -Naur dspace-1.2-source-devel/jsp/contact-info.jsp dspace-1.2-source-devel/multi/contact-info.jsp --- dspace-1.2-source-devel/jsp/contact-info.jsp 1969-12-31 22:00:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/contact-info.jsp 2005-01-27 12:37:51.000000000 -0200 @@ -0,0 +1,71 @@ +<%-- + - contact-info.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2004/05/21 19:27:56 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Contact information for the DSpace site. + --%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + +<%@ page import="org.dspace.core.ConfigurationManager" %> + +
    + <%--

    <%= ConfigurationManager.getProperty("dspace.name") %> administration + contact details:

    --%> +

    -

    + + + + <%-- --%> + + + + + <%-- --%> + + + +
    By e-mail:"><%= ConfigurationManager.getProperty("mail.admin") %>
    Or telephone:xxx-555-xxxx
    +
    + diff -Naur dspace-1.2-source-devel/jsp/display-item.jsp dspace-1.2-source-devel/multi/display-item.jsp --- dspace-1.2-source-devel/jsp/display-item.jsp 2004-06-24 17:48:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/display-item.jsp 2004-11-23 13:33:26.000000000 -0200 @@ -1,165 +1,186 @@ -<%-- - - display-item.jsp - - - - Version: $Revision: 1.12 $ - - - - Date: $Date: 2004/06/24 20:48:28 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Renders a whole HTML page for displaying item metadata. Simply includes - - the relevant item display component in a standard HTML page. - - - - Attributes: - - display.all - Boolean - if true, display full metadata record - - item - the Item to display - - collections - Array of Collections this item appears in. This must be - - passed in for two reasons: 1) item.getCollections() could - - fail, and we're already committed to JSP display, and - - 2) the item might be in the process of being submitted and - - a mapping between the item and collection might not - - appear yet. If this is omitted, the item display won't - - display any collections. - - admin_button - Boolean, show admin 'edit' button - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.util.UIUtil" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.core.ConfigurationManager" %> -<%@ page import="org.dspace.handle.HandleManager" %> -<%@ page import="org.dspace.license.CreativeCommons" %> - -<% - // Attributes - Boolean displayAllBoolean = (Boolean) request.getAttribute("display.all"); - boolean displayAll = (displayAllBoolean != null && displayAllBoolean.booleanValue()); - Item item = (Item) request.getAttribute("item"); - Collection[] collections = (Collection[]) request.getAttribute("collections"); - Boolean admin_b = (Boolean)request.getAttribute("admin_button"); - boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); - - String handle = item.getHandle(); - - // CC URL & RDF - String cc_url = CreativeCommons.getLicenseURL(item); - String cc_rdf = CreativeCommons.getLicenseRDF(item); - - // Full title needs to be put into a string to use as tag argument - String title = "Item " + handle; -%> - - - -<% - if (handle != null) - { -%> - - - -<% - if (admin_button) // admin edit button - { %> - -<% } %> - -
    - Please use this identifier to cite or link to this item: - <%= HandleManager.getCanonicalForm(handle) %> - -
    - - -
    -
    -
    -<% - } - - String displayStyle = (displayAll ? "full" : "default"); -%> - - -<% - String locationLink = request.getContextPath() + "/handle/" + handle; - - if (displayAll) - { -%> -

    Show simple item record

    -<% - } - else - { -%> -

    Show full item record

    -<% - } -%> - - <%-- SFX Link --%> -<% - if (ConfigurationManager.getProperty("sfx.server.url") != null) - { -%> -

    - " />">SFX Query -

    -<% - } -%> - <%-- Create Commons Link --%> -<% - if (cc_url != null) - { -%> -

    This item is licensed inder a Creative Commons License
    - Creative Commons -

    - -<% - } -%> -

    All items in DSpace are protected by copyright, with all rights reserved.

    - -
    +<%-- + - display-item.jsp + - + - Version: $Revision: 1.12 $ + - + - Date: $Date: 2004/06/24 20:48:28 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Renders a whole HTML page for displaying item metadata. Simply includes + - the relevant item display component in a standard HTML page. + - + - Attributes: + - display.all - Boolean - if true, display full metadata record + - item - the Item to display + - collections - Array of Collections this item appears in. This must be + - passed in for two reasons: 1) item.getCollections() could + - fail, and we're already committed to JSP display, and + - 2) the item might be in the process of being submitted and + - a mapping between the item and collection might not + - appear yet. If this is omitted, the item display won't + - display any collections. + - admin_button - Boolean, show admin 'edit' button + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.util.UIUtil" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.ConfigurationManager" %> +<%@ page import="org.dspace.handle.HandleManager" %> +<%@ page import="org.dspace.license.CreativeCommons" %> + +<% + // Attributes + Boolean displayAllBoolean = (Boolean) request.getAttribute("display.all"); + boolean displayAll = (displayAllBoolean != null && displayAllBoolean.booleanValue()); + Item item = (Item) request.getAttribute("item"); + Collection[] collections = (Collection[]) request.getAttribute("collections"); + Boolean admin_b = (Boolean)request.getAttribute("admin_button"); + boolean admin_button = (admin_b == null ? false : admin_b.booleanValue()); + + String handle = item.getHandle(); + + // CC URL & RDF + String cc_url = CreativeCommons.getLicenseURL(item); + String cc_rdf = CreativeCommons.getLicenseRDF(item); + + // Full title needs to be put into a string to use as tag argument + String title = "Item " + handle; +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="display-item.title"/> <%= handle %> + + + + +<% + if (handle != null) + { +%> + + + + + +<% + if (admin_button) // admin edit button + { %> + +<% } %> + +
    + <%-- Please use this identifier to cite or link to this item: + <%= HandleManager.getCanonicalForm(handle) %>--%> + + <%= HandleManager.getCanonicalForm(handle) %> + +
    + + <%----%> + "> +
    +
    +
    +<% + } + + String displayStyle = (displayAll ? "full" : "default"); +%> + + +<% + String locationLink = request.getContextPath() + "/handle/" + handle; + + if (displayAll) + { +%> + <%--

    Show simple item record

    --%> +

    +<% + } + else + { +%> + <%--

    Show full item record

    --%> +

    +<% + } +%> + + <%-- SFX Link --%> +<% + if (ConfigurationManager.getProperty("sfx.server.url") != null) + { +%> +

    + " />">SFX Query +

    +<% + } +%> + <%-- Create Commons Link --%> +<% + if (cc_url != null) + { +%> + <%--

    This item is licensed inder a Creative Commons License
    --%> +


    + Creative Commons +

    + +<% + } +%> + <%--

    All items in DSpace are protected by copyright, with all rights reserved.

    --%> +

    + +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/authorize-advanced.jsp dspace-1.2-source-devel/multi/dspace-admin/authorize-advanced.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/authorize-advanced.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/authorize-advanced.jsp 2005-02-01 14:49:36.000000000 -0200 @@ -1,156 +1,192 @@ -<%-- - - authorize-advanced.jsp - - - - $Id: authorize-advanced.jsp,v 1.2 2004/06/08 19:01:28 rtansley Exp $ - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/06/08 19:01:28 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Advanced policy tool - a bit dangerous, but powerful - - - - Attributes: - - collections - Collection [] all DSpace collections - - groups - Group [] all DSpace groups for select box - - Returns: - - submit_advanced_clear - erase all policies for set of objects - - submit_advanced_add - add a policy to a set of objects - - collection_id - ID of collection containing objects - - resource_type - type, "bitstream" or "item" - - group_id - group that policy relates to - - action_id - action that policy allows - - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.util.List" %> -<%@ page import="java.util.Iterator" %> - - -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.core.Constants" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - Group [] groups = (Group []) request.getAttribute("groups" ); - Collection [] collections= (Collection []) request.getAttribute("collections"); -%> - - - -

    Advanced Policy Manager

    -

    Allows you to do wildcard additions to and clearing - of policies for types of content contained in a collection. - Warning, dangerous - removing READ permissions from - items will make them not viewable! More help...

    - -
    - - - - - - - - - - - - - - - - - - - - - -
    Collection: - -
    Content Type: - -
    Group: - -
    Action: - -
    - -
    - - - - - -
    - - - (warning: clears all policies for a given set of objects) -
    -
    - -
    - -
    - +<%-- + - authorize-advanced.jsp + - + - $Id: authorize-advanced.jsp,v 1.2 2004/06/08 19:01:28 rtansley Exp $ + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/06/08 19:01:28 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Advanced policy tool - a bit dangerous, but powerful + - + - Attributes: + - collections - Collection [] all DSpace collections + - groups - Group [] all DSpace groups for select box + - Returns: + - submit_advanced_clear - erase all policies for set of objects + - submit_advanced_add - add a policy to a set of objects + - collection_id - ID of collection containing objects + - resource_type - type, "bitstream" or "item" + - group_id - group that policy relates to + - action_id - action that policy allows + - + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="java.util.List" %> +<%@ page import="java.util.Iterator" %> + + +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.core.Constants" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + Group [] groups = (Group []) request.getAttribute("groups" ); + Collection [] collections= (Collection []) request.getAttribute("collections"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authorize-advanced.parenttitle"/>: + <fmt:message key="authorize-advanced.title"/> + + + + <%--

    Advanced Policy Manager

    --%> + + +

    + + <%--

    Allows you to do wildcard additions to and clearing + of policies for types of content contained in a collection. + Warning, dangerous - removing READ permissions from + items will make them not viewable! More help...

    --%> + <%--

    --%> + + + + + +

    + +
    + + + + <%-- --%> + + + + + + <%-- --%> + + + + + + <%-- --%> + + + + + <%-- --%> + + + + +
    Collection: + +
    Content Type: + +
    Group: + +
    Action:
    + +
    + +
    + + + + + +
    + <%-- --%> + "> + + <%-- (warning: clears all policies for a given set of objects) --%> + "> +
    +
    + +
    +
    +
    + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/authorize-collection-edit.jsp dspace-1.2-source-devel/multi/dspace-admin/authorize-collection-edit.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/authorize-collection-edit.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/authorize-collection-edit.jsp 2005-02-02 10:05:29.000000000 -0200 @@ -1,150 +1,181 @@ -<%-- - - authorize_collection_edit.jsp - - - - $Id: authorize-collection-edit.jsp,v 1.5 2004/06/08 19:01:27 rtansley Exp $ - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2004/06/08 19:01:27 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Show policies for a collection, allowing you to modify, delete - - or add to them - - - - Attributes: - - collection - Collection being modified - - policies - ResourcePolicy [] of policies for the collection - - Returns: - - submit value collection_addpolicy to add a policy - - submit value collection_editpolicy to edit policy - - submit value collection_deletepolicy to delete policy - - - - policy_id - ID of policy to edit, delete - - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.util.List" %> -<%@ page import="java.util.Iterator" %> - - -<%@ page import="org.dspace.authorize.ResourcePolicy" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.core.Constants" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - Collection collection = (Collection) request.getAttribute("collection"); - List policies = - (List) request.getAttribute("policies"); -%> - - - - - - - - -
    -

    Policies for Collection "<%= collection.getMetadata("name") %>" (hdl:<%= collection.getHandle() %>, DB ID <%= collection.getID() %>)

    -
    - Help... -
    - - -

    - -

    - - -
    -

    - - - - - - - - - - - -<% - String row = "even"; - Iterator i = policies.iterator(); - - while( i.hasNext() ) - { - ResourcePolicy rp = (ResourcePolicy) i.next(); -%> - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
    IDActionGroup  
    <%= rp.getID() %> - <%= rp.getActionText() %> - - <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> - - - - - - -
    - -
    +<%-- + - authorize_collection_edit.jsp + - + - $Id: authorize-collection-edit.jsp,v 1.5 2004/06/08 19:01:27 rtansley Exp $ + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2004/06/08 19:01:27 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Show policies for a collection, allowing you to modify, delete + - or add to them + - + - Attributes: + - collection - Collection being modified + - policies - ResourcePolicy [] of policies for the collection + - Returns: + - submit value collection_addpolicy to add a policy + - submit value collection_editpolicy to edit policy + - submit value collection_deletepolicy to delete policy + - + - policy_id - ID of policy to edit, delete + - + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="java.util.List" %> +<%@ page import="java.util.Iterator" %> + + +<%@ page import="org.dspace.authorize.ResourcePolicy" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.core.Constants" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + Collection collection = (Collection) request.getAttribute("collection"); + List policies = + (List) request.getAttribute("policies"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authorize-collection-edit.parenttitle"/>: + <fmt:message key="authorize-collection-edit.title"/> + + + + + + + + +
    + <%--

    Policies for Collection "<%= collection.getMetadata("name") %>" (hdl:<%= collection.getHandle() %>, DB ID <%= collection.getID() %>)

    --%> +

    <%= collection.getMetadata("name") %>" (hdl:<%= collection.getHandle() %>, DB ID <%= collection.getID() %>)

    +
    + <%-- Help... --%> + + + + + + +
    + + +

    + +

    + + <%-- --%> + "> +
    +

    + + + + + + <%-- --%> + + <%-- --%> + + + + + +<% + String row = "even"; + Iterator i = policies.iterator(); + + while( i.hasNext() ) + { + ResourcePolicy rp = (ResourcePolicy) i.next(); +%> + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
    IDActionGroup  
    <%= rp.getID() %> + <%= rp.getActionText() %> + + <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> + + + + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    + + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/authorize-community-edit.jsp dspace-1.2-source-devel/multi/dspace-admin/authorize-community-edit.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/authorize-community-edit.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/authorize-community-edit.jsp 2005-02-02 10:16:05.000000000 -0200 @@ -1,144 +1,173 @@ -<%-- - - authorize_community_edit.jsp - - - - $Id: authorize-community-edit.jsp,v 1.5 2004/06/08 19:01:28 rtansley Exp $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Show policies for a community, allowing you to modify, delete - - or add to them - - - - Attributes: - - community - Community being modified - - policies - ResourcePolicy [] of policies for the community - - Returns: - - submit value community_addpolicy to add a policy - - submit value community_editpolicy to edit policy - - submit value community_deletepolicy to delete policy - - - - policy_id - ID of policy to edit, delete - - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.util.List" %> -<%@ page import="java.util.Iterator" %> - - -<%@ page import="org.dspace.authorize.ResourcePolicy" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.core.Constants" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - Community community = (Community) request.getAttribute("community"); - List policies = - (List) request.getAttribute("policies"); -%> - - - - - - - - -
    -

    Policies for Community "<%= community.getMetadata("name") %>" (hdl:<%= community.getHandle() %>, DB ID <%=community.getID()%>)

    -
    - Help... -
    - -

    -

    - - -
    -

    - - - - - - - - - - - -<% - String row = "even"; - Iterator i = policies.iterator(); - - while( i.hasNext() ) - { - ResourcePolicy rp = (ResourcePolicy) i.next(); -%> - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
    IDActionGroup  
    <%= rp.getID() %> - <%= rp.getActionText() %> - - <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> - - - - - - -
    - -
    +<%-- + - authorize_community_edit.jsp + - + - $Id: authorize-community-edit.jsp,v 1.5 2004/06/08 19:01:28 rtansley Exp $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Show policies for a community, allowing you to modify, delete + - or add to them + - + - Attributes: + - community - Community being modified + - policies - ResourcePolicy [] of policies for the community + - Returns: + - submit value community_addpolicy to add a policy + - submit value community_editpolicy to edit policy + - submit value community_deletepolicy to delete policy + - + - policy_id - ID of policy to edit, delete + - + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="java.util.List" %> +<%@ page import="java.util.Iterator" %> + + +<%@ page import="org.dspace.authorize.ResourcePolicy" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.core.Constants" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + Community community = (Community) request.getAttribute("community"); + List policies = + (List) request.getAttribute("policies"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authorize-community-edit.parenttitle"/>: + <fmt:message key="authorize-community-edit.title"/> + + + + + + + + +
    + <%--

    Policies for Community "<%= community.getMetadata("name") %>" (hdl:<%= community.getHandle() %>, DB ID <%=community.getID()%>)

    --%> +

    <%= community.getMetadata("name") %>" (hdl:<%= community.getHandle() %>, DB ID <%=community.getID()%>)

    +
    + <%-- Help... --%> + + + + + + +
    + +

    +

    + + <%-- --%> + "> +
    +

    + + + + + + <%-- --%> + + <%-- --%> + + + + + +<% + String row = "even"; + Iterator i = policies.iterator(); + + while( i.hasNext() ) + { + ResourcePolicy rp = (ResourcePolicy) i.next(); +%> + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
    IDActionGroup  
    <%= rp.getID() %> + <%= rp.getActionText() %> + + <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> + + + + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/authorize-item-edit.jsp dspace-1.2-source-devel/multi/dspace-admin/authorize-item-edit.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/authorize-item-edit.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/authorize-item-edit.jsp 2005-02-02 10:19:20.000000000 -0200 @@ -1,322 +1,370 @@ -<%-- - - authorize_item_edit.jsp - - - - $Id: authorize-item-edit.jsp,v 1.5 2004/06/08 19:01:27 rtansley Exp $ - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2004/06/08 19:01:27 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Show policies for an item, allowing you to modify, delete - - or add to them - - - - Attributes: - - item - Item being modified - - item_policies - ResourcePolicy List of policies for the item - - bundles - [] of Bundle objects - - bundle_policies - Map of (ID, List of policies) - - bitstream_policies - Map of (ID, List of policies) - - - - Returns: - - submit value item_add_policy to add a policy - - submit value item_edit_policy to edit policy for item, bundle, or bitstream - - submit value item_delete_policy to delete policy for item, bundle, or bitstream - - - - submit value bundle_add_policy add policy - - - - submit value bitstream_add_policy to add a policy - - - - policy_id - ID of policy to edit, delete - - item_id - - bitstream_id - - bundle_id - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.util.Iterator" %> -<%@ page import="java.util.List" %> -<%@ page import="java.util.Map" %> - -<%@ page import="org.dspace.authorize.ResourcePolicy" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.content.Bundle" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.core.Constants" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - // get item and list of policies - Item item = (Item) request.getAttribute("item"); - List item_policies = - (List) request.getAttribute("item_policies"); - - // get bitstreams and corresponding policy lists - Bundle [] bundles = (Bundle [])request.getAttribute("bundles"); - Map bundle_policies = (Map)request.getAttribute("bundle_policies" ); - Map bitstream_policies = (Map)request.getAttribute("bitstream_policies"); -%> - - - - - - - - -
    -

    Policies for Item <%= item.getHandle() %> (ID=<%= item.getID() %>)

    -
    - Help... -
    - - -

    With this editor you can view and alter the policies of an item, - plus alter policies of individual item components: bundles and bitstreams. - Briefly, an item is a container of bundles, and bundles, are containers - of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, - while bitstreams only have READ/WRITE policies. -

    -

    You will notice an extra bundle and bitstream for each item, and those - contain the license text for the item. -

    - - -

    Item Policies

    -

    -

    - - -
    -

    - - - - - - - - - - - - -<% - String row = "even"; - Iterator i = item_policies.iterator(); - - while( i.hasNext() ) - { - ResourcePolicy rp = (ResourcePolicy) i.next(); -%> - - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
    IDActionEPersonGroup  
    <%= rp.getID() %> - <%= rp.getActionText() %> - - <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %> - - <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> - - - - - - -
    -<% - for( int b = 0; b < bundles.length; b++ ) - { - Bundle myBun = bundles[b]; - List myPolicies = (List)bundle_policies.get(new Integer(myBun.getID())); - - // display add policy - // display bundle header w/ID - -%> -

    Bundle <%=myBun.getID()%> Policies

    - -

    -

    - - - -
    -

    - - - - - - - - - - - - -<% - row = "even"; - i = myPolicies.iterator(); - - while( i.hasNext() ) - { - ResourcePolicy rp = (ResourcePolicy) i.next(); -%> - - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
    IDActionEPersonGroup  
    <%= rp.getID() %> - <%= rp.getActionText() %> - - <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %> - - <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> - - - - - - - -
    - -<% - Bitstream [] bitstreams = myBun.getBitstreams(); - - for( int s = 0; s < bitstreams.length; s++ ) - { - Bitstream myBits = bitstreams[s]; - myPolicies = (List)bitstream_policies.get(new Integer(myBits.getID())); - - // display bitstream header w/ID, filename - // 'add policy' - // display bitstream's policies -%> -

    Bitstream <%=myBits.getID()%> (<%=myBits.getName()%>)

    -

    -

    - - - -
    -

    - - - - - - - - - - -<% - row = "even"; - i = myPolicies.iterator(); - - while( i.hasNext() ) - { - ResourcePolicy rp = (ResourcePolicy) i.next(); -%> - - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
    IDActionEPersonGroup  
    <%= rp.getID() %> - <%= rp.getActionText() %> - - <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %> - - <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> - - - - - - - -
    -<% - - } - } -%> - -
    +<%-- + - authorize_item_edit.jsp + - + - $Id: authorize-item-edit.jsp,v 1.5 2004/06/08 19:01:27 rtansley Exp $ + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2004/06/08 19:01:27 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Show policies for an item, allowing you to modify, delete + - or add to them + - + - Attributes: + - item - Item being modified + - item_policies - ResourcePolicy List of policies for the item + - bundles - [] of Bundle objects + - bundle_policies - Map of (ID, List of policies) + - bitstream_policies - Map of (ID, List of policies) + - + - Returns: + - submit value item_add_policy to add a policy + - submit value item_edit_policy to edit policy for item, bundle, or bitstream + - submit value item_delete_policy to delete policy for item, bundle, or bitstream + - + - submit value bundle_add_policy add policy + - + - submit value bitstream_add_policy to add a policy + - + - policy_id - ID of policy to edit, delete + - item_id + - bitstream_id + - bundle_id + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.Map" %> + +<%@ page import="org.dspace.authorize.ResourcePolicy" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.content.Bundle" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.core.Constants" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + // get item and list of policies + Item item = (Item) request.getAttribute("item"); + List item_policies = + (List) request.getAttribute("item_policies"); + + // get bitstreams and corresponding policy lists + Bundle [] bundles = (Bundle [])request.getAttribute("bundles"); + Map bundle_policies = (Map)request.getAttribute("bundle_policies" ); + Map bitstream_policies = (Map)request.getAttribute("bitstream_policies"); +%> + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authorize-item-edit.parenttitle"/>: + <fmt:message key="authorize-item-edit.title"/> + + + + + + + + +
    + <%--

    Policies for Item <%= item.getHandle() %> (ID=<%= item.getID() %>)

    --%> +

    <%= item.getHandle() %> (ID=<%= item.getID() %>)

    +
    + <%-- Help... --%> + + + + + + +
    + + + <%--

    With this editor you can view and alter the policies of an item, + plus alter policies of individual item components: bundles and bitstreams. + Briefly, an item is a container of bundles, and bundles, are containers + of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, + while bitstreams only have READ/WRITE policies. +

    --%> +

    +

    + <%--

    You will notice an extra bundle and bitstream for each item, and those + contain the license text for the item. +

    --%> +

    +

    + + + <%--

    Item Policies

    --%> +

    +

    +

    + + <%-- --%> + "> +
    +

    + + + + + + <%-- --%> + + <%-- --%> + + <%-- --%> + + + + + +<% + String row = "even"; + Iterator i = item_policies.iterator(); + + while( i.hasNext() ) + { + ResourcePolicy rp = (ResourcePolicy) i.next(); +%> + + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
    IDActionEPersonGroup  
    <%= rp.getID() %> + <%= rp.getActionText() %> + + <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %> + + <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> + + + + <%-- --%> + "> + + <%-- --%> + "> +
    +<% + for( int b = 0; b < bundles.length; b++ ) + { + Bundle myBun = bundles[b]; + List myPolicies = (List)bundle_policies.get(new Integer(myBun.getID())); + + // display add policy + // display bundle header w/ID + +%> + <%--

    Bundle <%=myBun.getID()%> Policies

    --%> +

    <%=myBun.getID()%>

    + +

    +

    + + + <%-- --%> + "> +
    +

    + + + + + + <%-- --%> + + + <%-- --%> + + + + + +<% + row = "even"; + i = myPolicies.iterator(); + + while( i.hasNext() ) + { + ResourcePolicy rp = (ResourcePolicy) i.next(); +%> + + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
    IDActionEPersonGroup  
    <%= rp.getID() %> + <%= rp.getActionText() %> + + <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %> + + <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> + + + + + <%-- --%> + "> + + <%-- --%> + "> +
    + +<% + Bitstream [] bitstreams = myBun.getBitstreams(); + + for( int s = 0; s < bitstreams.length; s++ ) + { + Bitstream myBits = bitstreams[s]; + myPolicies = (List)bitstream_policies.get(new Integer(myBits.getID())); + + // display bitstream header w/ID, filename + // 'add policy' + // display bitstream's policies +%> + <%--

    Bitstream <%=myBits.getID()%> (<%=myBits.getName()%>)

    --%> +

    <%=myBits.getID()%> (<%=myBits.getName()%>)

    +

    +

    + + + <%-- --%> + "> +
    +

    + + + + <%-- --%> + + + <%-- --%> + + + + + +<% + row = "even"; + i = myPolicies.iterator(); + + while( i.hasNext() ) + { + ResourcePolicy rp = (ResourcePolicy) i.next(); +%> + + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
    IDActionEPersonGroup  
    <%= rp.getID() %> + <%= rp.getActionText() %> + + <%= (rp.getEPerson() == null ? "..." : rp.getEPerson().getEmail() ) %> + + <%= (rp.getGroup() == null ? "..." : rp.getGroup().getName() ) %> + + + + + <%-- --%> + "> + + <%-- --%> + "> +
    +<% + + } + } +%> +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/authorize-main.jsp dspace-1.2-source-devel/multi/dspace-admin/authorize-main.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/authorize-main.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/authorize-main.jsp 2005-02-02 10:26:03.000000000 -0200 @@ -1,111 +1,140 @@ -<%-- - - authorize_policy_main.jsp - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - main page for authorization editing - - - - Attributes: - - none - - - - Returns: - - submit_community - - submit_collection - - submit_item - - item_handle - - item_id - - submit_advanced - - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.Collection" %> - -<% -// this space intentionally left blank -%> - - - -

    Administer Authorization Policies

    - - - - - -
    -

    Choose a resource to manage policies for:

    -
    - Help... -
    - - -
    - -
    - - - - - - - - - - - - - -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    +<%-- + - authorize_policy_main.jsp + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - main page for authorization editing + - + - Attributes: + - none + - + - Returns: + - submit_community + - submit_collection + - submit_item + - item_handle + - item_id + - submit_advanced + - + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.content.Collection" %> + +<% +// this space intentionally left blank +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authorize-main.parenttitle"/>: + <fmt:message key="authorize-main.title"/> + + + + <%--

    Administer Authorization Policies

    --%> +

    + + + + + +
    + <%--

    Choose a resource to manage policies for:

    --%> +

    +
    + <%-- Help... --%> + + + + + + +
    + + +
    + +
    + + + + + + + + + + + + + +
    + <%-- --%> + "> +
    + <%-- --%> + "> +
    + <%-- --%> + "> +
    + <%-- --%> + "> +
    +
    + +
    +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/authorize-policy-edit.jsp dspace-1.2-source-devel/multi/dspace-admin/authorize-policy-edit.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/authorize-policy-edit.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/authorize-policy-edit.jsp 2005-02-02 10:29:58.000000000 -0200 @@ -1,158 +1,187 @@ -<%-- - - authorize_policy_edit.jsp - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - policy editor - for new or existing policies - - - - Attributes: - - policy - a ResourcePolicy to be edited - - groups - Group [] of groups to choose from - - epeople - EPerson [] of epeople to choose from (unused in first version) - - edit_title - title of the page ("Collection 13", etc. - - id_name - name of string to put in hidden arg (collection_id, etc.) - - id - ID of the object policy relates to (collection.getID(), etc.) - - newpolicy - set to some string value if this is a new policy - - Returns: - - save_policy - user wants to save a policy - - cancel_policy - user wants to cancel, and return to policy list - - "id_name" - name/value passed in from id_name/id above - - group_id - set if user selected a group - - eperson_id - set if user selected an eperson - - start_date - not set, unused - - end_date - not set, unused - - action_id - set to whatever user chose - - (new policy) - set to a the string passed in above if policy is a new one - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.authorize.ResourcePolicy" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.core.Constants" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - ResourcePolicy policy = (ResourcePolicy) request.getAttribute("policy" ); - Group [] groups = (Group [] ) request.getAttribute("groups" ); - EPerson [] epeople = (EPerson[] ) request.getAttribute("epeople" ); - String edit_title = (String ) request.getAttribute("edit_title"); - String id_name = (String ) request.getAttribute("id_name" ); - String id = (String ) request.getAttribute("id" ); - String newpolicy = (String ) request.getAttribute("newpolicy" ); - - // calculate the resource type and its relevance ID - // to check what actions to present - int resourceType = policy.getResourceType(); - int resourceRelevance = 1 << resourceType; -%> - - - - - - - - -
    -

    Edit Policy for <%= edit_title %>:

    -
    - Help... -
    - - -
    - - - - - - - - - - -
    Group: - -
    Action: - - -
    - - <% if( newpolicy != null ) { %> <% } %> - -
    - - - - - -
    - - - -
    -
    - -
    - -
    +<%-- + - authorize_policy_edit.jsp + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - policy editor - for new or existing policies + - + - Attributes: + - policy - a ResourcePolicy to be edited + - groups - Group [] of groups to choose from + - epeople - EPerson [] of epeople to choose from (unused in first version) + - edit_title - title of the page ("Collection 13", etc. + - id_name - name of string to put in hidden arg (collection_id, etc.) + - id - ID of the object policy relates to (collection.getID(), etc.) + - newpolicy - set to some string value if this is a new policy + - Returns: + - save_policy - user wants to save a policy + - cancel_policy - user wants to cancel, and return to policy list + - "id_name" - name/value passed in from id_name/id above + - group_id - set if user selected a group + - eperson_id - set if user selected an eperson + - start_date - not set, unused + - end_date - not set, unused + - action_id - set to whatever user chose + - (new policy) - set to a the string passed in above if policy is a new one + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.authorize.ResourcePolicy" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.core.Constants" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + ResourcePolicy policy = (ResourcePolicy) request.getAttribute("policy" ); + Group [] groups = (Group [] ) request.getAttribute("groups" ); + EPerson [] epeople = (EPerson[] ) request.getAttribute("epeople" ); + String edit_title = (String ) request.getAttribute("edit_title"); + String id_name = (String ) request.getAttribute("id_name" ); + String id = (String ) request.getAttribute("id" ); + String newpolicy = (String ) request.getAttribute("newpolicy" ); + + // calculate the resource type and its relevance ID + // to check what actions to present + int resourceType = policy.getResourceType(); + int resourceRelevance = 1 << resourceType; +%> + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authorize-policy-edit.parenttitle"/>: + <fmt:message key="authorize-policy-edit.title"/> + + + + + + + + +
    + <%--

    Edit Policy for <%= edit_title %>:

    --%> +

    <%= edit_title %>:

    +
    + <%-- Help... --%> + + + + + + +
    + + +
    + + + + <%-- --%> + + + + + <%-- --%> + + + +
    Group: + +
    Action:
    + + +
    + + <% if( newpolicy != null ) { %> <% } %> + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    + +
    +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/collection-select.jsp dspace-1.2-source-devel/multi/dspace-admin/collection-select.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/collection-select.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/collection-select.jsp 2004-12-14 13:28:26.000000000 -0200 @@ -1,101 +1,119 @@ -<%-- - - collection_select.jsp - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of collections, with continue and cancel buttons - - post method invoked with collection_select or collection_select_cancel - - (collection_id contains ID of selected collection) - - - - Attributes: - - collections - a Collection [] containing all collections in the system - - Returns: - - submit set to collection_select, user has selected a collection - - submit set to collection_select_cancel, return user to main page - - collection_id - set if user has selected one - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.Collection" %> - -<% - Collection [] collections = - (Collection[]) request.getAttribute("collections"); -%> - - - -

    Collections:

    - -
    - - - - - -
    - -
    - -
    - - - - - -
    - - - -
    -
    - -
    - -
    +<%-- + - collection_select.jsp + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of collections, with continue and cancel buttons + - post method invoked with collection_select or collection_select_cancel + - (collection_id contains ID of selected collection) + - + - Attributes: + - collections - a Collection [] containing all collections in the system + - Returns: + - submit set to collection_select, user has selected a collection + - submit set to collection_select_cancel, return user to main page + - collection_id - set if user has selected one + + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.content.Collection" %> + +<% + Collection [] collections = + (Collection[]) request.getAttribute("collections"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="collection-select.parenttitle"/>: + <fmt:message key="collection-select.title"/> + + + + <%--

    Collections:

    --%> +

    + +
    + + + + + +
    + +
    + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    + +
    +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/community-select.jsp dspace-1.2-source-devel/multi/dspace-admin/community-select.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/community-select.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/community-select.jsp 2004-12-14 13:29:38.000000000 -0200 @@ -1,104 +1,123 @@ -<%-- - - community_select.jsp - - - - $Id: community-select.jsp,v 1.1 2004/01/27 08:23:08 dstuve Exp $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of communities, with continue and cancel buttons - - post method invoked with community_select or community_select_cancel - - (community_id contains ID of selected community) - - - - Attributes: - - communities - a Community [] containing all communities in the system - - Returns: - - submit set to community_select, user has selected a community - - submit set to community_select_cancel, return user to main page - - community_id - set if user has selected one - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.Community" %> - -<% - Community [] communities = - (Community[]) request.getAttribute("communities"); -%> - - - -

    communities:

    - -
    - - - - - -
    - -
    - -
    - - - - - -
    - - - -
    -
    - -
    - -
    +<%-- + - community_select.jsp + - + - $Id: community-select.jsp,v 1.1 2004/01/27 08:23:08 dstuve Exp $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of communities, with continue and cancel buttons + - post method invoked with community_select or community_select_cancel + - (community_id contains ID of selected community) + - + - Attributes: + - communities - a Community [] containing all communities in the system + - Returns: + - submit set to community_select, user has selected a community + - submit set to community_select_cancel, return user to main page + - community_id - set if user has selected one + + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.content.Community" %> + +<% + Community [] communities = + (Community[]) request.getAttribute("communities"); +%> + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="community-select.parenttitle"/>: + <fmt:message key="community-select.title"/> + + + + <%--

    communities:

    --%> +

    + +
    + + + + + +
    + +
    + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    + +
    +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-collection.jsp dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-collection.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-collection.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-collection.jsp 2004-12-14 13:30:58.000000000 -0200 @@ -1,93 +1,118 @@ -<%-- - - confirm-delete-collection.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm deletion of a collection - - - - Attributes: - - collection - collection we may delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Community" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); -%> - - - -

    Delete Collection: <%= collection.getID() %>

    - -

    Are you sure the collection <%= collection.getMetadata("name") %> - should be deleted? This will delete:

    - -
      -
    • Any items and incomplete submissions in this collections that aren't contained in other collections
    • -
    • The contents of those items
    • -
    • All associated authorisation policies
    • -
    - -
    - - - - -
    - - - - - -
    - - - -
    -
    -
    -
    - +<%-- + - confirm-delete-collection.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm deletion of a collection + - + - Attributes: + - collection - collection we may delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Community" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="confirm-delete-collection.parenttitle"/>: + <fmt:message key="confirm-delete-collection.title"/> + + + + <%--

    Delete Collection: <%= collection.getID() %>

    --%> +

    <%= collection.getID() %>

    + + <%--

    Are you sure the collection <%= collection.getMetadata("name") %> + should be deleted? This will delete:

    --%> +

    <%= collection.getMetadata("name") %> +

    + +
      + <%--
    • Any items and incomplete submissions in this collections that aren't contained in other collections
    • --%> +
    • + <%--
    • The contents of those items
    • --%> +
    • + <%--
    • All associated authorisation policies
    • --%> +
    • +
    + +
    + + + + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    +
    +
    + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-community.jsp dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-community.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-community.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-community.jsp 2004-12-14 13:32:16.000000000 -0200 @@ -1,91 +1,117 @@ -<%-- - - confirm-delete-community.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm deletion of a community - - - - Attributes: - - community - community we may delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Community" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Community community = (Community) request.getAttribute("community"); -%> - - - -

    Delete Community: <%= community.getID() %>

    - -

    Are you sure the community <%= community.getMetadata("name") %> - should be deleted? This will delete:

    - -
      -
    • Any collections in the community that are not contained in other communities
    • -
    • Any items and incomplete submissions in those collections that aren't contained in other collections
    • -
    • The contents of those items
    • -
    • All associated authorisation policies
    • -
    - -
    - - - -
    - - - - - -
    - - - -
    -
    -
    -
    - +<%-- + - confirm-delete-community.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm deletion of a community + - + - Attributes: + - community - community we may delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Community" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Community community = (Community) request.getAttribute("community"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="confirm-delete-community.parenttitle"/>: + <fmt:message key="confirm-delete-community.title"/> + + + + <%--

    Delete Community: <%= community.getID() %>

    --%> +

    <%= community.getID() %>

    + + <%--

    Are you sure the community <%= community.getMetadata("name") %> + should be deleted? This will delete:

    --%> +

    <%= community.getMetadata("name") %> +

    + +
      + <%--
    • Any collections in the community that are not contained in other communities
    • --%> +
    • + <%--
    • Any items and incomplete submissions in those collections that aren't contained in other collections
    • --%> +
    • + <%--
    • The contents of those items
    • --%> +
    • + <%--
    • All associated authorisation policies
    • --%> +
    • +
    + +
    + + + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    +
    +
    + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-dctype.jsp dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-dctype.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-dctype.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-dctype.jsp 2004-12-14 13:32:55.000000000 -0200 @@ -1,91 +1,113 @@ -<%-- - - confirm-delete-dctype.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm deletion of a DC type - - - - Attributes: - - type - DCType we may delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.administer.DCType" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - DCType type = (DCType) request.getAttribute("type"); - - String typeName = type.getElement() + - (type.getQualifier() == null ? "" : "." + type.getQualifier()); -%> - - - -

    Delete Dublin Core Format: <%= typeName %>

    - -

    Are you sure the format <%= typeName %> - should be deleted?

    - -

    This will result in an error if any DC values have this type.

    - -
    - - -
    - - - - - -
    - - - -
    -
    -
    -
    - +<%-- + - confirm-delete-dctype.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm deletion of a DC type + - + - Attributes: + - type - DCType we may delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.administer.DCType" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + DCType type = (DCType) request.getAttribute("type"); + + String typeName = type.getElement() + + (type.getQualifier() == null ? "" : "." + type.getQualifier()); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="confirm-delete-dctype.parenttitle"/>: + <fmt:message key="confirm-delete-dctype.title"/> + + + + <%--

    Delete Dublin Core Format: <%= typeName %>

    --%> +

    <%= typeName %>

    + + <%--

    Are you sure the format <%= typeName %> + should be deleted?

    --%> +

    <%= typeName %> +

    + + <%--

    This will result in an error if any DC values have this type.

    --%> +

    + +
    + + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    +
    +
    + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-eperson.jsp dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-eperson.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-eperson.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-eperson.jsp 2004-12-14 13:33:50.000000000 -0200 @@ -1,85 +1,105 @@ -<%-- - - confirm-delete-eperson.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm deletion of an e-person - - - - Attributes: - - eperson - eperson we may delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - EPerson eperson = (EPerson) request.getAttribute("eperson"); -%> - - - -

    Delete e-person: <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)

    - -

    Are you sure this e-person should be deleted?

    - -
    - - -
    - - - - - -
    - - - -
    -
    -
    -
    - +<%-- + - confirm-delete-eperson.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm deletion of an e-person + - + - Attributes: + - eperson - eperson we may delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + EPerson eperson = (EPerson) request.getAttribute("eperson"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="confirm-delete-eperson.parenttitle"/>: + <fmt:message key="confirm-delete-eperson.title"/> + + + + <%--

    Delete e-person: <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)

    --%> +

    <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)

    + + <%--

    Are you sure this e-person should be deleted?

    --%> +

    + +
    + + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    +
    +
    + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-format.jsp dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-format.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/confirm-delete-format.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/confirm-delete-format.jsp 2004-12-14 13:34:45.000000000 -0200 @@ -1,85 +1,108 @@ -<%-- - - confirm-delete-format.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm deletion of a bitstream format - - - - Attributes: - - format - bitstream format we may delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.content.BitstreamFormat" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - BitstreamFormat format = (BitstreamFormat) request.getAttribute("format"); -%> - - - -

    Delete Bitstream Format: <%= format.getID() %>

    - -

    Are you sure the format <%= format.getShortDescription() %> - should be deleted?

    - -

    Any existing bitstreams of this format will be reverted to the - unknown bitstream format.

    - -
    - - -
    - - - - - -
    - - - -
    -
    -
    -
    - +<%-- + - confirm-delete-format.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm deletion of a bitstream format + - + - Attributes: + - format - bitstream format we may delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.content.BitstreamFormat" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + BitstreamFormat format = (BitstreamFormat) request.getAttribute("format"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="confirm-delete-format.parenttitle"/>: + <fmt:message key="confirm-delete-format.title"/> + + + + <%--

    Delete Bitstream Format: <%= format.getID() %>

    --%> +

    <%= format.getID() %>

    + + <%--

    Are you sure the format <%= format.getShortDescription() %> + should be deleted?

    --%> +

    <%= format.getShortDescription() %> +

    + + <%--

    Any existing bitstreams of this format will be reverted to the + unknown bitstream format.

    --%> +

    + +
    + + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    +
    +
    + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/edit-collection.jsp dspace-1.2-source-devel/multi/dspace-admin/edit-collection.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/edit-collection.jsp 2004-06-15 15:55:36.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/edit-collection.jsp 2004-11-23 08:41:12.000000000 -0200 @@ -1,339 +1,392 @@ -<%-- - - edit-collection.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2004/06/15 18:55:36 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show form allowing edit of collection metadata - - - - Attributes: - - community - community to create new collection in, if creating one - - collection - collection to edit, if editing an existing one. If this - - is null, we are creating one. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.eperson.Group" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); - - String name = ""; - String shortDesc = ""; - String intro = ""; - String copy = ""; - String side = ""; - String license = ""; - String provenance = ""; - - Group[] wfGroups = new Group[3]; - wfGroups[0] = null; - wfGroups[1] = null; - wfGroups[2] = null; - - Group admins = null; - Group submitters = null; - - Item template = null; - - Bitstream logo = null; - - if (collection != null) - { - name = collection.getMetadata("name"); - shortDesc = collection.getMetadata("short_description"); - intro = collection.getMetadata("introductory_text"); - copy = collection.getMetadata("copyright_text"); - side = collection.getMetadata("side_bar_text"); - provenance = collection.getMetadata("provenance_description"); - - if (collection.hasCustomLicense()) - { - license = collection.getLicense(); - } - - if (copy == null) - { - copy = ""; - } - - if (side == null) - { - side = ""; - } - - if (provenance == null) - { - provenance = ""; - } - - wfGroups[0] = collection.getWorkflowGroup(1); - wfGroups[1] = collection.getWorkflowGroup(2); - wfGroups[2] = collection.getWorkflowGroup(3); - - admins = collection.getAdministrators(); - submitters = collection.getSubmitters(); - - template = collection.getTemplateItem(); - - logo = collection.getLogo(); - } -%> - - - -<% - if (collection == null) - { -%> -

    Create Collection

    -<% } else { %> -

    Edit Collection <%= collection.getHandle() %>

    -
    - - - - -
    -
    - - - - -
    -
    -
    -<% } %> - -
    - -<%-- =========================================================== - Basic metadata - =========================================================== --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<%-- =========================================================== - Logo - =========================================================== --%> - - - - - - - - -<%-- =========================================================== - Collection Submitters - =========================================================== --%> - - - - - -<%-- =========================================================== - Workflow groups - =========================================================== --%> -<% - String[] roleTexts = {"Accept/Reject", "Accept/Reject/Edit Metadata", "Edit Metadata"}; - for (int i = 0; i<3; i++) { %> - - - - -<% } %> - - - -<%-- =========================================================== - Collection Administrators - =========================================================== --%> - - - - -<%-- =========================================================== - Item template - =========================================================== --%> - - - - -<%-- =========================================================== - Edit collection's policies - =========================================================== --%> - - - - - - -
    Name:
    Short Description - -
    Introductory text (HTML): - -
    Copyright text (plain text): - -
    Side bar text (HTML): - -
    License: - -
    Provenance: - -
    Logo: -<% if (logo != null) { %> - - - - - -
    - - -

    - -
    -<% } else { %> - -<% } %> -
     

    Submission Workflow

    Submitters: -<% if (submitters == null) {%> - -<% } else { %> - -<% } %> -
    <%= roleTexts[i] %> Step: -<% if (wfGroups[i] == null) { %> - -<% } else { %> - - -<% } %> -
     
    Collection Administrators: -<% if (admins == null) {%> - -<% } else { %> - -<% } %> -
    Item template: -<% if (template == null) {%> - -<% } else { %> - - -<% } %> -
    Collection's Authorizations: - -
    - -

     

    - -
    - - - - - -
    -<% - if (collection == null) - { -%> - - - -<% - } - else - { -%> - - - - -<% - } -%> - - - - -
    -
    -
    -
    +<%-- + - edit-collection.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2004/06/15 18:55:36 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show form allowing edit of collection metadata + - + - Attributes: + - community - community to create new collection in, if creating one + - collection - collection to edit, if editing an existing one. If this + - is null, we are creating one. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.eperson.Group" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + + String name = ""; + String shortDesc = ""; + String intro = ""; + String copy = ""; + String side = ""; + String license = ""; + String provenance = ""; + + Group[] wfGroups = new Group[3]; + wfGroups[0] = null; + wfGroups[1] = null; + wfGroups[2] = null; + + Group admins = null; + Group submitters = null; + + Item template = null; + + Bitstream logo = null; + + if (collection != null) + { + name = collection.getMetadata("name"); + shortDesc = collection.getMetadata("short_description"); + intro = collection.getMetadata("introductory_text"); + copy = collection.getMetadata("copyright_text"); + side = collection.getMetadata("side_bar_text"); + provenance = collection.getMetadata("provenance_description"); + + if (collection.hasCustomLicense()) + { + license = collection.getLicense(); + } + + if (copy == null) + { + copy = ""; + } + + if (side == null) + { + side = ""; + } + + if (provenance == null) + { + provenance = ""; + } + + wfGroups[0] = collection.getWorkflowGroup(1); + wfGroups[1] = collection.getWorkflowGroup(2); + wfGroups[2] = collection.getWorkflowGroup(3); + + admins = collection.getAdministrators(); + submitters = collection.getSubmitters(); + + template = collection.getTemplateItem(); + + logo = collection.getLogo(); + } +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="edit-collection.parenttitle"/>: + <fmt:message key="edit-collection.title"/> + + + +<% + if (collection == null) + { +%> + <%--

    Create Collection

    --%> +

    + <% } else { %> + <%--

    Edit Collection <%= collection.getHandle() %>

    --%> +

    <%= collection.getHandle() %>

    +
    + + + + +
    +
    + + + + <%-- --%> + "> +
    +
    +
    +<% } %> + +
    + +<%-- =========================================================== + Basic metadata + =========================================================== --%> + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + +<%-- =========================================================== + Logo + =========================================================== --%> + + <%-- --%> + + + + + + <%-- --%> + + +<%-- =========================================================== + Collection Submitters + =========================================================== --%> + + <%-- --%> + + + + +<%-- =========================================================== + Workflow groups + =========================================================== --%> +<%-- <% + String[] roleTexts = {"Accept/Reject", "Accept/Reject/Edit Metadata", "Edit Metadata"}; + for (int i = 0; i<3; i++) { %> + + + + + + +<% } %> + + + +<%-- =========================================================== + Collection Administrators + =========================================================== --%> + + <%-- --%> + + + +<%-- =========================================================== + Item template + =========================================================== --%> + + <%-- --%> + + + +<%-- =========================================================== + Edit collection's policies + =========================================================== --%> + + <%-- --%> + + + + + +
    Name:
    Short Description + +
    Introductory text (HTML): + +
    Copyright text (plain text): + +
    Side bar text (HTML): + +
    License: + +
    Provenance: + +
    Logo: +<% if (logo != null) { %> + + + + + +
    + + + <%--

    --%> + ">

    + <%-- --%> + "> +
    +<% } else { %> + <%-- --%> + "> +<% } %> +
     

    Submission Workflow

    Submitters: +<% if (submitters == null) {%> + <%-- --%> + "> +<% } else { %> + <%-- --%> + "> +<% } %> +
    <%= roleTexts[i] %> Step: +--%> + +<% + String[] roleTexts = {"edit-collection.step1", "edit-collection.step2", "edit-collection.step3"}; + for (int i = 0; i<3; i++) { %> +
    +<% if (wfGroups[i] == null) { %> + <%-- --%> + "> +<% } else { %> + <%-- --%> + "> + <%-- --%> + "> +<% } %> +
     
    Collection Administrators: +<% if (admins == null) {%> + <%-- --%> + "> +<% } else { %> + <%-- --%> + "> +<% } %> +
    Item template: +<% if (template == null) {%> + <%-- --%> + "> +<% } else { %> + <%-- --%> + "> + <%-- --%> + "> +<% } %> +
    Collection's Authorizations: + <%-- --%> + "> +
    + +

     

    + +
    + + + + + +
    +<% + if (collection == null) + { +%> + + + <%-- --%> + "> +<% + } + else + { +%> + + + + <%-- --%> + "> +<% + } +%> + + + + <%-- --%> + "> +
    +
    +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/edit-community.jsp dspace-1.2-source-devel/multi/dspace-admin/edit-community.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/edit-community.jsp 2004-06-15 16:04:10.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/edit-community.jsp 2005-02-02 10:34:35.000000000 -0200 @@ -1,240 +1,282 @@ -<%-- - - edit-community.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2004/06/15 19:04:09 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show form allowing edit of community metadata - - - - Attributes: - - community - community to edit, if editing an existing one. If this - - is null, we are creating one. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.app.webui.util.UIUtil" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Community community = (Community) request.getAttribute("community"); - int parentID = UIUtil.getIntParameter(request, "parent_community_id"); - - String name = ""; - String shortDesc = ""; - String intro = ""; - String copy = ""; - String side = ""; - - Bitstream logo = null; - - if (community != null) - { - name = community.getMetadata("name"); - shortDesc = community.getMetadata("short_description"); - intro = community.getMetadata("introductory_text"); - copy = community.getMetadata("copyright_text"); - side = community.getMetadata("side_bar_text"); - - if (copy == null) - { - copy = ""; - } - - if (side == null) - { - side = ""; - } - - logo = community.getLogo(); - } -%> - - - - - - - - -
    -<% - if (community == null) - { -%> -

    Create Community

    -<% - } - else - { -%> -

    Edit Community <%= community.getHandle() %>

    -
    - - - - -
    -
    - - - -
    -
    -
    -<% - } -%> -
    - Help... -
    - -
    - -<%-- =========================================================== - Basic metadata - =========================================================== --%> - - - - - - - - - - - - - - - - - - - - -<%-- =========================================================== - Logo - =========================================================== --%> - - - - -<%-- =========================================================== - Edit community's policies - =========================================================== --%> - - - - - - -
    Name:
    Short Description - -
    Introductory text (HTML): - -
    Copyright text (plain text): - -
    Side bar text (HTML): - -
    Logo: -<% if (logo != null) { %> - - - - - -
    - - -

    - -
    -<% } else { %> - -<% } %> -
    Community's Authorizations: - -
    - -

     

    - -
    - - - - - - -
    - -<% - if (community == null) - { -%> - - - - - - - -<% - } - else - { -%> - - - - - - - -<% - } -%> -
    -
    -
    -
    +<%-- + - edit-community.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2004/06/15 19:04:09 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show form allowing edit of community metadata + - + - Attributes: + - community - community to edit, if editing an existing one. If this + - is null, we are creating one. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.app.webui.util.UIUtil" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Community community = (Community) request.getAttribute("community"); + int parentID = UIUtil.getIntParameter(request, "parent_community_id"); + + String name = ""; + String shortDesc = ""; + String intro = ""; + String copy = ""; + String side = ""; + + Bitstream logo = null; + + if (community != null) + { + name = community.getMetadata("name"); + shortDesc = community.getMetadata("short_description"); + intro = community.getMetadata("introductory_text"); + copy = community.getMetadata("copyright_text"); + side = community.getMetadata("side_bar_text"); + + if (copy == null) + { + copy = ""; + } + + if (side == null) + { + side = ""; + } + + logo = community.getLogo(); + } +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="edit-community.parenttitle"/>: + <fmt:message key="edit-community.title"/> + + + + + + + + +
    +<% + if (community == null) + { +%> + <%--

    Create Community

    --%> +

    +<% + } + else + { +%> + <%--

    Edit Community <%= community.getHandle() %>

    --%> +

    <%= community.getHandle() %>

    +
    + + + + +
    +
    + + + <%-- --%> + "> +
    +
    +
    +<% + } +%> +
    + <%-- Help... --%> + + + + + + +
    + +
    + +<%-- =========================================================== + Basic metadata + =========================================================== --%> + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + +<%-- =========================================================== + Logo + =========================================================== --%> + + <%-- --%> + + + +<%-- =========================================================== + Edit community's policies + =========================================================== --%> + + <%-- --%> + + + + + +
    Name:
    Short Description + +
    Introductory text (HTML): + +
    Copyright text (plain text): + +
    Side bar text (HTML): + +
    Logo: +<% if (logo != null) { %> + + + + + +
    + + + <%--

    --%> + ">

    + <%-- --%> "> +
    +<% } else { %> + <%-- --%> + "> +<% } %> +
    Community's Authorizations: + <%-- --%> + "> +
    + +

     

    + +
    + + + + + + +
    + +<% + if (community == null) + { +%> + + + <%-- --%> + "> + + + + <%-- --%> + "> +<% + } + else + { +%> + + + <%-- --%> + "> + + + + <%-- --%> + "> +<% + } +%> +
    +
    +
    +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/eperson-browse.jsp dspace-1.2-source-devel/multi/dspace-admin/eperson-browse.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/eperson-browse.jsp 2004-01-27 19:03:04.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/eperson-browse.jsp 2004-12-14 13:42:11.000000000 -0200 @@ -1,179 +1,204 @@ -<%-- - - eperson-browse.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/01/27 21:03:04 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of E-people, with pagination - - - - Attributes: - - - - epeople - EPerson[] - all epeople to browse - - page_size - size of pages (number of epeople per page) - - page_index - current page to display - - page_count - number of pages - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson[] epeople = - (EPerson[]) request.getAttribute("epeople"); - int pageSize = ((Integer)request.getAttribute("page_size" )).intValue(); - int pageIndex = ((Integer)request.getAttribute("page_index")).intValue(); - int pageCount = ((Integer)request.getAttribute("page_count")).intValue(); - - int firstEPerson = pageSize*pageIndex; - int lastEPerson = firstEPerson + (pageSize - 1); // index of last person - // most common case is full page - - if (lastEPerson >= epeople.length) - { - // oops, less than a full page left, trim - lastEPerson = -1 + firstEPerson + ((epeople.length-firstEPerson) % pageSize); - } - - - String previousButton = ""; - String nextButton = ""; - - if (pageIndex > 0) - { - // not at start, so create 'previous' button - previousButton = "" + - " " + - ""; - } - - if (pageIndex < (pageCount-1) ) - { - // not showing last either, so create 'next' button - nextButton = "" + - " " + - ""; - } - -%> - - - -

    Browse EPeople <%=firstEPerson%>-<%=lastEPerson%> of <%=epeople.length%>

    - - - - - - - - - - - - - - - -<% - String row = "even"; - for (int i = firstEPerson; i <= lastEPerson; i++) - { - EPerson e = epeople[i]; - String commandString = request.getContextPath() + "/dspace-admin/edit-epeople?submit_edit&eperson_id=" + e.getID(); -%> - - - - - - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
    IDE-mail Address Last NameFirst Name Can Log In?Must Use Cert? Self RegisteredTelephone  
    <%= e.getID() %> - <%= (e.getEmail() == null ? "" : e.getEmail()) %> - - <%= (e.getLastName() == null ? "" : e.getLastName()) %> - - <%= (e.getFirstName() == null ? "" : e.getFirstName()) %> - - <%= e.canLogIn() ? "yes" : "no" %> - - <%= e.getRequireCertificate() ? "yes" : "no" %> - - <%= e.getSelfRegistered() ? "yes" : "no" %> - - <%= (e.getMetadata("phone") == null ? "" : e.getMetadata("phone")) %> - - -<% if (request.getParameter("sortby") != null) { %> - "> -<% } %> - - - -
    - -
    - <%=previousButton%> -
    - -
    - <%=nextButton%> -
    - - - -
    +<%-- + - eperson-browse.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/01/27 21:03:04 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of E-people, with pagination + - + - Attributes: + - + - epeople - EPerson[] - all epeople to browse + - page_size - size of pages (number of epeople per page) + - page_index - current page to display + - page_count - number of pages + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson[] epeople = + (EPerson[]) request.getAttribute("epeople"); + int pageSize = ((Integer)request.getAttribute("page_size" )).intValue(); + int pageIndex = ((Integer)request.getAttribute("page_index")).intValue(); + int pageCount = ((Integer)request.getAttribute("page_count")).intValue(); + + int firstEPerson = pageSize*pageIndex; + int lastEPerson = firstEPerson + (pageSize - 1); // index of last person + // most common case is full page + + if (lastEPerson >= epeople.length) + { + // oops, less than a full page left, trim + lastEPerson = -1 + firstEPerson + ((epeople.length-firstEPerson) % pageSize); + } + + + String previousButton = ""; + String nextButton = ""; + + if (pageIndex > 0) + { + // not at start, so create 'previous' button + previousButton = "" + + " " + + ""; + } + + if (pageIndex < (pageCount-1) ) + { + // not showing last either, so create 'next' button + nextButton = "" + + " " + + ""; + } + +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="eperson-browse.parenttitle"/>: + <fmt:message key="eperson-browse.title"/> + + + + <%--

    Browse EPeople <%=firstEPerson%>-<%=lastEPerson%> of <%=epeople.length%>

    --%> +

    <%=firstEPerson%>-<%=lastEPerson%> <%=epeople.length%>

    + + + + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + + + + +<% + String row = "even"; + for (int i = firstEPerson; i <= lastEPerson; i++) + { + EPerson e = epeople[i]; + String commandString = request.getContextPath() + "/dspace-admin/edit-epeople?submit_edit&eperson_id=" + e.getID(); +%> + + + + + + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
    IDE-mail Address Last Name First Name Can Log In? Must Use Cert? Self Registered Telephone  
    <%= e.getID() %> + <%= (e.getEmail() == null ? "" : e.getEmail()) %> + + <%= (e.getLastName() == null ? "" : e.getLastName()) %> + + <%= (e.getFirstName() == null ? "" : e.getFirstName()) %> + + <%= e.canLogIn() ? "yes" : "no" %> + + <%= e.getRequireCertificate() ? "yes" : "no" %> + + <%= e.getSelfRegistered() ? "yes" : "no" %> + + <%= (e.getMetadata("phone") == null ? "" : e.getMetadata("phone")) %> + + +<% if (request.getParameter("sortby") != null) { %> + "> +<% } %> + <%-- --%> + "> + + <%-- --%> + "> +
    + +
    + <%=previousButton%> +
    + +
    + <%=nextButton%> +
    + + +
    +
    diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/eperson-confirm-delete.jsp dspace-1.2-source-devel/multi/dspace-admin/eperson-confirm-delete.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/eperson-confirm-delete.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/eperson-confirm-delete.jsp 2004-12-14 13:42:55.000000000 -0200 @@ -1,85 +1,104 @@ -<%-- - - confirm-delete-eperson.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm deletion of an e-person - - - - Attributes: - - eperson - eperson we may delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - EPerson eperson = (EPerson) request.getAttribute("eperson"); -%> - - - -

    Delete e-person: <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)

    - -

    Are you sure this e-person should be deleted?

    - -
    - - -
    - - - - - -
    - - - -
    -
    -
    -
    - +<%-- + - confirm-delete-eperson.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm deletion of an e-person + - + - Attributes: + - eperson - eperson we may delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + EPerson eperson = (EPerson) request.getAttribute("eperson"); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="eperson-confirm-delete.parenttitle"/>: + <fmt:message key="eperson-confirm-delete.title"/> + + + + <%--

    Delete e-person: <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)

    --%> +

    <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)

    + + <%--

    Are you sure this e-person should be deleted?

    --%> +

    + +
    + + +
    + + + + + +
    + <%-- --%> + "> + + <%-- --%> + "> +
    +
    +
    +
    +
    + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/eperson-deletion-error.jsp dspace-1.2-source-devel/multi/dspace-admin/eperson-deletion-error.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/eperson-deletion-error.jsp 2004-03-31 14:56:20.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/eperson-deletion-error.jsp 2004-12-14 13:44:00.000000000 -0200 @@ -46,6 +46,11 @@ <%@ page contentType="text/html;charset=UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + <%@ page isErrorPage="true" %> <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> @@ -64,13 +69,25 @@ - -

    Cannot Delete EPerson

    - -

    The EPerson <%=fullName%> cannot be deleted because a reference to it - exists in the following table(s):

    + parentlink="/dspace-admin"> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="eperson-deletion-error.parenttitle"/>: + <fmt:message key="eperson-deletion-error.title"/> + + + + <%--

    Cannot Delete EPerson

    --%> +

    + + <%--

    The EPerson <%=fullName%> cannot be deleted because a reference to it + exists in the following table(s):

    --%> +

    <%=fullName%>

      <% while(tableIt.hasNext()) @@ -90,8 +107,9 @@

       

      - Return to the Administer EPeople page + <%-- Return to the Administer EPeople page --%> +

      - + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/eperson-edit.jsp dspace-1.2-source-devel/multi/dspace-admin/eperson-edit.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/eperson-edit.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/eperson-edit.jsp 2005-02-02 15:37:34.000000000 -0200 @@ -1,157 +1,188 @@ -<%-- - - eperson-edit.jsp - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - eperson editor - for new or existing epeople - - - - Attributes: - - eperson - eperson to be edited - - Returns: - - submit_save - admin wants to save edits - - submit_delete - admin wants to delete edits - - submit_cancel - admin wants to cancel - - - - eperson_id - - email - - firstname - - lastname - - phone - - can_log_in - (boolean) - - require_certificate - (boolean) - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson eperson = (EPerson) request.getAttribute("eperson"); - - String email = eperson.getEmail(); - String firstName = eperson.getFirstName(); - String lastName = eperson.getLastName(); - String phone = eperson.getMetadata("phone"); - String errorMessage = (String)request.getAttribute("error_message"); -%> - - - - -

      <%= (errorMessage==null ? "" : errorMessage) %>

      - - - - - - -
      -

      Edit EPerson <%= eperson.getEmail() %>:

      -
      - Help... -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Email: - - "> -
      Last Name: - "> -
      First Name: - "> -
      Phone: - "> -
      Can Log In: - > -
      Require Certificate: - > -
      - -
      - - - - - -
      - - - -
      -
      - -
      - -
      +<%-- + - eperson-edit.jsp + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - eperson editor - for new or existing epeople + - + - Attributes: + - eperson - eperson to be edited + - Returns: + - submit_save - admin wants to save edits + - submit_delete - admin wants to delete edits + - submit_cancel - admin wants to cancel + - + - eperson_id + - email + - firstname + - lastname + - phone + - can_log_in - (boolean) + - require_certificate - (boolean) + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson eperson = (EPerson) request.getAttribute("eperson"); + + String email = eperson.getEmail(); + String firstName = eperson.getFirstName(); + String lastName = eperson.getLastName(); + String phone = eperson.getMetadata("phone"); + String errorMessage = (String)request.getAttribute("error_message"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="eperson-edit.parenttitle"/>: + <fmt:message key="eperson-edit.title"/> + + + +

      <%= (errorMessage==null ? "" : errorMessage) %>

      + + + + + + +
      + <%--

      Edit EPerson <%= eperson.getEmail() %>:

      --%> +

      <%= eperson.getEmail() %>:

      +
      + <%-- Help... --%> + + + + + + +
      + +
      + + + + <%-- --%> + + + + + + <%-- --%> + + + + + + <%-- --%> + + + + + + <%-- --%> + + + + + + <%-- --%> + + + + + + <%-- --%> + + + + + +
      Email: + + "> +
      Last Name: + "> +
      First Name: + "> +
      Phone: + "> +
      Can Log In: + > +
      Require Certificate: + > +
      + +
      + + + + + +
      + <%-- --%> + "> + + <%-- --%> + "> +
      +
      + +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/eperson-main.jsp dspace-1.2-source-devel/multi/dspace-admin/eperson-main.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/eperson-main.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/eperson-main.jsp 2005-02-02 15:42:43.000000000 -0200 @@ -1,103 +1,132 @@ -<%-- - - eperson-main.jsp - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - main page for eperson admin - - - - Attributes: - - none - - - - Returns: - - submit_add - admin wants to add an eperson - - submit_browse - admin wants to browse epeople - - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - -<% -%> - - - -

      Administer EPeople

      - - - - - -
      -

      Choose an action:

      -
      - Help... -
      - -
      - -
      - - - - - - - - - - - - -
      - -
      OR
      - - - then  - - -
      -
      - -
      - -
      +<%-- + - eperson-main.jsp + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - main page for eperson admin + - + - Attributes: + - none + - + - Returns: + - submit_add - admin wants to add an eperson + - submit_browse - admin wants to browse epeople + - + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + +<% +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="eperson-main.parenttitle"/>: + <fmt:message key="eperson-main.title"/> + + + + <%--

      Administer EPeople

      --%> +

      + + + + + +
      + <%--

      Choose an action:

      --%> +

      +
      + <%-- Help... --%> + + + + + + +
      + +
      + +
      + + + + + + <%-- --%> + + + + + + + +
      + <%-- --%> + "> +
      OR
      + + + <%-- then  --%> +  " onclick="javascript:finishEPerson();"> + + <%-- --%> + " onclick="javascript:finishEPerson();"> +
      +
      + +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/group-eperson-select.jsp dspace-1.2-source-devel/multi/dspace-admin/group-eperson-select.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/group-eperson-select.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/group-eperson-select.jsp 2004-12-14 13:47:49.000000000 -0200 @@ -1,108 +1,126 @@ -<%-- - - group_eperson_select.jsp - - - - $Id: group-eperson-select.jsp,v 1.2 2004/02/23 18:32:41 rtansley Exp $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of epeople, with continue and cancel buttons - - - - Attributes: - - collections - a Collection [] containing all collections in the system - - Returns: - - submit set to add_eperson_add, user has selected an eperson - - submit set to add_eperson_cancel, user has cancelled operation - - group_id - set if user has selected one - - eperson_id - set if user has selected one - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - Group group = (Group) request.getAttribute("group"); - EPerson [] epeople = - (EPerson []) request.getAttribute("epeople"); -%> - - - -

      Select EPerson to Add to Group <%= group.getID() %>

      - -
      - - - - - -
      - - - -
      - -
      - - - - - -
      - - - -
      -
      - -
      - -
      +<%-- + - group_eperson_select.jsp + - + - $Id: group-eperson-select.jsp,v 1.2 2004/02/23 18:32:41 rtansley Exp $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of epeople, with continue and cancel buttons + - + - Attributes: + - collections - a Collection [] containing all collections in the system + - Returns: + - submit set to add_eperson_add, user has selected an eperson + - submit set to add_eperson_cancel, user has cancelled operation + - group_id - set if user has selected one + - eperson_id - set if user has selected one + + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + Group group = (Group) request.getAttribute("group"); + EPerson [] epeople = + (EPerson []) request.getAttribute("epeople"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="group-eperson-select.parenttitle"/>: + <fmt:message key="group-eperson-select.title"/> + + + + <%--

      Select EPerson to Add to Group <%= group.getID() %>

      --%> +

      <%= group.getID() %>

      + +
      + + + + + +
      + + + +
      + +
      + + + + + +
      + <%-- --%> + "> + + <%-- --%> + "> +
      +
      + +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/index.jsp dspace-1.2-source-devel/multi/dspace-admin/index.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/index.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/index.jsp 2004-11-21 15:21:00.000000000 -0200 @@ -1,93 +1,107 @@ -<%-- - - index.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Admin tool index page - - - - Note that this is a "stand-alone" JSP that is invoked directly, and not - - via a Servlet. - - - - This means there's some business logic, basically some minimal stuff - - from DSpaceServlet.java. This shouldn't happen elsewhere in the JSPs. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.sql.SQLException" %> - -<%@ page import="org.apache.log4j.Logger" %> - -<%@ page import="org.dspace.app.webui.util.JSPManager" %> -<%@ page import="org.dspace.app.webui.util.UIUtil" %> -<%@ page import="org.dspace.core.Context" %> -<%@ page import="org.dspace.core.LogManager" %> - -<% - // Obtain a context so that the location bar can display log in status - Context context = null; - - try - { - context = UIUtil.obtainContext(request); -%> - -

      Administration Tools

      - -

      Please select an operation from the navigation bar on the left.

      -
      -<% - } - catch (SQLException se) - { - // Database error occurred. - Logger log = Logger.getLogger("org.dspace.jsp"); - log.warn(LogManager.getHeader(context, - "database_error", - se.toString()), se); - - // Also email an alert - UIUtil.sendAlert(request, se); - - JSPManager.showInternalError(request, response); - } -%> - +<%-- + - index.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Admin tool index page + - + - Note that this is a "stand-alone" JSP that is invoked directly, and not + - via a Servlet. + - + - This means there's some business logic, basically some minimal stuff + - from DSpaceServlet.java. This shouldn't happen elsewhere in the JSPs. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.sql.SQLException" %> + +<%@ page import="org.apache.log4j.Logger" %> + +<%@ page import="org.dspace.app.webui.util.JSPManager" %> +<%@ page import="org.dspace.app.webui.util.UIUtil" %> +<%@ page import="org.dspace.core.Context" %> +<%@ page import="org.dspace.core.LogManager" %> + +<% + // Obtain a context so that the location bar can display log in status + Context context = null; + + try + { + context = UIUtil.obtainContext(request); +%> + + + + <fmt:message key="general.title"/>: + <fmt:message key="index.title"/> + + + + <%--

      Administration Tools

      --%> +

      + + <%--

      Please select an operation from the navigation bar on the left.

      --%> +

      +
      +<% + } + catch (SQLException se) + { + // Database error occurred. + Logger log = Logger.getLogger("org.dspace.jsp"); + log.warn(LogManager.getHeader(context, + "database_error", + se.toString()), se); + + // Also email an alert + UIUtil.sendAlert(request, se); + + JSPManager.showInternalError(request, response); + } +%> + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/item-select.jsp dspace-1.2-source-devel/multi/dspace-admin/item-select.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/item-select.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/item-select.jsp 2005-02-02 15:45:59.000000000 -0200 @@ -1,88 +1,124 @@ -<%-- - - item-select.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/06/08 19:01:27 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Form requesting a Handle or internal item ID for item editing - - - - Attributes: - - invalid.id - if this attribute is present, display error msg - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.core.ConfigurationManager" %> - - -

      Select an Item

      - -<% - if (request.getAttribute("invalid.id") != null) { %> -

      The ID you entered isn't a valid item ID. If you're trying to - edit a community or collection, you need to use the - communities/collections admin page.

      -<% } %> - -

      Enter the Handle or internal item ID of the item you wish to select. - More Help...

      - -
      -
      - - - - - - - - - - -
      Handle: - /" size=12> - -
      Internal ID: - - -
      -
      -
      -
      +<%-- + - item-select.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/06/08 19:01:27 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Form requesting a Handle or internal item ID for item editing + - + - Attributes: + - invalid.id - if this attribute is present, display error msg + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.core.ConfigurationManager" %> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="item-select.parenttitle"/>: + <fmt:message key="item-select.title"/> + + + + <%--

      Select an Item

      --%> + + +

      + +<% + if (request.getAttribute("invalid.id") != null) { %> + <%--

      The ID you entered isn't a valid item ID. If you're trying to + edit a community or collection, you need to use the + communities/collections admin page.

      --%> +

      +

      +<% } %> + + <%--

      Enter the Handle or internal item ID of the item you wish to select. --%> +

      + <%-- More Help...

      --%> + + + + + +

      + +
      +
      + + + <%-- --%> + + + + + + <%-- --%> + + + +
      Handle: + /" size=12> + <%-- --%> + "> +
      Internal ID: + + <%-- --%> + "> +
      +
      +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/list-communities.jsp dspace-1.2-source-devel/multi/dspace-admin/list-communities.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/list-communities.jsp 2004-03-09 16:32:32.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/list-communities.jsp 2004-12-15 12:58:44.000000000 -0200 @@ -1,150 +1,175 @@ -<%-- - - list-communities.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/03/09 18:32:31 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display hierarchical list of communities and collections for admin editing - - - - Attributes to be passed in: - - communities - array of communities - - collections.map - Map where a keys is a community IDs and the value is - - the array of collections in that community. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="java.util.Map" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Community[] communities = (Community[]) request.getAttribute("communities"); - Map collectionMap = (Map) request.getAttribute("collections.map"); -%> - - - -

      Edit Communities and Collections

      - -
      - -

      -
      - - -<% - for (int i = 0; i < communities.length; i++) - { -%> - - - - - - - - - - - - - - - -<% - Collection[] collections = - (Collection[]) collectionMap.get(new Integer(communities[i].getID())); - - for (int j = 0; j < collections.length; j++) - { -%> - - - - - - - - - -<% - } -%> - -<% - } -%> -
      - <%= communities[i].getMetadata("name") %> - <%= communities[i].getHandle() %> (DB ID: <%= communities[i].getID()%>) -
      - - - -
      - - - -
      - - - -
      - - - -
      -     <%= collections[j].getMetadata("name") %> - <%= collections[j].getHandle() %> (DB ID: <%= collections[j].getID()%>) -
      - - - -
      - - - - -
      -
      +<%-- + - list-communities.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/03/09 18:32:31 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display hierarchical list of communities and collections for admin editing + - + - Attributes to be passed in: + - communities - array of communities + - collections.map - Map where a keys is a community IDs and the value is + - the array of collections in that community. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="java.util.Map" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Community[] communities = (Community[]) request.getAttribute("communities"); + Map collectionMap = (Map) request.getAttribute("collections.map"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="list-communities.parenttitle"/>: + <fmt:message key="list-communities.title"/> + + + + <%--

      Edit Communities and Collections

      --%> +

      + +
      + + <%--

      --%> +

      ">

      +
      + + +<% + for (int i = 0; i < communities.length; i++) + { +%> + + + + + + + + + + + + + + + +<% + Collection[] collections = + (Collection[]) collectionMap.get(new Integer(communities[i].getID())); + + for (int j = 0; j < collections.length; j++) + { +%> + + + + + + + + + +<% + } +%> + +<% + } +%> +
      + <%= communities[i].getMetadata("name") %> + <%= communities[i].getHandle() %> (DB ID: <%= communities[i].getID()%>) +
      + + + <%-- --%> + "> +
      + + + <%-- --%> + "> +
      + + + <%-- --%> + "> +
      + + + <%-- --%> + "> +
      +     <%= collections[j].getMetadata("name") %> + <%= collections[j].getHandle() %> (DB ID: <%= collections[j].getID()%>) +
      + + + <%-- --%> + "> +
      + + + + <%-- --%> + "> +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/list-dc-types.jsp dspace-1.2-source-devel/multi/dspace-admin/list-dc-types.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/list-dc-types.jsp 2004-06-24 06:12:02.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/list-dc-types.jsp 2005-02-02 15:52:39.000000000 -0200 @@ -1,130 +1,165 @@ -<%-- - - list-dctypes.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2004/06/24 09:12:01 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of DC types - - - - Attributes: - - - - formats - the DC formats in the system (DCType[]) - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.administer.DCType" %> - -<% - DCType[] types = - (DCType[]) request.getAttribute("types"); -%> - - - - - - - - -
      -

      Dublin Core Type Registry

      -
      - Help... -
      - -

      - Note: Adding a new element to the DC Registry does not add a corresponding input field to the submit forms! -

      - - - - - - - - - - - -<% - String row = "even"; - for (int i = 0; i < types.length; i++) - { -%> - - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
      IDElementQualifierScope Note  
      <%= types[i].getID() %> - - - " size=12> - - - - - - - -
      - -

      - Note: Adding a new element to the DC Registry does not add a corresponding input field to the submit forms!

      -

      - -
      -

      -
      +<%-- + - list-dctypes.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2004/06/24 09:12:01 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of DC types + - + - Attributes: + - + - formats - the DC formats in the system (DCType[]) + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.administer.DCType" %> + +<% + DCType[] types = + (DCType[]) request.getAttribute("types"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="list-dc-types.parenttitle"/>: + <fmt:message key="list-dc-types.title"/> + + + + + + + + +
      + <%--

      Dublin Core Type Registry

      --%> +

      +
      + <%-- Help... --%> + + + + + + +
      + + <%--

      + Note: Adding a new element to the DC Registry does not add a corresponding input field to the submit forms! +

      --%> +

      + +

      + + + + + <%-- --%> + + <%-- --%> + + <%-- --%> + + + + + +<% + String row = "even"; + for (int i = 0; i < types.length; i++) + { +%> + + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
      IDElementQualifierScope Note  
      <%= types[i].getID() %> + + + " size=12> + + + + + <%-- --%> + "> + + <%-- --%> + "> +
      + +

      + <%-- Note: Adding a new element to the DC Registry does not add a corresponding input field to the submit forms!

      --%> +

      +

      + <%-- --%> + "> +
      +

      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/list-formats.jsp dspace-1.2-source-devel/multi/dspace-admin/list-formats.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/list-formats.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/list-formats.jsp 2005-02-02 15:55:17.000000000 -0200 @@ -1,150 +1,190 @@ -<%-- - - list-formats.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/06/08 19:01:28 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of bitstream formats - - - - Attributes: - - - - formats - the bitstream formats in the system (BitstreamFormat[]) - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.BitstreamFormat" %> - -<% - BitstreamFormat[] formats = - (BitstreamFormat[]) request.getAttribute("formats"); -%> - - - -

      Bitstream Format Registry

      - -

      Extensions are comma-separated lists of filename - extensions used to automatically identify the formats of uploaded files. - Do not include the dot.

      - -

      When you add a bitstream format, it is initially made "internal" so that - it does not appear in the submission UI before you've finished editing - the format metadata. Be sure to uncheck "internal" if the format should - appear in the submission UI list of formats.

      - -

      More help...

      - - - - - - - - - - - - - - -<% - String row = "even"; - for (int i = 0; i < formats.length; i++) - { - String[] extensions = formats[i].getExtensions(); - String extValue = ""; - - for (int j = 0 ; j < extensions.length; j++) - { - if (j > 0) - { - extValue = extValue + ", "; - } - extValue = extValue + extensions[j]; - } -%> - - - - - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
      IDMIME TypeNameLong DescriptionSupport LevelInternal?Extensions  
      <%= formats[i].getID() %> - - - - - - - - - > - - - - - - - -
      - -

      -

      - -
      -

      -
      +<%-- + - list-formats.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/06/08 19:01:28 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of bitstream formats + - + - Attributes: + - + - formats - the bitstream formats in the system (BitstreamFormat[]) + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.content.BitstreamFormat" %> + +<% + BitstreamFormat[] formats = + (BitstreamFormat[]) request.getAttribute("formats"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="list-formats.parenttitle"/>: + <fmt:message key="list-formats.title"/> + + + + <%--

      Bitstream Format Registry

      --%> +

      + + <%--

      Extensions are comma-separated lists of filename + extensions used to automatically identify the formats of uploaded files. + Do not include the dot.

      --%> +

      + + <%--

      When you add a bitstream format, it is initially made "internal" so that + it does not appear in the submission UI before you've finished editing + the format metadata. Be sure to uncheck "internal" if the format should + appear in the submission UI list of formats.

      --%> +

      + + <%--

      More help...

      --%> + + + + + +

      + + + + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + + + + +<% + String row = "even"; + for (int i = 0; i < formats.length; i++) + { + String[] extensions = formats[i].getExtensions(); + String extValue = ""; + + for (int j = 0 ; j < extensions.length; j++) + { + if (j > 0) + { + extValue = extValue + ", "; + } + extValue = extValue + extensions[j]; + } +%> + + + + + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
      IDMIME TypeNameLong DescriptionSupport LevelInternal?Extensions  
      <%= formats[i].getID() %> + + + + + + + + + > + + + + + <%-- --%> + "> + + <%-- --%> + "> +
      + +

      +

      + <%-- --%> + "> +
      +

      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/news-edit.jsp dspace-1.2-source-devel/multi/dspace-admin/news-edit.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/news-edit.jsp 2004-04-19 15:16:24.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/news-edit.jsp 2004-12-15 13:02:59.000000000 -0200 @@ -1,104 +1,139 @@ -<%-- news-edit.jsp - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - News Edit Form JSP - - - - Attributes: - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.NewsEditServlet" %> -<%@ page import="org.dspace.core.Constants" %> - -<% - Integer position = (Integer)request.getAttribute("position"); - String positionStr = ""; - - //determine which news block we're working on - if(position.intValue() == Constants.NEWS_TOP) - { - positionStr = "top box"; - } - else - { - positionStr = "sidebar"; - } - - //get the existing news - String news = (String)request.getAttribute("news"); - - if (news == null) - { - news = ""; - } - -%> - - - -

      News Editor

      - -

      Add or edit text in the box below to have it appear - in the <%= positionStr%> of the DSpace home page.

      - -

      You may format the text using HTML tags, but please note that the HTML will not be validated here.

      - -
      -
      - - - - - - - - -
      News:
      - - - -
      -
      -
      - -
      +<%-- news-edit.jsp + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - News Edit Form JSP + - + - Attributes: + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.NewsEditServlet" %> +<%@ page import="org.dspace.core.Constants" %> + +<% + Integer position = (Integer)request.getAttribute("position"); + + //get the existing news + String news = (String)request.getAttribute("news"); + + if (news == null) + { + news = ""; + } + +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="news-edit.parenttitle"/>: + <fmt:message key="news-edit.title"/> + + + + + + <% + //determine which news block we're working on + if(position.intValue() == Constants.NEWS_TOP) + { + %> + + + + + <% + } + else + { + %> + + + + <% + } + %> + + + <%--

      News Editor

      --%> +

      + + <%--

      Add or edit text in the box below to have it appear + in the <%= positionStr%> of the DSpace home page.

      --%> +

      + + <%--

      You may format the text using HTML tags, but please note that the HTML will not be validated here.

      --%> +

      + +
      +
      + + + <%-- --%> + + + + + + +
      News:
      + + <%-- --%> + "> + <%-- --%> + "> +
      +
      +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/news-main.jsp dspace-1.2-source-devel/multi/dspace-admin/news-main.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/news-main.jsp 2004-06-16 16:07:48.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/news-main.jsp 2005-02-02 15:58:26.000000000 -0200 @@ -1,104 +1,131 @@ -<%-- - - news-main.jsp - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of Groups, with 'edit' and 'delete' buttons next to them - - - - Attributes: - - - - groups - Group [] of groups to work on - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.core.Constants" %> - -<% - String news = (String)request.getAttribute("news"); - - if (news == null) - { - news = ""; - } - -%> - - - - - - - - - -
      -

      News Editor

      -
      - Help... -
      - - - - - - - - - - - - - - -
      Top News - > - -
      Sidebar News - > - -
      - - - -
      +<%-- + - news-main.jsp + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of Groups, with 'edit' and 'delete' buttons next to them + - + - Attributes: + - + - groups - Group [] of groups to work on + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.core.Constants" %> + +<% + String news = (String)request.getAttribute("news"); + + if (news == null) + { + news = ""; + } + +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="news-main.parenttitle"/>: + <fmt:message key="news-main.title"/> + + + + + + + + +
      + <%--

      News Editor

      --%> +

      +
      + <%-- Help... --%> + + + + + + +
      + + + + + <%-- --%> + + + + + + + <%-- --%> + + + + +
      Top News + > + <%-- --%> + "> +
      Sidebar News + > + <%-- --%> + "> +
      + + +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/upload-logo.jsp dspace-1.2-source-devel/multi/dspace-admin/upload-logo.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/upload-logo.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/upload-logo.jsp 2004-12-16 09:17:53.000000000 -0200 @@ -1,95 +1,130 @@ -<%-- - - upload-logo.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/02/23 18:32:41 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Form to upload a logo - - - - Attributes: - - community - community to upload logo for - - collection - collection to upload logo for - "overrides" community - - if this isn't null - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Collection collection = (Collection) request.getAttribute("collection"); - Community community = (Community) request.getAttribute("community"); - - if (collection != null) - { - community = null; - } -%> - - - -

      Upload Logo

      - -

      Select the logo to upload for - <%= (collection != null ? "collection " + collection.getMetadata("name") + "" - : "community " + community.getMetadata("name") + "") %> -

      - -
      -

      - -

      - -<% if (collection == null) { %> - -<% } else { %> - -<% } %> - -

      -
      -
      +<%-- + - upload-logo.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/02/23 18:32:41 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Form to upload a logo + - + - Attributes: + - community - community to upload logo for + - collection - collection to upload logo for - "overrides" community + - if this isn't null + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditCommunitiesServlet" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + + if (collection != null) + { + community = null; + } +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="upload-logo.parenttitle"/>: + <fmt:message key="upload-logo.title"/> + + + + <%--

      Upload Logo

      --%> +

      + + <%--

      Select the logo to upload for + <%= (collection != null ? "collection " + collection.getMetadata("name") + "" + : "community " + community.getMetadata("name") + "") %> +

      --%> + + +

      + <% + if (collection != null){ + %> + <%= collection.getMetadata("name")%> + <% + } + else{ + %> + <%= community.getMetadata("name")%> + <% + } + %> +

      + +
      +

      + +

      + +<% if (collection == null) { %> + +<% } else { %> + +<% } %> + + <%--

      --%> +

      ">

      +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/wizard-basicinfo.jsp dspace-1.2-source-devel/multi/dspace-admin/wizard-basicinfo.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/wizard-basicinfo.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/wizard-basicinfo.jsp 2005-02-04 13:52:45.000000000 -0200 @@ -1,187 +1,227 @@ -<%-- - - wizard-questions.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/06/08 19:01:28 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - basic info for collection creation wizard - - - - attributes: - - collection - collection we're creating - --%> - -<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> -<%@ page import="org.dspace.content.Collection" %> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% Collection collection = (Collection) request.getAttribute("collection"); %> - - - - - - - - -
      -

      Describe the Collection

      -
      - Help... -
      - -
      - - - - - - -<%-- Hints about table width --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

      Name:

         
      - Shown in list on community home page -

      Short Description:

       
      - HTML, shown in center of collection home page. Be sure to enclose in <P> </P> tags! -

      Introductory text:

       
      - Plain text, shown at bottom of collection home page -

      Copyright text:

       
      - HTML, shown on right-hand side of collection home page. Be sure to enclose in <P> </P> tags! -

      Side bar text:

       
      - License that submitters must grant. Leave this blank to use the default license. -

      License:

       
      - Plain text, any provenance information about this collection. Not shown on collection pages. -

      Provenance:

       
      - Choose a JPEG or GIF logo for the collection home page. Should be quite small. -

      Logo:

      - -

       

      - -<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> - > - > - -
      - - - - - -
      -   - - -
      -
      -
      - -
      +<%-- + - wizard-questions.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/06/08 19:01:28 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - basic info for collection creation wizard + - + - attributes: + - collection - collection we're creating + --%> + +<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> +<%@ page import="org.dspace.content.Collection" %> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% Collection collection = (Collection) request.getAttribute("collection"); %> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="wizard-basicinfo.heading"/>: + <fmt:message key="wizard-basicinfo.title"/> + + + + + + + + + +
      + <%--

      Describe the Collection

      --%> +

      +
      + <%-- Help... --%> + + + + + + +
      + +
      + + + <%-- --%> + + + + +<%-- Hints about table width --%> + + + + + + + + <%-- --%> + + + + <%-- --%> + + + + + + + + + + + <%-- --%> + + + + + + + + + + + <%-- --%> + + + + + + + + + + + <%-- --%> + + + + + + + + + + + <%-- --%> + + + + + + + + + + + <%-- --%> + + + + + + + + + + + <%-- --%> + + + +

      Name:

         
      + Shown in list on community home page + + +

      Short Description:

       
      + <%-- HTML, shown in center of collection home page. Be sure to enclose in <P> </P> tags! --%> + +

      Introductory text:

       
      + <%-- Plain text, shown at bottom of collection home page --%> + +

      Copyright text:

       
      + <%-- HTML, shown on right-hand side of collection home page. Be sure to enclose in <P> </P> tags! --%> + +

      Side bar text:

       
      + <%-- License that submitters must grant. Leave this blank to use the default license. --%> + +

      License:

       
      + <%-- Plain text, any provenance information about this collection. Not shown on collection pages. --%> + +

      Provenance:

       
      + <%-- Choose a JPEG or GIF logo for the collection home page. Should be quite small. --%> + +

      Logo:

      + +

       

      + +<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> + > + > + +
      + + + + + +
        + + + <%-- --%> + "> +
      +
      +
      + +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/wizard-default-item.jsp dspace-1.2-source-devel/multi/dspace-admin/wizard-default-item.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/wizard-default-item.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/wizard-default-item.jsp 2005-02-04 10:37:31.000000000 -0200 @@ -1,130 +1,158 @@ -<%-- - - wizard-default-item.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/06/08 19:01:27 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - initial questions page for collection creation wizard - - - - attributes: - - collection - collection we're creating - --%> - -<%@ page import="org.dspace.administer.DCType" %> -<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> -<%@ page import="org.dspace.content.Collection" %> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% Collection collection = (Collection) request.getAttribute("collection"); - DCType[] dcTypes = (DCType[]) request.getAttribute("dctypes"); %> - - - - - - - - -
      -

      Enter Default Item Metadata

      -
      - Help... -
      - -

      Whenever a new submission is started in this collection, it will have the - metadata you entered below already filled out.

      - -

      You can leave as many fields blank as you like.

      - -
      -
      - - - - - -<% - String row = "even"; - - for (int i = 0; i < 10; i++) - { - %> - - - - - -<% } %> -
      Dublin Core FieldValueLanguage
      - - - -
      -
      -

       

      - -<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> - > - > - -
      - - - - - -
      -   - - -
      -
      -
      - -
      +<%-- + - wizard-default-item.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/06/08 19:01:27 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - initial questions page for collection creation wizard + - + - attributes: + - collection - collection we're creating + --%> + +<%@ page import="org.dspace.administer.DCType" %> +<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> +<%@ page import="org.dspace.content.Collection" %> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% Collection collection = (Collection) request.getAttribute("collection"); + DCType[] dcTypes = (DCType[]) request.getAttribute("dctypes"); %> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="wizard-default-item.title"/> + + + + + + + + + +
      + <%--

      Enter Default Item Metadata

      --%> +

      +
      + <%-- Help... --%> + + + + + + +
      + + <%--

      Whenever a new submission is started in this collection, it will have the + metadata you entered below already filled out.

      --%> +

      + + <%--

      You can leave as many fields blank as you like.

      --%> +

      + +
      +
      + + <%-- --%> + + <%-- --%> + + <%-- --%> + + +<% + String row = "even"; + + for (int i = 0; i < 10; i++) + { + %> + + + + + +<% } %> +
      Dublin Core FieldValueLanguage
      + + + +
      +
      +

       

      + +<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> + > + > + +
      + + + + + +
        + + + <%-- --%> + "> +
      +
      +
      + +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/wizard-permissions.jsp dspace-1.2-source-devel/multi/dspace-admin/wizard-permissions.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/wizard-permissions.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/wizard-permissions.jsp 2005-02-04 10:41:31.000000000 -0200 @@ -1,195 +1,232 @@ -<%-- - - wizard-permissions.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/06/08 19:01:28 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - set up a group with particular permissions - - - - attributes: - - collection - collection we're creating - - permission - one of the constants starting PERM_ at the top of - - org.dspace.app.webui.servlet.admin.CollectionWizardServlet - --%> - -<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> -<%@ page import="org.dspace.content.Collection" %> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Collection collection = (Collection) request.getAttribute("collection"); - int perm = ((Integer) request.getAttribute("permission")).intValue(); - boolean mitGroup = (request.getAttribute("mitgroup") != null); -%> - - - -<% - switch (perm) - { - case CollectionWizardServlet.PERM_READ: -%> -

      Authorization to Read

      - -

      Who has (by default) permission to read new items submitted to this collection? -<% - break; - - case CollectionWizardServlet.PERM_SUBMIT: -%> -

      Authorization to Submit

      - -

      Who has permission to submit new items to this collection? -<% - break; - - case CollectionWizardServlet.PERM_WF1: -%> -

      Submission Workflow Accept/Reject Step

      - -

      Who is responsible for performing the accept/reject step? - They will be able to accept or reject incoming submissions. They will not be - able to edit the submission's metadata, however. Only one of the group need perform the step - for each submission. -<% - break; - - case CollectionWizardServlet.PERM_WF2: -%> -

      Submission Workflow Accept/Reject/Edit Metadata Step

      - -

      Who is responsible for performing the accept/reject/edit metadata step? - They will be able to edit the metadata of incoming submissions, and then accept - or reject them. Only one of the group need perform the step for each submission. -<% - break; - - case CollectionWizardServlet.PERM_WF3: -%> -

      Submission Workflow Edit Metadata Step

      - -

      Who is responsible for performing the edit metadata step? - They will be able to edit the metadata of incoming submissions, but will not - be able to reject them. -<% - break; - - case CollectionWizardServlet.PERM_ADMIN: -%> -

      Delegated Collection Administrators

      - -

      Who are the collection administrators for this collection? They will be able to decide who can submit items -to the collection, withdraw items, edit item metadata (after submission), and add (map) existing items from -other collections to this collection (subject to authorization from that collection). -<% - break; - } -%> -More help...

      - -

      You can change this later using the relevant sections of the DSpace admin UI.

      - -
      - -
      - -<% - // MIT group checkbox - only if there's an MIT group and on the READ and SUBMIT pages - // (Sorry, everyone who isn't running DSpace at MIT, I know this isn't very elegant!) - - if (mitGroup && - (perm == CollectionWizardServlet.PERM_READ || perm == CollectionWizardServlet.PERM_SUBMIT)) - { -%> - - - - - - - - - - - - - -<% - } -%> - -<%-- width=40% centres table nicely --%> - - - - - - - - - -
       All MIT users -
       
      OR
       
      - Click on the 'Select E-people' button to choose e-people to add to the list.
      - -
      -
      - -<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> - > - > - > - -
      - - - - - -
      -   - - -
      -
      -
      - -
      +<%-- + - wizard-permissions.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/06/08 19:01:28 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - set up a group with particular permissions + - + - attributes: + - collection - collection we're creating + - permission - one of the constants starting PERM_ at the top of + - org.dspace.app.webui.servlet.admin.CollectionWizardServlet + --%> + +<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> +<%@ page import="org.dspace.content.Collection" %> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Collection collection = (Collection) request.getAttribute("collection"); + int perm = ((Integer) request.getAttribute("permission")).intValue(); + boolean mitGroup = (request.getAttribute("mitgroup") != null); +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="wizard-permissions.title"/> + + + +<% + switch (perm) + { + case CollectionWizardServlet.PERM_READ: +%> + <%--

      Authorization to Read

      --%> + +

      + + <%--

      Who has (by default) permission to read new items submitted to this collection? --%> +

      +<% + break; + + case CollectionWizardServlet.PERM_SUBMIT: +%> + <%--

      Authorization to Submit

      --%> +

      + + <%--

      Who has permission to submit new items to this collection? --%> +

      +<% + break; + + case CollectionWizardServlet.PERM_WF1: +%> + <%--

      Submission Workflow Accept/Reject Step

      --%> +

      + + <%--

      Who is responsible for performing the accept/reject step? + They will be able to accept or reject incoming submissions. They will not be + able to edit the submission's metadata, however. Only one of the group need perform the step + for each submission. --%> +

      +<% + break; + + case CollectionWizardServlet.PERM_WF2: +%> + <%--

      Submission Workflow Accept/Reject/Edit Metadata Step

      --%> +

      + + <%--

      Who is responsible for performing the accept/reject/edit metadata step? + They will be able to edit the metadata of incoming submissions, and then accept + or reject them. Only one of the group need perform the step for each submission. --%> +

      +<% + break; + + case CollectionWizardServlet.PERM_WF3: +%> + <%--

      Submission Workflow Edit Metadata Step

      --%> +

      + + <%--

      Who is responsible for performing the edit metadata step? + They will be able to edit the metadata of incoming submissions, but will not + be able to reject them. --%> +

      +<% + break; + + case CollectionWizardServlet.PERM_ADMIN: +%> + <%--

      Delegated Collection Administrators

      --%> +

      + + <%--

      Who are the collection administrators for this collection? They will be able to decide who can submit items +to the collection, withdraw items, edit item metadata (after submission), and add (map) existing items from +other collections to this collection (subject to authorization from that collection). --%> +

      +<% + break; + } +%> +<%-- More help...

      --%> + + + + + +

      + + <%--

      You can change this later using the relevant sections of the DSpace admin UI.

      --%> +

      + +
      + +
      + +<% + // MIT group checkbox - only if there's an MIT group and on the READ and SUBMIT pages + // (Sorry, everyone who isn't running DSpace at MIT, I know this isn't very elegant!) + + if (mitGroup && + (perm == CollectionWizardServlet.PERM_READ || perm == CollectionWizardServlet.PERM_SUBMIT)) + { +%> + + + <%-- + + + + + + <%-- --%> + + + + + +<% + } +%> + +<%-- width=40% centres table nicely --%> + + + --%> + + + + + + + +
       All MIT users --%> +   +
       
      OR
       
      + <%-- Click on the 'Select E-people' button to choose e-people to add to the list.
      + +
      +
      + +<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> + > + > + > + +
      + + + + + +
        + + + <%-- --%> + " onclick="javascript:finishEPerson();"> +
      +
      +
      + +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/wizard-questions.jsp dspace-1.2-source-devel/multi/dspace-admin/wizard-questions.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/wizard-questions.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/wizard-questions.jsp 2005-02-04 10:42:33.000000000 -0200 @@ -1,161 +1,191 @@ -<%-- - - wizard-questions.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2004/06/08 19:01:28 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - initial questions page for collection creation wizard - - - - attributes: - - collection - collection we're creating - --%> - -<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> -<%@ page import="org.dspace.content.Collection" %> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% Collection collection = (Collection) request.getAttribute("collection"); %> - - - -

      Describe the Collection

      - -
      - -

      Please check the boxes next to the statements that apply to the collection. - More Help...

      - -
      - - - - - - - - - - - - - - - - - - - - - - -
      - - - - - -
      New items should be publicly readable
      -
      - - - - - -
      Some users will be able to submit to this collection
      -
      - - - - - -
      The submission workflow will include an accept/reject step
      -
      - - - - - -
      The submission workflow will include an accept/reject/edit metadata step
      -
      - - - - - -
      The submission workflow will include an edit metadata step
      -
      - - - - - -
      This collection will have delegated collection administrators
      -
      - - - - - -
      New submissions will have some metadata already filled out with defaults
      -
      -
      - -

       

      - -<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> - > - > - -
      - - - - - -
      -   - - -
      -
      -
      - -
      +<%-- + - wizard-questions.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2004/06/08 19:01:28 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - initial questions page for collection creation wizard + - + - attributes: + - collection - collection we're creating + --%> + +<%@ page import="org.dspace.app.webui.servlet.admin.CollectionWizardServlet" %> +<%@ page import="org.dspace.content.Collection" %> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% Collection collection = (Collection) request.getAttribute("collection"); %> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="wizard-questions.title"/> + + + + <%--

      Describe the Collection

      --%> + + +

      + +
      + + <%--

      Please check the boxes next to the statements that apply to the collection. --%> +

      + <%-- More Help...

      --%> + + + + + +

      + +
      + + + + + + + + + + + + + + + + + + + + + + +
      + + + + <%-- --%> + + +
      New items should be publicly readable
      +
      + + + + <%-- --%> + + +
      Some users will be able to submit to this collection
      +
      + + + + <%-- --%> + + +
      The submission workflow will include an accept/reject step
      +
      + + + + <%-- --%> + + +
      The submission workflow will include an accept/reject/edit metadata step
      +
      + + + + <%-- --%> + + +
      The submission workflow will include an edit metadata step
      +
      + + + + <%-- --%> + + +
      This collection will have delegated collection administrators
      +
      + + + + <%-- --%> + + +
      New submissions will have some metadata already filled out with defaults
      +
      +
      + +

       

      + +<%-- Hidden fields needed for servlet to know which collection and page to deal with --%> + > + > + +
      + + + + + +
        + + + "> +
      +
      +
      + +
      diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/workflow-abort-confirm.jsp dspace-1.2-source-devel/multi/dspace-admin/workflow-abort-confirm.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/workflow-abort-confirm.jsp 2004-01-27 06:23:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/workflow-abort-confirm.jsp 2004-12-16 09:20:13.000000000 -0200 @@ -1,89 +1,114 @@ -<%-- - - workflow-abort-confirm.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/01/27 08:23:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm abort of a workflow - - - - Attributes: - - workflow - WorkflowItem representing the workflow in question - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.WorkflowAbortServlet" %> -<%@ page import="org.dspace.workflow.WorkflowItem" %> -<%@ page import="org.dspace.workflow.WorkflowManager" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - WorkflowItem workflow = (WorkflowItem) request.getAttribute("workflow"); -%> - - - -

      Delete Workflow: <%= workflow.getID() %>

      - -

      Are you sure you want to abort this workflow? It will return to the user's personal workspace

      - -
        -
      • Collection: <%= workflow.getCollection().getMetadata("name") %>
      • -
      • Submitter: <%= WorkflowManager.getSubmitterName(workflow) %>
      • -
      • Title: <%= WorkflowManager.getItemTitle(workflow) %>
      • -
      - -
      - - -
      - - - - - -
      - - - -
      -
      -
      -
      - +<%-- + - workflow-abort-confirm.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/01/27 08:23:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm abort of a workflow + - + - Attributes: + - workflow - WorkflowItem representing the workflow in question + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.WorkflowAbortServlet" %> +<%@ page import="org.dspace.workflow.WorkflowItem" %> +<%@ page import="org.dspace.workflow.WorkflowManager" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + WorkflowItem workflow = (WorkflowItem) request.getAttribute("workflow"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="workflow-abort-confirm.parenttitle"/>: + <fmt:message key="workflow-abort-confirm.title"/> + + + + <%--

      Delete Workflow: <%= workflow.getID() %>

      --%> + +

      <%= workflow.getID() %>

      + + <%--

      Are you sure you want to abort this workflow? It will return to the user's personal workspace

      --%> +

      + +
        + <%--
      • Collection: <%= workflow.getCollection().getMetadata("name") %>
      • --%> +
      • <%= workflow.getCollection().getMetadata("name") %>
      • + <%--
      • Submitter: <%= WorkflowManager.getSubmitterName(workflow) %>
      • --%> +
      • <%= WorkflowManager.getSubmitterName(workflow) %>
      • + <%--
      • Title: <%= WorkflowManager.getItemTitle(workflow) %>
      • --%> +
      • <%= WorkflowManager.getItemTitle(workflow) %>
      • +
      + +
      + + +
      + + + + + +
      + <%-- --%> + "> + + <%-- --%> + "> +
      +
      +
      +
      +
      + diff -Naur dspace-1.2-source-devel/jsp/dspace-admin/workflow-list.jsp dspace-1.2-source-devel/multi/dspace-admin/workflow-list.jsp --- dspace-1.2-source-devel/jsp/dspace-admin/workflow-list.jsp 2004-06-08 16:01:28.000000000 -0200 +++ dspace-1.2-source-devel/multi/dspace-admin/workflow-list.jsp 2005-02-04 10:51:35.000000000 -0200 @@ -1,120 +1,148 @@ -<%-- - - workflow_list.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2004/06/08 19:01:28 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of Workflows, with 'abort' buttons next to them - - - - Attributes: - - - - workflows - WorkflowItem [] to choose from - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.administer.DCType" %> -<%@ page import="org.dspace.workflow.WorkflowManager" %> -<%@ page import="org.dspace.workflow.WorkflowItem" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.core.Utils" %> - -<% - WorkflowItem[] workflows = - (WorkflowItem[]) request.getAttribute("workflows"); -%> - - - - - - - - -

      Currently Active Workflows

      -
      - Help... -
      - - - - - - - - - - -<% - String row = "even"; - for (int i = 0; i < workflows.length; i++) - { -%> - - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
      IDCollection SubmitterTitle 
      <%= workflows[i].getID() %> - <%= workflows[i].getCollection().getMetadata("name") %> - - <%= WorkflowManager.getSubmitterName(workflows[i]) %> - - <%= Utils.addEntities(WorkflowManager.getItemTitle(workflows[i])) %> - - - -
      - -
      +<%-- + - workflow_list.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2004/06/08 19:01:28 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of Workflows, with 'abort' buttons next to them + - + - Attributes: + - + - workflows - WorkflowItem [] to choose from + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.administer.DCType" %> +<%@ page import="org.dspace.workflow.WorkflowManager" %> +<%@ page import="org.dspace.workflow.WorkflowItem" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.core.Utils" %> + +<% + WorkflowItem[] workflows = + (WorkflowItem[]) request.getAttribute("workflows"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="workflow-list.parenttitle"/>: + <fmt:message key="workflow-list.title"/> + + + + + + <%-- + + +

      Currently Active Workflows

      --%> +

      +
      + <%-- Help... --%> + + + + + + +
      + + + + + <%-- --%> + + <%-- --%> + + <%-- --%> + + + + +<% + String row = "even"; + for (int i = 0; i < workflows.length; i++) + { +%> + + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
      IDCollection Submitter Title 
      <%= workflows[i].getID() %> + <%= workflows[i].getCollection().getMetadata("name") %> + + <%= WorkflowManager.getSubmitterName(workflows[i]) %> + + <%= Utils.addEntities(WorkflowManager.getItemTitle(workflows[i])) %> + + + <%-- --%> + "> +
      +
      +
      diff -Naur dspace-1.2-source-devel/jsp/error/404.jsp dspace-1.2-source-devel/multi/error/404.jsp --- dspace-1.2-source-devel/jsp/error/404.jsp 2002-11-01 15:59:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/error/404.jsp 2004-11-26 11:28:32.000000000 -0200 @@ -1,69 +1,89 @@ -<%-- - - 404.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2002/11/01 17:59:14 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Friendly 404 error message page - --%> - -<%@ page isErrorPage="true" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

      Error: Document Not Found

      -

      The document you are trying to access has not been found on the server.

      -
        -
      • If you got here by following a link or bookmark provided by someone - else, the link may be incorrect or you mistyped the link. Please check - the link and try again. If you still get this error, then try going - to the DSpace home page - and looking for what you want from there.

      • -
      • If you got to this error by clicking in a link on the DSpace site, - please let us know so we can fix it!

      • -
      - - - -

      - Go to the DSpace home page -

      - -
      +<%-- + - 404.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2002/11/01 17:59:14 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Friendly 404 error message page + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ page isErrorPage="true" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="404.title"/> + + + + <%--

      Error: Document Not Found

      --%> +

      + <%--

      The document you are trying to access has not been found on the server.

      --%> +

      +
        + <%--
      • If you got here by following a link or bookmark provided by someone + else, the link may be incorrect or you mistyped the link. Please check + the link and try again. If you still get this error, then try going + to the DSpace home page + and looking for what you want from there.

      • --%> +
      • +

      • + <%--
      • If you got to this error by clicking in a link on the DSpace site, + please let us know so we can fix it!

      • --%> +
      • +
      + + + +

      + <%-- Go to the DSpace home page --%> + +

      + +
      diff -Naur dspace-1.2-source-devel/jsp/error/authorize.jsp dspace-1.2-source-devel/multi/error/authorize.jsp --- dspace-1.2-source-devel/jsp/error/authorize.jsp 2003-02-21 17:51:48.000000000 -0200 +++ dspace-1.2-source-devel/multi/error/authorize.jsp 2004-11-23 08:53:56.000000000 -0200 @@ -1,66 +1,82 @@ -<%-- - - authorize.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:48 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Page representing an authorization error - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page isErrorPage="true" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

      Authorization Required

      - -

      You do not have permission to perform the action you just attempted.

      - -

      If you think you should have authorization, please feel free to - contact the DSpace administrators:

      - - - -

      - Go to the DSpace home page -

      - -
      +<%-- + - authorize.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:48 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Page representing an authorization error + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isErrorPage="true" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="authorize.title"/> + + + + <%--

      Authorization Required

      --%> +

      + + <%--

      You do not have permission to perform the action you just attempted.

      --%> +

      + + <%--

      If you think you should have authorization, please feel free to + contact the DSpace administrators:

      --%> +

      + + + +

      + <%-- Go to the DSpace home page --%> + +

      + +
      diff -Naur dspace-1.2-source-devel/jsp/error/integrity.jsp dspace-1.2-source-devel/multi/error/integrity.jsp --- dspace-1.2-source-devel/jsp/error/integrity.jsp 2003-02-21 17:51:48.000000000 -0200 +++ dspace-1.2-source-devel/multi/error/integrity.jsp 2004-11-23 08:55:34.000000000 -0200 @@ -1,84 +1,104 @@ -<%-- - - internal.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:48 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Page representing an integrity error - an inconsistency or error in the - - data received from the browser - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page isErrorPage="true" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - -

      System Error: Malformed Request

      - -

      There was an inconsistency in the data received from your browser. - This may be due to one of several things:

      - -
        -
      • Sometimes, if you used your browser's "back" button during an operation like a - submission, clicking on a button may try and do something that's already - been done, such as commit the submission to the archive. - Clicking your browsers "reload" or "refresh" button may have similar - results.
      • -
      • If you got here by following a link or bookmark provided by someone - else, the link may be incorrect or you mistyped the link. Please check - the link and try again.
      • -
      • If you have more than one browser window open with DSpace, this can cause - a similar problem whereby a button clicked in one window may make a button - click in the other window invalid.
      • -
      • Of course, you may have uncovered a problem with the system! All of - these errors are logged, and we'll be checking them regularly to see - if there is a problem.
      • -
      - -

      If the problem persists, please contact the DSpace site administrators:

      - - - -

      - Go to the DSpace home page -

      - - -
      +<%-- + - internal.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:48 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Page representing an integrity error - an inconsistency or error in the + - data received from the browser + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isErrorPage="true" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="integrity.title"/> + + + + <%--

      System Error: Malformed Request

      --%> +

      + + <%--

      There was an inconsistency in the data received from your browser. + This may be due to one of several things:

      --%> +

      + +
        + <%--
      • Sometimes, if you used your browser's "back" button during an operation like a + submission, clicking on a button may try and do something that's already + been done, such as commit the submission to the archive. + Clicking your browsers "reload" or "refresh" button may have similar + results.
      • --%> +
      • + <%--
      • If you got here by following a link or bookmark provided by someone + else, the link may be incorrect or you mistyped the link. Please check + the link and try again.
      • --%> +
      • + <%--
      • If you have more than one browser window open with DSpace, this can cause + a similar problem whereby a button clicked in one window may make a button + click in the other window invalid.
      • --%> +
      • + <%--
      • Of course, you may have uncovered a problem with the system! All of + these errors are logged, and we'll be checking them regularly to see + if there is a problem.
      • --%> +
      • +
      + + <%--

      If the problem persists, please contact the DSpace site administrators:

      --%> +

      + + + +

      + <%-- Go to the DSpace home page --%> + +

      + + +
      diff -Naur dspace-1.2-source-devel/jsp/error/internal.jsp dspace-1.2-source-devel/multi/error/internal.jsp --- dspace-1.2-source-devel/jsp/error/internal.jsp 2004-04-19 12:07:08.000000000 -0200 +++ dspace-1.2-source-devel/multi/error/internal.jsp 2005-02-23 13:56:55.000000000 -0200 @@ -1,83 +1,98 @@ -<%-- - - internal.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/04/19 15:07:08 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Page representing an internal server error - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> -<%@ page import="java.io.PrintWriter" %> - -<%@ page isErrorPage="true" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

      Internal System Error

      - -

      Oops! The system has experienced an internal error. This is our fault, - please pardon our dust during these early stages of the DSpace system!

      - -

      The system has logged this error. Please try to do what you were doing - again, and if the problem persists, please contact us so we can fix the - problem.

      - - - -

      - Go to the DSpace home page -

      - -
      +<%-- + - internal.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/04/19 15:07:08 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Page representing an internal server error + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="java.io.PrintWriter" %> + +<%@ page isErrorPage="true" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="internal.title"/> + + + + <%--

      Internal System Error

      --%> +

      + + <%--

      Oops! The system has experienced an internal error. This is our fault, + please pardon our dust during these early stages of the DSpace system!

      --%> +

      + + <%--

      The system has logged this error. Please try to do what you were doing + again, and if the problem persists, please contact us so we can fix the + problem.

      --%> + + + +

      + <%-- Go to the DSpace home page --%> + +

      + +
      diff -Naur dspace-1.2-source-devel/jsp/error/invalid-id.jsp dspace-1.2-source-devel/multi/error/invalid-id.jsp --- dspace-1.2-source-devel/jsp/error/invalid-id.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/error/invalid-id.jsp 2005-01-10 10:45:24.000000000 -0200 @@ -1,99 +1,126 @@ -<%-- - - invalid-id.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Page representing an invalid ID error - - - - Attributes: - - bad.id - Optional. The ID that is invalid. - - bad.type - Optional. The type of the ID (or the type the system thought - - is was!) from org.dspace.core.Constants. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page isErrorPage="true" %> -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.core.Constants" %> - -<% - String badID = (String) request.getAttribute("bad.id"); - Integer type = (Integer) request.getAttribute("bad.type"); - - // Make sure badID isn't null - if (badID == null) - { - badID = ""; - } - - // Get text for the type - String typeString = "object"; - if (type != null) - { - typeString = Constants.typeText[type.intValue()].toLowerCase(); - } -%> - - - -

      Invalid Identifier

      - -

      The identifier <%= badID %> does not correspond to a valid - <%= typeString %> in DSpace. This may be because of one of the following - reasons:

      - -
        -
      • The URL of the current page is incorrect - if you followed a link - from outside of DSpace it may be mistyped or corrupt.
      • -
      • You entered an invalid ID into a form - please try again.
      • -
      - -

      If you're having problems, or you expected the ID to work, feel free to - contact the site administrators.

      - - - -

      - Go to the DSpace home page -

      - - -
      +<%-- + - invalid-id.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Page representing an invalid ID error + - + - Attributes: + - bad.id - Optional. The ID that is invalid. + - bad.type - Optional. The type of the ID (or the type the system thought + - is was!) from org.dspace.core.Constants. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isErrorPage="true" %> +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.core.Constants" %> + +<% + String badID = (String) request.getAttribute("bad.id"); + Integer type = (Integer) request.getAttribute("bad.type"); + + // Make sure badID isn't null + if (badID == null) + { + badID = ""; + } + + // Get text for the type + //String typeString = "object"; + // if (type != null) + // { + // typeString = Constants.typeText[type.intValue()].toLowerCase(); + // } + + + String typeString = "constants.object"; + if (type != null) + { + typeString = "constants.type" + type.intValue(); + } + + +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="invalid-id.title"/> + + + + <%--

      Invalid Identifier

      --%> +

      + + <%--

      The identifier <%= badID %> does not correspond to a valid + <%= typeString %> in DSpace. This may be because of one of the following + reasons:

      --%> +

      <%= badID %> +

      + +
        + <%--
      • The URL of the current page is incorrect - if you followed a link + from outside of DSpace it may be mistyped or corrupt.
      • --%> +
      • + <%--
      • You entered an invalid ID into a form - please try again.
      • --%> +
      • +
      + + <%--

      If you're having problems, or you expected the ID to work, feel free to + contact the site administrators.

      --%> +

      + + + +

      + <%-- Go to the DSpace home page --%> + +

      + + +
      diff -Naur dspace-1.2-source-devel/jsp/error/require-certificate.jsp dspace-1.2-source-devel/multi/error/require-certificate.jsp --- dspace-1.2-source-devel/jsp/error/require-certificate.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/error/require-certificate.jsp 2004-11-22 07:21:20.000000000 -0200 @@ -1,60 +1,74 @@ -<%-- - - require-certificate.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Message informing MIT user they need to use a certificate to log in - - FIXME: MIT-specific message - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

      Certificate Required

      - -

      The configuration of this DSpace site means that you need a valid - Web certificate to log in. If you are having problems with this, - please contact us.

      - - - -
      +<%-- + - require-certificate.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Message informing MIT user they need to use a certificate to log in + - FIXME: MIT-specific message + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="require-certificate.title"/> + + + + <%--

      Certificate Required

      --%> +

      + + <%--

      The configuration of this DSpace site means that you need a valid + Web certificate to log in. If you are having problems with this, + please contact us.

      --%> +

      + + + +
      diff -Naur dspace-1.2-source-devel/jsp/feedback/acknowledge.jsp dspace-1.2-source-devel/multi/feedback/acknowledge.jsp --- dspace-1.2-source-devel/jsp/feedback/acknowledge.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/feedback/acknowledge.jsp 2004-11-22 07:21:47.000000000 -0200 @@ -1,55 +1,68 @@ -<%-- - - acknowledge.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Feedback received OK acknowledgement - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

      Thank you for your comments!

      - -

      Your comments have been received.

      - -
      +<%-- + - acknowledge.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Feedback received OK acknowledgement + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="acknowledge.title"/> + + + + <%--

      Thank you for your comments!

      --%> +

      + + <%--

      Your comments have been received.

      --%> +

      + +
      diff -Naur dspace-1.2-source-devel/jsp/feedback/form.jsp dspace-1.2-source-devel/multi/feedback/form.jsp --- dspace-1.2-source-devel/jsp/feedback/form.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/feedback/form.jsp 2004-11-22 07:22:04.000000000 -0200 @@ -1,110 +1,127 @@ -<%-- - - form.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Feedback form JSP - - - - Attributes: - - feedback.problem - if present, report that all fields weren't filled out - - authenticated.email - email of authenticated user, if any - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - boolean problem = (request.getParameter("feedback.problem") != null); - String email = request.getParameter("email"); - - if (email == null || email.equals("")) - { - email = (String) request.getAttribute("authenticated.email"); - } - - if (email == null) - { - email = ""; - } - - String feedback = request.getParameter("feedback"); - if (feedback == null) - { - feedback = ""; - } -%> - - - -

      Feedback Form

      - -

      Thanks for taking the time to share your feedback about the - DSpace system. Your comments are appreciated!

      - -<% - if (problem) - { -%> -

      Please fill out all of the information below.

      -<% - } -%> -
      -
      - - - - - - - - - - - - -
      Your Email Address:
      Your Comments:
      - - -
      -
      -
      - -
      +<%-- + - form.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Feedback form JSP + - + - Attributes: + - feedback.problem - if present, report that all fields weren't filled out + - authenticated.email - email of authenticated user, if any + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + boolean problem = (request.getParameter("feedback.problem") != null); + String email = request.getParameter("email"); + + if (email == null || email.equals("")) + { + email = (String) request.getAttribute("authenticated.email"); + } + + if (email == null) + { + email = ""; + } + + String feedback = request.getParameter("feedback"); + if (feedback == null) + { + feedback = ""; + } +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="form.title"/> + + + + <%--

      Feedback Form

      --%> +

      + + <%--

      Thanks for taking the time to share your feedback about the + DSpace system. Your comments are appreciated!

      --%> +

      + +<% + if (problem) + { +%> + <%--

      Please fill out all of the information below.

      --%> +

      +<% + } +%> +
      +
      + + + <%-- --%> + + + + + <%-- --%> + + + + + + +
      Your Email Address:
      Your Comments:
      + + <%-- --%> + "> +
      +
      +
      + +
      diff -Naur dspace-1.2-source-devel/jsp/help/collection-admin_el.html dspace-1.2-source-devel/multi/help/collection-admin_el.html --- dspace-1.2-source-devel/jsp/help/collection-admin_el.html 1969-12-31 22:00:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/collection-admin_el.html 2005-02-22 12:51:54.000000000 -0200 @@ -0,0 +1,82 @@ + + + + : + + + + +

      + + + + + + +

      + + + +

      + +

      , . , " ". , . . , Handle ''.

      + +

      , , . , , ' '.

      + +

      + +

      , . .

      + +

      , , ' '. .

      + + +

      + +

      , .

      + +

      . . .

      + +

      ( ). , ' '.

      + +

      , ' ...' . . ID ( ), e-mail , '' . . .

      + +

      , , '' . , . , . , , .

      + +

      / / , ' ' . ( , .)

      + + +

      + +

      , (, ), . '' .

      + +

      Dublin Core, .

      + +

      - Dublin Core, : DC, .

      + +

      , . Dublin Core , . , ( ) .

      + + +

      + +

      , , '' . , , '...', . , '' .

      + +

      . , . (' '), .

      + +

      '' , .

      + + +

      ( )

      + +

      . "" , " ". , . ' ' ' ' . , . , .

      + +

      - . , .

      + + + diff -Naur dspace-1.2-source-devel/jsp/help/collection-admin.html dspace-1.2-source-devel/multi/help/collection-admin.html --- dspace-1.2-source-devel/jsp/help/collection-admin.html 2004-08-05 18:42:18.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/collection-admin.html 2005-02-10 13:22:14.000000000 -0200 @@ -1,7 +1,7 @@ - DSpace: Collection Administrator Help + Repository: Collection Administrator Help @@ -26,13 +26,13 @@

      General Information

      -

      If you are a collection administrator, you will need to log in before the administration controls appear in the DSpace UI. The easiest way to do this is to go to your 'My DSpace' page. Then, go to the collection home page for the collection you wish to administer. On the top-right hand of the page you will see some extra controls. Additionally, on the pages of those items owned by a collection you administer, you will see an extra 'Edit' button next to the item's Handle.

      +

      If you are a collection administrator, you will need to log in before the administration controls appear in the Repository UI. The easiest way to do this is to go to your 'My Repository' page. Then, go to the collection home page for the collection you wish to administer. On the top-right hand of the page you will see some extra controls. Additionally, on the pages of those items owned by a collection you administer, you will see an extra 'Edit' button next to the item's Handle.

      Also note that in some of the administration screens, links to additional administration tools may appear. In some cases you may not be authorized to use those administration tools, so clicking on them will result in an 'authorization required' error message.

      Adding or Removing Authorized Submitters

      -

      Note that you cannot add submitters who do not already have e-person records in the system. You will need the DSpace central administrators to add e-person records for all potential submitters.

      +

      Note that you cannot add submitters who do not already have e-person records in the system. You will need the Repository central administrators to add e-person records for all potential submitters.

      To add to or remove from the group of submitters authorized to submit to the collection, make sure you're logged in, go to the relevant collection's home page, and click on the 'Edit Submitters' button. This will take you to the group editor page.

      @@ -60,16 +60,16 @@

      If you want to add new Dublin Core metadata fields one at a time. Select the relevant element and qualifier from the drop-down at the end of the list of DC fields, enter the text value in the box, and click on the Add button on the right-hand side.

      -

      This UI does no validation on anything you enter, so be careful; be sure to check DSpace's use of Dublin Core metadata to ensure that fields you enter will be understood by the system correctly. Minor corrections (such as fixing spelling mistakes and typos) should not be a problem, however.

      +

      This UI does no validation on anything you enter, so be careful; be sure to check Repository's use of Dublin Core metadata to ensure that fields you enter will be understood by the system correctly. Minor corrections (such as fixing spelling mistakes and typos) should not be a problem, however.

      Withdrawing an Item

      -

      To withdraw an item, first log in to DSpace, go to the item's display page, then click on the 'Edit' button on the top right. Then, on the item edit page, click on 'Withdraw...' button on the top right-hand corner of the page. You'll then see the item record. If you're sure you want to withdraw the item, click on 'Withdraw' at the bottom of this page.

      +

      To withdraw an item, first log in to Repository, go to the item's display page, then click on the 'Edit' button on the top right. Then, on the item edit page, click on 'Withdraw...' button on the top right-hand corner of the page. You'll then see the item record. If you're sure you want to withdraw the item, click on 'Withdraw' at the bottom of this page.

      -

      Note that withdrawing does not completely remove the item from the archive; it simply removes it from all public view (search and browse indices and so forth). DSpace does have a function to fully delete an item ('expunge'), used in a similar way to the withdraw tool, but it is strongly recommended you do not use it.

      +

      Note that withdrawing does not completely remove the item from the archive; it simply removes it from all public view (search and browse indices and so forth). Repository does have a function to fully delete an item ('expunge'), used in a similar way to the withdraw tool, but it is strongly recommended you do not use it.

      -

      If you want to 'reinstate' an item that has been previously withdrawn, contact a DSpace site administrator.

      +

      If you want to 'reinstate' an item that has been previously withdrawn, contact a Repository site administrator.

      Including Items from Other Collections (Item Mapping)

      diff -Naur dspace-1.2-source-devel/jsp/help/formats_el.html dspace-1.2-source-devel/multi/help/formats_el.html --- dspace-1.2-source-devel/jsp/help/formats_el.html 1969-12-31 22:00:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/formats_el.html 2005-02-22 12:47:37.000000000 -0200 @@ -0,0 +1,319 @@ + + + +Υποστηριζόμενοι Μορφότυποι Αρχείων στο Απόθεμα + + + + +

      Υποστηριζόμενοι Μορφότυποι Αρχείων στο Απόθεμα

      +

      επιστροφή στην κεντρική βοήθεια

      +
      ολιτική Υποστήριξης Μορφότυπων Αρχείων στο Απόθεμα
      +
      Μορφότυποι Αρχείων που Υποστηρίζονται στο Απόθεμα
      +
      Όταν ο Μορφότυπός σας δεν Συμπεριλαμβάνεται στη Λίστα
      +

       

      + + + + + +
      ολιτική Υποστήριξης Μορφότυπου Αρχείου στο Απόθεμααρχή
      +

      +Ο στόχος μας είναι να παρέχουμε υποστήριξη για όσο το δυνατόν περισσότερους μορφότυπους αρχείων. Με το πέρασμα +του χρόνου, τα στοιχεία που είναι αποθηκευμένα στο Απόθεμα θα παραμένουν ως έχουν, κάνοντας ένα συνδυασμό +νέων τεχνικών για τη διαχείριση δεδομένων και καλών πρακτικών για την ψηφιακή διατήρηση. Ωστόσο, όπως και για τους +εξειδικευμένους μορφότυπους, η ιδιόμορφη φύση πολλών τύπων αρχείου, καθιστά αδύνατο το γεγονός να εγγυηθούμε +κάτι παραπάνω εκτός από αυτό. Με απλά λόγια, η πολιτική μας για τους μορφότυπους αρχείων είναι η εξής: +

      +
        +
      • οτιδήποτε αποθηκεύεται θα μπορεί να ανακτηθεί
      • +
      • θα αναγνωρίζουμε όσο το δυνατόν περισσότερους μορφότυπους αρχείων
      • +
      • θα υποστηρίζουμε όσο το δυνατόν περισσότερους γνωστούς μορφότυπους αρχείων
      • +
      +

      +Με τον όρο "υποστηρίζουμε", εννοούμε ότι "καθιστούμε εύχρηστο στο μέλλον, χρησιμοποιώντας οποιονδήποτε +συνδυασμό τεχνικών (όπως προσομοίωση, κτλ) είναι κατάλληλος, δοθέντων των αναγκών". Όσον αφορά +τους υποστηριζόμενους μορφότυπους, ίσως κάποια στιγμή, για παράδειγμα, αποφασιστεί να γίνει μετατροπή των αρχείων +από μία έκδοση ενός συγκεκριμένου μορφότυπου σε μια άλλη μελλοντική. Όμως, δεν μπορούμε να προβλέψουμε ποιες υπηρεσίες θα είναι +απαραίτητες στη συνέχεια, οπότε συνεχώς θα παρακολουθούμε τους μορφότυπους και τις τεχνικές για να διασφαλιστεί +η διευθέτηση των προβλημάτων, όποτε αυτά προκύπτουν. +

      +

      +Εν τω μεταξύ, μπορεί να επιλέξουμε να "υποστηρίξουμε" ένα μορφότυπο +αν μπορούμε να συλλέξουμε αρκετές πληροφορίες για αυτόν οι οποίες να καθορίζουν τον τρόπο λειτουργίας του. +Συγκεκριμένα, συλλέγουμε προδιαγραφές αρχείων, περιγραφές και δείγματα κώδικα, τα οποία +καθιστούμε διαθέσιμα στη + +Συλλογή Μορφότυπων στο Απόθεμα. +Δυστυχώς, αυτό σημαίνει ότι δεν είναι δυνατόν να υποστηριχτούν στο Απόθεμα μορφότυποι που δημιουργούνται μόνο από ορισμένα προγράμματα και για τους οποίους +δεν είναι διαθέσιμο τέτοιο υλικό. Ωστόσο, θα εξακολουθούμε να διατηρούμε αρχεία σε τέτοιες μορφές και στην περίπτωση +που σχετίζονται με κάποια από τα υποστηριζόμενα εργαλεία, θα σας δοθούν οδηγίες για τη μετατροπή τους +σε υποστηριζόμενους μορφότυπους. Επίσης, είναι πιθανόν ότι αρχεία εξαιρετικά δημοφιλών αλλά κατασκευασμένων μόνο από ένα συγκεκριμένο πρόγραμμα μορφότυπων (όπως οι +.doc, .xls, και .ppt της Microsoft), θα μπορούσαν να γίνουν ακόμα πιο χρήσιμα, απλά και μόνο επειδή η επικράτησή τους αυτή +κάνει και πιο πιθανή την ύπαρξη διαθέσιμων +εργαλείων για αυτά. Ακόμα, όμως, και σε μια τέτοια περίπτωση δεν μπορούμε να εγγυηθούμε το αντίστοιχο επίπεδο υπηρεσίας χωρίς +να έχουμε και κάποιες πληροφορίες για το μορφότυπο, οπότε θα εξακολουθούμε να χαρακτηρίζουμε αυτούς τους μορφότυπους σαν +"γνωστούς" και όχι σαν "υποστηριζόμενους". +

      + + + + + +
      Μορφότυποι Αρχείων που Υποστηρίζονται στο Απόθεμααρχή
      +

      +Ο παρακάτω πίνακας δίνει το επίπεδο στο οποίο υποστηρίζει το Απόθεμα τους διάφορους τύπους μορφότυπων. αρακαλούμε, παρατηρήστε +ότι η τοπική σας εγκατάσταση για το Απόθεμα μπορεί να παρέχει διαφορετικό επίπεδο υποστήριξης για τους μορφότυπους που αναφέρονται. +Αν έχετε οποιαδήποτε απορία για τα επίπεδα υποστήριξης, παρακαλούμε επικοινωνήστε με το +Διαχειριστή του Αποθέματος.

      +

      Στον παρακάτω πίνακα, τύπος MIME είναι ο Multipurpose Internet Mail +Extensions (MIME) τύπος αναγνώρισης. Για περισσότερες πληροφορίες σχετικά με τον +MIME, δείτε στο MIME RFCs ή στο MIME FAQ. + εριγραφή είναι αυτό που οι περισσότεροι άνθρωποι χρησιμοποιούν για το όνομα του μορφότυπου. +Επεκτάσεις είναι οι τυπικές επεκτάσεις στα ονόματα των αρχείων (το τμήμα μετά την τελεία, +π.χ. η επέκταση για το "index.html" είναι το "html"). Στις επεκτάσεις στο Απόθεμα δεν γίνεται διάκριση μεταξύ πεζών και κεφαλαίων γραμμάτων, +οπότε το "sample.XML" είτε έτσι, είτε ως "sample.xml" σε κάθε περίπτωση θα αναγνωριστεί ως αρχείο τύπου XML. +Επίπεδο είναι το επίπεδο υποστήριξης κάθε μορφότυπου στο Απόθεμα: +

      +
      +

      + +

      υποστηρίζεται: υποστηρίζουμε πλήρως το μορφότυπο
      +

      +

      + +

      γνωστός: μπορούμε να αναγνωρίσουμε το μορφότυπο, αλλά δεν μπορούμε να εγγυηθούμε πλήρη υποστήριξη
      +

      +

      + +

      δεν υποστηρίζεται: δεν μπορούμε να αναγνωρίσουμε το μορφότυπο, άρα θα εμφανιστεί ως +"application/octet-stream" και περιγραφή Άγνωστη
      +

      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Τύπος MIME εριγραφήΕπεκτάσειςΕπίπεδο
      application/octet-streamΆγνωστηδεν υποστηρίζεται
      application/pdfAdobe PDFpdfυποστηρίζεται
      text/xmlXMLxmlυποστηρίζεται
      text/plainTexttxt, ascυποστηρίζεται
      text/htmlHTMLhtm, htmlυποστηρίζεται
      application/mswordMicrosoft Worddocγνωστός
      application/vnd.ms-powerpointMicrosoft Powerpointpptγνωστός
      application/vnd.ms-excelMicrosoft Excelxlsγνωστός
      application/marcMARCυποστηρίζεται
      image/jpegJPEGjpeg, jpgυποστηρίζεται
      image/gifGIFgifυποστηρίζεται
      image/pngimage/pngpngυποστηρίζεται
      image/tiffTIFFtiff, tifυποστηρίζεται
      audio/x-aiffAIFFaiff, aif, aifcυποστηρίζεται
      audio/basicaudio/basicau, sndγνωστός
      audio/x-wavWAVwavγνωστός
      video/mpegMPEGmpeg, mpg, mpeγνωστός
      text/richtextRTFrtfυποστηρίζεται
      application/vnd.visioMicrosoft Visiovsdγνωστός
      application/x-filemakerFMP3fmγνωστός
      image/x-ms-bmpBMPbmpγνωστός
      application/x-photoshopPhotoshoppsd, pddγνωστός
      application/postscriptPostscriptps, eps, aiυποστηρίζεται
      video/quicktimeVideo Quicktimemov, qtγνωστός
      audio/x-mpegMPEG Audiompa, abs, mpegaγνωστός
      application/vnd.ms-projectMicrosoft Projectmpp, mpx, mpdγνωστός
      application/mathematicaMathematicamaγνωστός
      application/x-latexLateXlatexγνωστός
      application/x-texTeXtexγνωστός
      application/x-dviTeX dvidviγνωστός
      application/sgmlSGMLsgm, sgmlγνωστός
      application/wordperfect5.1WordPerfectwpdγνωστός
      audio/x-pn-realaudioRealAudiora, ramγνωστός
      image/x-photo-cdPhoto CDpcdγνωστός
      +

       

      + + + + + +
      Όταν ο Μορφότυπός σας δεν Συμπεριλαμβάνεται στη Λίστααρχή
      +

      + αρακαλούμε επικοινωνήστε με το Διαχειριστή του Αποθέματος +αν έχετε ερωτήσεις για κάποιο συγκεκριμένο μορφότυπο. +

      +

       

      + + diff -Naur dspace-1.2-source-devel/jsp/help/formats.html dspace-1.2-source-devel/multi/help/formats.html --- dspace-1.2-source-devel/jsp/help/formats.html 2004-06-04 12:00:24.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/formats.html 2005-02-10 13:17:59.000000000 -0200 @@ -1,43 +1,43 @@ -DSpace Supported Formats +Repository Supported Formats - + - -

      DSpace Supported Formats

      + +

      Repository Supported Formats

      return to main help

      -
      DSpace Format Support Policy
      +
      Repository Format Support Policy
      Currently Supported Formats
      What To Do If Your Format Isn't Listed

       

      - +
      DSPACE FORMAT SUPPORT POLICYREPOSITORY FORMAT SUPPORT POLICY top

      We want to provide support for as many file formats as -possible. Over time, items stored in DSpace will be preserved +possible. Over time, items stored in Repository will be preserved as is, using a combination of time-honored techniques for data management and best practices for digital preservation. As for specific formats, however, the proprietary nature of many file types makes it impossible to guarantee much more than this. Put simply, our policy for file formats is:

      - +
      • everything put in will be retrievable
      • we will recognize as many files' formats as possible
      • we will support as many known file formats as possible
      - +

      -By "support", we mean "make useable in the future, using whatever +By "support", we mean "make useable in the future, using whatever combination of techniques (such as migration, emulation, etc.) is appropriate given the context of need". For supported formats, we might choose to bulk-transform files from a current @@ -46,22 +46,22 @@ monitor formats and techniques to ensure we can accomodate needs as they arise.

      - +

      In the meantime, we can choose to "support" a format if we can gather enough documentation to capture how the format works. In particular, we collect file specifications, descriptions, and code samples, and make those available in the -DSpace Format Reference Collection. +Repository Format Reference Collection. Unfortunately, this means that proprietary formats for which these materials are not -publicly available cannot be supported in DSpace. We will still +publicly available cannot be supported in Repository. We will still preserve these files, and in cases where those formats are native to tools supported, we will provide you with guidance on converting your files into formats we do support. It is also likely that for extremely popular but -proprietary formats (such as Microsoft .doc, .xls, and .ppt), +proprietary formats (such as Microsoft .doc, .xls, and .ppt), we will be able to help make files in those formats more useful in the future simply because their prevalence makes it likely tools will be available. Even so, we @@ -75,24 +75,24 @@ top - +

      -The table below lists the DSpace default level of support for various format types. Please note -your local DSpace installation may have a different level of support for the formats listed. If you -have any questions about support levels, you should contact your -DSpace Administrator.

      - +The table below lists the Repository default level of support for various format types. Please note +your local Repository installation may have a different level of support for the formats listed. If you +have any questions about support levels, you should contact your +Repository Administrator.

      +

      In the table below, MIME type is the Multipurpose Internet Mail Extensions (MIME) type identifier; for more information on MIME, see the MIME RFCs or the MIME FAQ. Description is what most people use as the name for the format. Extensions are typical file name extensions (the part after the dot, e.g. the extension for "index.html" is "html"). These are not -case-sensitive in DSpace, so either "sample.XML" or "sample.xml" will +case-sensitive in Repository, so either "sample.XML" or "sample.xml" will be recognized as XML. -Level is DSpace's support level for each format: +Level is Repository's support level for each format:

      - +

      @@ -108,10 +108,10 @@ listed as "application/octet-stream", aka Unknown

      - - - + @@ -323,7 +323,7 @@
      MIME type Description Extensions

       

      - + @@ -331,11 +331,11 @@
      WHAT TO DO IF YOUR FORMAT ISN'T LISTED

      -Please contact your DSpace Administrator +Please contact your Repository Administrator if you have questions about a particular format.

      - +

       

      - + diff -Naur dspace-1.2-source-devel/jsp/help/formats.jsp dspace-1.2-source-devel/multi/help/formats.jsp --- dspace-1.2-source-devel/jsp/help/formats.jsp 2004-06-25 13:09:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/formats.jsp 2005-02-08 13:19:35.000000000 -0200 @@ -1,184 +1,219 @@ -<%-- - - formats.jsp - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Formats JSP - - - - Note that this is a "stand-alone" JSP that is invoked directly, and not - - via a Servlet. - - This page involves no user interaction, but needs to be a JSP so that it - - can retrieve the bitstream formats from the database. - - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.sql.SQLException" %> - -<%@ page import="org.apache.log4j.Logger" %> - -<%@ page import="org.dspace.app.webui.util.JSPManager" %> -<%@ page import="org.dspace.app.webui.util.UIUtil" %> -<%@ page import="org.dspace.content.BitstreamFormat" %> -<%@ page import="org.dspace.core.Context" %> -<%@ page import="org.dspace.core.LogManager" %> - -<% - Context context = null; - BitstreamFormat[] formats = null; - - try - { - // Obtain a context so that the location bar can display log in status - context = UIUtil.obtainContext(request); - - // Get the Bitstream formats - formats = BitstreamFormat.findAll(context); - } - catch (SQLException se) - { - // Database error occurred. - Logger log = Logger.getLogger("org.dspace.jsp"); - log.warn(LogManager.getHeader(context, - "database_error", - se.toString()), se); - - // Also email an alert - UIUtil.sendAlert(request, se); - - JSPManager.showInternalError(request, response); - } -%> - - -DSpace Supported Formats - - - - - -

      DSpace Supported Formats

      -

      return to main help

      -
      Format Support Policy
      -
      Format Support Levels
      -
      What To Do If Your Format Isn't Listed
      -

       

      - - - - - -
      FORMAT SUPPORT POLICYtop
      -

      (Your Format Support Policy Here)

      -

       

      - - - - - -
      FORMAT SUPPORT LEVELStop
      - - - - - - - - - -<% - for (int i = 0; i < formats.length; i++) - { - if ( formats[i].isInternal() ) - continue; - - String[] extensions = formats[i].getExtensions(); - String extValue = ""; - - for (int j = 0 ; j < extensions.length; j++) - { - if (j > 0) - { - extValue = extValue + ", "; - } - extValue = extValue + extensions[j]; - } -%> - - - - - - -<% - } -%> -
      NameExtensionsMIME TypeSupport Level
      <%= formats[i].getShortDescription() %><%= extValue %><%= formats[i].getMIMEType() %> - <% - String support = ""; - - if(formats[i].getSupportLevel() == 2) - { - support = "supported"; - - } - else if(formats[i].getSupportLevel() == 1) - { - support = "known"; - } - else - { - support = "unknown"; - } - %> - <%= support%> -
      -

       

      - - - - - -
      WHAT TO DO IF YOUR FORMAT ISN'T LISTEDtop
      -

      -Please contact your DSpace Administrator -if you have questions about a particular format. -

      -

       

      - +<%-- + - formats.jsp + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Formats JSP + - + - Note that this is a "stand-alone" JSP that is invoked directly, and not + - via a Servlet. + - This page involves no user interaction, but needs to be a JSP so that it + - can retrieve the bitstream formats from the database. + - + --%> + +<%-- <%@ page contentType="text/html;charset=iso-8859-1" %> --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.sql.SQLException" %> + +<%@ page import="org.apache.log4j.Logger" %> + +<%@ page import="org.dspace.app.webui.util.JSPManager" %> +<%@ page import="org.dspace.app.webui.util.UIUtil" %> +<%@ page import="org.dspace.content.BitstreamFormat" %> +<%@ page import="org.dspace.core.Context" %> +<%@ page import="org.dspace.core.LogManager" %> + +<% + Context context = null; + BitstreamFormat[] formats = null; + + try + { + // Obtain a context so that the location bar can display log in status + context = UIUtil.obtainContext(request); + + // Get the Bitstream formats + formats = BitstreamFormat.findAll(context); + } + catch (SQLException se) + { + // Database error occurred. + Logger log = Logger.getLogger("org.dspace.jsp"); + log.warn(LogManager.getHeader(context, + "database_error", + se.toString()), se); + + // Also email an alert + UIUtil.sendAlert(request, se); + + JSPManager.showInternalError(request, response); + } +%> + + +<%-- DSpace Supported Formats --%> + + <fmt:message key="general.title"/>: + <fmt:message key="formats.title"/> + + + + + +<%--

      DSpace Supported Formats

      --%> +

      +<%--

      return to main help

      --%> + + + + + +

      +<%--
      Format Support Policy
      --%> +
      +<%--
      Format Support Levels
      --%> +
      +<%--
      What To Do If Your Format Isn't Listed
      --%> +
      +

       

      + + + <%-- --%> + + <%-- --%> + + +
      FORMAT SUPPORT POLICYtop
      +<%--

      (Your Format Support Policy Here)

      --%> +

      +

       

      + + + <%-- --%> + + <%-- --%> + + +
      FORMAT SUPPORT LEVELStop
      + + + + <%-- --%> + + <%-- --%> + + <%-- --%> + + <%-- --%> + + + +<% + for (int i = 0; i < formats.length; i++) + { + if ( formats[i].isInternal() ) + continue; + + String[] extensions = formats[i].getExtensions(); + String extValue = ""; + + for (int j = 0 ; j < extensions.length; j++) + { + if (j > 0) + { + extValue = extValue + ", "; + } + extValue = extValue + extensions[j]; + } +%> + + + + + + +<% + } +%> +
      NameExtensionsMIME TypeSupport Level
      <%= formats[i].getShortDescription() %><%= extValue %><%= formats[i].getMIMEType() %> + <% + String support = ""; + + if(formats[i].getSupportLevel() == 2) + { + support = "supported"; + + } + else if(formats[i].getSupportLevel() == 1) + { + support = "known"; + } + else + { + support = "unknown"; + } + %> + <%= support%> +
      +

       

      + + + <%-- --%> + + <%-- --%> + + +
      WHAT TO DO IF YOUR FORMAT ISN'T LISTEDtop
      +

      +<%-- Please contact your DSpace Administrator +if you have questions about a particular format. --%> + + +

      +

       

      + \ No newline at end of file diff -Naur dspace-1.2-source-devel/jsp/help/index_el.html dspace-1.2-source-devel/multi/help/index_el.html --- dspace-1.2-source-devel/jsp/help/index_el.html 1969-12-31 22:00:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/index_el.html 2005-02-21 11:01:22.000000000 -0200 @@ -0,0 +1,461 @@ + + + +Βοήθεια για το Απόθεμα + + + + +

      ΒΟΗΘΕΙΑ ΓΙΑ ΤΟ Α ΟΘΕΜΑ

      + + + + + +

      εριεχόμενα Βοήθειας:

      + Κλείσιμο του παραθύρου +
      +
      λοήγηση
      +
      Αναζήτηση
      +
      Σύνθετη αναζήτηση
      +
      Κοινότητες
      +
      Συλλογές
      +
      Σύνδεση στο Απόθεμα
      +
      Υποβολή
      +
      Μορφότυποι αρχείων
      +
      Handles
      +
      Το Απόθεμά μου
      +
      Επεξεργασία προφίλ
      +
      Εγγραφή για ενημέρωση με mail
      +
       
      +

      Το Απόθεμα αποθηκεύει, κατανέμει και διατηρεί ψηφιακά ερευνητικά προϊόντα. Εδώ μπορείτε να βρείτε άρθρα, εργασίες, τεχνικές αναφορές, δημοσιεύσεις συνεδρίων και σύνολα δεδομένων σε διάφορους ψηφιακούς μορφότυπους. Το περιεχόμενο αυξάνεται καθημερινά, καθώς νέες κοινότητες και συλλογές προστίθενται στο Απόθεμα.

      +

      Το περιεχόμενο του Αποθέματος είναι οργανωμένο σε Κοινότητες οι οποίες μπορεί να αντιστοιχούν σε διαχειριστικές οντότητες όπως σχολεία, πανεπιστημιακά τμήματα, εργαστήρια και ερευνητικά κέντρα. Μέσα σε κάθε κοινότητα μπορεί να υπάρχει ένας απεριόριστος αριθμός από υπο-κοινότητες και ένας απεριόριστος αριθμός από συλλογές. Κάθε συλλογή μπορεί να περιέχει έναν απεριόριστο αριθμό από στοιχεία.

      +
      + + + + + +
      ΛΟΗΓΗΣΗαρχή
      +

      Η λοήγηση σας επιτρέπει να δείτε μία λίστα στοιχείων σε μια καθορισμένη σειρά:

      +

      Η λοήγηση με βάση την Κοινότητα/Συλλογή εμφανίζει τις κοινότητες σε αλφαβητική σειρά και σας επιτρέπει να δείτε τις υπο-κοινότητες και τις συλλογές μέσα σε κάθε κοινότητα.

      +

      Η λοήγηση με βάση τον Τίτλο σας επιτρέπει να πλοηγηθείτε σε μία αλφαβητική λίστα όλων των τίτλων των στοιχείων στο Απόθεμα.

      +

      Η λοήγηση με βάση το Συγγραφέα σας επιτρέπει να πλοηγηθείτε σε μία αλφαβητική λίστα όλων των συγγραφέων των στοιχείων του Αποθέματος.

      +

      Η λοήγηση με βάση την Ημερομηνία σας επιτρέπει να πλοηγηθείτε σε μια λίστα όλων των στοιχείων του Αποθέματος σε αντίστροφη χρονολογική σειρά.

      +

      Μπορείτε να συνδεθείτε στο σύστημα αν:

      +
        +
      • επιθυμείτε να εγγραφείτε σε μία συλλογή και να λαμβάνετε ενημέρωση με mail όταν προστίθενται νέα στοιχεία
      • +
      • επιθυμείτε να πάτε στη σελίδα "Το Απόθεμά μου", η οποία ελέγχει τις εγγραφές σας και άλλες ενέργειες στο Απόθεμα που απαιτούν εξουσιοδότηση (για παράδειγμα, αν έχετε δικαιώματα υποβολής σε μια συλλογή)
      • +
      • επιθυμείτε να επεξεργαστείτε το προφίλ σας
      • +
      +

      Η Υποβολή είναι η λειτουργία που επιτρέπει στους χρήστες να προσθέσουν κάποιο στοιχείο στο Απόθεμα. Η διαδικασία της υποβολής περιλαμβάνει τη συμπλήρωση πληροφορίας σχετικά με το στοιχείο σε μια φόρμα μεταδεδομένων και τη μεταφόρτωση του αρχείου (ή των αρχείων) που αποτελούν το ψηφιακό στοιχείο. Κάθε κοινότητα θέτει τις δικές της πολιτικές υποβολής.

      +

      Το Απόθεμά μου είναι μια προσωπική σελίδα που διατηρείται για κάθε μέλος. Αυτή η σελίδα μπορεί να περιέχει μια λίστα από στοιχεία που βρίσκονται στη διαδικασία υποβολής από το συγκεκριμένο μέλος, ή μια λίστα από εργασίες που πρέπει να γίνουν στα στοιχεία, όπως διαγραφή, αναθεώρηση, ή έλεγχος. Στο μέλλον αυτή η σελίδα θα διατηρεί επίσης πληροφορία γύρω από προσωπικές υπηρεσίες που παρέχει το Απόθεμα, όπως η ενημέρωση με mail όταν νέα στοιχεία προστεθούν σε μια συλλογή.

      +

      Η Επεξεργασία προφίλ σας επιτρέπει να αλλάξετε τον κωδικό σας.

      +

      Η επιλογή Σχετικά με το Απόθεμα σας πηγαίνει σε πληροφορίες σχετικά με το έργο του Αποθέματος και την ανάπτυξή του.

      +
      + + + + + +
      ΑΝΑΖΗΤΗΣΗαρχή
      +

      Για να κάνετε αναζήτηση σε όλο το Απόθεμα, χρησιμοποιήστε το κίτρινο πλαίσιο για την αναζήτηση στη μπάρα πλοήγησης στο αριστερό μέρος της αρχική σελίδας (ή το πλαίσιο για την αναζήτηση στο μέσο της αρχικής σελίδας)

      +

      +

      +

      Για να περιορίσετε την αναζήτησή σας σε μια συγκεκριμένη κοινότητα ή συλλογή, πηγαίνετε σε αυτήν την κοινότητα ή συλλογή και χρησιμοποιήστε τη μπάρα αναζήτησης σε εκείνη τη σελίδα.

      +

      +

      Το Απόθεμα χρησιμοποιεί τη μηχανή αναζήτησης Jakarta + Lucene. Ακολουθούν κάποιες υποδείξεις για την αναζήτηση:

      +
      +

      Τι αναζητείται στη γενική αναζήτηση με λέξη κλειδί (κίτρινο πλαίσιο)
      +
      Η λέξη (ή οι λέξεις) που εισάγετε στο πλαίσιο αναζήτησης θα αναζητηθεί στα πεδία: τίτλος, συγγραφέας, περίληψη, σειρές, χρηματοδότηση και αναγνωριστικό από την εγγραφή κάθε αντικειμένου.

      +

      Αν η σελίδα σας παρέχει δυνατότητα για αναζήτηση σε πλήρες κείμενο, το κείμενο που εισάγατε θα αναζητηθεί και μέσα στο πλήρες κείμενο όλων των αποθηκευμένων εγγράφων. Για περισσότερες πληροφορίες σχετικά με την αναζήτηση σε πλήρες κείμενο παρακαλούμε επικοινωνήστε με το διαχειριστή του Αποθέματος. +

      Τι δεν αναζητείται - Stop Words
      +
      Η μηχανή αναζήτησης αγνοεί συγκεκριμένες λέξεις που εμφανίζονται συχνά στα Αγγλικά, αλλά δεν προσθέτουν κάτι στην αναζήτηση. Αυτές είναι οι εξής:

      +

      "a", "and" + , "are" , "as" , "at" , "be" , "but" , "by" , "for" , "if" , "in" , "into", +

      +

      "is" ,"it" + ,"no" , "not" , "of" , "on" , "or" , "such", "the" , "to" , "was"

      +

      Αποκοπή
      +
      Χρησιμοποιήστε έναν αστερίσκο (*) μετά από ένα θέμα λέξης για να ανακτήσετε όλα τα αποτελέσματα που έχουν λέξεις που ξεκινούν με αυτό το θέμα, για παράδειγμα:

      +
      +

      +     θα ανακτήσει selects, selector, selectman, selecting.

      +
      +

      Αναζήτηση φράσης
      + Για να κάνετε αναζήτηση χρησιμοποιώντας πολλές λέξεις σαν μία φράση, τοποθετήστε εισαγωγικά (") γύρω από τη φράση.

      +

      +

      +

      Ακριβές ταίριασμα λέξης
      + Τοποθετήστε ένα συν (+) πριν από μια λέξη αν ΡΕ ΕΙ να εμφανίζεται στο αποτέλεσμα της αναζήτησης. + Για παράδειγμα, στην ακόλουθη αναζήτηση η λέξη "training" είναι προαιρετική, αλλά η λέξη "dog" πρέπει να βρίσκεται μέσα στο αποτέλεσμα.

      +
      +

      +
      +

      Αποκλεισμός στοιχείων με ανεπιθύμητες λέξεις
      +
      Τοποθετήστε ένα μείον (-) πριν από μια λέξη αν δεν θέλετε να εμφανίζεται στα αποτελέσματα της αναζήτησης. Εναλλακτικά, μπορείτε να χρησιμοποιήσετε το NOT. Αυτό μπορεί να περιορίσει την αναζήτησή σας, ώστε να αποκλειστούν τα ανεπιθύμητα αποτελέσματα. Για παράδειγμα, στην αναζήτηση

      +
      +

      +   ή  

      +
      +

      θα ανακτηθούν τα στοιχεία που περιέχουν τη λέξη "training", εκτός από αυτά που περιέχουν επίσης τη λέξη "cat".

      +

      Αναζήτηση Boolean

      +

      Οι παρακάτω δυαδικοί τελεστές μπορούν να χρησιμοποιηθούν για να συνδυάσουν όρους. Σημειώστε ότι πρέπει να γραφούν με ΚΕΦΑΛΑΙΑ!

      +

      AND - περιορίζει τις αναζητήσεις, ώστε να βρεθούν στοιχεία που περιέχουν όλες τις λέξεις ή τις φράσεις που συνδυάζονται με αυτόν τον τελεστή, π.χ.

      +
      +

      + θα ανακτήσει όλα τα στοιχεία που περιέχουν ΚΑΙ τη λέξη "cats" ΚΑΙ τη λέξη "dogs".

      +
      +

      OR - επεκτείνει τις αναζητήσεις, ώστε να βρεθούν στοιχεία που περιέχουν οποιαδήποτε από τις λέξεις ή τις φράσεις που περιβάλλουν αυτόν τον τελεστή, π.χ.

      +
      +

      + θα ανακτήσει όλα τα στοιχεία που περιέχουν ΕΙΤΕ τη λέξη "cats" Ή τη λέξη "dogs".

      +
      +

      NOT - αποκλείει στοιχεία που περιέχουν τη λέξη που ακολουθεί αυτόν τον τελεστή, π.χ.

      +
      +

      θα ανακτήσει όλα τα στοιχεία που περιέχουν τη λέξη "training" ΕΚΤΟΣ από αυτά που περιέχουν επίσης τη λέξη "cat".

      +
      +

      Στην αναζήτηση μπορούν να χρησιμοποιηθούν παρενθέσεις για να ομαδοποιήσουν τους όρους αναζήτησης σε σύνολα, και οι τελεστές μπορούν τότε να εφαρμοστούν σε όλο το σύνολο, π.χ.

      +

      +

      +
      +
      + + + + + +
      ΣΥΝΘΕΤΗ ΑΝΑΖΗΤΗΣΗαρχή
      +

      Η σελίδα της σύνθετης αναζήτησης σας επιτρέπει να προσδιορίσετε τα πεδία που θέλετε να ψάξετε, συνδυάζοντάς τα με τους τελεστές "and", "or" ή "not".

      +

      Μπορείτε να περιορίσετε την αναζήτησή σας σε μια κοινότητα πατώντας το βέλος στο δεξιά του αρχικού πλαισίου. Αν θέλετε η αναζήτησή σας να περιλάβει όλο το Απόθεμα, αφήστε αυτό το πλαίσιο στην προκαθορισμένη θέση.

      +

      Μετά επιλέξτε το πεδίο αναζήτησης στην αριστερή στήλη και εισάγετε τη λέξη ή τη φράση που ψάχνετε στη δεξιά στήλη. Μπορείτε να επιλέξετε το δυαδικό τελεστή για να συνδυάσετε τις αναζητήσεις πατώντας το βέλος στα δεξιά του πλαισίου "AND".

      +

      Σημείωση: ρέπει να χρησιμοποιείτε τα πλαίσια εισαγωγής με τη σειρά. Αν αφήσετε το πρώτο κενό, η αναζήτηση δε θα δουλέψει.

      +
      + + + + + +
      ΚΟΙΝΟΤΗΤΕΣαρχή
      +

      Το περιεχόμενο του Αποθέματος είναι οργανωμένο γύρω από Κοινότητες που μπορεί να αντιστοιχούν σε διαχειριστικές οντότητες, όπως σχολεία, πανεπιστημιακά τμήματα, εργαστήρια και ερευνητικά κέντρα. Μέσα σε κάθε κοινότητα μπορεί να βρίσκεται ένας απεριόριστος αριθμός από υπο-κοινότητες κι ένας απεριόριστος αριθμός από συλλογές. Κάθε συλλογή μπορεί να περιέχει έναν απεριόριστο αριθμό από στοιχεία. Αυτή η οργάνωση δίνει στο Απόθεμα την ευελιξία να ανταπεξέλθει στις διάφορες ανάγκες των κοινοτήτων, επιτρέποντάς τους:

      +
        +
      • Να αποφασίσουν για πολιτικές όπως: +
        - + ποιος προσθέτει περιεχόμενο
        +
        - + εάν θα υπάρχει διαδικασία αναθεώρησης
        +
        - ποιος θα έχει πρόσβαση
        +
      • +
      • Να προσδιορίσουν τη ροή εργασίας - αναθεώρηση, επεξεργασία μεταδεδομένων
      • +
      • Να διαχειριστούν τις συλλογές
      • +
      +

      Κάθε κοινότητα έχει τη δική της αρχική σελίδα όπου εμφανίζονται πληροφορίες, νέα και σύνδεσμοι σχετικά με τα ενδιαφέροντα της κοινότητας, καθώς και μια περιγραφική λίστα των συλλογών που περιλαμβάνει.

      +
      + + + + + +
      ΣΥΛΛΟΓΕΣαρχή
      +

      Οι κοινότητες μπορούν να διατηρούν έναν απεριόριστο αριθμό από συλλογές στο Απόθεμα. Οι συλλογές μπορούν να οργανωθούν σύμφωνα με ένα θέμα, σύμφωνα με το είδος της πληροφορίας, ή σύμφωνα με οποιονδήποτε άλλο τρόπο θεωρεί η κοινότητα ότι είναι χρήσιμο να οργανώσει τα ψηφιακά της στοιχεία. Οι συλλογές μπορούν να έχουν διαφορετικές πολιτικές και ροές εργασίες.

      +

      Κάθε συλλογή του Αποθέματος έχει τη δική της αρχική σελίδα όπου εμφανίζονται πληροφορίες, νέα και σύνδεσμοι σχετικά με τα ενδιαφέροντα των χρηστών αυτής της συλλογής.

      +
      + + + + + +
      ΣΥΝΔΕΣΗ ΣΤΟ Α ΟΘΕΜΑαρχή
      +

      Όταν προσπελαύνετε μια περιοχή του Αποθέματος που απαιτεί εξουσιοδότηση, το σύστημα θα σας ζητήσει να συνδεθείτε. Μάλιστα, μερικές ενέργειες, όπως η υποβολή περιεχομένου, απαιτούν εξουσιοδότηση από την κοινότητα.

      + +

      ριν συνδεθείτε για πρώτη φορά θα χρειαστεί να εγγραφείτε στο Απόθεμα. Αυτό γίνεται δίνοντας το e-mail σας, οπότε και θα σας σταλεί ένα μήνυμα με κάποιες οδηγίες που πρέπει να ακολουθήσετε. Μετά την εγγραφή σας, μπορείτε να συνδέεστε στο Απόθεμα, εισάγοντας στη φόρμα σύνδεσης το e-mail σας και τον κωδικό που επιλέξατε κατά την εγγραφή σας. Το e-mail θα πρέπει να περιλαμβάνει το όνομα χρήστη και το όνομα domain. Δεν γίνεται διάκριση μεταξύ κεφαλαίων και μικρών γραμμάτων.

      +

      αράδειγμα: + moniker@mycorp.com

      +

      ληκτρολογήστε τον κωδικό σας ακριβώς έτσι όπως τον εισάγατε αρχικά. Γίνεται διάκριση μεταξύ κεφαλαίων και μικρών. Επιλέξτε το κουμπί "Σύνδεση" για να συνδεθείτε.

      + +
      + + + + + +
      Υ ΟΒΟΛΗαρχή
      +

      +Διακοπή κατά τη διάρκεια της διαδικασίας υποβολής:

      +

      Κάθε στιγμή κατά τη διαδικασία της υποβολής μπορείτε να σταματήσετε και να σώσετε τη δουλειά σας για αργότερα, επιλέγοντας το κουμπί "Ακύρωση/Αποθήκευση" στο κάτω μέρος της σελίδας. Τα δεδομένα που έχετε εισάγει μέχρι εκείνη τη στιγμή θα παραμείνουν αποθηκευμένα μέχρι να επιστρέψετε στην υποβολή, και θα ενημερωθείτε στη σελίδα "Το Απόθεμά μου" ότι έχετε μια υποβολή σε εξέλιξη. Αν κατά λάθος βγείτε από τη διαδικασία υποβολής, μπορείτε πάντα να συνεχίσετε από τη σελίδα "Το Απόθεμά μου". Μπορείτε επίσης να ακυρώσετε την υποβολή σε οποιοδήποτε σημείο.

      +

      Επιλογή Συλλογής

      +

      Μπάρα ένδειξης - Τα οβάλ κουμπιά στο πάνω μέρος της σελίδας:

      +

      Στο πάνω μέρος των σελίδων υποβολής θα βρείτε 7 κουμπιά σχήματος οβάλ, τα οποία αναπαριστούν κάθε βήμα της διαδικασίας υποβολής. Καθώς προχωράτε στη διαδικασία αυτά τα κουμπιά θα αλλάζουν χρώμα. Από τη στιγμή που θα ξεκινήσετε μπορείτε επίσης να χρησιμοποιήσετε αυτά τα κουμπιά για να μετακινηθείτε μπροστά ή πίσω μέσα στη διαδικασία υποβολής. Τα δεδομένα σας δε χάνονται όταν μετακινήστε μπροστά και πίσω.

      +

      +

      Επιλέξτε Συλλογή:

      +

      ιέστε το βέλος στο δεξί μέρος του πλαισίου για να δείτε τη λίστα των Συλλογών. Μετακινήστε το ποντίκι στη συλλογή στην οποία επιθυμείτε να προσθέσετε το στοιχείο σας και επιλέξτε την.

      +

      (Αν δεν έχετε άδεια να κάνετε υποβολή στη συλλογή που επιλέξατε, παρακαλούμε επικοινωνήστε με το διαχειριστή του Αποθέματος για περισσότερες πληροφορίες.)

      +

      ρέπει να έχετε εξουσιοδότηση από την κοινότητα για να υποβάλλετε στοιχεία σε μια συλλογή. Αν θέλετε να υποβάλλετε κάποιο στοιχείο στο Απόθεμα, αλλά δεν βλέπετε κάποια κατάλληλη κοινότητα, παρακαλούμε επικοινωνήστε με το διαχειριστή του Αποθέματος για να δείτε πώς μπορείτε να δημιουργήσετε τη δική σας κοινότητα στο Απόθεμα.

      +

      Επιλέξτε "Επόμενο" για να προχωρήσετε, ή "Ακύρωση/Αποθήκευση" για να σταματήσετε και να σώσετε ή να ακυρώσετε την υποβολή σας.

      +
      + + + + + + + +
      Υ ΟΒΟΛΗ: εριγράψτε το Στοιχείο σας - Σελίδα 1υποβολήαρχή
      +

      Αν επιλέξετε κάποια από τις προτάσεις σε αυτή τη σελίδα, θα σας παρουσιαστεί μια τροποποιημένη φόρμα εισαγωγής, τέτοια ώστε να δεχθεί την επιπλέον πληροφορία. Διαφορετικά, θα σας παρουσιαστεί η προκαθορισμένη φόρμα εισαγωγής.

      +
      +

      * αραπάνω από έναν τίτλους - Μερικές φορές ένα στοιχείο έχει περισσότερους από έναν τίτλους, ίσως μια σύντμηση, ένα ακρωνύμιο ή έναν τίτλο σε μια άλλη γλώσσα. Εάν συμβαίνει κάτι τέτοιο και θέλετε αυτή η πληροφορία να αποθηκευτεί, επιλέξτε την πρόταση αυτή.

      +

      * Έχει ήδη εκδοθεί - + Στα νέα στοιχεία που ΔΕΝ έχουν δημοσιευτεί ή διανεμηθεί προηγουμένως, θα ανατεθεί μια ημερομηνία έκδοσης από το σύστημα τη στιγμή της διανομής τους στο Απόθεμα. Εάν εισάγετε παλαιότερα στοιχεία που έχουν ήδη διανεμηθεί ή δημοσιευτεί, επιλέξτε την πρόταση αυτή. Θα σας παρουσιαστεί μια φόρμα που θα σας ζητά διάφορες πληροφορίες σχετικά με τη δημοσίευση.

      +

      * αραπάνω του ενός αρχεία - Ένα στοιχείο μπορεί να αποτελείται από περισσότερα του ενός αρχεία στο Απόθεμα. Ένα κοινό παράδειγμα θα μπορούσε να είναι ένα αρχείο HTML το οποίο περιέχει αναφορές σε αρχεία εικόνας (όπως αρχεία JPG ή GIF). Ένα άλλο παράδειγμα θα μπορούσε να είναι μια δημοσίευση με μια προσομοίωση βίντεο και ένα αρχείο δεδομένων. Εάν υποβάλλετε περισσότερα του ενός αρχεία για αυτό το στοιχείο, επιλέξτε αυτήν την πρόταση.

      +
      +

      Επιλέξτε "Επόμενο" για να προχωρήσετε ή "Ακύρωση/Αποθήκευση" για να σταματήσετε και να σώσετε ή να ακυρώσετε την υποβολή.

      +
      + + + + + + +
      Υ ΟΒΟΛΗ: εριγράψτε το Στοιχείο σας - Σελίδα 2υποβολήαρχή
      +

      Οι πληροφορίες που θα εισάγετε σε αυτές τις δύο οθόνες θα αποτελέσουν τα μεταδεδομένα που θα επιτρέπουν στους χρήστες να ανακτούν το στοιχείο σας, χρησιμοποιώντας μηχανές αναζήτησης. Όσο πιο πλούσια είναι τα μεταδεδομένα, τόσο πιο εύκολα θα μπορεί να βρεθεί το στοιχείο, για αυτό συμπληρώστε όλα τα πεδία που μπορούν να εφαρμοστούν. Να σημειωθεί ότι θα πρέπει επίσης να δηλώσετε τη γλώσσα που χρησιμοποιήσατε για τη συμπλήρωση των πεδίων, επιλέγοντας την κατάλληλη, από τη λίστα που σας δίνεται στο πλαίσιο, στο δεξί μέρος του κάθε πεδίου.

      +
      +

      Συγγραφέας:

      +

      Αυτός μπορεί να είναι ένα πρόσωπο, ένας οργανισμός ή μια υπηρεσία υπεύθυνη για τη δημιουργία ή τη συνεισφορά του περιεχομένου του στοιχείου. ατώντας το κουμπί " ροσθήκη ερισσότερων" μπορείτε να προσθέσετε επιπλέον όσους συγγραφείς είναι απαραίτητο. αραδείγματα:

      +

      +

      Αν ο συγγραφέας είναι κάποιος οργανισμός, χρησιμοποιήστε το πλαίσιο εισαγωγής του επωνύμου για το όνομα του οργανισμού:

      +

      +
      +

      Τίτλος:

      +

      Εισάγετε το πλήρες και ακριβές όνομα με το οποίο πρέπει να εμφανίζεται αυτό το στοιχείο. Όλα τα στοιχεία του Αποθέματος θα πρέπει να έχουν έναν τίτλο!

      +

      +
      + Άλλος τίτλος: (σημείωση - αυτό το πλαίσιο εμφανίζεται μόνο αν στην πρώτη σελίδα δηλώσατε ότι το στοιχείο έχει περισσότερους από έναν τίτλους.) +

      Αν το στοιχείο σας έχει έναν έγκυρο εναλλακτικό τίτλο, για παράδειγμα, έναν τίτλο σε μια άλλη γλώσσα ή μια σύντμηση, τότε εισάγετέ τον εδώ. αράδειγμα:

      +

      +
      +

      Ημερομηνία Έκδοσης: + (σημείωση - αυτό το πλαίσιο εμφανίζεται μόνο αν δηλώσατε στην πρώτη σελίδα ότι το στοιχείο έχει ήδη δημοσιευθεί ή διανεμηθεί. Αν το Απόθεμα είναι το πρώτο μέσο διάθεσης του στοιχείου, θα ανατεθεί σε αυτό μια ημερομηνία από το σύστημα όταν γίνει μέρος του αποθέματος.)

      +

      Αν το στοιχείο σας έχει ήδη δημοσιευθεί ή διανεμηθεί, εισάγετε την αντίστοιχη ημερομηνία. Αν δεν γνωρίζετε το μήνα, αφήστε το προκαθορισμένο "Κανένας μήνας". Αλλιώς, επιλέξτε ένα μήνα από το πλαίσιο. Αν δεν γνωρίζετε την ακριβή ημέρα, αφήστε το αντίστοιχο πλαίσιο κενό.

      +

      +
      +

      Εκδότης: (σημείωση + - αυτό το πλαίσιο εμφανίζεται μόνο αν δηλώσατε στην πρώτη σελίδα ότι το στοιχείο έχει ήδη δημοσιευθεί ή διανεμηθεί.)

      +

      Εισάγετε το όνομα του εκδότη του στοιχείου.

      +
      +

      αραπομπή: (σημείωση + - αυτό το πλαίσιο εμφανίζεται μόνο αν δηλώσατε στην πρώτη σελίδα ότι το στοιχείο έχει ήδη δημοσιευθεί ή διανεμηθεί.)

      +

      Εισάγετε τις πληροφορίες της παραπομπής για αυτό το στοιχείο, εάν αυτό ήταν δημοσίευση σε περιοδικό ή μέρος μιας μεγαλύτερης δουλειάς, όπως ένα κεφάλαιο βιβλίου. Για άρθρα περιοδικών, συμπεριλάβετε τον τίτλο του περιοδικού, τον αριθμό τεύχους, την ημερομηνία και τις σελίδες.
      + Για κεφάλαια βιβλίων, συμπεριλάβετε τον τίτλο του βιβλίου, τον τόπο δημοσίευσης, το όνομα του εκδότη, την ημερομηνία και τις σελίδες.

      +
      +

      Αριθμός Σειράς/Αναφοράς:

      +

      Μερικές από τις συλλογές στο Απόθεμα είναι αριθμημένες σειρές, όπως τεχνικές αναφορές ή εργασίες. Αν αυτή η συλλογή ανήκει σε αυτήν την κατηγορία, τότε θα πρέπει να υπάρχει μια προκαθορισμένη τιμή στο πλαίσιο Όνομα Σειράς το οποίο δεν πρέπει να αλλάξετε, αλλά πρέπει να συμπληρώσετε τον ανατιθέμενο αριθμό στο πλαίσιο εισαγωγής του Αριθμού Αναφοράς ή Δημοσίευσης.   αραδείγμα:

      +

      +
      +

      Αναγνωριστικά:

      +

      Αν υπάρχει κάποιος ακριβής αριθμός ή κωδικός που αναγνωρίζει αυτό το στοιχείο σε κάποιο σύστημα, παρακαλούμε εισάγετέ το εδώ. ιέστε το βέλος στο δεξί μέρος του πλαισίου και επιλέξτε κάποια από τις επιλογές του μενού. Οι επιλογές είναι οι εξής:

      +
      +

      Αριθμός κρατικού εγγράφου - π.χ. NASA SP 8084
      + ISBN - International Standard Book Number - π.χ. 0-1234-5678-9
      + ISSN - International Standard Serial Number - π.χ. 1234-5678
      + ISMN - International Standard Music Number - π.χ. M-53001-001-3
      + URI - Universal Resource Identifier - π.χ. http://www.dspace.org/help/submit.html
      + Άλλο - Ένα μοναδικό αναγνωριστικό που ανατίθεται στο στοιχείο, χρησιμοποιώντας κάποιο σύστημα διαφορετικό από τα παραπάνω

      +
      +
      +

      Τύπος:

      +

      Επιλέξτε τον τύπο εργασίας (ή είδος) που ταιριάζει καλύτερα με το στοιχείο σας. Για να επιλέξετε περισσότερες από μια τιμές της λίστας, χρησιμοποιήστε το πλήκτρο "ctrl" ή "shift".

      +

      Γλώσσα:

      +

      Επιλέξτε τη γλώσσα του περιεχομένου του στοιχείου σας. Αν η προκαθορισμένη γλώσσα (English - United States) δεν είναι κατάλληλη, πιέστε το βέλος στο δεξί μέρος του πλαισίου για να δείτε μια λίστα από γλώσσες που χρησιμοποιούνται συχνά για δημοσιεύσεις, π.χ.

      +

      +

      Αν το στοιχείο σας δεν είναι αρχείο κειμένου και η γλώσσα δεν μπορεί να χρησιμοποιηθεί σαν περιγραφή, τότε επιλέξτε "N/A".

      +
      +

      Επιλέξτε "Επόμενο" για να προχωρήσετε, ή "Ακύρωση/Αποθήκευση" για να σταματήσετε και να σώσετε ή να ακυρώσετε την υποβολή.

      +
      + + + + + + +
      Υ ΟΒΟΛΗ: εριγράψτε το Στοιχείο σας - Σελίδα 3υποβολήαρχή
      +
      +

      Θέμα/Λέξεις κλειδιά:

      +

      αρακαλούμε εισάγετε τόσες λέξεις κλειδιά όσες είναι απαραίτητο για να περιγράψετε το στοιχείο, από την πιο γενική στην πιο ειδική. Όσες περισσότερες λέξεις δώσετε, τόσο πιθανότερο είναι οι χρήστες να βρουν αυτό το στοιχείο στις αναζητήσεις τους. Χρησιμοποιήστε ένα πλαίσιο εισαγωγής για κάθε λέξη ή φράση για το θέμα. Μπορείτε να πάρετε επιπλέον πλαίσια εισαγωγής επιλέγοντας " ροσθήκη ερισσότερων". αραδείγματα: +

      +

      +

      Η κοινότητά σας μπορεί να προτείνει τη χρήση συγκεκριμένου λεξιλογίου, ταξινομίας ή θησαυρού. Εάν συμβαίνει αυτό, παρακαλούμε επιλέξτε τις λέξεις για το θέμα από αυτήν τη λίστα. Μελλοντικές εκδόσεις του Αποθέματος θα παρέχουν συνδέσμους προς αυτές τις λίστες.

      +
      +

      ερίληψη:

      +

      Μπορείτε να αντιγράψετε και να επικολλήσετε μια περίληψη μέσα στο πλαίσιο ή να την πληκτρολογήσετε. Δεν υπάρχει περιορισμός ως προς το μέγεθός της. Σας συνιστούμε να συμπεριλάβετε περίληψη για διευκόλυνση των τελικών χρηστών και για να βελτιώσετε τις δυνατότητες αναζήτησης και ανάκτησης.

      +

      Χρηματοδότηση:

      +

      Αν το στοιχείο σας είναι προϊόν κάποιας έρευνας που έγινε με χρηματοδότηση, μπορείτε εδώ να δώσετε πληροφορία για το χρηματοδότη. Μέσα στο πλαίσιο μπορείτε να εισάγετε ό,τι πληροφορία θέλετε. αράδειγμα:

      +

      +

       

      +
      +

      εριγραφή:

      +

      Εδώ μπορείτε να εισάγετε οποιαδήποτε άλλη πληροφορία περιγράφει το στοιχείο που υποβάλετε ή σχόλια μου μπορεί να ενδιαφέρουν τους χρήστες του στοιχείου.

      +
      +

      Επιλέξτε "Επόμενο" για να προχωρήσετε, ή "Ακύρωση/Αποθήκευση" για να σταματήσετε και να σώσετε ή να ακυρώσετε την υποβολή σας.

      +
      + + + + + + + +
      Υ ΟΒΟΛΗ: Μεταφορτώστε ένα Αρχείουποβολήαρχή
      +

      Υπάρχουν δύο τρόποι για να εισάγετε το όνομα του αρχείου που επιθυμείτε να μεταφορτώσετε:

      +
        +
      1. +

        ληκτρολογήστε το πλήρες μονοπάτι και το όνομα του αρχείου στο πλαίσιο εισαγωγής και επιλέξτε το κουμπί "Επόμενο" στην κάτω δεξιά γωνία της οθόνης.

        +
      2. +
      3. +

        Επιλέξτε το κουμπί "browse" και θα εμφανιστεί ένα παράθυρο που δείχνει τα αρχεία σας. Μπορείτε να πλοηγηθείτε μέσα στους καταλόγους και τους φακέλους σας μέχρι να βρείτε το σωστό αρχείο για να μεταφορτώσετε. Επιλέξτε, με διπλό πάτημα του ποντικιού, το όνομα του αρχείου που θέλετε να μεταφορτώσετε και το όνομά του θα εμφανιστεί στο πλαίσιο εισαγωγής.

        +

        Σημείωση: + Αν χρησιμοποιείτε τον φυλλομετρητή Netscape browser, ο προκαθορισμένος τύπος αρχείου θα είναι "HTML files", οπότε μπορεί να μην βλέπετε όλα τα αρχεία σας. Για να τα δείτε όλα:

        +
          +
        • +

          Σε υπολογιστές Windows και + Macintosh, το παράθυρο αρχικά φαίνεται ως εξής:

          +

          +

          ιέστε το βέλος δίπλα από το "HTML Files" και επιλέξτε "All Files (*.*)":

          +

          +
        • +
        • +

          Σε συστήματα UNIX, + το παράθυρο αρχικά φαίνεται ως εξής:

          +

          +

          ιέστε στο δεξί μέρος της λέξης "*.html" στο πλαίσιο κειμένου που βρίσκεται στο πάνω μέρος και διαγράψτε το ".html" χρησιμοποιώντας το πλήκτρο backspace, αλλά αφήστε το "*". +Μετά, πιέστε το κουμπί "Filter" στο κάτω μέρος του παραθύρου. +Τότε θα δείτε όλα τα αρχεία σας, ως εξής:

          +

          +
        • +
        +
      4. +
      +

      Όταν το όνομα του σωστού αρχείου βρίσκεται στο πλαίσιο, επιλέξτε το κουμπί "Επόμενο" για να προχωρήσετε.

      +

      εριγραφή του Αρχείου

      +

      Αν στην αρχή της διαδικασίας υποβολής είχατε προσδιορίσει ότι έχετε περισσότερα από ένα αρχεία να μεταφορτώσετε για αυτό το στοιχείο, θα δείτε ένα πλαίσιο που ονομάζεται " εριγραφή Αρχείου". + Η περιγραφή που θα εισάγετε εδώ θα βοηθήσει τους χρήστες να καταλάβουν τι πληροφορία περιέχεται στο κάθε αρχείο, για παράδειγμα "κύριο άρθρο" ή "εικόνες" ή "πρόγραμμα υπολογιστή" ή "σύνολο δεδομένων". Εισάγετε περιγραφή για κάθε αρχείο και επιλέξτε το κουμπί "Επόμενο" για να προχωρήσετε.

      +
      + + + + + + + +
      Υ ΟΒΟΛΗ: Μορφότυποι Αρχείωνυποβολήαρχή
      +

      Για να αποθηκευτεί σωστά και για να υπάρχει πρόσβαση σε ένα αρχείο, πρέπει να γνωρίζουμε το μορφότυπό του, για παράδειγμα "PDF", "HTML", ή "Microsoft Word". Αν το σύστημα δεν αναγνωρίσει αυτόματα το μορφότυπο του αρχείου που μεταφορτώσατε, θα σας ζητηθεί να τον περιγράψετε. Αν ο μορφότυπος του αρχείου περιέχεται στη λίστα που θα εμφανιστεί, επιλέξτε τον και μετά πατήστε "Υποβολή". Αν ο μορφότυπος δεν υπάρχει στη λίστα, επιλέξτε "Δεν υπάρχει ο μορφότυπος του αρχείου" και περιγράψτε τον στο πλαίσιο που βρίσκεται στο κάτω μέρος της σελίδας. Σιγουρευτείτε ότι δώσατε το όνομα και την έκδοση της εφαρμογής που χρησιμοποιήσατε για να δημιουργήσετε το αρχείο, για παράδειγμα "Autodesk AutoCAD R20 for UNIX".

      +

      Για περισσότερες πληροφορίες σχετικά με τους μορφότυπους των αρχείων, δείτε Υποστηριζόμενοι Μορφότυποι του Αποθέματος.

      +

      Μεταφορτωμένο Αρχείο

      +

      Αφού μεταφορτώσετε ένα αρχείο, ελέγξτε τις πληροφορίες στον πίνακα για να σιγουρευτείτε ότι είναι σωστές. Υπάρχουν δύο τρόποι για να διαπιστώσετε ότι τα αρχεία σας έχουν μεταφορτωθεί σωστά:

      +
        +
      • ιέστε το ποντίκι πάνω στο όνομα του αρχείου. Τότε, το αρχείο θα φορτωθεί σε ένα νέο παράθυρο, ώστε να μπορέσετε να ελέγξετε τα περιεχόμενά του.
      • +
      • Συγκρίνετε το checksum του αρχείου που εμφανίζεται εδώ με το checksum που υπολογίζετε εσείς.
      • +
      +

      Αν μεταφορτώνετε μόνο ένα αρχείο, αφού σιγουρευτείτε ότι φορτώθηκε σωστά, επιλέξτε "Επόμενο".

      +

      Αν μεταφορτώνετε περισσότερα του ενός αρχεία, πιέστε το κουμπί " ροσθήκη Νέου Αρχείου" (το κουμπί αυτό θα εμφανιστεί μόνο αν στην αρχική σελίδα "Υποβολή: εριγράψτε το Στοιχείο σας" είχατε επιλέξει "Το στοιχείο αποτελείται από παραπάνω του ενός αρχεία". Όταν σιγουρευτείτε ότι όλα τα αρχεία για αυτό το στοιχείο μεταφορτώθηκαν επιτυχώς, πατήστε το κουμπί "Επόμενο".

      +

      Αν μεταφορτώνετε μία HTML σελίδα με ενσωματωμένα αρχεία, πιέστε το κουμπί " ροσθήκη Νέου Αρχείου" και μεταφορτώστε όλα τα αρχεία ή τις δυαδικές ροές που αναφέρονται στην html σελίδα. Αφού μεταφορτωθούν όλα, στη στήλη " ρωτεύουσα δυαδική ροή", επιλέξτε τη δυαδική ροή ή το αρχείο που αποτελεί την κεντρική σελίδα. Αυτό θα εξασφαλίσει ότι όλα τα ενσωματωμένα αρχεία θα εμφανίζονται σωστά μέσα στην HTML σελίδα. + Μετά επιλέξτε το κουμπί "Επόμενο".

      + +

      + Checksums

      +

      Το απόθεμα παράγει ένα MD5 checksum για κάθε αρχείο που αποθηκεύει, το οποίο χρησιμοποιείται εσωτερικά για να πιστοποιείται η ακεραιότητα των αρχείων με το πέρασμα του χρόνου (αφού το checksum ενός αρχείου κανονικά παραμένει αμετάβλητο). Μπορείτε να χρησιμοποιήσετε αυτό το checksum για να σιγουρευτείτε ότι πραγματικά λάβαμε το αρχείο που μεταφορτώσατε.

      +

      Αν θέλετε να βεβαιωθείτε για την εγκυρότητα του αρχείου χρησιμοποιώντας checksums, επιλέξτε "Εμφάνιση των checksums" στη σελίδα "Μεταφορτωμένο Αρχείο". Τότε, στον πίνακα που περιέχει τις λεπτομέρειες για το αρχείο θα εμφανιστεί το MD5 checksum που υπολόγισε το Απόθεμα για κάθε αρχείο που λάβαμε από εσάς. Εσείς θα πρέπει να υπολογίσετε το checksum των αρχείων χρησιμοποιώντας κάποιο τοπικό πρόγραμμα και να ελέγξετε αν ταιριάζει με αυτό που υπολόγισε το Απόθεμα. Στα περισσότερα συστήματα τύπου UNIX (συμπεριλαμβανομένου και του Mac OS X), χρησιμοποιείται το md5sum. Για παράδειγμα, πληκτρολογήστε "md5sum MYFILE" για κάθε αρχείο που θέλετε να ελέγξετε και στην οθόνη θα τυπωθεί το αποτέλεσμα. Για μηχανές Windows, διατίθενται ελεύθερα τα εργαλεία MD5: δοκιμάστε το md5 (από τη σελίδα http://www.fourmilab.ch/md5/), ή το md5sum, που διατίθεται στα πακέτα του Cygwin (http://www.cygwin.com/). Το checksum που θα υπολογιστεί με αυτό το εργαλείο για το τοπικό αντίγραφο του αρχείου που μεταφορτώσατε θα πρέπει να είναι ακριβώς το ίδιο με αυτό που υπολογίστηκε από το Απόθεμα.

      +
      + + + + + + + +
      Υ ΟΒΟΛΗ: Επιβεβαίωση Υποβολήςυποβολήαρχή
      +

      Αυτή η σελίδα σας επιτρέπει να δείτε την πληροφορία που εισαγάγατε για να περιγράψετε το στοιχείο. Για να διορθώσετε ή να επεξεργαστείτε κάποια πληροφορία, επιλέξτε το αντίστοιχο κουμπί στα δεξιά. Μπορείτε, επίσης, να χρησιμοποιήσετε τα κουμπιά σχήματος οβάλ που βρίσκονται στην μπάρα, στο πάνω μέρος της σελίδας, τα οποία σας επιτρέπουν να μετακινηθείτε ανάμεσα στις σελίδες της υποβολής. Όταν βεβαιωθείτε ότι η επιβολή έγινε σωστά, πατήστε "Επόμενο" για να προχωρήσετε.

      +

      Επιλέξτε "Ακύρωση/Αποθήκευση" για να σταματήσετε και να σώσετε τα δεδομένα σας, ή για να ακυρώσετε την υποβολή.

      +
      + + + + + + +
      Υ ΟΒΟΛΗ: Άδειαυποβολήαρχή
      +

      Για να μπορέσει το στοιχείο σας να εμφανιστεί στο Απόθεμα είναι απαραίτητο να συμφωνήσετε με τους όρους της άδειας. αρακαλούμε διαβάστε προσεκτικά τους όρους και για οποιεσδήποτε απορίες επικοινωνήστε με το Διαχειριστή του Αποθέματος.

      +
      + + + + + + + +
      Υ ΟΒΟΛΗ: Η Υποβολή Ολοκληρώθηκευποβολήαρχή
      +

      Τώρα που η υποβολή σας στο σύστημα του Αποθέματος ολοκληρώθηκε με επιτυχία, θα περάσει διαμέσου της διαδικασίας που έχει σχεδιαστεί για τη συλλογή στην οποία έγινε η υποβολή. Μερικές συλλογές απαιτούν η υποβολή να περάσει από κάποια βήματα επεξεργασίας, ενώ άλλες δέχονται απευθείας την υποβολή. Θα σας σταλεί σχετική ειδοποίηση με e-mail όταν το στοιχείο σας γίνει μέλος της συλλογής, ή αν για κάποιο λόγο υπήρξε πρόβλημα με την υποβολή. Αν έχετε απορίες σχετικά με τη διαδικασία υποβολής σε μια συγκεκριμένη συλλογή, παρακαλούμε επικοινωνήστε με την κοινότητα που είναι υπεύθυνη για τη συλλογή. Μπορείτε να ελέγξετε την κατάσταση της υποβολής σας πηγαίνοντας στη σελίδα "Το Απόθεμά μου".

      +
      + + + + + +
      HANDLESαρχή
      +

      Όταν το στοιχείο σας γίνει μέρος του Αποθέματος, ανατίθεται σε αυτό ένα μόνιμο URL. Αυτό σημαίνει ότι, σε αντίθεση με τα περισσότερα URLs, το αναγνωριστικό αυτό δεν θα αλλάξει, αν γίνουν αλλαγές στο σύστημα ή αν αυτό μεταφερθεί σε νέο υλικό. Το Απόθεμα δεσμεύεται να διατηρήσει την ακεραιότητα του αναγνωριστικού, έτσι ώστε να μπορείτε να το χρησιμοποιείτε με ασφάλεια για να αναφέρεστε στο στοιχείο σας. Τα μόνιμα urls προκύπτουν από το Handle + System, ένα αναλυτικό σύστημα για την ανάθεση και τη διαχείριση μόνιμων αναγνωριστικών, γνωστών ως "handles", για ψηφιακά αντικείμενα και άλλους πόρους στο Internet. Το Handle System το διαχειρίζεται ο οργανισμός Corporation + for National Research Initiatives (CNRI), ο οποίος αναλαμβάνει, ενθαρρύνει και προωθεί την έρευνα στο κοινό.

      +
      + + + + + +
      ΤΟ Α ΟΘΕΜΑ ΜΟΥαρχή
      +

      Αν είστε εξουσιοδοτημένος χρήστης του Αποθέματος ή αν είστε υπεύθυνος για τις συλλογές του ή τη διατήρηση των μεταδεδομένων, θα έχετε μια σελίδα "Το Απόθεμά μου". Εκεί θα βρείτε:

      +
        +
      • μια λίστα με τις μη ολοκληρωμένες υποβολές σας. Από αυτή τη λίστα μπορείτε να συνεχίσετε τη διαδικασία υποβολής από το σημείο που την αφήσατε ή μπορείτε να την διαγράψετε και να ακυρώσετε το στοιχείο.
      • +
      • μια λίστα από υποβολές που περιμένουν κάποια ενέργεια από εσάς (αν έχετε κάποιο ρόλο στη ροή εργασίας της συλλογής).
      • +
      • ένα σύνδεσμο σε μια λίστα από στοιχεία που έχετε υποβάλλει κι έχουν ήδη γίνει αποδεκτά στο Απόθεμα.
      • +
      +

      +


      + + + + + +
      Ε ΕΞΕΡΓΑΣΙΑ ΡΟΦΙΛαρχή
      +

      Σε αυτήν τη σελίδα μπορείτε να αλλάξετε την πληροφορία που έχουμε για εσάς. ρώτα, όμως, πρέπει να συνδεθείτε στο απόθεμα.

      +
      + + + + + +
      ΕΓΓΡΑΦΗ ΓΙΑ ΕΝΗΜΕΡΩΣΗ ΜΕ MAILαρχή
      +

      Οι χρήστες μπορούν να εγγραφούν ως συνδρομητές στις συλλογές, ώστε να ενημερώνονται με mail για τα νέα στοιχεία που προστίθενται σε αυτές. Μπορούν να εγγραφούν σε όσες συλλογές θέλουν. Για την εγγραφή:

      +
        +
      • πηγαίνετε στη σελίδα εγγραφής του Αποθέματος, επιλέγοντας το σύνδεσμο για τη σύνδεση στη μπάρα πλοήγησης στο αριστερό μέρος της αρχικής σελίδας του αποθέματος
      • +
      • συμπληρώστε τη φόρμα εγγραφής
      • +
      • πηγαίνετε στη σελίδα της συλλογής για την οποία θέλετε να ενημερώνεστε και επιλέξτε το κουμπί "Εγγραφή Συνδρομητή" (επαναλάβετε τη διαδικασία για άλλες συλλογές)
      • +
      • μπορείτε να δείτε και να επεξεργαστείτε τις συνδρομές σας, ακολουθώντας το σύνδεσμο "Δείτε τις Εγγραφές σας", στη σελίδα "Το Απόθεμά μου".
      • +
      +
      + + + + + +

      ΓΙΑ Ε Ι ΛΕΟΝ ΒΟΗΘΕΙΑ...

      αρχή
      +

      Για οποιαδήποτε απορία και για επιπλέον βοήθεια σχετικά με τη χρήση του Αποθέματος, παρακαλούμε επικοινωνήστε με το Διαχειριστή.

      +
      + + + + diff -Naur dspace-1.2-source-devel/jsp/help/index.html dspace-1.2-source-devel/multi/help/index.html --- dspace-1.2-source-devel/jsp/help/index.html 2004-06-23 11:59:24.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/index.html 2005-03-01 09:55:38.000000000 -0200 @@ -8,9 +8,9 @@

      DSPACE HELP

      - + - @@ -23,20 +23,20 @@
      Sign on to DSpace
      Submit
      File Formats
      -
      Handles
      +
      Handles
      My DSpace
      Edit Profile
      -
      Subscribe +
      Subscribe to E-mail alerts
       
      -

      DSpace captures, distributes and preserves digital research products. - Here you can find articles, working papers, preprints, technical reports, conference papers - and data sets in various digital formats. Content grows daily as new communities +

      DSpace captures, distributes and preserves digital research products. + Here you can find articles, working papers, preprints, technical reports, conference papers + and data sets in various digital formats. Content grows daily as new communities and collections are added to DSpace.

      -

      The DSpace content is organized - around Communities which can correspond to administrative entities such as schools, - departments, labs and research centers. Within each community there can be an - unlimited number subcommunities and an unlimited number of collections. Each collection +

      The DSpace content is organized + around Communities which can correspond to administrative entities such as schools, + departments, labs and research centers. Within each community there can be an + unlimited number subcommunities and an unlimited number of collections. Each collection may contain an unlimited number of items.


      Help Contents:

      + Close this window
      @@ -45,42 +45,42 @@
      top
      -

      Browse allows you +

      Browse allows you to go through a list of items in some specified order:

      -

      Browse by Community/Collection - takes you through the communities in alphabetical order and allows you to see +

      Browse by Community/Collection + takes you through the communities in alphabetical order and allows you to see the subcommunities and collections within each community.

      -

      Browse by Title allows +

      Browse by Title allows you to move through an alphabetical list of all titles of items in DSpace.

      -

      Browse by Author +

      Browse by Author allows you to move through an alphabetical list of all authors of items in DSpace.

      -

      Browse by Date allows +

      Browse by Date allows you to move through a list of all items in DSpace in reverse chronological order.

      -

      You may sign on to the +

      You may sign on to the system if you:

        -
      • wish to subscribe to +
      • wish to subscribe to a collection and receive e-mail updates when new items are added
      • -
      • wish to go to the "My - DSpace" page that tracks your subscriptions and other interactions with - DSpace requiring authorization (if you are a submitter for a collection, for +
      • wish to go to the "My + DSpace" page that tracks your subscriptions and other interactions with + DSpace requiring authorization (if you are a submitter for a collection, for instance.)
      • wish to edit your profile
      -

      Submit is the DSpace - function that enables users to add an item to DSpace. The process of submission - includes filling out information about the item on a metadata form and uploading - the file(s) comprising the digital item. Each community sets its own submission +

      Submit is the DSpace + function that enables users to add an item to DSpace. The process of submission + includes filling out information about the item on a metadata form and uploading + the file(s) comprising the digital item. Each community sets its own submission policy.

      -

      My DSpace is a personal - page that is maintained for each member. This page can contain a list of items - that are in the submission process for a particular member, or a task list of - items that need attention such as editing, reviewing, or checking. In the future - this page will also maintain information about personal services offered by +

      My DSpace is a personal + page that is maintained for each member. This page can contain a list of items + that are in the submission process for a particular member, or a task list of + items that need attention such as editing, reviewing, or checking. In the future + this page will also maintain information about personal services offered by DSpace, such as e-mail notification when new items are added to a collection.

      -

      Edit Profile allows +

      Edit Profile allows you to change your password.

      -

      About takes you to +

      About takes you to information about the DSpace project and its development.


      @@ -89,100 +89,100 @@
      top
      -

      To search all of DSpace, - use the yellow search box at the top of the navigation bar on the left (or the +

      To search all of DSpace, + use the yellow search box at the top of the navigation bar on the left (or the search box in the middle of the home page)

      -

      +

      -

      To limit your search to - a specific community or collection, navigate to that community or collection +

      To limit your search to + a specific community or collection, navigate to that community or collection and use the search bar on that page.

      -

      DSpace uses the Jakarta +

      DSpace uses the Jakarta Lucene search engine. Here are some search hints:

      -
      -

      What is searched in +

      +

      What is searched in the general keyword search (yellow box)
      -
      The word(s) you enter in the search box will be searched against the title, - author, subject abstract, series, sponsor and identifier fields of each item's +
      The word(s) you enter in the search box will be searched against the title, + author, subject abstract, series, sponsor and identifier fields of each item's record.

      If your site is enabled for full-text searching, the text you entered will also be searched against the full text of all archived documents. For more information on full-text - searching please contact + searching please contact your DSpace Administrator. -

      What is not searched +

      What is not searched - Stop Words
      -
      The search engine ignores certain words that occur frequently in +
      The search engine ignores certain words that occur frequently in English, but do not add value to the search. These are:

      -

      "a", "and" - , "are" , "as" , "at" , "be" , "but" , "by" , "for" , "if" , "in" , "into", +

      "a", "and" + , "are" , "as" , "at" , "be" , "but" , "by" , "for" , "if" , "in" , "into",

      -

      "is" ,"it" +

      "is" ,"it" ,"no" , "not" , "of" , "on" , "or" , "such", "the" , "to" , "was"

      Truncation
      -
      Use an asterisk (*) after a word stem to get all hits having words starting +
      Use an asterisk (*) after a word stem to get all hits having words starting with that root, for example:

      -
      -

      +

      +

          will retrieve selects, selector, selectman, selecting.

      Stemming
      -
      The search engine automatically expands words with common endings to include + The search engine automatically expands words with common endings to include plurals, past tenses ...etc.

      Phrase Searching
      - To search using multiple words as a phrase, put quotation marks (") around + To search using multiple words as a phrase, put quotation marks (") around the phrase.

      -

      +

      Exact word match
      - Put a plus (+) sign before a word if it MUST appear in the search result. - For instance, in the following search the word "training" is optional, + Put a plus (+) sign before a word if it MUST appear in the search result. + For instance, in the following search the word "training" is optional, but the word "dog" must be in the result.

      -
      +

      -

      Eliminate items with +

      Eliminate items with unwanted words
      -
      Put a minus (-) sign before a word if it should not appear in the search - results. Alternatively, you can use NOT. This can limit your search +
      Put a minus (-) sign before a word if it should not appear in the search + results. Alternatively, you can use NOT. This can limit your search to eliminate unwanted hits. For instance, in the search

      -
      -

      +

      +

        or  

      -

      you will get items containing +

      you will get items containing the word "training", except those that also contain the word "cat".

      Boolean searching

      -

      The following Boolean - operators can be used to combine terms. Note that they must be CAPITALIZED +

      The following Boolean + operators can be used to combine terms. Note that they must be CAPITALIZED !

      -

      AND - to limit - searches to find items containing all words or phrases combined with this +

      AND - to limit + searches to find items containing all words or phrases combined with this operator, e.g.

      -
      -

      - will retrieve all items that contain BOTH the words "cats" and +

      +

      + will retrieve all items that contain BOTH the words "cats" and "dogs".

      -

      OR - to enlarge - searches to find items containing any of the words or phrases surrounding +

      OR - to enlarge + searches to find items containing any of the words or phrases surrounding this operator

      -
      -

      - will retrieve all items that contain EITHER the words "cats" or +

      +

      + will retrieve all items that contain EITHER the words "cats" or "dogs".

      -

      NOT - to exclude +

      NOT - to exclude items containing the word following this operator, e.g.

      -
      -

      will - retrieve all items that contain the word "training" EXCEPT those +

      +

      will + retrieve all items that contain the word "training" EXCEPT those also containing the word "cat".

      -

      Parentheses can be used - in the search query to group search terms into sets, and operators can then +

      Parentheses can be used + in the search query to group search terms into sets, and operators can then be applied to the whole set, e.g.

      -

      +


      @@ -192,18 +192,18 @@ top -

      The advanced search page - allows you to specify the fields you wish to search, and to combine these searches +

      The advanced search page + allows you to specify the fields you wish to search, and to combine these searches with the Boolean "and", "or" or "not".

      -

      You can restrict your search - to a community by clicking on the arrow to the right of the top box. If you +

      You can restrict your search + to a community by clicking on the arrow to the right of the top box. If you want your search to encompass all of DSpace, leave that box in the default position.

      -

      Then select the field to - search in the left hand column and enter the word or phrase you are searching - in the right hand column. You can select the Boolean operator to combine searches +

      Then select the field to + search in the left hand column and enter the word or phrase you are searching + in the right hand column. You can select the Boolean operator to combine searches by clicking on the arrow to the right of the "AND" box.

      -

      Note: You must use the - input boxes in order. If you leave the first one blank your search will not +

      Note: You must use the + input boxes in order. If you leave the first one blank your search will not work.


      @@ -212,28 +212,28 @@
      top
      -

      The DSpace content is organized - around Communities which can correspond to administrative entities such as schools, - departments, labs and research centers. Within each community there can be an - unlimited number subcommunities and an unlimited number of collections. Each collection - may contain an unlimited number of items. This organization gives DSpace the flexibility to accommodate +

      The DSpace content is organized + around Communities which can correspond to administrative entities such as schools, + departments, labs and research centers. Within each community there can be an + unlimited number subcommunities and an unlimited number of collections. Each collection + may contain an unlimited number of items. This organization gives DSpace the flexibility to accommodate differing needs of communities by allowing them to

        -
      • Decide on policies such - as: -
        - - +
      • Decide on policies such + as: +
        - who contributes content
        -
        - - +
        - whether there will be a review process
        -
        - - who +
        - who will have access
      • -
      • Determine workflow - +
      • Determine workflow - reviewing, editing, metadata
      • Manage collections
      -

      Each community has its own - entry page displaying information, news and links reflecting the interests of +

      Each community has its own + entry page displaying information, news and links reflecting the interests of that community, as well as a descriptive list of collections within the community.


      @@ -242,13 +242,13 @@
      top
      -

      Communities can maintain - an unlimited number of collections in DSpace. Collections can be organized around - a topic, or by type of information (such as working papers or datasets) or by - any other sorting method a community finds useful in organizing its digital +

      Communities can maintain + an unlimited number of collections in DSpace. Collections can be organized around + a topic, or by type of information (such as working papers or datasets) or by + any other sorting method a community finds useful in organizing its digital items. Collections can have different policies and workflows.

      -

      Each DSpace collection has - its own entry page displaying information, news and links reflecting the interests +

      Each DSpace collection has + its own entry page displaying information, news and links reflecting the interests of users of that collection.


      @@ -257,20 +257,20 @@
      top
      -

      When you access an area - of DSpace that requires authorization, the system will require you to log in. - All users can register to become subscribers. Some restricted functions, such +

      When you access an area + of DSpace that requires authorization, the system will require you to log in. + All users can register to become subscribers. Some restricted functions, such as content submission, require authorization from the community

      -

      Before you log in - for the first time, you will need to click on "register with DSpace" and - follow the instructions. After that, you will need to enter your e-mail - address and password in the log-in form that appears. Your e-mail address +

      Before you log in + for the first time, you will need to click on "register with DSpace" and + follow the instructions. After that, you will need to enter your e-mail + address and password in the log-in form that appears. Your e-mail address should include your username and domain name. It is not case sensitive.

      -

      Example: +

      Example: moniker@mycorp.com

      -

      Type your password exactly - as you entered it originally. It is case sensitive. Be sure to click +

      Type your password exactly + as you entered it originally. It is case sensitive. Be sure to click on the "log in" button to continue.


      @@ -280,263 +280,265 @@ top -

      Stopping during the Submission +

      Stopping during the Submission Process:

      -

      At any point in the submission - process you can stop and save your work for a later date by clicking on the - "cancel/save" button at the bottom of the page. The data you have - already entered will be stored until you come back to the submission, and you - will be reminded on your "My DSpace" page that you have a submission - in process. If somehow you accidentally exit from the submit process, you can - always resume from your "My DSpace" page. You can also cancel your +

      At any point in the submission + process you can stop and save your work for a later date by clicking on the + "cancel/save" button at the bottom of the page. The data you have + already entered will be stored until you come back to the submission, and you + will be reminded on your "My DSpace" page that you have a submission + in process. If somehow you accidentally exit from the submit process, you can + always resume from your "My DSpace" page. You can also cancel your submission at any point.

      -

      Choose +

      Choose Collection

      -

      Progress Bar - Oval Buttons +

      Progress Bar - Oval Buttons at Top of Page:

      -

      At the top of the submit - pages you will find 7 oval buttons representing each step in the submission - process. As you move through the process these ovals will change color. Once - you have started you can also use these buttons to move back and forth within - the submission process by clicking on them. You will not lose data by moving +

      At the top of the submit + pages you will find 7 oval buttons representing each step in the submission + process. As you move through the process these ovals will change color. Once + you have started you can also use these buttons to move back and forth within + the submission process by clicking on them. You will not lose data by moving back and forth.

      Select Collection:

      -

      Click on the arrow at - the right of the drop-down box to see a list of Collections. Move your mouse +

      Click on the arrow at + the right of the drop-down box to see a list of Collections. Move your mouse to the collection into which you wish to add your item and click.

      -

      (If you are denied permission - to submit to the collection you choose, please contact your DSpace Administrator +

      (If you are denied permission + to submit to the collection you choose, please contact your DSpace Administrator for more information.)

      -

      You must be authorized by - a community to submit items to a collection. If you would like to submit an - item to DSpace, but don't see an appropriate community, please contact your - DSpace Administrator to find out how +

      You must be authorized by + a community to submit items to a collection. If you would like to submit an + item to DSpace, but don't see an appropriate community, please contact your + DSpace Administrator to find out how you can get your community set up in DSpace.

      -

      Click on the "next" - button to proceed, or "cancel/save" button to stop and save or cancel +

      Click on the "next" + button to proceed, or "cancel/save" button to stop and save or cancel your submission.


      - +
      SUBMIT: Describe Your Item - Page 1top of submittop of submit top
      -

      If you respond "yes" to - any of the questions on this page, you will be presented with a modified input - form tailored to capture extra information. Otherwise you will get the "regular" +

      If you respond "yes" to + any of the questions on this page, you will be presented with a modified input + form tailored to capture extra information. Otherwise you will get the "regular" input form.

      -
      -

      * More than one title - - Sometimes an item has more than one title, perhaps an abbreviation, acronym, - or a title in another language. If this is the case, and you want this information +

      +

      * More than one title + - Sometimes an item has more than one title, perhaps an abbreviation, acronym, + or a title in another language. If this is the case, and you want this information captured, click in the "yes" box.

      -

      * Previously issued - - New items that have NOT been previously published or distributed will be assigned - an issue date by the system upon DSpace distribution. If you are entering - older items that have already been distributed or published, click in the - "yes" box. You will receive a form prompting you for several pieces of information +

      * Previously issued - + New items that have NOT been previously published or distributed will be assigned + an issue date by the system upon DSpace distribution. If you are entering + older items that have already been distributed or published, click in the + "yes" box. You will receive a form prompting you for several pieces of information relating to publication.

      -

      * Multiple files - An +

      * Multiple files - An item can consist of more than one file in DSpace. A common example of this would be - an HTML file with references to image files (such as JPG or GIF files). Another example - of this would be an article supplemented with a video simulation and a data file. - If you are submitting more than one file for this item, click in the "yes" + an HTML file with references to image files (such as JPG or GIF files). Another example + of this would be an article supplemented with a video simulation and a data file. + If you are submitting more than one file for this item, click in the "yes" box.

      -

      Click on the "next" - button to proceed, or "cancel/save" button to stop and save or cancel +

      Click on the "next" + button to proceed, or "cancel/save" button to stop and save or cancel your submission.


      - +
      SUBMIT: Describe Your Item - Page 2top of submittop of submit top
      -

      The information you fill - in on these two screens will form the metadata record that will enable users - to retrieve your item using search engines. The richer the metadata, the more - "findable" your item will be, so please take the time to fill in as - many fields as are applicable to your item.

      -
      +

      The information you fill + in on these two screens will form the metadata record that will enable users + to retrieve your item using search engines. The richer the metadata, the more + "findable" your item will be, so please take the time to fill in as + many fields as are applicable to your item. Next to each input box you are able + to choose the language of the metadata. If the requested language is not + listed here or if the information you import is independent from the language, choose N/A.

      +

      Author:

      -

      This can be a person, - organization or service responsible for creating or contributing to the content - of the item. By clicking on the "Add More" button you can add as +

      This can be a person, + organization or service responsible for creating or contributing to the content + of the item. By clicking on the "Add More" button you can add as many authors as needed.   Examples:

      -

      If the - author is an organization, use the last name input box for the organization +

      If the + author is an organization, use the last name input box for the organization name:


      Title:

      -

      Enter the full and proper +

      Enter the full and proper name by which this item should be known. All DSpace items must have a title!


      - Other Title: (note - - this input box appears only if you indicated on the first page that the item - has more than one title.) -

      If your item has a valid - alternative title, for instance, a title in another language or an abbreviation, + Other Title: (note + - this input box appears only if you indicated on the first page that the item + has more than one title.) +

      If your item has a valid + alternative title, for instance, a title in another language or an abbreviation, then enter it here. Example:


      -

      Date of Issue: - (note - this input box appears only if you indicated on the first page that - the item has been previously published or distributed. If DSpace is the first - means of distribution of this item, a date will be assigned by the system +

      Date of Issue: + (note - this input box appears only if you indicated on the first page that + the item has been previously published or distributed. If DSpace is the first + means of distribution of this item, a date will be assigned by the system when the item becomes a part of the repository.)

      -

      If your item was previously - published or made public, enter the date of that event here. If you don't - know the month, leave the default "no month"; otherwise select a - month from the drop-down box. If you don't know the exact day, leave that +

      If your item was previously + published or made public, enter the date of that event here. If you don't + know the month, leave the default "no month"; otherwise select a + month from the drop-down box. If you don't know the exact day, leave that box empty.


       

      -

      Publisher: (note - - this input box appears only if you indicated on the first page that the +

      Publisher: (note + - this input box appears only if you indicated on the first page that the item has been previously published or distributed.)

      -

      Enter the name of the +

      Enter the name of the publisher of this item.


      -

      Citation: (note - - this input box appears only if you indicated on the first page that the +

      Citation: (note + - this input box appears only if you indicated on the first page that the item has been previously published or distributed.)

      -

      Enter citation information - for this item if it was a journal article or part of a larger work, such as - a book chapter. For journal articles, include the journal title, volume +

      Enter citation information + for this item if it was a journal article or part of a larger work, such as + a book chapter. For journal articles, include the journal title, volume number, date and paging.
      - For book chapters, include the book title, place of publication, publisher + For book chapters, include the book title, place of publication, publisher name, date and paging.


      Series/Report No.:

      -

      Some of the collections - in DSpace are numbered series such as technical reports or working papers. - If this collection falls into that category, then there should be a default - value in the Series Name box which you should not change, - but you will have to fill in the assigned number in the Report or Paper +

      Some of the collections + in DSpace are numbered series such as technical reports or working papers. + If this collection falls into that category, then there should be a default + value in the Series Name box which you should not change, + but you will have to fill in the assigned number in the Report or Paper No. input box.  Examples:


      Identifiers:

      -

      If you know of a unique - number or code that identifies this item in some system, please enter it here. - Click on the arrow to the right of the input box, and select from one of the +

      If you know of a unique + number or code that identifies this item in some system, please enter it here. + Click on the arrow to the right of the input box, and select from one of the choices in the drop down menu. The choices refer to:

      -
      -

      Govt.doc # - +

      +

      Govt.doc # - Government Document Number - e.g. NASA SP 8084
      ISBN - International Standard Book Number - e.g. 0-1234-5678-9
      ISSN - International Standard Serial Number - e.g. 1234-5678
      ISMN - International Standard Music Number - e.g. M-53001-001-3
      URI - Universal Resource Identifier - e.g.. http://www.dspace.org/help/submit.html
      - Other - An unique identifier assigned to the item using a system + Other - An unique identifier assigned to the item using a system other than the above


      Type:

      -

      Select the type of work - (or genre) that best fits your item. To select more than one value in the - list, you may have to hold down the "ctrl" or "shift" +

      Select the type of work + (or genre) that best fits your item. To select more than one value in the + list, you may have to hold down the "ctrl" or "shift" key.

      Language:

      -

      Select the - language of the intellectual content of your item. If the default (English - - United States) is not appropriate, click on the arrow on the right of the - drop down box to see a list of languages commonly used for publications, +

      Select the + language of the intellectual content of your item. If the default (English + - United States) is not appropriate, click on the arrow on the right of the + drop down box to see a list of languages commonly used for publications, e.g.

      -

      If your item is not a - text document and language is not applicable as description, then select the +

      If your item is not a + text document and language is not applicable as description, then select the N/A choice.

      -

      Click on the "next" - button to proceed, or "cancel/save" button to stop and save or cancel +

      Click on the "next" + button to proceed, or "cancel/save" button to stop and save or cancel your submission.


      - +
      SUBMIT: Describe Your Item - Page 3top of submittop of submit top

      Subject/Keywords:

      -

      Please enter as many subject - keywords as are appropriate to describe this item, from the general to the specific. - The more words you provide, the more likely it is that users will find this - item in their searches. Use one input box for each subject word or phrase. You - can get more input boxes by clicking on the "add more" button. Examples: +

      Please enter as many subject + keywords as are appropriate to describe this item, from the general to the specific. + The more words you provide, the more likely it is that users will find this + item in their searches. Use one input box for each subject word or phrase. You + can get more input boxes by clicking on the "add more" button. Examples:

      -

      Your community may suggest - the use of a specific vocabulary, taxonomy, or thesaurus. If this is the case, - please select your subject words from that list. Future versions of DSpace will +

      Your community may suggest + the use of a specific vocabulary, taxonomy, or thesaurus. If this is the case, + please select your subject words from that list. Future versions of DSpace will provide links to those lists.


      Abstract:

      -

      You can either cut and paste - an abstract into this box, or you can type in the abstract. There is no limit - to the length of the abstract. We urge you to include an abstract for the convenience +

      You can either cut and paste + an abstract into this box, or you can type in the abstract. There is no limit + to the length of the abstract. We urge you to include an abstract for the convenience of end-users and to enhance search and retrieval capabilities.

      Sponsors:

      -

      If your item is the product - of sponsored research, you can provide information about the sponsor(s) here. +

      If your item is the product + of sponsored research, you can provide information about the sponsor(s) here. This is a freeform field where you can enter any note you like. Example:

       


      Description:

      -

      Here you can enter any other - information describing the item you are submitting or comments that may be of +

      Here you can enter any other + information describing the item you are submitting or comments that may be of interest to users of the item.

      -

      Click on the "next" - button to proceed, or "cancel/save" button to stop and save or cancel +

      Click on the "next" + button to proceed, or "cancel/save" button to stop and save or cancel your submission.


      - +
      SUBMIT: Upload a Filetop of submittop of submit top
      -

      There are two methods of +

      There are two methods of entering the name of the file you wish to upload:

      1. -

        Type the full path and - file name into the input box and then click on the "next" button +

        Type the full path and + file name into the input box and then click on the "next" button in the lower right hand corner of the screen.

      2. -

        Click on the "browse" - button and a window showing your files will appear. You can navigate through - your directories and folders until you find the correct file to upload. - Double-click on the file name you wish to upload, and the name will be entered +

        Click on the "browse" + button and a window showing your files will appear. You can navigate through + your directories and folders until you find the correct file to upload. + Double-click on the file name you wish to upload, and the name will be entered into the input box.

        -

        Note: - If you are using the Netscape browser, the default file type will be set - to "HTML files", so you may not see all of your files. Here is +

        Note: + If you are using the Netscape browser, the default file type will be set + to "HTML files", so you may not see all of your files. Here is how to see all your files:

        • -

          On Windows and +

          On Windows and Macintosh computers, the window initially looks like this:

          -

          Click - on the drop down arrow next to the "HTML Files" and select +

          Click + on the drop down arrow next to the "HTML Files" and select "All Files (*.*)":

        • @@ -544,10 +546,10 @@

          On UNIX systems, the window initially looks like this:

          -

          Click - to the right of the "*.html" in the top text box, and remove - the ".html" with the backspace key, but leave the "*". - Then, click on the "Filter" button at the bottom of the window. +

          Click + to the right of the "*.html" in the top text box, and remove + the ".html" with the backspace key, but leave the "*". + Then, click on the "Filter" button at the bottom of the window. You will then see all of your files, like this:

          @@ -555,131 +557,131 @@
      -

      Once the correct file name +

      Once the correct file name is in the input box, click on the "next" button to proceed.

      File Description

      -

      If you specified at the - beginning of the submit process that you had more than one file to upload for - this item, you will see an input box marked "File Description". - The information you provide here will help users to understand what information - is in each file, for instance, "main article" or "images" - or "computer program" or "data set". Enter file descriptions +

      If you specified at the + beginning of the submit process that you had more than one file to upload for + this item, you will see an input box marked "File Description". + The information you provide here will help users to understand what information + is in each file, for instance, "main article" or "images" + or "computer program" or "data set". Enter file descriptions for each item, and click on the "next" button to proceed.


      - + - +
      SUBMIT: File Formatstop of submittop of submit top
      -

      To properly archive and - give access to a file, we need to know what format it is, for example - "PDF", "HTML", or "Microsoft Word". If the system does not automatically recognize - the format of the file you have uploaded, you will be asked to describe it. - If the format of the file appears in the list offered, click on it and then - on "Submit". If you can't see the format in the list, click on "format - not in list" and describe the format in the text box lower down on the page. - Be sure to give the name of the application you used to create the file and - the version of that application, for example "Autodesk AutoCAD R20 for +

      To properly archive and + give access to a file, we need to know what format it is, for example + "PDF", "HTML", or "Microsoft Word". If the system does not automatically recognize + the format of the file you have uploaded, you will be asked to describe it. + If the format of the file appears in the list offered, click on it and then + on "Submit". If you can't see the format in the list, click on "format + not in list" and describe the format in the text box lower down on the page. + Be sure to give the name of the application you used to create the file and + the version of that application, for example "Autodesk AutoCAD R20 for UNIX".

      -

      For more information about file formats, see DSpace Supported +

      For more information about file formats, see DSpace Supported Formats.

      -

      Uploaded +

      Uploaded File

      -

      After you have uploaded - a file, check the information in the table to make sure it is correct. There +

      After you have uploaded + a file, check the information in the table to make sure it is correct. There are two further ways to verify that your files have been uploaded correctly:

        -
      • Click on the filename. - This will download the file in a new browser window, so that you can check +
      • Click on the filename. + This will download the file in a new browser window, so that you can check the contents.
      • -
      • Compare the file +
      • Compare the file checksum displayed here with the checksum you calculate.
      -

      If you're only uploading - one file, click on "Next" when you're happy that the file has been uploaded +

      If you're only uploading + one file, click on "Next" when you're happy that the file has been uploaded correctly.

      -

      If you're uploading more - than one file, click on the "Add Another File" button (this will appear -if you checked "The item consists of more than one file" on the "Submit: Describe Your Item" page). When you - are satisfied that all files for this item have been successfully uploaded, +

      If you're uploading more + than one file, click on the "Add Another File" button (this will appear +if you checked "The item consists of more than one file" on the "Submit: Describe Your Item" page). When you + are satisfied that all files for this item have been successfully uploaded, click on the "Next" button.

      If you're uploading an HTML page with embedded files, click on the "Add Another File" button, and upload all files or bitstreams referenced - in the html page. After all the are uploaded, in the column marked "Primary Bitstream", - select the bitstream or file that is the index page or the top page for the web page. - This will ensure that all of your embedded files will display properly on the HTML page. + in the html page. After all the are uploaded, in the column marked "Primary Bitstream", + select the bitstream or file that is the index page or the top page for the web page. + This will ensure that all of your embedded files will display properly on the HTML page. Then click on the "Next" button.

      -

      +

      Checksums

      -

      DSpace generates an MD5 - checksum for every file it stores; we use this checksum internally to verify - the integrity of files over time (a file's checksum shouldn't change). You can +

      DSpace generates an MD5 + checksum for every file it stores; we use this checksum internally to verify + the integrity of files over time (a file's checksum shouldn't change). You can use this checksum to be sure what we've received is indeed the file you've uploaded.

      -

      If you wish to verify the file using checksums, click "Show - checksums" on the "Uploaded File" page. The DSpace-generated MD5 checksum for - every file we've received from you will show to the right of the filename. You will - then need to use a local program to generate your own checksum for these files, - and verify that your results match ours. On most UNIX-like systems (including Mac OS X), - use md5sum. For instance, type "md5sum MYFILE" for every file you want to check; - the summary should print on your screen. For Windows machines, MD5 - tools are freely available: try md5 (from http://www.fourmilab.ch/md5/), or md5sum, - available via the textutils package in Cygwin (http://www.cygwin.com/). All of these utilities will - need to be run from a command-line, or terminal, window. The entire digest printed - out when you run the md5 tool on your local copy of the file you're uploading +

      If you wish to verify the file using checksums, click "Show + checksums" on the "Uploaded File" page. The DSpace-generated MD5 checksum for + every file we've received from you will show to the right of the filename. You will + then need to use a local program to generate your own checksum for these files, + and verify that your results match ours. On most UNIX-like systems (including Mac OS X), + use md5sum. For instance, type "md5sum MYFILE" for every file you want to check; + the summary should print on your screen. For Windows machines, MD5 + tools are freely available: try md5 (from http://www.fourmilab.ch/md5/), or md5sum, + available via the textutils package in Cygwin (http://www.cygwin.com/). All of these utilities will + need to be run from a command-line, or terminal, window. The entire digest printed + out when you run the md5 tool on your local copy of the file you're uploading should be exactly equal to what DSpace reports.


      - +
      SUBMIT: Verify Submissiontop of submittop of submit top
      -

      This page lets you review - the information you have entered to describe the item. To correct or edit information, - click on the corresponding button on the right, or use the oval buttons in the - progress bar at the top of the page to move around the submission pages. When - you are satisfied that the submission is in order, click on the "Next" +

      This page lets you review + the information you have entered to describe the item. To correct or edit information, + click on the corresponding button on the right, or use the oval buttons in the + progress bar at the top of the page to move around the submission pages. When + you are satisfied that the submission is in order, click on the "Next" button to continue.

      -

      Click on the "Cancel/Save" +

      Click on the "Cancel/Save" button to stop and save your data, or to cancel your submission.


      - +
      SUBMIT: Licensetop of submittop of submit top
      -

      DSpace requires agreement - to this non-exclusive distribution license before your item can appear on DSpace. - Please read the license carefully. If you have any questions, please contact +

      DSpace requires agreement + to this non-exclusive distribution license before your item can appear on DSpace. + Please read the license carefully. If you have any questions, please contact your DSpace Administrator.


      - +
      SUBMIT: Submission Completetop of submittop of submit top
      -

      Now that your submission - has been successfully entered into the DSpace system, it will go through the - workflow process designated for the collection to which you are submitting. - Some collections require the submission to go through editing or review steps, - while others may immediately accept the submission. You will receive e-mail - notification as soon as your item has become a part of the collection, or if - for some reason there is a problem with your submission. If you have questions - about the workflow procedures for a particular collection, please contact the - community responsible for the collection directly. You can check on the status +

      Now that your submission + has been successfully entered into the DSpace system, it will go through the + workflow process designated for the collection to which you are submitting. + Some collections require the submission to go through editing or review steps, + while others may immediately accept the submission. You will receive e-mail + notification as soon as your item has become a part of the collection, or if + for some reason there is a problem with your submission. If you have questions + about the workflow procedures for a particular collection, please contact the + community responsible for the collection directly. You can check on the status of your submission by going to the My DSpace page.


      @@ -688,17 +690,17 @@
      top
      -

      When your item becomes a - part of the DSpace repository it is assigned a persistent URL. This means that, - unlike most URLs, this identifier will not have to be changed when the system +

      When your item becomes a + part of the DSpace repository it is assigned a persistent URL. This means that, + unlike most URLs, this identifier will not have to be changed when the system migrates to new hardware, or when changes are made to the system. DSpace - is committed to maintaining the integrity of this identifier - so that you can safely use it to refer to your item when citing it in publications - or other communications. Our persistent urls are registered with the Handle - System, a comprehensive system for assigning, managing, and resolving persistent - identifiers, known as "handles," for digital objects and other resources on - the Internet. The Handle System is administered by the Corporation - for National Research Initiatives (CNRI), which undertakes, fosters, and + is committed to maintaining the integrity of this identifier + so that you can safely use it to refer to your item when citing it in publications + or other communications. Our persistent urls are registered with the Handle + System, a comprehensive system for assigning, managing, and resolving persistent + identifiers, known as "handles," for digital objects and other resources on + the Internet. The Handle System is administered by the Corporation + for National Research Initiatives (CNRI), which undertakes, fosters, and promotes research in the public interest.


      @@ -707,16 +709,16 @@
      top
      -

      If you are an authorized - DSpace submitter, or if you are a staff member responsible for DSpace collection +

      If you are an authorized + DSpace submitter, or if you are a staff member responsible for DSpace collection or metadata maintenance, you will have a My DSpace page. Here you will find:

        -
      • a list of your in-progress - submissions - from this list you can resume the submission process where you +
      • a list of your in-progress + submissions - from this list you can resume the submission process where you left off, or you can remove the submission and cancel the item.
      • -
      • a list of submissions +
      • a list of submissions that are awaiting your action (if you have a collection workflow role).
      • -
      • a link to a list of items +
      • a link to a list of items that you have submitted and that have already been accepted into DSpace.

      @@ -727,8 +729,8 @@ top -

      This page allows you to - change the information we have for you. You must be authenticated +

      This page allows you to + change the information we have for you. You must be authenticated with your log-in to change any of your personal information.


      @@ -737,19 +739,19 @@
      top
      -

      Users can subscribe to receive - daily e-mail alerts of new items added to collections. Users may subscribe to +

      Users can subscribe to receive + daily e-mail alerts of new items added to collections. Users may subscribe to as many collections as they wish. To subscribe:

        -
      • go to the DSpace registration - page by clicking on the sign-on link in the navigation bar on the left of +
      • go to the DSpace registration + page by clicking on the sign-on link in the navigation bar on the left of the home page
      • -
      • fill out the registration +
      • fill out the registration form
      • -
      • navigate to a collection - for which you would like to receive e-mail alerts, and click on the "subscribe" +
      • navigate to a collection + for which you would like to receive e-mail alerts, and click on the "subscribe" button (repeat for other collections)
      • -
      • to edit your subscriptions, +
      • to edit your subscriptions, go to the "Subscribe" page.

      @@ -760,11 +762,10 @@

      For help with using DSpace and questions about your specific site, please contact your DSpace Administrator.

      -

      For general information and news about DSpace, visit the DSpace Website.


      - diff -Naur dspace-1.2-source-devel/jsp/help/site-admin_el.html dspace-1.2-source-devel/multi/help/site-admin_el.html --- dspace-1.2-source-devel/jsp/help/site-admin_el.html 1969-12-31 22:00:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/site-admin_el.html 2005-02-22 13:48:37.000000000 -0200 @@ -0,0 +1,286 @@ + + + + : + + + + +

      + + + + + + +

      + + + +

      + +

      . , . " ".

      + +

      . , URL /dspace-admin, :

      + +
      https://dspace.myu.edu/dspace-admin
      + +

      . , .

      + +

      -

      + +

      -, . , ' -' , ' '. ' '.

      + + +

      + +
        +
      • . '', ' ' ' '. .
      • +
      • ' ' , , .
      • +
      • ' ', ' ' ' copyright', . ' ' ' ' HTML , <P> </P>
      • +
      • , . , , , .
      • , , , '' . , , . +
      • , .
      • +
      + + +

      + +

      "" . .

      + +

      : . . , , .

      + +

      , , ' ' . .

      + +

      (Checkboxes)

      + +

      . ' >'. , , .

      + +

      , '', '', .

      + +

      , . .

      + +

      1: , , READ , . , , , READ , . .

      + +

      2: ' . .

      + +

      3: , . , .

      + + +

      ()

      + +

      . , , . (, .)

      + +

      Copyright .

      + +

      ( ) . ( [dspace]/config/default.license ). , .

      + +

      . .

      + + +

      + +

      , , / . . ' >' .

      + +

      : . . , , .

      + + +

      + +

      Dublin Core - . , . ! , Dublin Core .

      + + + +

      + +

      e-mail , , , , .

      + +

      , , (, , ). , . , .

      + +

      + +

      .

      + +
        +
      • , , - .

      • +
      • ' ' MIT's X509. , MITAuthenticator

        + +

        ' ' ' '. , . ( , ) ' '.

      • +
      + +

      , .

      + +

      + +

      ... . . , e-mail, ID, '' . ''. , ' '. , '' '' .

      + + +

      + +

      , .

      + +

      '' '' . .

      + +

      '' , .

      + +

      . , , . , .

      + +

      . , . :

      + +
      OBJECTTYPE_OBJECTID_ACTION
      + +

      , XYZ :

      + +
      COLLECTION_XYZ_ADD
      + +

      XYZ ID ( ) Handle. ID /. ID .

      + +

      , . , .

      + +

      + +

      , . .

      + +

      + + + +

      + +

      , . Handle ID ( ) . , , .

      + +

      + +

      + +

      . ( ), . , , OAI .

      + + +

      Dublin Core

      + +

      Dublin Core Dublin Core Libraries Working Group Application Profile (LAP). , .

      + +

      , :

      + +
        +
      • / . ''. .
      • +
      • DC , .
      • +
      • , 'contributor' 'creator', '', 'contributor' 'creator'.
      • +
      • / , date.available OAI , title . . / , [dspace-source]/config/registries/dublin-core.xml.
      • +
      + +

      , dublin-core-types.xml Dublin Core , 'live' . XML ( ).

      + + +

      + +

      . . , :

      + +
        +
      • . ''. .
      • +
      • '' . , .
      • +
      • '' , MIME. , Microsoft Word, MIME .
      • +
      • '' . , , 'License' .
      • +
      • , ''
      • +
      • '' 'License'!
      • +
      + +

      , config/registries/bitstream-formats.xml . XML ( ).

      + + +

      + +

      .

      + + +

      + +

      + , . + , . + ''. ''. , + READ , READ bundles + .

      + +

      + +

      .

      + +
        +
      • .
      • +
      • .
      • +
      • .
      • +
      • .
      • +
      • .
      • +
      • .
      • +
      + +

      :

      +
        +
      • - + DEFAULT_ITEM_READ + DEFAULT_BITSTREAM_READ + , + READ + . , , + . + + + .

      • +
      • ADD + , .

      • +
      + + +

      + +

      , .

      + +

      , , - READ . , , .

      + +

      + Anonymous READ.

      + + +

      + +

      . + , + . + , , + .

      + + +

      + +

      . .

      + +

      . ( ) . .

      + +

      , 'privileged_users' Read . , ' ' ' ', 'privileged_users' '', 'READ' '' ' '.

      + + +

      + +

      : + .

      +

      " " , + . , , + . HTML , + .

      +

       

      + + + diff -Naur dspace-1.2-source-devel/jsp/help/site-admin.html dspace-1.2-source-devel/multi/help/site-admin.html --- dspace-1.2-source-devel/jsp/help/site-admin.html 2004-06-09 12:51:58.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/site-admin.html 2005-02-22 10:21:30.000000000 -0200 @@ -1,7 +1,7 @@ - DSpace: Site Administrator Help + Repository: Site Administrator Help @@ -17,7 +17,6 @@
      • General Information
      • -
      • Creating a Top-level Community
      • Creating a Sub-community
      • Editing a Community
      • Creating a Collection
      • @@ -33,20 +32,14 @@

        General Information

        -

        As of DSpace 1.2, many administration tools can now be accessed via the regular DSpace UI. However, they only appear if you are logged in as an administrator. The easiest way to do this is to go to your 'My DSpace' page.

        +

        Many administration tools can be accessed via the regular DSpace UI. However, they only appear if you are logged in as an administrator. The easiest way to do this is to go to your 'My Repository' page.

        -

        Some tasks must be performed entrally using the administration user interface, part of the Web UI. To access the administration UI, enter the base URL of your DSpace followed by /dspace-admin, for example:

        +

        Some tasks must be performed entrally using the administration user interface, part of the Web UI. To access the administration UI, enter the base URL of your Repository followed by /dspace-admin, for example:

        https://dspace.myu.edu/dspace-admin

        You will need to authenticate as an administrator to be able to access the page. Then, click on the relevant tool on the left-hand navigation bar.

        - -

        Creating a Top-level Community

        - -

        TODO

        - -

        Creating a Sub-community

        To create a sub-community, go to the community home page of the community that is to be the parent of the new sub-community. Then, click on the 'Create sub-community' in the 'Admin Tools' box at the top right-hand corner of the page. This will create the new community and take you to the 'Edit Community' page for that community.

        @@ -65,7 +58,7 @@

        Creating a Collection

        -

        Creating a collection is done with a 'wizard' style tool that should be familiar to most people who've used modern operating systems user interfaces. It's rather similar to the submission interface in DSpace.

        +

        Creating a collection is done with a 'wizard' style tool that should be familiar to most people who've used modern operating systems user interfaces. It's rather similar to the submission interface in Repository.

        Note: You cannot add new e-people records with this wizard. All the e-person records must be loaded into the system first. However, you will be able to add more e-people to each group associated with the collection later if required.

        @@ -79,7 +72,7 @@

        When you have completed the wizard, you're dropped into the Edit Collection screen. This allows you to review what you've entered and make any necessary tweaks.

        -

        Note 1: If the New items should be publicly readable option is checked, it means that new items arriving via the submission UI or batch importer will, by default, will get anonymous READ permissions for both the item and all the bitstreams). You can change this later so that e.g. items get anonymous READ permissions but bitstreams do not. Items that are 'mapped' or included from other collections will not have their authorizations changed.

        +

        Note 1: If the New items should be publicly readable option is checked, it means that new items arriving via the submission UI or batch importer will, by default, will get anonymous READ permissions for both the item and all the bitstreams. You can change this later so that e.g. items get anonymous READ permissions but bitstreams do not. Items that are 'mapped' or included from other collections will not have their authorizations changed.

        Note 2: New items should be publicly readable is just a default; an item's permissions may later changed.

        @@ -106,7 +99,7 @@

        Enter Default Item Metadata

        -

        On this screen you can specify some Dublin Core values that new submissions will have pre-filled out. Some of the values you can set here do not appear in the submission UI, so end-users may not have the chance to edit them. This can be a good or a bad thing! (FIXME?) Also note that these Dublin Core values will be added to items imported via the batch importer.

        +

        On this screen you can specify some Dublin Core values that new submissions will have pre-filled out. Some of the values you can set here do not appear in the submission UI, so end-users may not have the chance to edit them. This can be a good or a bad thing! Also note that these Dublin Core values will be added to items imported via the batch importer.

        @@ -285,7 +278,7 @@

        Edit News

        -

        You can use this tool to edit the text ("news") in two places on the DSpace home page: +

        You can use this tool to edit the text ("news") in two places on the Repository home page: the top box of the center frame, and the right sidebar.

        After clicking on "Edit News" on the admin menu, click on the Edit button next to the news item you wish to edit. A text box will be displayed with the current news, which can be deleted diff -Naur dspace-1.2-source-devel/jsp/help/Thumbs.db dspace-1.2-source-devel/multi/help/Thumbs.db --- dspace-1.2-source-devel/jsp/help/Thumbs.db 1969-12-31 22:00:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/help/Thumbs.db 2004-11-22 07:22:12.000000000 -0200 @@ -0,0 +1,229 @@ +ࡱ>  + $% !"#&15'()*+,-./02?346I789:;<=>@OABCDEFGHJKLMNPQRSTURoot Entryʿt1Q 2. 3] +  !"#$%&'()*+,-/0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\^_`abcdefghijklmnoprstuvwxyz{|}~ E JFIF``C + + +    C   Q`" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?};INKk#mxf5$0'cS]5+f-Gśp%#gZswĚ&c}xcx9;BLcF)=6tGM}WM4}@|NxƟ'NkdқyoRU_46TUo?? +п^|h0~ѫq4@Shoo 3wg\ V|_ sZo ىf1xdX6 ]Oe%ϩ(m0.ߧJ sZ?Eyojog$fBZkD8 `eڷFt_/׋~Ԗ~!mBI,,,"n֓O:cFuOD>]}>6o?Ƽ{#ⷹYu +q_y+(li-obIJ{GsKK/0 3FTU@Q@|E&EI_[W?Q$ZnTOysL!Ze,З +08Э?i ہ 7 H'܏ּ]n?-֞lPDv|m=p~UiH<+.6}=7烸c>5Rnk߃ s_h4dt ( [_h>ܽ'N%-6͌b|9e|wwčcZ峹x20T:w^'8\q׌JXe`茎Yg$ ndp;Ι3Zt{8 #MU[uǶ:_F?% ihZGio':Z>RW]q_n [t{Kƀ$~^bO-Fxە]< {i_񯜿k[_ +xBC'wf +>۬ <&eļ =}u%mJDm g<9YZ|5LL)K)’,0~Z_x61sxH#t slQ3ДՑ8T$o/}ư_هtN? OG5<;/}Ɖ೵Hm+˜g=` OG5x" [1rOs]G,4T#0$?:_<4x?Ih>'Օb%1ROf- xfUiH +#ktF`_:;(duEbj$z_b&cuuܧ#.:qm웤۷דӂݾx !Xܮv 5Kxzigi]B3+ָoO/nᜭCv?! ((*͇|l3^(J +ZswĚ&c}xcx9;BLcF)=6tGM}WM4}@|NxƟ'NkdқyoRU_46TUo?? +п^|h0~ѫq4@Shoo 3wg\ V|_ sZo ىf1xdX6 ]{}eo)syAJ d`t4_//B]{/( _ΏQAx@ uߵ%nxPK _kQA|lxS>'_kO./f3 ~Q>P֗ ]f[95#ptsZ.ë iPSz @=xJ_jixBTh˴Mrp2p:r*1-K Y^Fpel֗V_I}(,??TVHuTu/VO\kxXHQQ@=G@jbO O9?ƻ=#L6K[ nA>V8<hG눯&~䴒Em>/]3pEzTv[xwK.Ϻw g_?[Hc'J<(C3{)ӉK] o<[xznk߃M_FiܼFF*`k#NqF~f:nemQM&A c<㌞3z>&kZNog!i< + s_k+4_F?%4 Jn6(Dn98?wgn O[t9?ӟo ??x_|<nUv.8d5'7s5_kZ|$2~WN9)Vo84 &F]Y I_}*s>Ƽg|/ݫK]:Ync܄( %bV G˦xzigi]B3+ָoO/nᜭCv?! ((*͇|l3^(J +iZGsy#VnI,qӁڥ}?O.;$),vgk}ֹO*:7Gaш#jo ׻Q6,P:*yٳSTƟ%ơZ-ʶMNsmF@b{?>{_?>{_,"2нKNiv\iЂI[]=s:V6<ȳxU#c4jU}3B!\'k?@ e\ԥ,+Nwrֻ>)ln&hO%tF!l[I +_&P 1- +*sR|Aj=OD$Tg/\j/uq-ڄWR7{V+6Ӧ_AY'ga V%͞2g'8G +FvO~6{!JIȫ>cn&l얅+;2KP@dǮkV/$oj2<O𪫈GsX|\i^ϻzXuoMMD;e@:3Znxڶ8vIQ ޹ JAR -29G:קw]OY(-8ja$2I` _KW]%Rrd#cHT KC?I?]J^$wF,[trls^ƌpFy4)k ((?|u`k'kyJ߂Gkm=mN@VUqn^ 5yeN#$ +6 +=y.ziXyH$8 z%ki S672 %xN4ʭww6=֊#- z^ot- dTvO&! +cG^y V V^y V V^s?:5T!ciX}y*w>CZ\z}ȤqH( vm6ֹ2˓TZw0Ʋ}T j9&x!#,"i}inœNPkCw玛V]"լ'g`;:߈bMCzdg|r?:g|Ѭ5WOfDw+vIl +v~)XXKOm +.DmC4G +XeOF#SII [o{|ssvwFo.E {Iwzk# @$ķR#w)?z5լw#ȁ6yT^$hV׺%+70e RĄ';}TmçMY'ga V%͞2g'8G +FvO~6{!JIȫ>c$`e4f7&]UGz1Y_:t.4g=g,:VpM&Z Nq]u}GQm<@_[ hRQ$ڄ\焥x ϩ[Oit#kk;sw.܁b5@0$0/%+ܮ}qeͲo~Oak*7^Sg+0 ?*EW$nۭJm;\EݞKWpbŷH8g+G8>hXgg^A RKX1@ UO9,s/k}mvsG|$3}QuMxwO<u-Gʷ'UOϡ45ˡ^Mxɜ\sU:okϪDoR+ԷH]Â$_`j6_g l&Ps##qi)>SGVgfV..IVM6ݿ)€FzG/kuyc^ͮɲ#$viG*<ֿG} +7>(j6Q4e.ƌTI?()⛃8jk?B{ס#٬oRK v2GC\?4ƚ1^ioA3O%%HA_! cw'uZ/l$mre_'QֵHad$^sL)CGXE?fx_/&=G]KK)Yё9dcAOtZ{شݔfvRsaO ?fx_/&>xE$TqS?U,K E 3ğ4'#'O*GgOU|w 3ğ4'_M} _Z֞!mb\eʦDR8?,smcXZDq-ʕ$^# 3ğ5V:+\]G3(/m;@ }i&. f?jRL|1|LݼT ?J/5Z ]\GM] Khr_#!} JFIF``C + + +    C    `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?G6vzGp-"הm(NK"ROG^kDܫXT`1ڰ4)٪aD(ڧڬ FO_I5:56 f .m$d1R@9R<5X\NVD8fP<߲g%ZhR<MuFm'SSN ܀< # #'+ZRnl'AV#+(^ cUh?&xT +ǵGYMВ`fB b'fa]6AAA\J/ V=x50Ga 3] $7۲:p b=8 "ZLrq +?*ԿJ,D4:_& jil/ijAۭ3KׄomYzqKx}+2]zyIE1g;j^ew4ьvѩ FB5G^,=O JFIF``C + + +    C    `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?~ӭ/4Zcm ;$ˆ^H-nsXHp@|FsԀ+66ѥ#UNڦorJŸM|l}4[;ul 6ᨕm2C @XBAۿұV.&ϻUHvȎw`|G3G%/W~LjюZOa9|<xX/,AIaxDSnñgW~ v>Ҹ=G㵔F[Bԥ.?^ҿ!cIK3gy~'a[ߘ?-Mk#?6t> YM {ewI$1/F_ N rYd0ןQ_ŞH$x?#x,bH$B FB;|Q׽s JFIF``C + + +    C    `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵ8 9)01 "b118  +    !#$%&'()*+,-./012345679:;<=>?@ABCDEFGHIJKMNOPQRSTUVWXYZ[\]^_`abcdfghijklmnopqrstuvwxyz{|}~w!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?Rl)xxQ(h,{ws' Mg ᾭ$b$t!A.وS\͗5[8!lqƨp?!ck9_s+suތUӣOǂI$}k#v_^S 14? MK'\ Zw#-*i'IRT3gRyZMO$d:>a?&~ k_<o=v:MnXVN1ۯ|:t s/xjKo 7-&|JSv?yGlf4:_?&J2QgI>ڜ:εًV&Y0yZ6'I8t T g3i$y&)+V촩z5_YIPQ׽.}s~^{hn^f6 c +1-ZElt6p +z=}W9֙k$&/&-Mt\8X#`eRȩ JFIF``C + + +    C   `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?'д5k[Ik5;Ps" + ڴ LҩkC +l$l.B/2JW.PΥ>{6a=O]'ߵW;Likqsr|qjrZ5+,Yw6m`7w2׬ mNiH'f@-Gd`? }Sv|axEw^Լ7i TwVɧEq%1^o vF~$jIa?Kkhbd%hum39?!T9<.ccíIaokvOE%˺* q_W(<awZuMJ3PKDmvYd|)2`[ }?mwh>{6|m=궰Y7$y.mUy$q瀬C_ğtYm/?Q01҈(|8r=6|y3 no7'S[/fv{#)?n=rIo +j01IXv#*0$N9AuO? +3b_)]`HЇ^xcs8Oj; sQ?g+ 7{)TtW ~rWG22&srUc/zR.GIO%h٧o.B?f#o +-O<>I4MMc@K-"ǻќd?v#i=GٲHiw+ " O4[irVck|D|?s"X6@YSq/ð7^=KD0T؂ yv㯆Fm"},-5䒢3##çúX5{9RF, 5"PӤ JFIF``C + + +    C   `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ? EjI%Dy 6/>:|N+}k iO|Y0!u*/Ui #JM"ge._Nyt, a +U +h߀#16ڙW֞eX'W'gSMO?3X|cFߴ"D ~|/>?O*|qFys4oB,-v/jY?i? Syl=O$|/>$eduE_@ UW/H| _ܼFcYņq ohO8g\s{Q|/>?co|?Igwd|p#_BU(Α~N9{EyDүTSYUF1)IGCRm JFIF``C + + +    C   `" + ĵ}!1A21 +L31e!Catalog41  Qa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?w<7iy^p{TE.>?ZkCxG#jl8݌>@+oOҬ_{goxj W;TxcGAcFc~}u9߇n*BKv 95ɮѲ,1iaˮT܃J94h4@dh:tEkd:E;sڢ"'86BX3]XRڛRɕi^ėַV<}>ԕr0#`ʟ^/CnQo֌7om*k6v+ ?wiE[HcPHI |ԟzm6Kk+'Cֻjѡ9EuD?Z.%KY%m&%VʞiT.0[cco$XueIC`\1O~PFT|I.\UHI 7p]8: JXsTzߺ_zeĩuq +ɦ,ml>Tf}1rWDL@IC(aX+n2mxݏkW N֤vvcft2{nTuL]Q#N[HA/)!O?lO(uLjux_}n[.yi-x-/8 +Yҏ3~9?]ԒWPU(Nެo4QX=?O ]?O ](JJEPJJEUuMu .3?)kp? JFIF``C + + +    C   `"ā  + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?^[kSyg ¢ Z'x4$3q듎+H}Wū/`׮u=n>U}.01h^45HSU[ + +cM6#ףrʲu?4h!"xJkhMH 4cq м:t [fW>il) kϧ]YOҵDൽǥ4dX F×ڿgQ inգ4 +]xi.e&o2#grcQy +`b4G4O a?Ǔnwmsڲυ.'IcY/#ԐM Y6,3 #1 /β$ڟaOgos>W?$P{uߟX]Y5kB dh!@.@7NZK-6KKR̶X6 jpp w +m/l⻶n-eA,sŮGB20 s\'Tmdpc+t!l +X7tGŵk))d, +( ~4$/ĊQ5ρTuxF}6]J[nWv!P $P``>ϬfEathena-netscape-1.jpg>ϬfEathena-netscape-2.jpg(ϬfEauthor.gif(ϬfEbrowse.jpg*ϬfEbrowse2.jpg0ϬfEcorpauthor.gif0ϬfEcorpauthor.jpg$ϬfEdate.gif, ϬfEDrawing1.gif8 +ϬfEfinalLanguage1.jpg2 ϬfEfinalTitle1.jpg, ϬfEkeywords.gif* ϬfEsearch5.jpg* JFIF``C + + +    C   `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?^[kSyg ¢';xsg8PqIw=|cc>aJ7|GcqigldwlN j‹H1?m GxE0F7s\Zl B|UᄓX<%95^JXLrDM]8aݹJ)y#I|q1FĮ}F8›FG~TD,'fddH*_w4i0/ÍktZ[7W\>,V [8th? +G:( wP?/! (i?袀]'CHG.С_C?w #OB(;" RHdeu#lAb|)9 ZíLK/˗ `d2N2p;d( e #P<__:ׅt+KmoM^YdLX@I +( ٬fEsearch6.jpg*ϬfEsearch7. JFIF``C + + +    C   `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz5161"71p81 + + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?Rm&,༸7r +A5wQLoq +6Sjl<( [jڞ@,- F>c:`׌Uw( L1') #{%ntyPۭ^bu҉6N$&[fEm[lbfLay@2Q@ @ 1HV>za1'6HN6.[KᵌZqi,KΣ9( +8m4RI5OK4П(yx[yǬk "@IoaB1,ǘ07nOF2Q@ 2Efc:xfEхwd8"@r9޺eVcJ:Ao>z/$[x݈|PXd{ZQ~? ZPZ,,pD''$s@ [Ú Gj&"I;AF23>͇K%r7c%!&/ң.crB+$r-n|5{uENgRCI 8Mi[~ +mc߈ؤ2dDr_̅ pa4<Vr"i?"̅(6mĀJE&[]ZX+oވMYҝG˹^euA|O gDˎ=]6G֜ߵ7Ѽ;Cn H0q8ܼ/Pq j͞Yqid"3>zK'μq+&{o |DP0ov>W*]'g i7ZjbU VVF)V  k4ᮀg:~[͹'QFX+F^ko%1,cm.rVRz)y dJFIF``C + + +    C   `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?~oimY^ׂ`Qc&91 K/th$)&cX  N3' l7`189 cqڌ:;V)̟gYcdU+m/@jxI4BKm(cl2eH!N?o'RÓw o<6[g.NnFC@  x_:tދx.,纵ҵ 77HAX.៽,0KFmԬ,麔fVff%`m!3G,f22jr.oy4Q]RVa78|s` + OTu(m`YJH$a{sdFvwWtۺ'WxvnS?Q׶7K $jj̪02HNVAǎd*#rr3U=H:7sn5_r1eN 8b3AJEmi? ^qՌ~`&7X+?k889Q!9<-I?wwW zl߲i6ǎ)ͫˆ +70 +?eMo{xʼ&Aql (NJϹ/d_D? k}kwu/ 0\v "0`188bgy<{qzjV^Z+)]~s汧=GVa记.2x\%vH潳7kjv3_yFJD͜xaVTt{c{{Em?qZWYcg_4In'ʅwEU Ӂ77z#P +bt~UQR>ӯ9aG^sºL,?\&ؿwXOƏL,?\&ؿwXOƏL,?\&ؿwXOƼTt3Cuʷx]^BIZ#П½bt~Tl_ʀ>V?@ABCDEFGHIJQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?;&?i +x¾ 77$b[e"[0M\q^?g_>0̚_¯| uohwľ +Pٶs658.[{*gAnVxCgNnź$Q(Vk$+`(  |tߴ^ҿΟ x7 O7G3& ~Ś3Ѵł.{;opNDItVb&;'sg<N~ WEO _2y0ongOL<t?ٗ%ī^{?Zjo:]^F4qc9roǿ׌]#w^e't[n-q= Yv6(3r+_x_??iCφxVmi/喍m 7ʺ *pOC޽ᾀ4MOҏ +/~߮w_ڹ%Y_b[n/⪟?9[VT/m~ocľx_O xKm?A'^M_NkiIS~9^ǟ< H>eo')a +R3AsLSag[x(chAD +=4QJȃo;z5ִM\IOf߾Gr1w?irϥh.Y̫S9nC׳k_( ~*{ox{KOSS1{Ysa3Bѡ\mѧܱt5v>>$-ګ|W [z^ J]AerͼD98VQ0,|wtm\E_)r_EO߲k x-XW I9\c>ѿS?rtscm q*"'3?^fcEZ2ʎ~? +?S+~ L]z? [woQS?r/gн ?+7Om7oW ?៼B7Gor# EL3$Ugн W˞o_O%%mC>$-ڛ !xn ?2i\,Ѱ\PGrF]whtop.gif(ϬfESeries.gif* JFIF``C + + +    C   91022 +`" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ? Y4:;?KBqѭP+c"Y`HUֵE/; (8R'^5 4/ -ޭmjsk6nMsO>OM҉t!Be+(bHCFԵКRq1_*Aucqmjsh?7D* + ăºC2&E*;T7(9޺]}EFOa,s $boCZV˷Z7Z-*d =xZQ|9YͻtR`7^kPG֡??Ʃb k:{E*^+Fq=4TiO: -|6!v`Ru=O8OCZZik}X>'k%YyXYm'9ֽ85K}sEaq$1 >mjsj CXk oH10 }*NIFx- JFIF``C + + +    C   `" + ĵ}!1AQa"q2#BR$3br +%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz + ĵw!1AQaq"2B #3Rbr +$4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz ?&д-5=8>ԓo$¿{L u_ӯ5_Z[Xj/5 q +tA&m#xVw(T֣8W:^͵Dvy$18:-³ᑶڶ` 0s=K+at˻u-$lTdx9k_ 5 X;Rl RSJ<, ޿˙2>2@<0ZN84'1kku +؛P0$NkI%Ok9Y9}4 +G%̒C%6Dt.AdN;r8wg׆ 2\tE'<% fI-g, /?&qhm_](f^{ܒcl FCK6Is8b2=M_z })kH` +h9S|-jP8E)F #A{{{ P9^N8(&{{y$w x?A͝ e҅Çl7> T7VH-<c eJ-J +NH= B"!4)4ijҫ~yxa(QNMT8ɷxYM*V + @տMIEyܫA ? ??7!'EW`MI ? ?(v[M9W`MI ? ?(v[MVg˦ݣ^eZ'yI|ϬfEsponsor.gif \ No newline at end of file diff -Naur dspace-1.2-source-devel/jsp/home.jsp dspace-1.2-source-devel/multi/home.jsp --- dspace-1.2-source-devel/jsp/home.jsp 2004-04-19 15:12:36.000000000 -0200 +++ dspace-1.2-source-devel/multi/home.jsp 2004-12-10 12:02:10.000000000 -0200 @@ -1,111 +1,124 @@ -<%-- - - home.jsp - - - - Version: $Revision: 1.12 $ - - - - Date: $Date: 2004/04/19 18:12:36 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Home page JSP - - - - Attributes: - - communities - Community[] all communities in DSpace - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.io.File" %> - -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.core.ConfigurationManager" %> -<%@ page import="org.dspace.core.Constants" %> - -<% - Community[] communities = (Community[]) request.getAttribute("communities"); - - String topNews = ConfigurationManager.readNewsFile(Constants.NEWS_TOP); - String sideNews = ConfigurationManager.readNewsFile(Constants.NEWS_SIDE); - -%> - - - - - - - -
        <%= topNews %>
        - -
        - -

        - - - - -
        -

        Search

        -

        Enter some text in the box below to search DSpace.

        -

         

        -
        - - - - - - -
        -

        Communities in DSpace

        -

        Select a community to browse its collections.

        - -<% - for (int i = 0; i < communities.length; i++) - { -%> - - -<% - } -%> -
        - <%= communities[i].getMetadata("name") %> -
        -
        - - <%= sideNews %> - +<%-- + - home.jsp + - + - Version: $Revision: 1.12 $ + - + - Date: $Date: 2004/04/19 18:12:36 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Home page JSP + - + - Attributes: + - communities - Community[] all communities in DSpace + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.io.File" %> + +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.core.ConfigurationManager" %> +<%@ page import="org.dspace.core.Constants" %> + +<% + Community[] communities = (Community[]) request.getAttribute("communities"); + + String topNews = ConfigurationManager.readNewsFile(Constants.NEWS_TOP); + String sideNews = ConfigurationManager.readNewsFile(Constants.NEWS_SIDE); + +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="home.title"/> + + + +
        + + + + +
        +

        +

        +

         ">

        +
        +
        + + + + + +
        +

        +

        + +<% + for (int i = 0; i < communities.length; i++) + { +%> + + +<% + } +%> +
        + <%= communities[i].getMetadata("name") %> +
        +
        + + <%= sideNews %> +
        diff -Naur dspace-1.2-source-devel/jsp/layout/footer-default.jsp dspace-1.2-source-devel/multi/layout/footer-default.jsp --- dspace-1.2-source-devel/jsp/layout/footer-default.jsp 2004-04-09 14:28:46.000000000 -0200 +++ dspace-1.2-source-devel/multi/layout/footer-default.jsp 2005-01-11 14:27:37.000000000 -0200 @@ -41,7 +41,13 @@ <%-- - Footer for home page --%> - + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored="false" %> <%@ page import="java.net.URLEncoder" %> <%@ page import="org.dspace.app.webui.util.UIUtil" %> @@ -58,16 +64,23 @@ <%-- Right-hand side bar if appropriate --%> -<% - if (sidebar != null) - { -%> - - <%= sidebar %> - -<% - } -%> + +<% + if (sidebar != null) + { +%> + + +<% if (!sidebar.trim().equals("")) { +%> + <%= sidebar %> +<% + } else { +%> + +<% } %> + +<% } %> <%-- Page footer --%> @@ -81,8 +94,14 @@ - DSpace Software Copyright © 2002-2004 MIT and Hewlett-Packard - - Feedback + <%-- Based on  Powered By: DSpace --%> +  Powered By: DSpace + + + <%-- Copyright © 2004 University of Patras and HPCLab - --%> + Copyright © 2004   HPCLab - + <%-- Feedback --%> + <%-- nowrap, valign for broken NS 4.x --%> @@ -93,3 +112,5 @@ + + diff -Naur dspace-1.2-source-devel/jsp/layout/header-default.jsp dspace-1.2-source-devel/multi/layout/header-default.jsp --- dspace-1.2-source-devel/jsp/layout/header-default.jsp 2004-04-09 14:28:46.000000000 -0200 +++ dspace-1.2-source-devel/multi/layout/header-default.jsp 2005-03-09 10:49:59.000000000 -0200 @@ -42,11 +42,23 @@ - HTML header for main home page --%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> +<%@ page isELIgnored ="false" %> <%@ page import="java.util.List"%> +<%@ page import="java.util.Enumeration"%> <%@ page import="org.dspace.app.webui.util.JSPManager" %> <%@ page import="org.dspace.core.ConfigurationManager" %> +<%@ page import="javax.servlet.jsp.jstl.core.*" %> +<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> + + +<%@ page contentType="text/html;charset=UTF-8" %> <% String title = (String) request.getAttribute("dspace.layout.title"); @@ -59,7 +71,7 @@ - <%= siteName %>: <%= title %> + @@ -74,6 +86,55 @@ <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> + + <%-- re-post variables on language change --%> + + + + <% + String appScope = request.getRequestURI(); + boolean doPost = true; + + //Cannot change language in /admin and /tools contexts + String onClickSubmit = "document.repost.submit();"; + String linkClass = "class = \"langChangeOn\""; + + if (!appScope.equals("/dspace/dspace-admin/") ){ + if ((appScope.indexOf("/dspace/dspace-admin/")>-1) || (appScope.indexOf("/dspace/tools/")>-1) || (appScope.indexOf("/dspace/submit/")>-1)){ + doPost = false; + onClickSubmit = ""; + linkClass = "class = \"langChangeOff\""; + } + } + %> + + <% + + Enumeration postdata = request.getParameterNames(); + + + while (postdata.hasMoreElements() && doPost) { + String param = (String) postdata.nextElement(); + if (!param.equals("locale")) { + %> + + <% } + out.print("\n"); + } + %> + + + + <%-- Manage Query String for localization --%> + + <% String query = request.getQueryString(); + if (query!=null) { + int locindex = query.lastIndexOf("&locale="); + if (locindex > -1) query = query.substring(0, locindex); + } + else query = ""; + %> + <%-- DSpace logo --%> <%-- Blue stripe --%> + + +
        @@ -88,8 +149,19 @@
         
        onClick="javascript:document.repost.locale.value='el'; <%=onClickSubmit%>">Ελληνικά   onClick="javascript:document.repost.locale.value='en'; <%=onClickSubmit%>">English 
        + <%-- Localization --%> + + + + + + + <%-- Page contents --%> <%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> @@ -125,4 +197,3 @@ <% } %> - diff -Naur dspace-1.2-source-devel/jsp/layout/items-by-author.jsp dspace-1.2-source-devel/multi/layout/items-by-author.jsp --- dspace-1.2-source-devel/jsp/layout/items-by-author.jsp 1969-12-31 22:00:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/layout/items-by-author.jsp 2004-12-10 09:53:28.000000000 -0200 @@ -0,0 +1,180 @@ +<%-- + - items_by_author.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/03/23 19:22:29 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display items by a particular author + - + - Attributes to pass in: + - + - community - pass in if the scope of the browse is a community, or + - a collection within this community + - collection - pass in if the scope of the browse is a collection + - browse.info - the BrowseInfo containing the items to display + - author - The name of the author + - sort.by.date - Boolean. if true, we're sorting by date, otherwise by + - title. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.net.URLEncoder" %> + +<%@ page import="org.dspace.browse.BrowseInfo" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.Utils" %> + +<% + Collection collection = (Collection) request.getAttribute("collection"); + Community community = (Community) request.getAttribute("community"); + BrowseInfo browseInfo = (BrowseInfo) request.getAttribute("browse.info" ); + String author = (String) request.getAttribute("author"); + boolean orderByTitle = ((Boolean) request.getAttribute("order.by.title")).booleanValue(); + String pageTitle = "Items for Author " + author; + +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="items-by-author.title"/> <%= author %> + + + + + + + + + <% + + // Description of what the user is actually browsing + if (collection != null) + { + + pageContext.setAttribute("scopeName", collection.getMetadata("name")); %> + + + + + "" + <% + + } + else if (community != null) + { + pageContext.setAttribute("scopeName", community.getMetadata("name")); %> + + + + + "" + <% + + } + + %> + + + <%--

        Items for Author "<%= Utils.addEntities(author) %>" in <%= scopeName %>

        --%> +

        "<%= Utils.addEntities(author) %>"

        + + <%-- Sorting controls --%> + + + + + + + + + +
        + <%-- Return to Browse by Author --%> + +
        +<% + if (orderByTitle) + { +%> + <%-- Sorting by Title --%> + + + <%-- Sort by Date --%> + +<% + } + else + { +%> + <%-- Sort by Title --%> + + + <%-- Sorting by Date --%> + +<% + } +%> +
        + + <%--

        Showing <%= browseInfo.getResultCount() %> items.

        --%> +

        <%= browseInfo.getResultCount() %>

        + + + <%-- The items --%> +<% + String emphColumn = (orderByTitle ? "title" : "date"); +%> + + + +
        diff -Naur dspace-1.2-source-devel/jsp/layout/location-bar.jsp dspace-1.2-source-devel/multi/layout/location-bar.jsp --- dspace-1.2-source-devel/jsp/layout/location-bar.jsp 2002-11-01 15:59:16.000000000 -0200 +++ dspace-1.2-source-devel/multi/layout/location-bar.jsp 2004-10-20 10:01:00.000000000 -0200 @@ -53,6 +53,11 @@ - for non-links --%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + <%@ page import="java.util.List" %>

        @@ -66,23 +71,24 @@ String u = (String) parentLinks.get(i); // New line for each breadcrumb (no
        needed for first) - if (i > 0) - { -%>
        <% - } + if (i == 0) { + if (u.equals("")) {%>  > <%} else { + %>  > + <% }} else { + + %>
        <% + if (u.equals("")) { -%> -<%= s %> > -<% + out.print(s+" >"); } else { -%> -<%= s %> > -<% + +%> <%= s %> > <% } + } } %> -

        +

        \ No newline at end of file diff -Naur dspace-1.2-source-devel/jsp/layout/navbar-admin.jsp dspace-1.2-source-devel/multi/layout/navbar-admin.jsp --- dspace-1.2-source-devel/jsp/layout/navbar-admin.jsp 2004-06-08 16:01:30.000000000 -0200 +++ dspace-1.2-source-devel/multi/layout/navbar-admin.jsp 2005-02-01 14:44:21.000000000 -0200 @@ -1,136 +1,163 @@ -<%-- - - navbar-admin.jsp - - - - Version: $Revision: 1.11 $ - - - - Date: $Date: 2004/06/08 19:01:29 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Navigation bar for admin pages - --%> - -<%@ page import="java.util.LinkedList" %> -<%@ page import="java.util.List" %> - -<%@ page import="org.dspace.app.webui.util.UIUtil" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - // Build up lists of menu item labels and links - List labels = new LinkedList(); - List links = new LinkedList(); - - labels.add("Communities/
        Collections"); - links.add("/dspace-admin/edit-communities"); - - labels.add("E-people"); - links.add("/dspace-admin/edit-epeople"); - - labels.add("Groups"); - links.add("/tools/group-edit"); - - labels.add("Items"); - links.add("/tools/edit-item"); - - labels.add("Dublin Core
        Registry"); - links.add("/dspace-admin/dc-registry"); - - labels.add("Bitstream Format
        Registry"); - links.add("/dspace-admin/format-registry"); - - labels.add("Workflow"); - links.add("/dspace-admin/workflow"); - - labels.add("Authorization"); - links.add("/dspace-admin/authorize"); - - labels.add("Edit News"); - links.add("/dspace-admin/news-edit"); - - // Get the current page, minus query string - String currentPage = UIUtil.getOriginalURL(request); - int c = currentPage.indexOf( '?' ); - if( c > -1 ) - { - currentPage = currentPage.substring(0, c); - } -%> - -<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> - -<% - for (int i = 0; i < labels.size(); i++) - { - String s = (String) labels.get(i); - String l = (String) links.get(i); - - // Use "highlit" arrow if label corresponds to current page - String image = (currentPage.endsWith(l) ? "arrow-highlight" : "arrow"); -%> - - - - -<% - } -%> - - - - - - - - - - - - - -
         
        +<%-- + - navbar-admin.jsp + - + - Version: $Revision: 1.11 $ + - + - Date: $Date: 2004/06/08 19:01:29 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Navigation bar for admin pages + --%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="java.util.LinkedList" %> +<%@ page import="java.util.List" %> + +<%@ page import="org.dspace.app.webui.util.UIUtil" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page isELIgnored ="false" %> + +<% + // Build up lists of menu item labels and links + List labels = new LinkedList(); + List links = new LinkedList(); + + //labels.add("Communities/
        Collections"); + labels.add("navbar-admin.menu0"); + links.add("/dspace-admin/edit-communities"); + + //labels.add("E-people"); + labels.add("navbar-admin.menu1"); + links.add("/dspace-admin/edit-epeople"); + + //labels.add("Groups"); + labels.add("navbar-admin.menu2"); + links.add("/tools/group-edit"); + + //labels.add("Items"); + labels.add("navbar-admin.menu3"); + links.add("/tools/edit-item"); + + //labels.add("Dublin Core
        Registry"); + labels.add("navbar-admin.menu4"); + links.add("/dspace-admin/dc-registry"); + + //labels.add("Dublin Core
        Registry"); + labels.add("navbar-admin.menu5"); + links.add("/dspace-admin/format-registry"); + + //labels.add("Workflow"); + labels.add("navbar-admin.menu6"); + links.add("/dspace-admin/workflow"); + + //labels.add("Authorization"); + labels.add("navbar-admin.menu7"); + links.add("/dspace-admin/authorize"); + + //labels.add("Edit News"); + labels.add("navbar-admin.menu8"); + links.add("/dspace-admin/news-edit"); + + // Get the current page, minus query string + String currentPage = UIUtil.getOriginalURL(request); + int c = currentPage.indexOf( '?' ); + if( c > -1 ) + { + currentPage = currentPage.substring(0, c); + } +%> + +<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> + +<% + for (int i = 0; i < labels.size(); i++) + { + String s = (String) labels.get(i); + String l = (String) links.get(i); + + // Use "highlit" arrow if label corresponds to current page + String image = (currentPage.endsWith(l) ? "arrow-highlight" : "arrow"); +%> + + + + +<% + } +%> + + + + + + + + + + + + + +
         
        diff -Naur dspace-1.2-source-devel/jsp/layout/navbar-default.jsp dspace-1.2-source-devel/multi/layout/navbar-default.jsp --- dspace-1.2-source-devel/jsp/layout/navbar-default.jsp 2004-06-02 17:39:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/layout/navbar-default.jsp 2005-02-01 14:24:32.000000000 -0200 @@ -1,224 +1,238 @@ -<%-- - - navbar-default.jsp - - - - Version: $Revision: 1.12 $ - - - - Date: $Date: 2004/06/02 20:39:13 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Default navigation bar - --%> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.util.ArrayList" %> -<%@ page import="java.util.List" %> -<%@ page import="org.dspace.app.webui.util.UIUtil" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - // Is anyone logged in? - EPerson user = (EPerson) request.getAttribute("dspace.current.user"); - - // Get the current page, minus query string - String currentPage = UIUtil.getOriginalURL(request); - int c = currentPage.indexOf( '?' ); - if( c > -1 ) - { - currentPage = currentPage.substring( 0, c ); - } - - // E-mail may have to be truncated - String navbarEmail = null; - - if (user != null) - { - navbarEmail = user.getEmail(); - if (navbarEmail.length() > 18) - { - navbarEmail = navbarEmail.substring(0, 17) + "..."; - } - } -%> - -<%-- Search Box --%> -
        - -<% - if (user != null) - { -%> -

        Logged in as <%= navbarEmail %> - (Logout)

        -<% - } -%> - - - - - - -
        - -<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         
         
         
        +<%-- + - navbar-default.jsp + - + - Version: $Revision: 1.12 $ + - + - Date: $Date: 2004/06/02 20:39:13 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Default navigation bar + --%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="java.util.ArrayList" %> +<%@ page import="java.util.List" %> +<%@ page import="org.dspace.app.webui.util.UIUtil" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + // Is anyone logged in? + EPerson user = (EPerson) request.getAttribute("dspace.current.user"); + + // Get the current page, minus query string + String currentPage = UIUtil.getOriginalURL(request); + int c = currentPage.indexOf( '?' ); + if( c > -1 ) + { + currentPage = currentPage.substring( 0, c ); + } + + // E-mail may have to be truncated + String navbarEmail = null; + + if (user != null) + { + navbarEmail = user.getEmail(); + if (navbarEmail.length() > 18) + { + navbarEmail = navbarEmail.substring(0, 17) + "..."; + } + } +%> + +<%-- Search Box --%> +
        + +<% + if (user != null) + { +%> +

        <%= navbarEmail %> + ()

        +<% + } +%> + + + + + + +
        + +<%-- HACK: width, border, cellspacing, cellpadding: for non-CSS compliant Netscape, Mozilla browsers --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
         
         
         
        diff -Naur dspace-1.2-source-devel/jsp/login/incorrect.jsp dspace-1.2-source-devel/multi/login/incorrect.jsp --- dspace-1.2-source-devel/jsp/login/incorrect.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/login/incorrect.jsp 2005-02-04 12:01:06.000000000 -0200 @@ -44,21 +44,44 @@ <%@ page contentType="text/html;charset=UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + <fmt:message key="general.title"/>: + <fmt:message key="incorrect.title"/> + + +
        -

        Log In to DSpace

        + <%--

        Log In to DSpace

        --%> +

        - Help... + <%-- Help... --%> + + + + + +
        -

        The e-mail address and password you supplied were not valid. Please try again, or have you forgotten your password?

        + <%--

        The e-mail address and password you supplied were not valid. Please try again, or have you forgotten your password?

        --%> +

        diff -Naur dspace-1.2-source-devel/jsp/login/logged-out.jsp dspace-1.2-source-devel/multi/login/logged-out.jsp --- dspace-1.2-source-devel/jsp/login/logged-out.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/login/logged-out.jsp 2004-11-23 09:02:31.000000000 -0200 @@ -44,11 +44,26 @@ <%@ page contentType="text/html;charset=UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> -

        Logged Out

        + + + <fmt:message key="general.title"/>: + <fmt:message key="logged-out.title"/> + + + + <%--

        Logged Out

        --%> +

        -

        Thank you for remembering to log out!

        -

        Go to DSpace Home

        + <%--

        Thank you for remembering to log out!

        --%> +

        + <%--

        Go to DSpace Home

        --%> +

        diff -Naur dspace-1.2-source-devel/jsp/login/not-in-records.jsp dspace-1.2-source-devel/multi/login/not-in-records.jsp --- dspace-1.2-source-devel/jsp/login/not-in-records.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/login/not-in-records.jsp 2004-11-23 09:02:50.000000000 -0200 @@ -45,15 +45,31 @@ <%@ page contentType="text/html;charset=UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> -

        No User Record Available

        + + + <fmt:message key="general.title"/>: + <fmt:message key="not-in-records.title"/> + + + + <%--

        No User Record Available

        --%> +

        -

        You have a valid Web certficate, but the DSpace system does not have a + <%--

        You have a valid Web certficate, but the DSpace system does not have a record of you. You will need to register with DSpace before using those areas of the system that - require a user account.

        + require a user account.

        --%> +

        +

        -

        Register with DSpace

        + <%--

        Register wth DSpace

        --%> +

        diff -Naur dspace-1.2-source-devel/jsp/login/no-valid-cert.jsp dspace-1.2-source-devel/multi/login/no-valid-cert.jsp --- dspace-1.2-source-devel/jsp/login/no-valid-cert.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/login/no-valid-cert.jsp 2005-02-04 12:03:24.000000000 -0200 @@ -1,64 +1,86 @@ -<%-- - - no-valid-cert.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Display message indicating no valid certificate was found - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - - - - - -
        -

        Log In to DSpace

        -
        - Help... -
        - -

        You do not seem to have a valid Web certificate. Please try again.

        - - -
        +<%-- + - no-valid-cert.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Display message indicating no valid certificate was found + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="no-valid-cert.title"/> + + + + + + + + +
        + <%--

        Log In to DSpace

        --%> +

        +
        + <%-- Help... --%> + + + + + + +
        + + <%--

        You do not seem to have a valid Web certificate. Please try again.

        --%> +

        + + +
        diff -Naur dspace-1.2-source-devel/jsp/login/password.jsp dspace-1.2-source-devel/multi/login/password.jsp --- dspace-1.2-source-devel/jsp/login/password.jsp 2004-03-06 18:24:20.000000000 -0200 +++ dspace-1.2-source-devel/multi/login/password.jsp 2005-02-04 12:07:13.000000000 -0200 @@ -44,16 +44,37 @@ <%@ page contentType="text/html;charset=UTF-8" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + <fmt:message key="general.title"/>: + <fmt:message key="password.title"/> + + +
        -

        Log In to DSpace

        + <%--

        Log In to DSpace

        --%> +

        - Help... + <%-- Help... --%> + + + + + +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/in-archive.jsp dspace-1.2-source-devel/multi/mydspace/in-archive.jsp --- dspace-1.2-source-devel/jsp/mydspace/in-archive.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/in-archive.jsp 2004-12-17 11:17:16.000000000 -0200 @@ -1,73 +1,94 @@ -<%-- - - in-archive.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Task completed message page - - - - Attributes: - - handle - Handle of the item that's just gone in the archive. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - String handle = (String) request.getAttribute("handle"); -%> - - - -

        Thank You

        - -

        The submission has been placed in the main archive. It has been assigned - the following identifier:

        - -

        <%= handle %>

        - -

        Notification has been sent to the appropriate people.

        - -

        - - Return to My DSpace - -

        - -
        +<%-- + - in-archive.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Task completed message page + - + - Attributes: + - handle - Handle of the item that's just gone in the archive. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + String handle = (String) request.getAttribute("handle"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="in-archive.parenttitle"/>: + <fmt:message key="in-archive.title"/> + + + + + <%--

        Thank You

        --%> +

        + + <%--

        The submission has been placed in the main archive. It has been assigned + the following identifier:

        --%> +

        + +

        <%= handle %>

        + + <%--

        Notification has been sent to the appropriate people.

        --%> +

        + +

        + + <%--Return to My DSpace--%> + + +

        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/main.jsp dspace-1.2-source-devel/multi/mydspace/main.jsp --- dspace-1.2-source-devel/jsp/mydspace/main.jsp 2004-03-23 00:10:02.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/main.jsp 2005-02-04 12:25:10.000000000 -0200 @@ -1,335 +1,384 @@ -<%-- - - main.jsp - - - - Version: $Revision: 1.11 $ - - - - Date: $Date: 2004/03/23 02:10:02 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Main My DSpace page - - - - - - Attributes: - - mydspace.user: current user (EPerson) - - workspace.items: WorkspaceItem[] array for this user - - workflow.items: WorkflowItem[] array of submissions from this user in - - workflow system - - workflow.owned: WorkflowItem[] array of tasks owned - - workflow.pooled WorkflowItem[] array of pooled tasks - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.DCDate" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.content.WorkspaceItem" %> -<%@ page import="org.dspace.core.Utils" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.workflow.WorkflowItem" %> -<%@ page import="org.dspace.workflow.WorkflowManager" %> - -<% - EPerson user = (EPerson) request.getAttribute("mydspace.user"); - - WorkspaceItem[] workspaceItems = - (WorkspaceItem[]) request.getAttribute("workspace.items"); - - WorkflowItem[] workflowItems = - (WorkflowItem[]) request.getAttribute("workflow.items"); - - WorkflowItem[] owned = - (WorkflowItem[]) request.getAttribute("workflow.owned"); - - WorkflowItem[] pooled = - (WorkflowItem[]) request.getAttribute("workflow.pooled"); -%> - - - - - - - - -
        -

        - My DSpace: <%= user.getFullName() %> -

        -
        - Help... -
        - -<%-- Task list: Only display if the user has any tasks --%> -<% - if (owned.length > 0) - { -%> -

        Owned Tasks

        - -

        - Below are the current tasks that you have chosen to do. -

        - - - - - - - - - - -<% - // even or odd row: Starts even since header row is odd (1). Toggled - // between "odd" and "even" so alternate rows are light and dark, for - // easier reading. - String row = "even"; - - for (int i = 0; i < owned.length; i++) - { - DCValue[] titleArray = - owned[i].getItem().getDC("title", null, Item.ANY); - String title = (titleArray.length > 0 ? titleArray[0].value - : "Untitled" ); - EPerson submitter = owned[i].getItem().getSubmitter(); -%> - - - - - - - - - - - - -<% - row = (row.equals("even") ? "odd" : "even" ); - } -%> -
        TaskItemSubmitted ToSubmitted By  
        -<% - switch (owned[i].getState()) - { - case WorkflowManager.WFSTATE_STEP1: %>Review Submission<% break; - case WorkflowManager.WFSTATE_STEP2: %>Check Submission<% break; - case WorkflowManager.WFSTATE_STEP3: %>Final Edit of Submission<% break; - } -%> - <%= Utils.addEntities(title) %><%= owned[i].getCollection().getMetadata("name") %><%= submitter.getFullName() %> - - - -
        -<% - } - - // Pooled tasks - only show if there are any - if (pooled.length > 0) - { -%> -

        Tasks in the Pool

        - -

        - Below are tasks in the task pool that have been assigned to you. -

        - - - - - - - - - -<% - // even or odd row: Starts even since header row is odd (1). Toggled - // between "odd" and "even" so alternate rows are light and dark, for - // easier reading. - String row = "even"; - - for (int i = 0; i < pooled.length; i++) - { - DCValue[] titleArray = - pooled[i].getItem().getDC("title", null, Item.ANY); - String title = (titleArray.length > 0 ? titleArray[0].value - : "Untitled"); - EPerson submitter = pooled[i].getItem().getSubmitter(); -%> - - - - - - - - - - - -<% - row = (row.equals("even") ? "odd" : "even"); - } -%> -
        TaskItemSubmitted ToSubmitted By 
        -<% - switch (pooled[i].getState()) - { - case WorkflowManager.WFSTATE_STEP1POOL: %>Review Submission<% break; - case WorkflowManager.WFSTATE_STEP2POOL: %>Check Submission<% break; - case WorkflowManager.WFSTATE_STEP3POOL: %>Final Edit of Submission<% break; - } -%> - <%= Utils.addEntities(title) %><%= pooled[i].getCollection().getMetadata("name") %><%= submitter.getFullName() %> - -
        -<% - } -%> - -
        - -
        - - - - - -
        - - - -
        -
        -
        - -

        See Your Subscriptions

        - -<% - // Display workspace items, if any - if (workspaceItems.length > 0) - { - // even or odd row: Starts even since header row is odd (1) - String row = "even"; -%> -

        Unfinished Submissions

        - - - - - - - - -<% - for (int i = 0; i < workspaceItems.length; i++) - { - DCValue[] titleArray = - workspaceItems[i].getItem().getDC("title", null, Item.ANY); - String title = (titleArray.length > 0 ? titleArray[0].value - : "Untitled"); -%> - - - - - - - - - - -<% - row = (row.equals("even") ? "odd" : "even" ); - } -%> -
        TitleSubmitted to  
        <%= Utils.addEntities(title) %> - <%= workspaceItems[i].getCollection().getMetadata("name") %> - - - - -
        -<% - } - - // Display workflow items, if any - if (workflowItems.length > 0) - { - // even or odd row: Starts even since header row is odd (1) - String row = "even"; -%> -

        Submissions In Workflow Process

        - - - - - - -<% - for (int i = 0; i < workflowItems.length; i++) - { - DCValue[] titleArray = - workflowItems[i].getItem().getDC("title", null, Item.ANY); - String title = (titleArray.length > 0 ? titleArray[0].value - : "Untitled" ); -%> - - - - - - - - -<% - row = (row.equals("even") ? "odd" : "even" ); - } -%> -
        TitleSubmitted to
        <%= Utils.addEntities(title) %> - <%= workflowItems[i].getCollection().getMetadata("name") %> -
        -<% - } -%> -
        +<%-- + - main.jsp + - + - Version: $Revision: 1.11 $ + - + - Date: $Date: 2004/03/23 02:10:02 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Main My DSpace page + - + - + - Attributes: + - mydspace.user: current user (EPerson) + - workspace.items: WorkspaceItem[] array for this user + - workflow.items: WorkflowItem[] array of submissions from this user in + - workflow system + - workflow.owned: WorkflowItem[] array of tasks owned + - workflow.pooled WorkflowItem[] array of pooled tasks + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.DCDate" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.content.WorkspaceItem" %> +<%@ page import="org.dspace.core.Utils" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.workflow.WorkflowItem" %> +<%@ page import="org.dspace.workflow.WorkflowManager" %> + +<% + EPerson user = (EPerson) request.getAttribute("mydspace.user"); + + WorkspaceItem[] workspaceItems = + (WorkspaceItem[]) request.getAttribute("workspace.items"); + + WorkflowItem[] workflowItems = + (WorkflowItem[]) request.getAttribute("workflow.items"); + + WorkflowItem[] owned = + (WorkflowItem[]) request.getAttribute("workflow.owned"); + + WorkflowItem[] pooled = + (WorkflowItem[]) request.getAttribute("workflow.pooled"); +%> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="main.title"/> + + + + + + + + + +
        +

        + <%-- My DSpace: <%= user.getFullName() %> --%> + : <%= user.getFullName() %> +

        +
        + <%-- Help... --%> + + + + + + +
        + +<%-- Task list: Only display if the user has any tasks --%> +<% + if (owned.length > 0) + { +%> + <%--

        Owned Tasks

        --%> +

        + +

        + <%-- Below are the current tasks that you have chosen to do. --%> + +

        + + + + <%-- + + + --%> + + + + + + + +<% + // even or odd row: Starts even since header row is odd (1). Toggled + // between "odd" and "even" so alternate rows are light and dark, for + // easier reading. + String row = "even"; + + for (int i = 0; i < owned.length; i++) + { + DCValue[] titleArray = + owned[i].getItem().getDC("title", null, Item.ANY); + String title = (titleArray.length > 0 ? titleArray[0].value + : "Untitled" ); + EPerson submitter = owned[i].getItem().getSubmitter(); +%> + + + + + + + + + + + + +<% + row = (row.equals("even") ? "odd" : "even" ); + } +%> +
        TaskItemSubmitted ToSubmitted By  
        +<% + switch (owned[i].getState()) + { + + //There was once some code... + case WorkflowManager.WFSTATE_STEP1: %><% break; + case WorkflowManager.WFSTATE_STEP2: %><% break; + case WorkflowManager.WFSTATE_STEP3: %><% break; + } +%> + <%= Utils.addEntities(title) %><%= owned[i].getCollection().getMetadata("name") %><%= submitter.getFullName() %> + <%-- --%> + "> + + <%-- --%> + "> +
        +<% + } + + // Pooled tasks - only show if there are any + if (pooled.length > 0) + { +%> + <%--

        Tasks in the Pool

        --%> +

        + +

        + <%--Below are tasks in the task pool that have been assigned to you. --%> + +

        + + + + <%-- + + + --%> + + + + + +<% + // even or odd row: Starts even since header row is odd (1). Toggled + // between "odd" and "even" so alternate rows are light and dark, for + // easier reading. + String row = "even"; + + for (int i = 0; i < pooled.length; i++) + { + DCValue[] titleArray = + pooled[i].getItem().getDC("title", null, Item.ANY); + String title = (titleArray.length > 0 ? titleArray[0].value + : "Untitled"); + EPerson submitter = pooled[i].getItem().getSubmitter(); +%> + + + + + + + + + + + +<% + row = (row.equals("even") ? "odd" : "even"); + } +%> +
        TaskItemSubmitted ToSubmitted By
        +<% + switch (pooled[i].getState()) + { + case WorkflowManager.WFSTATE_STEP1POOL: %><% break; + case WorkflowManager.WFSTATE_STEP2POOL: %><% break; + case WorkflowManager.WFSTATE_STEP3POOL: %><% break; + } +%> + <%= Utils.addEntities(title) %><%= pooled[i].getCollection().getMetadata("name") %><%= submitter.getFullName() %> + <%-- --%> + "> +
        +<% + } +%> + +
        + +
        + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        + + <%--

        See Your Subscriptions

        --%> +

        + +<% + // Display workspace items, if any + if (workspaceItems.length > 0) + { + // even or odd row: Starts even since header row is odd (1) + String row = "even"; +%> + <%--

        Unfinished Submissions

        --%> +

        + + + + <%-- + --%> + + + + + +<% + for (int i = 0; i < workspaceItems.length; i++) + { + DCValue[] titleArray = + workspaceItems[i].getItem().getDC("title", null, Item.ANY); + String title = (titleArray.length > 0 ? titleArray[0].value + : "Untitled"); +%> + + + + + + + + + + +<% + row = (row.equals("even") ? "odd" : "even" ); + } +%> +
        TitleSubmitted to  
        <%= Utils.addEntities(title) %> + <%= workspaceItems[i].getCollection().getMetadata("name") %> + + <%-- --%> + "> + + <%-- --%> + "> +
        +<% + } + + // Display workflow items, if any + if (workflowItems.length > 0) + { + // even or odd row: Starts even since header row is odd (1) + String row = "even"; +%> + <%--

        Submissions In Workflow Process

        --%> +

        + + + + <%-- + --%> + + + +<% + for (int i = 0; i < workflowItems.length; i++) + { + DCValue[] titleArray = + workflowItems[i].getItem().getDC("title", null, Item.ANY); + String title = (titleArray.length > 0 ? titleArray[0].value + : "Untitled" ); +%> + + + + + + + + +<% + row = (row.equals("even") ? "odd" : "even" ); + } +%> +
        TitleSubmitted to
        <%= Utils.addEntities(title) %> + <%= workflowItems[i].getCollection().getMetadata("name") %> +
        +<% + } +%> +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/own-submissions.jsp dspace-1.2-source-devel/multi/mydspace/own-submissions.jsp --- dspace-1.2-source-devel/jsp/mydspace/own-submissions.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/own-submissions.jsp 2004-12-17 11:16:26.000000000 -0200 @@ -1,99 +1,122 @@ -<%-- - - own-submissions.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show user's previous (accepted) submissions - - - - Attributes to pass in: - - user - the e-person who's submissions these are (EPerson) - - items - the submissions themselves (Item[]) - - handles - Corresponding Handles (String[]) - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson eperson = (EPerson) request.getAttribute("user"); - Item[] items = (Item[]) request.getAttribute("items"); -%> - - - -

        Your Submissions

        - -<% - if (items.length == 0) - { -%> -

        There are no items in the main archive that have been submitted by you.

        -<% - } - else - { -%> -

        Below are listed your previous submissions that have been accepted into - the archive.

        -<% - if (items.length == 1) - { -%> -

        There is 1 item in the main archive that was submitted by you.

        -<% - } - else - { -%> -

        There are <%= items.length %> items in the main archive that were submitted by you.

        -<% - } -%> - -<% - } -%> - -

        Back to My DSpace

        - -
        +<%-- + - own-submissions.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show user's previous (accepted) submissions + - + - Attributes to pass in: + - user - the e-person who's submissions these are (EPerson) + - items - the submissions themselves (Item[]) + - handles - Corresponding Handles (String[]) + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson eperson = (EPerson) request.getAttribute("user"); + Item[] items = (Item[]) request.getAttribute("items"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="own-submissions.parenttitle"/>: + <fmt:message key="own-submissions.title"/> + + + + + <%--

        Your Submissions

        --%> +

        + +<% + if (items.length == 0) + { +%> + <%--

        There are no items in the main archive that have been submitted by you.

        --%> +

        +<% + } + else + { +%> + <%--

        Below are listed your previous submissions that have been accepted into + the archive.

        --%> +

        +<% + if (items.length == 1) + { +%> + <%--

        There is 1 item in the main archive that was submitted by you.

        --%> +

        +<% + } + else + { +%> + <%--

        There are <%= items.length %> items in the main archive that were submitted by you.

        --%> +

        <%= items.length %>

        +<% + } +%> + +<% + } +%> + + <%--

        Back to My DSpace

        --%> +

        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/perform-task.jsp dspace-1.2-source-devel/multi/mydspace/perform-task.jsp --- dspace-1.2-source-devel/jsp/mydspace/perform-task.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/perform-task.jsp 2004-12-17 11:15:16.000000000 -0200 @@ -1,205 +1,241 @@ -<%-- - - perform-task.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Perform task page - - - - Attributes: - - workflow.item: The workflow item for the task being performed - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.workflow.WorkflowItem" %> -<%@ page import="org.dspace.workflow.WorkflowManager" %> - -<% - WorkflowItem workflowItem = - (WorkflowItem) request.getAttribute("workflow.item"); - - Collection collection = workflowItem.getCollection(); - Item item = workflowItem.getItem(); -%> - - - -

        Perform Task

        - -<% - if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1) - { -%> -

        The following item has been submitted to collection <%= collection.getMetadata("name") %>. - Please review the item, check that it meets the criteria for entry into - the collection. After reviewing the item, please approve or reject the - item using the controls at the bottom of the page.

        -<% - } - else if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP2) - { -%> -

        The following item has been submitted to collection <%= collection.getMetadata("name") %>. - Please review the item, check that it meets the criteria for entry into - the collection. After reviewing the item, you may edit the metadata with the - item, and then approve or reject the item using the controls at the bottom of - the page.

        -<% - } - else if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP3) - { -%> -

        The following item has been accepted for inclusion in collection - <%= collection.getMetadata("name") %>. Please perform any - necessary edits of the metadata to conform with the standards of the collection, - and then commit the item to the archive using the controls at the bottom - of the page.

        -<% - } -%> - - - -

         

        - -
        - - - -<% - String row = "odd"; - - if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1 || - workflowItem.getState() == WorkflowManager.WFSTATE_STEP2) - { -%> - - - - -<% - } - else - { - // Must be an editor (step 3) -%> - - - - -<% - } - row = "even"; - - if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1 || - workflowItem.getState() == WorkflowManager.WFSTATE_STEP2) - { -%> - - - - -<% - row = ( row.equals( "odd" ) ? "even" : "odd" ); - } - - if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP2 || - workflowItem.getState() == WorkflowManager.WFSTATE_STEP3) - { -%> - - - - -<% - row = (row.equals( "odd" ) ? "even" : "odd"); - } -%> - - - - -<% - row = (row.equals( "odd" ) ? "even" : "odd"); -%> - - - - -
        - If you have reviewed the item and it is suitable for inclusion in the collection, select "Approve". - - -
        - Once you've edited the item, use this option to commit the - item to the archive. - - -
        - If you have reviewed the item and found it is not suitable - for inclusion in the collection, select "Reject". You will then be asked - to enter a message indicating why the item is unsuitable, and whether the - submitter should change something and re-submit. - - -
        - Select this option to correct, amend or otherwise edit the item's metadata. - - -
        - If you wish to leave this task for now, and return to your "My DSpace", use this option. - - -
        - To return the task to the pool so that another user can perform the task, use this option. - - -
        -
        -
        +<%-- + - perform-task.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Perform task page + - + - Attributes: + - workflow.item: The workflow item for the task being performed + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.workflow.WorkflowItem" %> +<%@ page import="org.dspace.workflow.WorkflowManager" %> + +<% + WorkflowItem workflowItem = + (WorkflowItem) request.getAttribute("workflow.item"); + + Collection collection = workflowItem.getCollection(); + Item item = workflowItem.getItem(); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="perform-task.parenttitle"/>: + <fmt:message key="perform-task.title"/> + + + + + <%--

        Perform Task

        --%> +

        + +<% + if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1) + { +%> + <%--

        The following item has been submitted to collection <%= collection.getMetadata("name") %>. + Please review the item, check that it meets the criteria for entry into + the collection. After reviewing the item, please approve or reject the + item using the controls at the bottom of the page.

        --%> +

        <%= collection.getMetadata("name") %> + .

        +<% + } + else if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP2) + { +%> + <%--

        The following item has been submitted to collection <%= collection.getMetadata("name") %>. + Please review the item, check that it meets the criteria for entry into + the collection. After reviewing the item, you may edit the metadata with the + item, and then approve or reject the item using the controls at the bottom of + the page.

        --%> +

        <%= collection.getMetadata("name") %> + .

        +<% + } + else if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP3) + { +%> + <%--

        The following item has been accepted for inclusion in collection + <%= collection.getMetadata("name") %>. Please perform any + necessary edits of the metadata to conform with the standards of the collection, + and then commit the item to the archive using the controls at the bottom + of the page.

        --%> +

        + <%= collection.getMetadata("name") %>.

        +<% + } +%> + + + +

         

        + +
        + + + +<% + String row = "odd"; + + if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1 || + workflowItem.getState() == WorkflowManager.WFSTATE_STEP2) + { +%> + + + + +<% + } + else + { + // Must be an editor (step 3) +%> + + + + +<% + } + row = "even"; + + if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1 || + workflowItem.getState() == WorkflowManager.WFSTATE_STEP2) + { +%> + + + + +<% + row = ( row.equals( "odd" ) ? "even" : "odd" ); + } + + if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP2 || + workflowItem.getState() == WorkflowManager.WFSTATE_STEP3) + { +%> + + + + +<% + row = (row.equals( "odd" ) ? "even" : "odd"); + } +%> + + + + +<% + row = (row.equals( "odd" ) ? "even" : "odd"); +%> + + + + +
        + <%-- If you have reviewed the item and it is suitable for inclusion in the collection, select "Approve". --%> + + + <%-- --%> + "> +
        + <%-- Once you've edited the item, use this option to commit the + item to the archive. --%> + + + <%-- --%> + "> +
        + <%-- If you have reviewed the item and found it is not suitable + for inclusion in the collection, select "Reject". You will then be asked + to enter a message indicating why the item is unsuitable, and whether the + submitter should change something and re-submit. --%> + + + <%-- --%> + "/> +
        + <%-- Select this option to correct, amend or otherwise edit the item's metadata. --%> + + + <%-- --%> + " /> +
        + <%-- If you wish to leave this task for now, and return to your "My DSpace", use this option. --%> + + + <%-- --%> + " /> +
        + <%-- To return the task to the pool so that another user can perform the task, use this option. --%> + + + <%-- --%> + " /> +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/preview-task.jsp dspace-1.2-source-devel/multi/mydspace/preview-task.jsp --- dspace-1.2-source-devel/jsp/mydspace/preview-task.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/preview-task.jsp 2004-12-17 11:14:21.000000000 -0200 @@ -1,117 +1,143 @@ -<%-- - - preview-task.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Preview task page - - - - workflow.item: The workflow item for the task they're performing - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.workflow.WorkflowItem" %> -<%@ page import="org.dspace.workflow.WorkflowManager" %> - -<% - WorkflowItem workflowItem = - (WorkflowItem) request.getAttribute("workflow.item"); - - Collection collection = workflowItem.getCollection(); - Item item = workflowItem.getItem(); -%> - - - -

        Preview Task

        - -<% - if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1POOL) - { -%> -

        The following item has been submitted to collection - <%= collection.getMetadata("name") %>. In order to - accept the task of reviewing this item, please click "Accept This Task" below.

        -<% - } - else if(workflowItem.getState() == WorkflowManager.WFSTATE_STEP2POOL) - { -%> -

        The following item has been submitted to collection - <%= collection.getMetadata("name") %>. In order to - accept the task of checking this item, please click "Accept This Task" below.

        -<% - } - else if(workflowItem.getState() == WorkflowManager.WFSTATE_STEP3POOL) - { -%> -

        The following item has been accepted for inclusion in collection - <%= collection.getMetadata("name") %>. In order to - accept the task of the final edit of this item, please click "Accept This Task" below.

        -<% - } -%> - - - -
        - - - - - - - -
        - - - -
        -
        -
        +<%-- + - preview-task.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Preview task page + - + - workflow.item: The workflow item for the task they're performing + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.workflow.WorkflowItem" %> +<%@ page import="org.dspace.workflow.WorkflowManager" %> + +<% + WorkflowItem workflowItem = + (WorkflowItem) request.getAttribute("workflow.item"); + + Collection collection = workflowItem.getCollection(); + Item item = workflowItem.getItem(); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="preview-task.parenttitle"/>: + <fmt:message key="preview-task.title"/> + + + + + <%--

        Preview Task

        --%> +

        + +<% + if (workflowItem.getState() == WorkflowManager.WFSTATE_STEP1POOL) + { +%> + <%--

        The following item has been submitted to collection + <%= collection.getMetadata("name") %>. In order to + accept the task of reviewing this item, please click "Accept This Task" below.

        --%> +

        + <%= collection.getMetadata("name") %>.

        +<% + } + else if(workflowItem.getState() == WorkflowManager.WFSTATE_STEP2POOL) + { +%> + <%--

        The following item has been submitted to collection + <%= collection.getMetadata("name") %>. In order to + accept the task of checking this item, please click "Accept This Task" below.

        --%> +

        + <%= collection.getMetadata("name") %>.

        +<% + } + else if(workflowItem.getState() == WorkflowManager.WFSTATE_STEP3POOL) + { +%> + <%--

        The following item has been accepted for inclusion in collection + <%= collection.getMetadata("name") %>. In order to + accept the task of the final edit of this item, please click "Accept This Task" below.

        --%> +

        + <%= collection.getMetadata("name") %>.

        +<% + } +%> + + + +
        + + + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/reject-reason.jsp dspace-1.2-source-devel/multi/mydspace/reject-reason.jsp --- dspace-1.2-source-devel/jsp/mydspace/reject-reason.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/reject-reason.jsp 2004-12-17 11:13:28.000000000 -0200 @@ -1,92 +1,113 @@ -<%-- - - reject-reason.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Get a reason for rejecting a submission (or just reject reason itself - - - this is JSP programming after all!) - - - - Attributes: - - workflow.item: The workflow item being rejected - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.workflow.WorkflowItem" %> - -<% - WorkflowItem workflowItem = - (WorkflowItem) request.getAttribute("workflow.item"); -%> - - - -

        Enter Reason for Rejection

        - -

        Please enter the reason you are rejecting the submission into the box - below. Please indicate in your message whether the submitter should fix - a problem and resubmit.

        - -
        - - -
        - -
        - - - - - - -
        - - - -
        -
        -
        +<%-- + - reject-reason.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Get a reason for rejecting a submission (or just reject reason itself - + - this is JSP programming after all!) + - + - Attributes: + - workflow.item: The workflow item being rejected + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.workflow.WorkflowItem" %> + +<% + WorkflowItem workflowItem = + (WorkflowItem) request.getAttribute("workflow.item"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="reject-reason.parenttitle"/>: + <fmt:message key="reject-reason.title"/> + + + + + <%--

        Enter Reason for Rejection

        --%> +

        + + <%--

        Please enter the reason you are rejecting the submission into the box + below. Please indicate in your message whether the submitter should fix + a problem and resubmit.

        --%> +

        + +
        + + +
        + +
        + + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/remove-item.jsp dspace-1.2-source-devel/multi/mydspace/remove-item.jsp --- dspace-1.2-source-devel/jsp/mydspace/remove-item.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/remove-item.jsp 2005-02-18 16:10:23.000000000 -0200 @@ -1,82 +1,103 @@ -<%-- - - remove-item.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Remove Item page - - - - Attributes: - - workspace.item - the workspace item the user wishes to delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> -<%@ page import="org.dspace.content.WorkspaceItem" %> - -<% - WorkspaceItem wi = (WorkspaceItem) request.getAttribute("workspace.item"); -%> - - - -

        Remove Item

        - -

        Are you sure you want to remove the following incomplete item?

        - - - -
        - - - - - - - - -
        - - - -
        -
        -
        +<%-- + - remove-item.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Remove Item page + - + - Attributes: + - workspace.item - the workspace item the user wishes to delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.MyDSpaceServlet" %> +<%@ page import="org.dspace.content.WorkspaceItem" %> + +<% + WorkspaceItem wi = (WorkspaceItem) request.getAttribute("workspace.item"); +%> + + <fmt:message key="general.title"/>: + <fmt:message key="remove-item.parenttitle"/>: + <fmt:message key="remove-item.title"/> + + + + <%--

        Remove Item

        --%> + + + + + + + +

        + + <%--

        Are you sure you want to remove the following incomplete item?

        --%> +

        + + + +
        + + + + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/subscriptions.jsp dspace-1.2-source-devel/multi/mydspace/subscriptions.jsp --- dspace-1.2-source-devel/jsp/mydspace/subscriptions.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/subscriptions.jsp 2005-02-04 12:28:10.000000000 -0200 @@ -1,148 +1,182 @@ -<%-- - - subscription.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show a user's subscriptions and allow them to be modified - - - - Attributes: - - subscriptions - Collection[] - collections user is subscribed to - - updated - Boolean - if true, subscriptions have just been updated - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> - -<% - Collection[] subscriptions = - (Collection[]) request.getAttribute("subscriptions"); - boolean updated = - ((Boolean) request.getAttribute("updated")).booleanValue(); -%> - - - - - - - - -
        -

        Your Subscriptions

        -
        - Help... -
        - -<% - if (updated) - { -%> -

        Your subscriptions have been updated.

        -<% - } -%> -

        To subscribe to a collection, visit the collection's home page, and - click on the "Subscribe" button.

        -<% - if (subscriptions.length > 0) - { -%> -

        Below are the collections you are subscribed to. You will be sent an - e-mail each day detailing new items that have become available in these - collections. On days that no new items have appeared, no e-mail will be - sent.

        - -
        - -<% - String row = "odd"; - - for (int i = 0; i < subscriptions.length; i++) - { -%> - - <%-- - - HACK: form shouldn't open here, but IE adds a carraige - - return where is placed, breaking our nice layout. - --%> - - - - - -<% - row = (row.equals("even") ? "odd" : "even" ); - } -%> -
        - <%= subscriptions[i].getMetadata("name") %> - - - -
        -
        - -
        - -
        -
        - -
        -
        -<% - } - else - { -%> -

        You are not currently subscribed to any collections.

        -<% - } -%> - -

        Go to - My DSpace

        - -
        +<%-- + - subscription.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show a user's subscriptions and allow them to be modified + - + - Attributes: + - subscriptions - Collection[] - collections user is subscribed to + - updated - Boolean - if true, subscriptions have just been updated + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> + +<% + Collection[] subscriptions = + (Collection[]) request.getAttribute("subscriptions"); + boolean updated = + ((Boolean) request.getAttribute("updated")).booleanValue(); +%> + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="subscriptions.parenttitle"/>: + <fmt:message key="subscriptions.title"/> + + + + + + + + + +
        + <%--

        Your Subscriptions

        --%> +

        +
        + <%-- Help... --%> + + + + + + +
        + +<% + if (updated) + { +%> + <%--

        Your subscriptions have been updated.

        --%> +

        +<% + } +%> + <%--

        To subscribe to a collection, visit the collection's home page, and + click on the "Subscribe" button.

        --%> +

        +<% + if (subscriptions.length > 0) + { +%> + <%--

        Below are the collections you are subscribed to. You will be sent an + e-mail each day detailing new items that have become available in these + collections. On days that no new items have appeared, no e-mail will be + sent.

        --%> +

        + +
        + +<% + String row = "odd"; + + for (int i = 0; i < subscriptions.length; i++) + { +%> + + <%-- + - HACK: form shouldn't open here, but IE adds a carraige + - return where is placed, breaking our nice layout. + --%> + + + + + +<% + row = (row.equals("even") ? "odd" : "even" ); + } +%> +
        + <%= subscriptions[i].getMetadata("name") %> + + + <%-- --%> + "> +
        +
        + +
        + +
        +
        + <%-- --%> + "> +
        +
        +<% + } + else + { +%> + <%--

        You are not currently subscribed to any collections.

        --%> +

        +<% + } +%> + + <%--

        Go to + My DSpace

        --%> +

        + +
        +
        diff -Naur dspace-1.2-source-devel/jsp/mydspace/task-complete.jsp dspace-1.2-source-devel/multi/mydspace/task-complete.jsp --- dspace-1.2-source-devel/jsp/mydspace/task-complete.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/mydspace/task-complete.jsp 2004-12-17 11:10:29.000000000 -0200 @@ -1,57 +1,80 @@ -<%-- - - task-complete.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Task complete message page - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Thank You

        - -

        The task is complete, and notification has been sent to the appropriate people.

        - -

        Return to My DSpace

        - -
        +<%-- + - task-complete.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Task complete message page + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="task-complete.parenttitle"/>: + <fmt:message key="task-complete.title"/> + + + + +<%--

        Thank You

        --%> +

        + + <%--

        The task is complete, and notification has been sent to the appropriate people.

        --%> +

        + + <%--

        Return to My DSpace

        --%> +

        + +
        +
        diff -Naur dspace-1.2-source-devel/jsp/register/already-registered.jsp dspace-1.2-source-devel/multi/register/already-registered.jsp --- dspace-1.2-source-devel/jsp/register/already-registered.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/already-registered.jsp 2004-11-23 13:23:22.000000000 -0200 @@ -1,64 +1,83 @@ -<%-- - - already-registered.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2003/02/21 19:51:49 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Message informing user who's tried to register that they're registered - - already - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Already Registered

        - -

        Our records show that you've already registered with DSpace and have - an active account with us.

        - -

        You can set - a new password if you've forgotten it.

        - -

        If you're having trouble logging in, please contact us.

        - - - -
        +<%-- + - already-registered.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2003/02/21 19:51:49 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Message informing user who's tried to register that they're registered + - already + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="already-registered.title"/> + + + + +<%--

        Already Registered

        --%> +

        + + <%--

        Our records show that you've already registered with DSpace and have + an active account with us.

        --%> +

        + + <%--

        You can set + a new password if you've forgotten it.

        --%> +

        .

        + + <%--

        If you're having trouble logging in, please contact us.

        --%> +

        + + + +
        diff -Naur dspace-1.2-source-devel/jsp/register/cannot-register.jsp dspace-1.2-source-devel/multi/register/cannot-register.jsp --- dspace-1.2-source-devel/jsp/register/cannot-register.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/cannot-register.jsp 2004-11-22 07:56:36.000000000 -0200 @@ -1,56 +1,71 @@ -<%-- - - cannot-register.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Message informing user they are not allowed to self-register. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - -

        Cannot Register

        - -

        The configuration of this DSpace site does not allow you to register - yourself. Please feel free to contact us with any queries.

        - - -
        +<%-- + - cannot-register.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Message informing user they are not allowed to self-register. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="cannot-register.title"/> + + + + <%--

        Cannot Register

        --%> +

        + + <%--

        The configuration of this DSpace site does not allow you to register + yourself. Please feel free to contact us with any queries.

        --%> +

        + + +
        diff -Naur dspace-1.2-source-devel/jsp/register/edit-profile.jsp dspace-1.2-source-devel/multi/register/edit-profile.jsp --- dspace-1.2-source-devel/jsp/register/edit-profile.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/edit-profile.jsp 2005-02-04 12:31:36.000000000 -0200 @@ -1,126 +1,159 @@ -<%-- - - edit-profile.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Profile editing page - - - - Attributes to pass in: - - - - eperson - the EPerson who's editing their profile - - missing.fields - if a Boolean true, the user hasn't entered enough - - information on the form during a previous attempt - - password.problem - if a Boolean true, there's a problem with password - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson eperson = (EPerson) request.getAttribute("eperson"); - - Boolean attr = (Boolean) request.getAttribute("missing.fields"); - boolean missingFields = (attr != null && attr.booleanValue()); - - attr = (Boolean) request.getAttribute("password.problem"); - boolean passwordProblem = (attr != null && attr.booleanValue()); -%> - - - -

        Edit Your Profile

        - -<% - if (missingFields) - { -%> -

        Please fill out all of the required fields.

        -<% - } - - if (passwordProblem) - { -%> -

        The passwords you enter below must match, and need to be at - least 6 characters long.

        -<% - } -%> - -

        Please enter or amend the following information. The fields marked with a * are - required. (More Help...)

        - -
        - - - -<% - // Only show password update section if the user doesn't use - // certificates - if (eperson.getRequireCertificate() == false) - { -%> -

        Optionally, you can choose a new password and enter it into the box below, and confirm it by typing it - again into the second box for verification. It should be at least six characters long.

        - - - - - -
        - - - - - - - - - -
        New Password:
        Again to Confirm:
        -
        -<% - } -%> -

        - -
        +<%-- + - edit-profile.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Profile editing page + - + - Attributes to pass in: + - + - eperson - the EPerson who's editing their profile + - missing.fields - if a Boolean true, the user hasn't entered enough + - information on the form during a previous attempt + - password.problem - if a Boolean true, there's a problem with password + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson eperson = (EPerson) request.getAttribute("eperson"); + + Boolean attr = (Boolean) request.getAttribute("missing.fields"); + boolean missingFields = (attr != null && attr.booleanValue()); + + attr = (Boolean) request.getAttribute("password.problem"); + boolean passwordProblem = (attr != null && attr.booleanValue()); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="edit-profile.title"/> + + + + + <%--

        Edit Your Profile

        --%> +

        + +<% + if (missingFields) + { +%> + <%--

        Please fill out all of the required fields.

        --%> +

        +<% + } + + if (passwordProblem) + { +%> + <%--

        The passwords you enter below must match, and need to be at + least 6 characters long.

        --%> +

        +<% + } +%> + + <%--

        Please enter or amend the following information. The fields marked with a * are + required. (More Help...)

        --%> + + + + + + + +

        +

        + +
        + + + +<% + // Only show password update section if the user doesn't use + // certificates + if (eperson.getRequireCertificate() == false) + { +%> + <%--

        Optionally, you can choose a new password and enter it into the box below, and confirm it by typing it + again into the second box for verification. It should be at least six characters long.

        --%> +

        + + + + + +
        + + + <%-- --%> + + + + + <%-- --%> + + + +
        New Password:
        Again to Confirm:
        +
        +<% + } +%> + <%--

        --%> +

        ">

        + +
        diff -Naur dspace-1.2-source-devel/jsp/register/forgot-password.jsp dspace-1.2-source-devel/multi/register/forgot-password.jsp --- dspace-1.2-source-devel/jsp/register/forgot-password.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/forgot-password.jsp 2004-11-22 07:57:24.000000000 -0200 @@ -1,102 +1,122 @@ -<%-- - - forgot-password.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Forgotten password DSpace form - - - - Form where new users enter their email address to get a token to enter a - - new password. - - - - Attributes to pass in: - - retry - if set, this is a retry after the user entered an invalid email - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> - -<% - boolean retry = (request.getAttribute("retry") != null); -%> - - - -

        Forgotten Password

        - -<% - if (retry) - { -%> -

        The e-mail address you entered was not recognized. Please - try again.

        -<% - } -%> -

        Please enter your e-mail - address in the box below and click "I Forgot My Password". You'll be sent - an e-mail which will allow you to set a new password.

        - -
        - - -
        - - - - -
        - - - - - - - - -
        E-mail Address:
        - -
        -
        -
        -
        - -
        +<%-- + - forgot-password.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Forgotten password DSpace form + - + - Form where new users enter their email address to get a token to enter a + - new password. + - + - Attributes to pass in: + - retry - if set, this is a retry after the user entered an invalid email + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> + +<% + boolean retry = (request.getAttribute("retry") != null); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="forgot-password.title"/> + + + + + <%--

        Forgotten Password

        --%> +

        + +<% + if (retry) + { +%> + <%--

        The e-mail address you entered was not recognized. Please + try again.

        --%> +

        +<% + } +%> + <%--

        Please enter your e-mail + address in the box below and click "I Forgot My Password". You'll be sent + an e-mail which will allow you to set a new password.

        --%> +

        + +
        + + +
        + + + + +
        + + + <%-- --%> + + + + + + +
        E-mail Address:
        + <%-- --%> + "> +
        +
        +
        +
        + +
        diff -Naur dspace-1.2-source-devel/jsp/register/inactive-account.jsp dspace-1.2-source-devel/multi/register/inactive-account.jsp --- dspace-1.2-source-devel/jsp/register/inactive-account.jsp 2003-09-08 12:17:54.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/inactive-account.jsp 2004-11-23 13:22:31.000000000 -0200 @@ -1,59 +1,75 @@ -<%-- - - inactive-account.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2003/09/08 15:17:53 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Message informing user who said they'd forgot their password that their - - account is inactive. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - -

        Inactive Account

        - -

        The e-mail address you entered corresponds to an inactive account. - Perhaps you haven't yet - registered. Please feel free to contact the site administrators - with any queries.

        - - -
        +<%-- + - inactive-account.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2003/09/08 15:17:53 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Message informing user who said they'd forgot their password that their + - account is inactive. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="inactive-account.title"/> + + + + <%--

        Inactive Account

        --%> +

        + + <%--

        The e-mail address you entered corresponds to an inactive account. + Perhaps you haven't yet + registered. Please feel free to contact the site administrators + with any queries.

        --%> +

        + .

        + + +
        diff -Naur dspace-1.2-source-devel/jsp/register/invalid-token.jsp dspace-1.2-source-devel/multi/register/invalid-token.jsp --- dspace-1.2-source-devel/jsp/register/invalid-token.jsp 2003-04-11 12:05:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/invalid-token.jsp 2004-11-22 07:58:07.000000000 -0200 @@ -1,83 +1,105 @@ -<%-- - - invalid-token.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2003/04/11 15:05:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.core.ConfigurationManager" %> - -<%-- - - Invalid token sent message. - --%> - - - -

        Invalid Token

        - -

        The registration or forgotten password "token" in the URL is invalid. - This may be because of one of the following reason:

        - -
          -
        • The token might be incorrectly copied into the URL. Some e-mail - programs will "wrap" long lines of text in an email, so maybe it split - your special URL up into two lines, like this: - -
          -<%= ConfigurationManager.getProperty("dspace.url") %>/register?token=ABCDEFGHIJK
          -LMNOP
          -        
          - - If it has, you should copy and paste the first line into your browser's - address bar, then copy the second line, and paste into the address bar - just on the end of the first line, making sure there are no spaces. The - address bar should then contain something like: - -
          -<%= ConfigurationManager.getProperty("dspace.url") %>/register?token=ABCDEFGHIJKLMNOP
          -        
          - - Then press return in the address bar, and the URL should work fine.
        • -
        - -

        If you're still having trouble, please contact us.

        - - -
        +<%-- + - invalid-token.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2003/04/11 15:05:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.core.ConfigurationManager" %> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="invalid-token.title"/> + + + + +<%-- + - Invalid token sent message. + --%> + + + <%--

        Invalid Token

        --%> +

        + + <%--

        The registration or forgotten password "token" in the URL is invalid. + This may be because of one of the following reason:

        --%> +

        + +
          + <%--
        • The token might be incorrectly copied into the URL. Some e-mail + programs will "wrap" long lines of text in an email, so maybe it split + your special URL up into two lines, like this: --%> +
        • + +
          +<%= ConfigurationManager.getProperty("dspace.url") %>/register?token=ABCDEFGHIJK
          +LMNOP
          +        
          + + <%-- If it has, you should copy and paste the first line into your browser's + address bar, then copy the second line, and paste into the address bar + just on the end of the first line, making sure there are no spaces. The + address bar should then contain something like: --%> +
        • + +
          +<%= ConfigurationManager.getProperty("dspace.url") %>/register?token=ABCDEFGHIJKLMNOP
          +        
          + + <%-- Then press return in the address bar, and the URL should work fine.
        • --%> + +
        + + <%--

        If you're still having trouble, please contact us.

        --%> +

        + + +
        diff -Naur dspace-1.2-source-devel/jsp/register/new-password.jsp dspace-1.2-source-devel/multi/register/new-password.jsp --- dspace-1.2-source-devel/jsp/register/new-password.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/new-password.jsp 2004-11-23 13:21:57.000000000 -0200 @@ -1,115 +1,136 @@ -<%-- - - new-password.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - New password form - - - - Form where users can enter a new password, after having been sent a token - - because they forgot the old one. - - - - Attributes to pass in: - - eperson - the eperson - - token - the token associated with this password setting - - password.problem - Boolean true if the user has already tried a password - - which is for some reason unnacceptible - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson eperson = (EPerson) request.getAttribute("eperson"); - String token = (String) request.getAttribute("token"); - Boolean attr = (Boolean) request.getAttribute("password.problem"); - - boolean passwordProblem = (attr != null && attr.booleanValue()); -%> - - - -

        Enter a New Password

        - -

        Hello <%= eperson.getFullName() %>,

        - -<% - if (passwordProblem) - { -%> -

        The passwords you enter below must match, and need to be at - least 6 characters long.

        -<% - } -%> - -

        Please enter a new password into the box below, and confirm it by typing it - again into the second box. It should be at least six characters long.

        - -
        - - - - -
        - - - - - - - - - - - - -
        New Password:
        Again to Confirm:
        - -
        -
        - - - -
        - -
        +<%-- + - new-password.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - New password form + - + - Form where users can enter a new password, after having been sent a token + - because they forgot the old one. + - + - Attributes to pass in: + - eperson - the eperson + - token - the token associated with this password setting + - password.problem - Boolean true if the user has already tried a password + - which is for some reason unnacceptible + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson eperson = (EPerson) request.getAttribute("eperson"); + String token = (String) request.getAttribute("token"); + Boolean attr = (Boolean) request.getAttribute("password.problem"); + + boolean passwordProblem = (attr != null && attr.booleanValue()); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="new-password.title"/> + + + + <%--

        Enter a New Password

        --%> +

        + + +

        <%= eperson.getFullName() %>,

        + +<% + if (passwordProblem) + { +%> + <%--

        The passwords you enter below must match, and need to be at + least 6 characters long.

        --%> +

        +<% + } +%> + + <%--

        Please enter a new password into the box below, and confirm it by typing it + again into the second box. It should be at least six characters long.

        --%> +

        + +
        + + + + +
        + + + <%-- --%> + + + + + <%-- --%> + + + + + + +
        New Password:
        Again to Confirm:
        + <%-- --%> + "> +
        +
        + + + +
        + +
        diff -Naur dspace-1.2-source-devel/jsp/register/new-user.jsp dspace-1.2-source-devel/multi/register/new-user.jsp --- dspace-1.2-source-devel/jsp/register/new-user.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/new-user.jsp 2004-11-22 07:58:36.000000000 -0200 @@ -1,102 +1,123 @@ -<%-- - - new-user.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Register with DSpace form - - - - Form where new users enter their email address to get a token to access - - the personal info page. - - - - Attributes to pass in: - - retry - if set, this is a retry after the user entered an invalid email - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> - -<% - boolean retry = (request.getAttribute("retry") != null); -%> - - - -

        User Registration

        - -<% - if (retry) - { %> -

        The e-mail address you entered was invalid. Please try again.

        -<% } %> - -

        If you've never logged on to DSpace before, please enter your e-mail - address in the box below and click "Register".

        - -
        - - - - - - - -
        - - - - - - - - -
        E-mail Address:
        - -
        -
        -
        - -

        If you or your department are interested in registering with DSpace, please - contact the DSpace site administrators.

        - - - -
        +<%-- + - new-user.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Register with DSpace form + - + - Form where new users enter their email address to get a token to access + - the personal info page. + - + - Attributes to pass in: + - retry - if set, this is a retry after the user entered an invalid email + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> + +<% + boolean retry = (request.getAttribute("retry") != null); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="new-user.title"/> + + + + + <%--

        User Registration

        --%> +

        + +<% + if (retry) + { %> + <%--

        The e-mail address you entered was invalid. Please try again.

        --%> +

        +<% } %> + + <%--

        If you've never logged on to DSpace before, please enter your e-mail + address in the box below and click "Register".

        --%> +

        + +
        + + + + + + + +
        + + + <%-- --%> + + + + + + +
        E-mail Address:
        + <%-- --%> + "> +
        +
        +
        + + <%--

        If you or your department are interested in registering with DSpace, please + contact the DSpace site administrators.

        --%> +

        + + + + diff -Naur dspace-1.2-source-devel/jsp/register/password-changed.jsp dspace-1.2-source-devel/multi/register/password-changed.jsp --- dspace-1.2-source-devel/jsp/register/password-changed.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/password-changed.jsp 2004-11-23 13:21:46.000000000 -0200 @@ -1,58 +1,76 @@ -<%-- - - password-token-sent.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Password changed message - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Password Changed

        - -

        Thank you, your new password has been set and is active immediately.

        - -

        Go to DSpace Home

        - -
        - +<%-- + - password-token-sent.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Password changed message + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="password-changed.title"/> + + + + + <%--

        Password Changed

        --%> +

        + + <%--

        Thank you, your new password has been set and is active immediately.

        --%> +

        + + <%--

        Go to DSpace Home

        --%> +

        + +
        + diff -Naur dspace-1.2-source-devel/jsp/register/password-token-sent.jsp dspace-1.2-source-devel/multi/register/password-token-sent.jsp --- dspace-1.2-source-devel/jsp/register/password-token-sent.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/password-token-sent.jsp 2004-11-22 07:59:13.000000000 -0200 @@ -1,57 +1,74 @@ -<%-- - - password-token-sent.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Forgot password token sent message. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        New Password E-mail Sent

        - -

        You have been sent an e-mail containing a special URL. When you visit - this URL, you will be able to set a new password to carry on using DSpace.

        - -
        - +<%-- + - password-token-sent.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Forgot password token sent message. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="password-token-sent.title"/> + + + + + <%--

        New Password E-mail Sent

        --%> +

        + + <%--

        You have been sent an e-mail containing a special URL. When you visit + this URL, you will be able to set a new password to carry on using DSpace.

        --%> +

        + +
        + diff -Naur dspace-1.2-source-devel/jsp/register/profile-form.jsp dspace-1.2-source-devel/multi/register/profile-form.jsp --- dspace-1.2-source-devel/jsp/register/profile-form.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/profile-form.jsp 2004-10-25 05:34:14.000000000 -0200 @@ -1,91 +1,99 @@ -<%-- - - profile-form.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - User profile editing form. - - - - This isn't a full page, just the fields for entering a user's profile. - - - - Attributes to pass in: - - eperson - the EPerson to edit the profile for. Can be null, - - in which case blank fields are displayed. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson epersonForm = (EPerson) request.getAttribute("eperson"); - - String lastName = ""; - String firstName = ""; - String phone = ""; - - if (epersonForm != null) - { - // Get non-null values - lastName = epersonForm.getLastName(); - if (lastName == null) lastName = ""; - - firstName = epersonForm.getFirstName(); - if (firstName == null) firstName = ""; - - phone = epersonForm.getMetadata("phone"); - if (phone == null) phone = ""; - } -%> - - - - - - - - - - - - - - -
        First name*:
        Last name*:
        Contact telephone:
        +<%-- + - profile-form.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - User profile editing form. + - + - This isn't a full page, just the fields for entering a user's profile. + - + - Attributes to pass in: + - eperson - the EPerson to edit the profile for. Can be null, + - in which case blank fields are displayed. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson epersonForm = (EPerson) request.getAttribute("eperson"); + + String lastName = ""; + String firstName = ""; + String phone = ""; + + if (epersonForm != null) + { + // Get non-null values + lastName = epersonForm.getLastName(); + if (lastName == null) lastName = ""; + + firstName = epersonForm.getFirstName(); + if (firstName == null) firstName = ""; + + phone = epersonForm.getMetadata("phone"); + if (phone == null) phone = ""; + } +%> + + + + <%-- --%> + + + + + <%-- --%> + + + + + <%-- --%> + + + +
        First name*:
        Last name*:
        Contact telephone:
        diff -Naur dspace-1.2-source-devel/jsp/register/profile-updated.jsp dspace-1.2-source-devel/multi/register/profile-updated.jsp --- dspace-1.2-source-devel/jsp/register/profile-updated.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/profile-updated.jsp 2004-12-13 10:57:11.000000000 -0200 @@ -1,68 +1,110 @@ -<%-- - - profile-form.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Profile updated message - - - - password.updated - a Boolean indicating whether the user updated their - - password. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - boolean passwordUpdated = - ((Boolean) request.getAttribute("password.updated")).booleanValue(); -%> - - - -

        Profile Updated

        - -

        Thank you, your profile information - <%= (passwordUpdated ? "and password have" : "has") %> - been updated.

        - -

        Return to DSpace Home

        -
        +<%-- + - profile-form.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Profile updated message + - + - password.updated - a Boolean indicating whether the user updated their + - password. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + boolean passwordUpdated = + ((Boolean) request.getAttribute("password.updated")).booleanValue(); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="profile-updated.title"/> + + + + <%--

        Profile Updated

        --%> +

        + + <%--

        Thank you, your profile information + <%= (passwordUpdated ? "and password have" : "has") %> + been updated.

        --%> + +

        + + <% + if(passwordUpdated) + { + %> + + + + <% + } + else + { + %> + + + + <% + } + %> + + + +  

        + + <%--

        Return to DSpace Home

        --%> +

        +
        diff -Naur dspace-1.2-source-devel/jsp/register/registered.jsp dspace-1.2-source-devel/multi/register/registered.jsp --- dspace-1.2-source-devel/jsp/register/registered.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/registered.jsp 2004-11-23 13:20:27.000000000 -0200 @@ -1,71 +1,90 @@ -<%-- - - registered.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Registered OK message - - - - Displays a message indicating that the user has registered OK. - - - - Attributes to pass in: - - eperson - eperson who's just registered - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson eperson = (EPerson) request.getAttribute("eperson"); -%> - - - -

        Registration Complete

        - -

        Thank you <%= eperson.getFirstName() %>,

        - -

        You're now registered to use the DSpace system. You can subscribe to - collections to receive e-mail updates about new items.

        - -

        Return to DSpace Home

        -
        +<%-- + - registered.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Registered OK message + - + - Displays a message indicating that the user has registered OK. + - + - Attributes to pass in: + - eperson - eperson who's just registered + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson eperson = (EPerson) request.getAttribute("eperson"); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="registered.title"/> + + + + + <%--

        Registration Complete

        --%> +

        + + <%--

        Thank you <%= eperson.getFirstName() %>,

        --%> +

        <%= eperson.getFirstName() %>,

        + + <%--

        You're now registered to use the DSpace system. You can subscribe to + collections to receive e-mail updates about new items.

        --%> +

        + + <%--

        Return to DSpace Home

        --%> +

        +
        diff -Naur dspace-1.2-source-devel/jsp/register/registration-form.jsp dspace-1.2-source-devel/multi/register/registration-form.jsp --- dspace-1.2-source-devel/jsp/register/registration-form.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/registration-form.jsp 2004-11-22 08:01:10.000000000 -0200 @@ -1,139 +1,160 @@ -<%-- - - registration-form.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Registration information form - - - - Form where new users enter their personal information and select a - - password. - - - - Attributes to pass in: - - - - eperson - the EPerson who's registering - - token - the token key they've been given for registering - - set.password - if Boolean true, the user can set a password - - missing.fields - if a Boolean true, the user hasn't entered enough - - information on the form during a previous attempt - - password.problem - if a Boolean true, there's a problem with password - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - EPerson eperson = (EPerson) request.getAttribute( "eperson" ); - String token = (String) request.getAttribute("token"); - - Boolean attr = (Boolean) request.getAttribute("missing.fields"); - boolean missingFields = (attr != null && attr.booleanValue()); - - attr = (Boolean) request.getAttribute("password.problem"); - boolean passwordProblem = (attr != null && attr.booleanValue()); - - attr = (Boolean) request.getAttribute("set.password"); - boolean setPassword = (attr != null && attr.booleanValue()); -%> - - - -

        Registration Information

        - -<% - if (missingFields) - { -%> -

        Please fill out all of the required fields.

        -<% - } - - if( passwordProblem) - { -%> -

        The passwords you enter below must match, and need to be at - least 6 characters long.

        -<% - } -%> - -

        Please enter the following information. The fields marked with a * are - required.

        - -
        - - - -<% - - if (setPassword) - { -%> -

        Please choose a password and enter it into the box below, and confirm it by typing it - again into the second box. It should be at least six characters long.

        - - - - - -
        - - - - - - - - - -
        Password:
        Again to Confirm:
        -
        -<% - } -%> - - - - -

        - -
        +<%-- + - registration-form.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Registration information form + - + - Form where new users enter their personal information and select a + - password. + - + - Attributes to pass in: + - + - eperson - the EPerson who's registering + - token - the token key they've been given for registering + - set.password - if Boolean true, the user can set a password + - missing.fields - if a Boolean true, the user hasn't entered enough + - information on the form during a previous attempt + - password.problem - if a Boolean true, there's a problem with password + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %> +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + EPerson eperson = (EPerson) request.getAttribute( "eperson" ); + String token = (String) request.getAttribute("token"); + + Boolean attr = (Boolean) request.getAttribute("missing.fields"); + boolean missingFields = (attr != null && attr.booleanValue()); + + attr = (Boolean) request.getAttribute("password.problem"); + boolean passwordProblem = (attr != null && attr.booleanValue()); + + attr = (Boolean) request.getAttribute("set.password"); + boolean setPassword = (attr != null && attr.booleanValue()); +%> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="registration-form.title"/> + + + + + <%--

        Registration Information

        --%> +

        + +<% + if (missingFields) + { +%> + <%--

        Please fill out all of the required fields.

        --%> +

        +<% + } + + if( passwordProblem) + { +%> + <%--

        The passwords you enter below must match, and need to be at + least 6 characters long.

        --%> +

        +<% + } +%> + + <%--

        Please enter the following information. The fields marked with a * are + required.

        --%> +

        + +
        + + + +<% + + if (setPassword) + { +%> + <%--

        Please choose a password and enter it into the box below, and confirm it by typing it + again into the second box. It should be at least six characters long.

        --%> +

        + + + + + +
        + + + <%-- --%> + + + + + <%-- --%> + + + +
        Password:
        Again to Confirm:
        +
        +<% + } +%> + + + + + <%--

        --%> +

        ">

        + +
        diff -Naur dspace-1.2-source-devel/jsp/register/registration-sent.jsp dspace-1.2-source-devel/multi/register/registration-sent.jsp --- dspace-1.2-source-devel/jsp/register/registration-sent.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/register/registration-sent.jsp 2004-11-22 08:01:30.000000000 -0200 @@ -1,57 +1,72 @@ -<%-- - - inactive-account.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Registration token sent message. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Registration E-mail Sent

        - -

        You have been sent an e-mail containing a special URL, or "token". When - you visit this URL, you will need to fill out some simple information. - After that, you'll be ready to log into DSpace!

        - -
        +<%-- + - inactive-account.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Registration token sent message. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="registration-sent.title"/> + + + + + <%--

        Registration E-mail Sent

        --%> +

        + + <%--

        You have been sent an e-mail containing a special URL, or "token". When + you visit this URL, you will need to fill out some simple information. + After that, you'll be ready to log into DSpace!

        --%> +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/search/advanced.jsp dspace-1.2-source-devel/multi/search/advanced.jsp --- dspace-1.2-source-devel/jsp/search/advanced.jsp 2004-02-23 17:39:00.000000000 -0200 +++ dspace-1.2-source-devel/multi/search/advanced.jsp 2005-02-15 13:16:58.000000000 -0200 @@ -1,200 +1,228 @@ -<%-- - - advanced.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2004/02/23 19:38:59 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Advanced Search JSP - - - - - - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.search.QueryResults" %> - -<% - Community [] communityArray = (Community[] )request.getAttribute("communities"); - String query1 = request.getParameter("query1") == null ? "" : request.getParameter("query1"); - String query2 = request.getParameter("query2") == null ? "" : request.getParameter("query2"); - String query3 = request.getParameter("query3") == null ? "" : request.getParameter("query3"); - - String field1 = request.getParameter("field1") == null ? "ANY" : request.getParameter("field1"); - String field2 = request.getParameter("field2") == null ? "ANY" : request.getParameter("field2"); - String field3 = request.getParameter("field3") == null ? "ANY" : request.getParameter("field3"); - - String conjunction1 = request.getParameter("conjunction1") == null ? "AND" : request.getParameter("conjunction1"); - String conjunction2 = request.getParameter("conjunction2") == null ? "AND" : request.getParameter("conjunction1"); - - QueryResults qResults = (QueryResults)request.getAttribute("queryresults"); - -%> - - - -
        - - - -
        -

        Search:  - -

        - - - - - -
        - - - - - - - - - - - - - - - - - -
        - Search type:
        - - -

        -
        - - Search for:
        - -
        -

        -
        - - - - - -
        - - - - -
        -
        - -
        -
        -       - -       - - -
        -
        -
        - -<% if( request.getParameter("query") != null) -{ - if( qResults.getErrorMsg()!=null ) - {%> -

        <%= qResults.getErrorMsg() %>

        - <% - }else - { %> -

        Search produced no results.

        - <% - } -} -%> - -
        +<%-- + - advanced.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2004/02/23 19:38:59 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Advanced Search JSP + - + - + - + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.search.QueryResults" %> + +<% + Community [] communityArray = (Community[] )request.getAttribute("communities"); + String query1 = request.getParameter("query1") == null ? "" : request.getParameter("query1"); + String query2 = request.getParameter("query2") == null ? "" : request.getParameter("query2"); + String query3 = request.getParameter("query3") == null ? "" : request.getParameter("query3"); + + String field1 = request.getParameter("field1") == null ? "ANY" : request.getParameter("field1"); + String field2 = request.getParameter("field2") == null ? "ANY" : request.getParameter("field2"); + String field3 = request.getParameter("field3") == null ? "ANY" : request.getParameter("field3"); + + String conjunction1 = request.getParameter("conjunction1") == null ? "AND" : request.getParameter("conjunction1"); + String conjunction2 = request.getParameter("conjunction2") == null ? "AND" : request.getParameter("conjunction1"); + + QueryResults qResults = (QueryResults)request.getAttribute("queryresults"); + +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="advanced.title"/> + + + +
        + + + +
        + <%--

        Search:  --%> +

          + +

        + + + + + +
        + + + + + + + + + + + + + + + + + +
        + <%-- Search type:
        --%> +
        + + +

        +
        + <%-- Search for:
        --%> +
        + +
        +

        +
        + + + + + +
        + + + + +
        +
        + +
        +
        +       + <%-- --%> + "> +       + + <%-- --%> + "> +
        +
        +
        + +<% if( request.getParameter("query") != null) +{ + if( qResults.getErrorMsg()!=null ) + {%> +

        <%= qResults.getErrorMsg() %>

        + <% + }else + { %> + <%--

        Search produced no results.

        --%> +

        + <% + } +} +%> + +
        diff -Naur dspace-1.2-source-devel/jsp/search/results.jsp dspace-1.2-source-devel/multi/search/results.jsp --- dspace-1.2-source-devel/jsp/search/results.jsp 2004-07-12 13:26:24.000000000 -0200 +++ dspace-1.2-source-devel/multi/search/results.jsp 2005-03-07 13:39:10.000000000 -0200 @@ -1,262 +1,285 @@ -<%-- - - results.jsp - - - - Version: $Revision: 1.12 $ - - - - Date: $Date: 2004/07/12 16:26:24 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display the results of a simple search - - - - Attributes to pass in: - - - - community - pass in if the scope of the search was a community - - or a collection in this community - - collection - pass in if the scope of the search was a collection - - community.array - if the scope of the search was "all of DSpace", pass - - in all the communities in DSpace as an array to - - display in a drop-down box - - collection.array - if the scope of a search was a community, pass in an - - array of the collections in the community to put in - - the drop-down box - - items - the results. An array of Items, most relevant first - - communities - results, Community[] - - collections - results, Collection[] - - - - query - The original query - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.net.URLEncoder" %> -<%@ page import="org.dspace.content.Community" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.search.QueryResults" %> - -<% - // Get the attributes - Community community = (Community ) request.getAttribute("community" ); - Collection collection = (Collection ) request.getAttribute("collection"); - Community[] communityArray = (Community[] ) request.getAttribute("community.array"); - Collection[] collectionArray = (Collection[]) request.getAttribute("collection.array"); - - Item [] items = (Item[] )request.getAttribute("items"); - Community [] communities = (Community[] )request.getAttribute("communities"); - Collection[] collections = (Collection[])request.getAttribute("collections"); - - String query = (String) request.getAttribute("query"); - - QueryResults qResults = (QueryResults)request.getAttribute("queryresults"); - - int pageTotal = ((Integer)request.getAttribute("pagetotal" )).intValue(); - int pageCurrent = ((Integer)request.getAttribute("pagecurrent")).intValue(); - int pageLast = ((Integer)request.getAttribute("pagelast" )).intValue(); - int pageFirst = ((Integer)request.getAttribute("pagefirst" )).intValue(); -%> - - - -

        Search Results

        - - <%-- Controls for a repeat search --%> -
        - - - - -
        - - - - - - - -
        - Search:  -
        - for   -
        -
        -
        - -<% if( qResults.getErrorMsg()!=null ) -{ - %> -

        <%= qResults.getErrorMsg() %>

        -<% -} -else if( qResults.getHitCount() == 0 ) -{ - %> -

        Search produced no results.

        -<% -} -else -{ -%> -

        Results <%=qResults.getStart()+1%>-<%=qResults.getStart()+qResults.getHitHandles().size()%> of - <%=qResults.getHitCount()%>.

        - -<% } %> - -<% if (communities.length > 0 ) { %> -

        Community Hits:

        - -<% } %> - -<% if (collections.length > 0 ) { %> -
        -

        Collection hits:

        - -<% } %> - -<% if (items.length > 0) { %> -
        -

        Item hits:

        - -<% } %> - -

        - - -<% - String prevLink = "" - + "previous" - + ""; - - nextLink = nextLink - + (pageCurrent) * qResults.getPageSize() - + "\">" - + "next" - + ""; - - - -%> - -<%= (pageFirst != pageCurrent) ? prevLink : "" %> - -<% for( int q = pageFirst; q <= pageLast; q++ ) -{ - String myLink = "" - + q - + ""; - } -%> - -<%= myLink %> - -<% -} -%> - -<%= ((pageTotal > pageCurrent) ? nextLink : "") %> - -

        - -
        - +<%-- + - results.jsp + - + - Version: $Revision: 1.12 $ + - + - Date: $Date: 2004/07/12 16:26:24 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display the results of a simple search + - + - Attributes to pass in: + - + - community - pass in if the scope of the search was a community + - or a collection in this community + - collection - pass in if the scope of the search was a collection + - community.array - if the scope of the search was "all of DSpace", pass + - in all the communities in DSpace as an array to + - display in a drop-down box + - collection.array - if the scope of a search was a community, pass in an + - array of the collections in the community to put in + - the drop-down box + - items - the results. An array of Items, most relevant first + - communities - results, Community[] + - collections - results, Collection[] + - + - query - The original query + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.net.URLEncoder" %> +<%@ page import="org.dspace.content.Community" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.search.QueryResults" %> + +<% + // Get the attributes + Community community = (Community ) request.getAttribute("community" ); + Collection collection = (Collection ) request.getAttribute("collection"); + Community[] communityArray = (Community[] ) request.getAttribute("community.array"); + Collection[] collectionArray = (Collection[]) request.getAttribute("collection.array"); + + Item [] items = (Item[] )request.getAttribute("items"); + Community [] communities = (Community[] )request.getAttribute("communities"); + Collection[] collections = (Collection[])request.getAttribute("collections"); + + String query = (String) request.getAttribute("query"); + + QueryResults qResults = (QueryResults)request.getAttribute("queryresults"); + + int pageTotal = ((Integer)request.getAttribute("pagetotal" )).intValue(); + int pageCurrent = ((Integer)request.getAttribute("pagecurrent")).intValue(); + int pageLast = ((Integer)request.getAttribute("pagelast" )).intValue(); + int pageFirst = ((Integer)request.getAttribute("pagefirst" )).intValue(); +%> + + + + + <fmt:message key="general.title"/>: + <fmt:message key="results.title"/> + + + + <%--

        Search Results

        --%> + + +

        + + <%-- Controls for a repeat search --%> +
        + + + + +
        + + + + + + + +
        + <%-- Search:  +<% + if (community == null && collection == null) + { + // Scope of the search was all of DSpace. The scope control will list + // "all of DSpace" and the communities. +%> + <%-- --%> + +<% + for (int i = 0; i < communityArray.length; i++) + { +%> + +<% + } + } + else if (collection == null) + { + // Scope of the search was within a community. Scope control will list + // "all of DSpace", the community, and the collections within the community. +%> + <%-- --%> + + +<% + for (int i = 0; i < collectionArray.length; i++) + { +%> + +<% + } + } + else + { + // Scope of the search is a specific collection +%> + <%-- --%> + + + +<% + } +%> + +
        + <%-- for   --%> +   "> +
        +
        +
        + +<% if( qResults.getErrorMsg()!=null ) +{ + %> +

        <%= qResults.getErrorMsg() %>

        +<% +} +else if( qResults.getHitCount() == 0 ) +{ + %> + <%--

        Search produced no results.

        --%> +

        +<% +} +else +{ +%> + <%--

        Results - of --%> +

        <%=qResults.getStart()+1%>-<%=qResults.getStart()+qResults.getHitHandles().size()%> + <%=qResults.getHitCount()%>.

        + +<% } %> + +<% if (communities.length > 0 ) { %> + <%--

        Community Hits:

        --%> +

        + +<% } %> + +<% if (collections.length > 0 ) { %> +
        + <%--

        Collection hits:

        --%> +

        + +<% } %> + +<% if (items.length > 0) { %> +
        + <%--

        Item hits:

        --%> +

        + +<% } %> + +

        + +<% + String prevLink = "" + + "previous" + + ""; + + nextLink = nextLink + + (pageCurrent) * qResults.getPageSize() + + "\">" + + "next" + + ""; + + + +%> + +<%= (pageFirst != pageCurrent) ? prevLink : "" %> + +<% for( int q = pageFirst; q <= pageLast; q++ ) +{ + String myLink = "" + + q + + ""; + } +%> + +<%= myLink %> + +<% +} +%> + +<%= ((pageTotal > pageCurrent) ? nextLink : "") %> + +

        + +
        + diff -Naur dspace-1.2-source-devel/jsp/styles.css.jsp dspace-1.2-source-devel/multi/styles.css.jsp --- dspace-1.2-source-devel/jsp/styles.css.jsp 2004-06-25 13:03:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/styles.css.jsp 2005-02-28 14:44:21.000000000 -0200 @@ -104,6 +104,20 @@ <%-- This class is here so the standard style from "P" above can be applied --%. <%-- to anything else. --%> +.langChangeOff { text-decoration: none; + color : #bbbbbb; + cursor : default; + font-size: 10pt; + + } + +.langChangeOn { text-decoration: underline; + color: #336699; + cursor: pointer; + font-size: 10pt; + } + + .standard { margin-left: 10px; margin-right: 10px; font-family: "verdana", "Arial", "Helvetica", sans-serif; diff -Naur dspace-1.2-source-devel/jsp/submit/cancel.jsp dspace-1.2-source-devel/multi/submit/cancel.jsp --- dspace-1.2-source-devel/jsp/submit/cancel.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/cancel.jsp 2004-11-22 08:01:54.000000000 -0200 @@ -1,109 +1,128 @@ -<%-- - - cancel.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Cancel or save submission page - - - - This page is displayed whenever the user clicks "cancel" during a - - submission. It asks them whether they want to delete the incomplete - - item or leave it so they can continue later. - - - - Attributes to pass in: - - submission.info - the SubmissionInfo object - - step - the step the user was at when the cancelled - - (as a String) - - display.step - - this is the step to display in the progress bar - - (i.e. the step from the user's perspective, rather - - than the exact JSP the user clicked cancel on) - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - String step = (String) request.getAttribute("step"); - String displayStep = (String) request.getAttribute("display.step"); - - if (displayStep==null) displayStep = step; -%> - - - -
        - - - - - - -

        Cancel or Save Submission

        - -

        Do you want the half-finished submission removed, or do you want to keep - it so you can carry on working on it later? You can also return to where - you where during the submission process if you clicked Cancel by accident.

        - - <%= SubmitServlet.getSubmissionParameters(si) %> - > - > - - - - - - - -
        - - - - - -
        - -
        - -
        +<%-- + - cancel.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Cancel or save submission page + - + - This page is displayed whenever the user clicks "cancel" during a + - submission. It asks them whether they want to delete the incomplete + - item or leave it so they can continue later. + - + - Attributes to pass in: + - submission.info - the SubmissionInfo object + - step - the step the user was at when the cancelled + - (as a String) + - display.step - - this is the step to display in the progress bar + - (i.e. the step from the user's perspective, rather + - than the exact JSP the user clicked cancel on) + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + String step = (String) request.getAttribute("step"); + String displayStep = (String) request.getAttribute("display.step"); + + if (displayStep==null) displayStep = step; +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="cancel.title"/> + + + + +
        + + + + + + + <%--

        Cancel or Save Submission

        --%> +

        + + <%--

        Do you want the half-finished submission removed, or do you want to keep + it so you can carry on working on it later? You can also return to where + you where during the submission process if you clicked Cancel by accident.

        --%> +

        + + <%= SubmitServlet.getSubmissionParameters(si) %> + > + > + + + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> + + <%-- --%> + "> +
        + +
        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/cancelled-removed.jsp dspace-1.2-source-devel/multi/submit/cancelled-removed.jsp --- dspace-1.2-source-devel/jsp/submit/cancelled-removed.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/cancelled-removed.jsp 2004-11-23 13:28:07.000000000 -0200 @@ -1,59 +1,76 @@ -<%-- - - cancelled-removed.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Submission cancelled and removed page - displayed whenever the user has - - clicked "cancel/save" during a submission and elected to remove the item. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Submission Cancelled

        - -

        Your submission has been cancelled, and the incomplete item removed - from the system.

        - -

        Go to My DSpace

        - -
        +<%-- + - cancelled-removed.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Submission cancelled and removed page - displayed whenever the user has + - clicked "cancel/save" during a submission and elected to remove the item. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="cancelled-removed.title"/> + + + + <%--

        Submission Cancelled

        --%> +

        + + <%--

        Your submission has been cancelled, and the incomplete item removed + from the system.

        --%> +

        + + <%--

        Go to My DSpace

        --%> +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/cc-license.jsp dspace-1.2-source-devel/multi/submit/cc-license.jsp --- dspace-1.2-source-devel/jsp/submit/cc-license.jsp 2004-06-15 12:56:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/cc-license.jsp 2004-10-26 05:43:34.000000000 -0200 @@ -1,61 +1,61 @@ -<%-- - - cc-license.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/06/15 15:56:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - - - Attributes to pass in: - - license_url - the CC license URL - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - String cc_license_url = (String) request.getParameter("license_url"); -%> - +<%-- + - cc-license.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/06/15 15:56:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - + - Attributes to pass in: + - license_url - the CC license URL + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + String cc_license_url = (String) request.getParameter("license_url"); +%> + diff -Naur dspace-1.2-source-devel/jsp/submit/change-file-description.jsp dspace-1.2-source-devel/multi/submit/change-file-description.jsp --- dspace-1.2-source-devel/jsp/submit/change-file-description.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/change-file-description.jsp 2005-02-04 12:58:09.000000000 -0200 @@ -1,114 +1,143 @@ -<%-- - - change-file-description.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Change file description form - - - - Attributes to pass in: - - submission.info - the SubmissionInfo object - bitstream field must be set - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.BitstreamFormat" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); -%> - - - -
        - - - - - - -

        Submit: Change File Description

        - -

        Here are the details of the file. - (More Help...)

        - - - - - - - - - - - - -
        FileSizeFile Format
        <%= si.bitstream.getName() %><%= si.bitstream.getSize() %> bytes<%= si.bitstream.getFormatDescription() %>
        - -

        Enter the correct description of the file in the box below:

        - -<% - String currentDesc = si.bitstream.getDescription(); - if (currentDesc == null) - { - currentDesc=""; - } -%> -
        - - - - - -
        File Description:
        -
        - - <%= SubmitServlet.getSubmissionParameters(si) %> - > - -

        - -
        - -
        +<%-- + - change-file-description.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Change file description form + - + - Attributes to pass in: + - submission.info - the SubmissionInfo object - bitstream field must be set + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.BitstreamFormat" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="change-file-description.title"/> + + + +
        + + + + + + + <%--

        Submit: Change File Description

        --%> +

        + + <%--

        Here are the details of the file. + (More Help...)

        --%> +

        + + + + + +

        + + + + <%-- + + --%> + + + + + + + + + +
        FileSizeFile Format
        <%= si.bitstream.getName() %><%= si.bitstream.getSize() %> bytes<%= si.bitstream.getFormatDescription() %>
        + + +

        +<% + String currentDesc = si.bitstream.getDescription(); + if (currentDesc == null) + { + currentDesc=""; + } +%> +
        + + + <%-- --%> + + + +
        File Description:
        +
        + + <%= SubmitServlet.getSubmissionParameters(si) %> + > + + <%--

        --%> +

        ">

        + +
        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/choose-file.jsp dspace-1.2-source-devel/multi/submit/choose-file.jsp --- dspace-1.2-source-devel/jsp/submit/choose-file.jsp 2004-06-16 17:11:56.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/choose-file.jsp 2005-02-04 13:23:54.000000000 -0200 @@ -1,148 +1,188 @@ -<%-- - - choose-file.jsp - - - - Version: $Revision: 1.8 $ - - - - Date: $Date: 2004/06/16 20:11:56 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Select file to upload - - - - Attributes to pass in to this page: - - submission.info - the SubmissionInfo object - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); -%> - - - -
        - - - - - - -

        Submit: Upload a File

        - -

        Please enter the name of - <%= (si.submission.hasMultipleFiles() ? "one of the files" : "the file" ) %> on your - local hard drive corresponding to your item. If you click "Browse...", a - new window will appear in which you can locate and select the file on your - local hard drive. (More Help...)

        - -

        Netscape users please note: By - default, the window brought up by clicking "Browse..." will only display - files of type HTML. If the file you are uploading isn't an HTML file, - you will need to select the option to display files of other types. - Instructions for Netscape users are available.

        - -<%-- FIXME: Collection-specific stuff should go here? --%> - -

        Please also note that the DSpace system is - able to preserve the content of certain types of files better than other - types. - Information about file types and levels of - support for each are available.

        - - - - - - -<% - if (si.submission.hasMultipleFiles()) - { -%> - - - - - - - - - - -<% - } -%> -
        - Document File: - - -
         
        - Please give a brief description of the contents of this file, for - example "Main article", or "Experiment data readings." -
        File Description:
        - - <%= SubmitServlet.getSubmissionParameters(si) %> - - -

         

        - -
        - - - - - - - - -
          - - - -     - -
        -
        - - -
        - -
        +<%-- + - choose-file.jsp + - + - Version: $Revision: 1.8 $ + - + - Date: $Date: 2004/06/16 20:11:56 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Select file to upload + - + - Attributes to pass in to this page: + - submission.info - the SubmissionInfo object + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="choose-file.title"/> + + + +
        + + + + + + + <%--

        Submit: Upload a File

        --%> +

        + + <%--

        Please enter the name of + <%= (si.submission.hasMultipleFiles() ? "one of the files" : "the file" ) %> on your + local hard drive corresponding to your item. If you click "Browse...", a + new window will appear in which you can locate and select the file on your + local hard drive. (More Help...)

        --%> + + + + + +

        +

        + + <%--

        Netscape users please note: By + default, the window brought up by clicking "Browse..." will only display + files of type HTML. If the file you are uploading isn't an HTML file, + you will need to select the option to display files of other types. + Instructions for Netscape users are available.

        --%> +

        +

        + +<%-- FIXME: Collection-specific stuff should go here? --%> + + <%--

        Please also note that the DSpace system is + able to preserve the content of certain types of files better than other + types. + Information about file types and levels of + support for each are available.

        --%> + + + + + +

        + +

        + + + + + + +<% + if (si.submission.hasMultipleFiles()) + { +%> + + + + + + + + <%-- --%> + + + +<% + } +%> +
        + <%-- Document File: --%> + + + +
         
        + <%-- Please give a brief description of the contents of this file, for + example "Main article", or "Experiment data readings." --%> + +
        File Description:
        + + <%= SubmitServlet.getSubmissionParameters(si) %> + + +

         

        + +
        + + + + + + + + +
          + + "> + + + "> +     + + "> +
        +
        + + +
        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/complete.jsp dspace-1.2-source-devel/multi/submit/complete.jsp --- dspace-1.2-source-devel/jsp/submit/complete.jsp 2003-02-21 17:51:50.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/complete.jsp 2004-11-23 13:27:39.000000000 -0200 @@ -1,70 +1,88 @@ -<%-- - - complete.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2003/02/21 19:51:50 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Submission complete message - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - - - - - - - -

        Submit: Submission Complete!

        - - <%-- FIXME Probably should say something specific to workflow --%> -

        Your submission will now go through the workflow process designated for - the collection to which you are submitting. You will receive e-mail - notification as soon as your submission has become a part of the collection, - or if for some reason there is a problem with your submission. You can also - check on the status of your submission by going to the My DSpace page.

        - -

        Go to My DSpace

        - -
        +<%-- + - complete.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2003/02/21 19:51:50 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Submission complete message + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="complete.title"/> + + + + + + + + + + + <%--

        Submit: Submission Complete!

        --%> +

        + + <%-- FIXME Probably should say something specific to workflow --%> + <%--

        Your submission will now go through the workflow process designated for + the collection to which you are submitting. You will receive e-mail + notification as soon as your submission has become a part of the collection, + or if for some reason there is a problem with your submission. You can also + check on the status of your submission by going to the My DSpace page.

        --%> +

        + + <%--

        Go to My DSpace

        --%> +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/creative-commons.jsp dspace-1.2-source-devel/multi/submit/creative-commons.jsp --- dspace-1.2-source-devel/jsp/submit/creative-commons.jsp 2004-06-24 17:53:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/creative-commons.jsp 2004-11-23 13:30:49.000000000 -0200 @@ -1,141 +1,169 @@ -<%-- - - creative-commons.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/06/24 20:53:13 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show the user a license which they may grant or reject - - - - Attributes to pass in: - - submission.info - the SubmissionInfo object - - license - the license text to display - - cclicense.exists - boolean to indicate CC license already exists - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - String license = (String) request.getAttribute("license"); - String reqURL = request.getRequestURL().toString(); - int firstIndex = reqURL.indexOf("://") + 3; - int secondIndex = reqURL.indexOf("/", firstIndex); - String baseURL = reqURL.substring(0, secondIndex) + request.getContextPath(); - String ssURL = baseURL + "/submit/creative-commons.css"; - String exitURL = baseURL + "/submit/cc-license.jsp?license_url=[license_url]"; - Boolean lExists = (Boolean)request.getAttribute("cclicense.exists"); - boolean licenseExists = (lExists == null ? false : lExists.booleanValue()); -%> - - - -
        - - - - - - -

        Submit: Use a Creative Commons License

        -
        - -<% - if (licenseExists) - { -%> -

        You have already chosen a Creative Commons license and added it to this item. - You may:

        -
          -
        • Press the 'Next' button below to keep the license previously chosen.
        • -
        • Press the 'Skip Creative Commons' button below to remove the current choice, and forego a Creative Commons license.
        • -
        • Complete the selection process below to replace the current choice.
        • -
        -<% - } - else - { -%> -

        To license your Item under Creative Commons, follow the instructions below. You will be given an opportunity to review your selection. - Follow the 'proceed' link to add the license. If you wish to omit a Creative Commons license, press the 'Skip Creative Commons' button.

        -<% - } -%> - - - - <%= SubmitServlet.getSubmissionParameters(si) %> - > - - -
        - - - - -<% - if (licenseExists) - { -%> - -<% - } -%> - - - - -
          - - - - - -     - -
        -
        -
        -
        +<%-- + - creative-commons.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/06/24 20:53:13 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show the user a license which they may grant or reject + - + - Attributes to pass in: + - submission.info - the SubmissionInfo object + - license - the license text to display + - cclicense.exists - boolean to indicate CC license already exists + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + String license = (String) request.getAttribute("license"); + String reqURL = request.getRequestURL().toString(); + int firstIndex = reqURL.indexOf("://") + 3; + int secondIndex = reqURL.indexOf("/", firstIndex); + String baseURL = reqURL.substring(0, secondIndex) + request.getContextPath(); + String ssURL = baseURL + "/submit/creative-commons.css"; + String exitURL = baseURL + "/submit/cc-license.jsp?license_url=[license_url]"; + Boolean lExists = (Boolean)request.getAttribute("cclicense.exists"); + boolean licenseExists = (lExists == null ? false : lExists.booleanValue()); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="creative-commons.title"/> + + + + +
        + + + + + + + <%--

        Submit: Use a Creative Commons License

        --%> +

        +
        + +<% + if (licenseExists) + { +%> + <%--

        You have already chosen a Creative Commons license and added it to this item. + You may:

        --%> +

        + <%--
          +
        • Press the 'Next' button below to keep the license previously chosen.
        • +
        • Press the 'Skip Creative Commons' button below to remove the current choice, and forego a Creative Commons license.
        • +
        • Complete the selection process below to replace the current choice.
        • +
        --%> +
          +
        • +
        • +
        • +
        +<% + } + else + { +%> + <%--

        To license your Item under Creative Commons, follow the instructions below. You will be given an opportunity to review your selection. + Follow the 'proceed' link to add the license. If you wish to omit a Creative Commons license, press the 'Skip Creative Commons' button.

        --%> +

        +<% + } +%> + + <%-- --%> + + + <%= SubmitServlet.getSubmissionParameters(si) %> + > + + +
        + + + + +<% + if (licenseExists) + { +%> + +<% + } +%> + + + + +
          + <%-- --%> + "> + + <%-- --%> + "> + + <%-- --%> + "/> +     + <%-- --%> + "/> +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/submit/edit-metadata-1.jsp dspace-1.2-source-devel/multi/submit/edit-metadata-1.jsp --- dspace-1.2-source-devel/jsp/submit/edit-metadata-1.jsp 2004-07-13 05:35:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/edit-metadata-1.jsp 2005-03-01 10:11:25.000000000 -0200 @@ -1,795 +1,983 @@ -<%-- - - edit-metadata-1.jsp - - - - Version: $Revision: 1.15 $ - - - - Date: $Date: 2004/07/13 08:35:14 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Edit metadata form, page 1 - - - - Attributes to pass in to this page: - - submission.info - the SubmissionInfo object - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="java.util.HashMap" %> -<%@ page import="java.util.Iterator" %> -<%@ page import="java.util.Map" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> -<%@ page import="org.dspace.content.DCDate" %> -<%@ page import="org.dspace.content.DCLanguage" %> -<%@ page import="org.dspace.content.DCPersonName" %> -<%@ page import="org.dspace.content.DCSeriesNumber" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - Item item = si.submission.getItem(); - - final int lastNameWidth = 23; - final int firstNamesWidth = 23; - final int formWidth = 50; -%> - - - -
        - - - - - - -

        Submit: Describe Your Item

        - -

        Please fill in the requested information about your submission below. In - most browsers, you can use the tab key to move the cursor to the next input - box or button, to save you having to use the mouse each time. - (More Help...)

        - - <%-- HACK: a
        tag seems to be the only way to convince certain --%> - <%-- browsers to center the table. --%> -
        - - -<%-- ================================================ --%> -<%-- Contributor.Author --%> -<%-- ================================================ --%> - - - -<%-- Width hints used here to affect whole table --%> - - - - - - -<% - DCValue[] authors = item.getDC("contributor", "author", Item.ANY); - int authorFieldCount = authors.length + 1; - if (si.moreBoxesFor != null && "contributor_author".equals(si.moreBoxesFor)) - { - authorFieldCount += 2; - } - - for (int i = 0; i < authorFieldCount; i++) - { - DCPersonName dpn = - (i < authors.length ? new DCPersonName(authors[i].value) - : new DCPersonName() ); -%> - -<% - if (i == 0) - { -%> - -<% - } - else - { -%> - -<% - } -%> - - -<% - if (i < authors.length) - { - // Put a "remove" button next to all filled-in values -%> - -<% - } - else if (i == authorFieldCount - 1) - { - // Put an "add more" button next to the last space (which is always - // initially empty.) -%> - -<% - } - else - { - // An empty space that isn't the last one -%> - -<% - } -%> - -<% - } -%> - -<%-- HACK: Using this line to give the browser hints as to the widths of cells --%> - - - - - - -<%-- ================================================ --%> -<%-- Main title --%> -<%-- ================================================ --%> - - -<% - if (si.missing && si.jumpToField != null && "title".equals(si.jumpToField)) - { -%> - - -<% - // FIXME: (Maybe) Assumes a single main title - DCValue[] titleArray = item.getDC("title", null, Item.ANY); - String title = (titleArray.length > 0 ? titleArray[0].value : ""); -%> - - - - - - - - - -<%-- ================================================ --%> -<%-- Alternative titles --%> -<%-- ================================================ --%> - -<% - if (si.submission.hasMultipleTitles()) - { -%> - - - -<% - DCValue[] altTitles = item.getDC("title", "alternative", Item.ANY); - int altTitleFieldCount = altTitles.length + 1; - if (si.moreBoxesFor != null && "title_alternative".equals(si.moreBoxesFor)) - { - altTitleFieldCount += 2; - } - - - for (int i = 0; i < altTitleFieldCount; i++) - { - String val = ""; - if (i < altTitles.length) - { - val = altTitles[i].value; - } -%> - -<%-- HACK: nowrap used since browsers do not act on "white-space" CSS property --%> -<% - if (i == 0) - { -%> - -<% - } - else - { -%> - -<% - } -%> - -<% - if (i < altTitles.length) - { - // Put a "remove" button next to all filled-in values -%> - -<% - } - else if(i == altTitleFieldCount - 1) - { - // Put an "add more" button next to the last space (which is always - // initially empty.) -%> - -<% - } - else - { - // An empty space that isn't the last one -%> - -<% - } -%> - -<% - } -%> - - - -<% - } -%> - -<% - if (si.submission.isPublishedBefore()) - { -%> -<%-- ================================================ --%> -<%-- date.issued --%> -<%-- ================================================ --%> - - - -<% - DCValue[] dateIssuedArray = item.getDC("date", "issued", Item.ANY); - DCDate dateIssued = new DCDate( - (dateIssuedArray.length > 0 ? dateIssuedArray[0].value : "")); - if (si.missing && dateIssued.getYear() <= 0 && si.jumpToField != null && "date_issued_year".equals(si.jumpToField)) - { -%> - - - -<% - } -%> - -<%-- HACK: nowrap used since browsers do not act on "white-space" CSS property --%> - - - - - - - - - -<%-- ================================================ --%> -<%-- publisher --%> -<%-- ================================================ --%> - - - - -<% - // FIXME: (Maybe) Assumes a single citation - DCValue[] pubArray = item.getDC("publisher", null, Item.ANY); - String publisher = (pubArray.length > 0 ? pubArray[0].value : ""); -%> - - - - - - - - - - -<%-- ================================================ --%> -<%-- identifier.citation --%> -<%-- ================================================ --%> - - - - -<% - // FIXME: (Maybe) Assumes a single citation - DCValue[] citeArray = item.getDC("identifier", "citation", Item.ANY); - String citation = (citeArray.length > 0 ? citeArray[0].value : ""); -%> - - - - - - - - -<% - } -%> - - -<%-- ================================================ --%> -<%-- relation.ispartofseries --%> -<%-- ================================================ --%> - - - - - - - - - -<% - DCValue[] seriesNumbers = item.getDC("relation", "ispartofseries", Item.ANY); - int seriesNumberFieldCount = seriesNumbers.length + 1; - - if (si.moreBoxesFor != null && "relation_ispartofseries".equals(si.moreBoxesFor)) - { - seriesNumberFieldCount += 2; - } - - for (int i = 0; i < seriesNumberFieldCount; i++) - { - DCSeriesNumber sn = - (i < seriesNumbers.length ? new DCSeriesNumber(seriesNumbers[i].value) - : new DCSeriesNumber()); -%> - -<% - if (i == 0) - { -%> - -<% - } - else - { -%> - -<% - } -%> - - -<% - if (i < seriesNumbers.length) - { - // Put a "remove" button next to all filled-in values -%> - -<% - } - else if(i == seriesNumberFieldCount - 1) - { - // Put an "add more" button next to the last space (which is always - // initially empty.) -%> - -<% - } - else - { - // An empty space that isn't the last one -%> - -<% - } -%> - -<% - } -%> - - - - - -<%-- ================================================ --%> -<%-- Identifiers --%> -<%-- ================================================ --%> -<% - // Names of each identifier type - // FIXME: Maybe should draw from DC registry? - Map identifierQualNames = new HashMap(); - identifierQualNames.put("govdoc", "Gov't Doc #"); - identifierQualNames.put("uri", "URI"); - identifierQualNames.put("isbn", "ISBN"); - identifierQualNames.put("issn", "ISSN"); - identifierQualNames.put("ismn", "ISMN"); - identifierQualNames.put("other", "Other"); - - DCValue[] identifiers = item.getDC("identifier", Item.ANY, Item.ANY); - - // Remove any identifier.citation. - // FIXME: (Maybe) assumes there will only be one? - for (int i = 0; i < identifiers.length; i++) - { - if ("citation".equals(identifiers[i].qualifier)) - { - DCValue[] newIDs = new DCValue[identifiers.length - 1]; - for (int j = 0; j < i; j++) - { - newIDs[j] = identifiers[j]; - } - for (int j = i + 1; j < identifiers.length; j++) - { - newIDs[j-1] = identifiers[j]; - } - identifiers = newIDs; - break; - } - } -%> - - - -<% - // Work out how many input boxes to display - int identifierFieldCount = identifiers.length + 1; - - if (si.moreBoxesFor != null && "identifier".equals(si.moreBoxesFor)) - { - identifierFieldCount += 2; - } - - // Display the input boxes - for (int i = 0; i < identifierFieldCount; i++) - { - String currentQual = ""; - String currentValue = ""; - - if (i < identifiers.length) - { - currentQual = identifiers[i].qualifier; - currentValue = identifiers[i].value; - } - - if (i == 0) - { - // Only put "Identifiers" label next to first input box -%> - - -<% - } - else - { -%> - -<% - } -%> -<%-- Qualifier pull-down --%> - -<% - if (i < identifiers.length) - { - // Remove button next to filled-in values -%> - -<% - } - else if (i == identifierFieldCount - 1) - { - // "Add more" button on last line -%> - -<% - } - else - { - // Empty space -%> - -<% - } -%> - -<% - } -%> - - - - - -<%-- ================================================ --%> -<%-- Type --%> -<%-- ================================================ --%> - - - -<% - String[] allTypes = { - "Animation", - "Article", - "Book", - "Book chapter", - "Dataset", - "Learning Object", - "Image", - "Image,3-D", - "Map", - "Musical Score", - "Plan or blueprint", - "Preprint", - "Presentation", - "Recording,acoustical", - "Recording,musical", - "Recording,oral", - "Software", - "Technical Report", - "Thesis", - "Video", - "Working Paper", - "Other"}; - - DCValue[] typeArray = item.getDC("type", null, Item.ANY); - // Make into a HashMap for easy access - HashMap typeMap = new HashMap(); - for (int i = 0; i < typeArray.length; i++) - { - typeMap.put(typeArray[i].value, new Boolean(true)); - } -%> - - - - - - - - - - - -<%-- ================================================ --%> -<%-- Language --%> -<%-- ================================================ --%> - - - -<% - // FIXME: (Maybe) assume one language - String[] defLanguages = {"en_US", "en", "es", "de", "fr", "it", "ja", "zh", "other", ""}; - DCValue[] langArray = item.getDC("language", "iso", Item.ANY); - String lang = (langArray.length > 0 ? langArray[0].value : ""); -%> - - - - - -
        -<% - if (si.jumpToField != null && "contributor_author".equals(si.jumpToField)) - { -%> - -<% - } -%> - Enter the names of the authors of this item below. -
         Last name
        e.g. Smith
        First name(s) + "Jr"
        e.g. Donald Jr
         
        Authors  - size=<%= lastNameWidth %> - value="<%= dpn.getLastName() %>"> - - size=<%= firstNamesWidth %> - value="<%= dpn.getFirstNames() %>"> - value="Remove This Author"> 
           
        - - You must enter a main title for the item. -<% - } - else - { -%> - - Enter the main title of the item. -<% - } -%> - -
        Title - value="<%= title %>"> -  
         
        -<% - if (si.jumpToField != null && "title_alternative".equals(si.jumpToField)) - { -%> - -<% - } -%> - If the item has any alternative titles, please enter them below. -
        Other titles  - size=<%= formWidth %> value="<%= val %>"> - value="Remove This Value"> 
         
        - Please give the date of previous publication or public distribution - below. You can leave out the day and/or month if they aren't - applicable. -
        - - You must enter at least the year. -
        Date of Issue - Month: - Day:"> - Year:"> - -   -
         
        - Enter the name of the publisher of the previously issued instance of this item. -
        Publisher - value="<%= publisher %>"> -  
         
        - Enter the standard citation for the previously issued instance of this item. -
        Citation - value="<%= citation %>"> -  
         
        -<% - if (si.jumpToField != null && "relation_ispartofseries".equals(si.jumpToField)) - { -%> - -<% - } -%> - Enter the series and number assigned to this item by your community. -
         Series NameReport or Paper No. 
        Series/Report No.  - size=<%= lastNameWidth %> - value="<%= sn.getSeries() %>"> - - size=<%= firstNamesWidth %> - value="<%= sn.getNumber() %>"> - value="Remove This Value"> 
         
        -<% - if (si.jumpToField != null && "identifier".equals(si.jumpToField)) - { -%> - -<% - } -%> - If the item has any identification numbers or codes associated with - it, please enter the types and the actual numbers or codes below. -
        Identifiers  -   size=34 - value="<%= currentValue %>"> - value="Remove This Value"> 
         
        - Select the type(s) of content you are submitting. To - select more than one value in the list, you may have to - hold down the "CTRL" or "Shift" key. -
        Type - -  
         
        - Select the language of the main content of the item. If the language does not appear in the list below, please - select "Other". If the content does not really have a language (for example, if it is a dataset or an image) - please select "N/A". -
        Language - -  
        -
        - -<%-- HACK: Need a space - is there a nicer way to do this than
        or a --%> -<%-- blank

        ? --%> -

         

        - -<%-- Hidden fields needed for submit servlet to know which item to deal with --%> - <%= SubmitServlet.getSubmissionParameters(si) %> - > -
        - - - - - - - - -
          - - - -     - -
        -
        - - +<%-- + - edit-metadata-1.jsp + - + - Version: $Revision: 1.15 $ + - + - Date: $Date: 2004/07/13 08:35:14 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Edit metadata form, page 1 + - + - Attributes to pass in to this page: + - submission.info - the SubmissionInfo object + --%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="java.util.HashMap" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.Map" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> +<%@ page import="org.dspace.content.DCDate" %> +<%@ page import="org.dspace.content.DCLanguage" %> +<%@ page import="org.dspace.content.DCPersonName" %> +<%@ page import="org.dspace.content.DCSeriesNumber" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> + +<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> +<%@ page import="org.apache.taglibs.standard.tag.common.fmt.BundleSupport" %> +<%@ page import="java.util.Locale" %> +<%@ page import="java.util.ResourceBundle" %> + + + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + Item item = si.submission.getItem(); + + final int lastNameWidth = 23; + final int firstNamesWidth = 23; + final int formWidth = 50; + final int langNumber = 2; + +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="edit-metadata-1.title"/> + + + +<% + //get Locale first + LocalizationContext locCtxt = null; + locCtxt = BundleSupport.getLocalizationContext(pageContext); + Locale loc = locCtxt.getLocale(); +%> + +<%! //Simple function to enable metadata lang menu + + static final String[] metaLangs = {"el", "en", ""}; //can add more + + + private String createLangMenu (DCLanguage dcl, Locale loc, String name) { + String output = ""; + output = "\n"; + return output; + } +%> + + + + + + + +
        + + + + + + + <%--

        Submit: Describe Your Item

        --%> +

        + + <%--

        Please fill in the requested information about your submission below. In + most browsers, you can use the tab key to move the cursor to the next input + box or button, to save you having to use the mouse each time. + (More Help...)

        --%> + + + + + +

        +

        + + <%-- HACK: a
        tag seems to be the only way to convince certain --%> + <%-- browsers to center the table. --%> +
        + + +<%-- ================================================ --%> +<%-- Contributor.Author --%> +<%-- ================================================ --%> + + + +<%-- Width hints used here to affect whole table --%> + + + <%-- + --%> + + + + +<% + DCValue[] authors = item.getDC("contributor", "author", Item.ANY); + int authorFieldCount = authors.length + langNumber; + if (si.moreBoxesFor != null && "contributor_author".equals(si.moreBoxesFor)) + { + authorFieldCount += 2; + } + + for (int i = 0; i < authorFieldCount; i++) + { + DCPersonName dpn = + (i < authors.length ? new DCPersonName(authors[i].value) + : new DCPersonName() ); + DCLanguage dpl = + ((i < authors.length && authors[i].language!=null) ? new DCLanguage(authors[i].language) + : new DCLanguage("") ); + + + + +%> + +<% + if (i == 0) + { +%> + <%-- --%> + +<% + } + else + { +%> + +<% + } +%> + + + + +<% + if (i < authors.length) + { + // Put a "remove" button next to all filled-in values +%> + <%-- --%> + +<% + } + else if (i == authorFieldCount - 1) + { + // Put an "add more" button next to the last space (which is always + // initially empty.) +%> + <%-- --%> + +<% + } + else + { + // An empty space that isn't the last one +%> + +<% + } +%> + +<% + } +%> + +<%-- HACK: Using this line to give the browser hints as to the widths of cells --%> + + + + + + +<%-- ================================================ --%> +<%-- Main title --%> +<%-- ================================================ --%> + + +<% + if (si.missing && si.jumpToField != null && "title".equals(si.jumpToField)) + { +%> + + +<% + // FIXME: (Maybe) Assumes a single main title + DCValue[] titleArray = item.getDC("title", null, Item.ANY); + String title = (titleArray.length > 0 ? titleArray[0].value : ""); + DCLanguage tl = + ((titleArray.length > 0 && titleArray[0].language!=null) ? new DCLanguage(titleArray[0].language) : new DCLanguage("") ); +%> + + <%-- --%> + + + + + + + + +<%-- ================================================ --%> +<%-- Alternative titles --%> +<%-- ================================================ --%> + +<% + if (si.submission.hasMultipleTitles()) + { +%> + + + +<% + DCValue[] altTitles = item.getDC("title", "alternative", Item.ANY); + int altTitleFieldCount = altTitles.length + 1; + if (si.moreBoxesFor != null && "title_alternative".equals(si.moreBoxesFor)) + { + altTitleFieldCount += 2; + } + + + for (int i = 0; i < altTitleFieldCount; i++) + { + String val = ""; + DCLanguage altTl = new DCLanguage(""); + if (i < altTitles.length) + { + val = altTitles[i].value; + altTl = + (altTitles[i].language!=null ? new DCLanguage(altTitles[i].language) : new DCLanguage("") ); + + + } +%> + +<%-- HACK: nowrap used since browsers do not act on "white-space" CSS property --%> +<% + if (i == 0) + { +%> + <%-- --%> + +<% + } + else + { +%> + +<% + } +%> + + + +<% + if (i < altTitles.length) + { + // Put a "remove" button next to all filled-in values +%> + + +<% + } + else if(i == altTitleFieldCount - 1) + { + // Put an "add more" button next to the last space (which is always + // initially empty.) +%> + <%-- --%> + +<% + } + else + { + // An empty space that isn't the last one +%> + +<% + } +%> + +<% + } +%> + + + +<% + } +%> + +<% + if (si.submission.isPublishedBefore()) + { +%> +<%-- ================================================ --%> +<%-- date.issued --%> +<%-- ================================================ --%> + + + +<% + DCValue[] dateIssuedArray = item.getDC("date", "issued", Item.ANY); + DCDate dateIssued = new DCDate( + (dateIssuedArray.length > 0 ? dateIssuedArray[0].value : "")); + if (si.missing && dateIssued.getYear() <= 0 && si.jumpToField != null && "date_issued_year".equals(si.jumpToField)) + { +%> + + + +<% + } +%> + +<%-- HACK: nowrap used since browsers do not act on "white-space" CSS property --%> + <%-- --%> + + + + + + + + + +<%-- ================================================ --%> +<%-- publisher --%> +<%-- ================================================ --%> + + + + +<% + // FIXME: (Maybe) Assumes a single citation + DCValue[] pubArray = item.getDC("publisher", null, Item.ANY); + String publisher = (pubArray.length > 0 ? pubArray[0].value : ""); + + DCLanguage pub = + ((pubArray.length > 0 && pubArray[0].language!=null) ? new DCLanguage(pubArray[0].language) : new DCLanguage("") ); +%> + + + + + <%----%> + + + + <% + + for (int i=1; i < langNumber; i++) { + publisher = (pubArray.length > i ? pubArray[i].value : ""); + pub = + ((pubArray.length > i && pubArray[i].language!=null) ? new DCLanguage(pubArray[i].language) : new DCLanguage("") ); + %> + + + + + + <%----%> + + + + + <% } %> + + + + + +<%-- ================================================ --%> +<%-- identifier.citation --%> +<%-- ================================================ --%> + + + + +<% + // FIXME: (Maybe) Assumes a single citation + DCValue[] citeArray = item.getDC("identifier", "citation", Item.ANY); + String citation = (citeArray.length > 0 ? citeArray[0].value : ""); +%> + + <%-- --%> + + + + + + + +<% + } +%> + + +<%-- ================================================ --%> +<%-- relation.ispartofseries --%> +<%-- ================================================ --%> + + + + + + <%-- + --%> + + + + +<% + DCValue[] seriesNumbers = item.getDC("relation", "ispartofseries", Item.ANY); + int seriesNumberFieldCount = seriesNumbers.length + langNumber; + + if (si.moreBoxesFor != null && "relation_ispartofseries".equals(si.moreBoxesFor)) + { + seriesNumberFieldCount += 2; + } + + for (int i = 0; i < seriesNumberFieldCount; i++) + { + DCSeriesNumber sn = new DCSeriesNumber(); + DCLanguage DCSeriesLang = new DCLanguage(""); + + if (i < seriesNumbers.length) { + sn = new DCSeriesNumber(seriesNumbers[i].value); + DCSeriesLang = + (seriesNumbers[i].language!=null ? new DCLanguage(seriesNumbers[i].language) : new DCLanguage("") ); + } +%> + +<% + if (i == 0) + { +%> + + +<% + } + else + { +%> + +<% + } +%> + + + +<% + if (i < seriesNumbers.length) + { + // Put a "remove" button next to all filled-in values +%> + <%-- --%> + +<% + } + else if(i == seriesNumberFieldCount - 1) + { + // Put an "add more" button next to the last space (which is always + // initially empty.) +%> + <%-- --%> + +<% + } + else + { + // An empty space that isn't the last one +%> + +<% + } +%> + +<% + } +%> + + + + + +<%-- ================================================ --%> +<%-- Identifiers --%> +<%-- ================================================ --%> +<% + // Names of each identifier type + // FIXME: Maybe should draw from DC registry? + Map identifierQualNames = new HashMap(); + + //identifierQualNames.put("govdoc", "Gov't Doc #"); + //identifierQualNames.put("uri", "URI"); + //identifierQualNames.put("isbn", "ISBN"); + //identifierQualNames.put("issn", "ISSN"); + //identifierQualNames.put("ismn", "ISMN"); + //identifierQualNames.put("other", "Other"); + + identifierQualNames.put("govdoc", "identifiers.type1"); + identifierQualNames.put("uri", "identifiers.type2"); + identifierQualNames.put("isbn", "identifiers.type3"); + identifierQualNames.put("issn", "identifiers.type4"); + identifierQualNames.put("ismn", "identifiers.type5"); + identifierQualNames.put("other", "identifiers.type6"); + + DCValue[] identifiers = item.getDC("identifier", Item.ANY, Item.ANY); + + // Remove any identifier.citation. + // FIXME: (Maybe) assumes there will only be one? + for (int i = 0; i < identifiers.length; i++) + { + if ("citation".equals(identifiers[i].qualifier)) + { + DCValue[] newIDs = new DCValue[identifiers.length - 1]; + for (int j = 0; j < i; j++) + { + newIDs[j] = identifiers[j]; + } + for (int j = i + 1; j < identifiers.length; j++) + { + newIDs[j-1] = identifiers[j]; + } + identifiers = newIDs; + break; + } + } +%> + + + +<% + // Work out how many input boxes to display + int identifierFieldCount = identifiers.length + 1; + + if (si.moreBoxesFor != null && "identifier".equals(si.moreBoxesFor)) + { + identifierFieldCount += 2; + } + + // Display the input boxes + for (int i = 0; i < identifierFieldCount; i++) + { + String currentQual = ""; + String currentValue = ""; + + if (i < identifiers.length) + { + currentQual = identifiers[i].qualifier; + currentValue = identifiers[i].value; + } + + if (i == 0) + { + // Only put "Identifiers" label next to first input box +%> + <%-- + --%> + + +<% + } + else + { +%> + +<% + } +%> +<%-- Qualifier pull-down --%> + +<% + if (i < identifiers.length) + { + // Remove button next to filled-in values +%> + <%-- --%> + +<% + } + else if (i == identifierFieldCount - 1) + { + // "Add more" button on last line +%> + <%-- --%> + +<% + } + else + { + // Empty space +%> + +<% + } +%> + +<% + } +%> + + + + + +<%-- ================================================ --%> +<%-- Type --%> +<%-- ================================================ --%> + + + +<% + + + ResourceBundle mon = ResourceBundle.getBundle("months", loc); + ResourceBundle mon_en = ResourceBundle.getBundle("months", new Locale("en")); + ResourceBundle mon_el = ResourceBundle.getBundle("months", new Locale("el")); + String[] allTypes = (String[])mon.getObject("submit_types"); + String[] allTypes_en = (String[])mon_en.getObject("submit_types"); + String[] allTypes_el = (String[])mon_el.getObject("submit_types"); + + DCValue[] typeArray = item.getDC("type", null, Item.ANY); + // Make into a HashMap for easy access + HashMap typeMap = new HashMap(); + for (int i = 0; i < typeArray.length; i++) + { + typeMap.put(typeArray[i].value, new Boolean(true)); + } +%> + + <%-- --%> + + + + + + + + + + +<%-- ================================================ --%> +<%-- Language --%> +<%-- ================================================ --%> + + + +<% + // FIXME: (Maybe) assume one language + String[] defLanguages = {"el", "en_US", "en", "es", "de", "fr", "it", "ja", "zh", "other", ""}; + DCValue[] langArray = item.getDC("language", "iso", Item.ANY); + String lang = (langArray.length > 0 ? langArray[0].value : ""); +%> + + <%-- --%> + + + + +
        +<% + if (si.jumpToField != null && "contributor_author".equals(si.jumpToField)) + { +%> + +<% + } +%> + <%-- Enter the names of the authors of this item below. --%> + +
         Last name
        e.g. Smith
        First name(s) + "Jr"
        e.g. Donald Jr
         
        Authors  + size=<%= lastNameWidth %> + value="<%= dpn.getLastName() %>"> + + size=<%= firstNamesWidth %> + value="<%= dpn.getFirstNames() %>"> + + <%=createLangMenu(dpl, loc, "contributor_author_lang_"+i)%> + value="Remove This Author"> value="">"> 
           
        + + <%-- You must enter a main title for the item. --%> + +<% + } + else + { +%> + + <%-- Enter the main title of the item. --%> + +<% + } +%> + +
        Title + value="<%= title %>"> + + <%=createLangMenu(tl, loc, "title_lang") %> +
         
        +<% + if (si.jumpToField != null && "title_alternative".equals(si.jumpToField)) + { +%> + +<% + } +%> + <%-- If the item has any alternative titles, please enter them below. --%> + +
        Other titles  + size=<%= formWidth %> value="<%= val %>"> + + <%= createLangMenu(altTl, loc, "title_alternative_lang_"+i)%> + value="">"> 
         
        + <%-- Please give the date of previous publication or public distribution + below. You can leave out the day and/or month if they aren't + applicable. --%> + +
        + + <%-- You must enter at least the year. --%> + +
        Date of Issue + <%-- Month: + <%-- --%> + +<% + for (int i = 1; i < 13; i++) + { +%> + +<% + } +%> + + <%-- Day:"> + Year:"> --%> + "> + "> +   + +
         
        + <%-- Enter the name of the publisher of the previously issued instance of this item. --%> + +
        + value="<%= publisher %>"> +   + <%-- --%> + <%=createLangMenu(pub, loc, "publisher_lang_0") %> +
        + value="<%= publisher %>"> +   + <%-- --%> + <%=createLangMenu(pub, loc, "publisher_lang_"+i) %> +
         
        + <%-- Enter the standard citation for the previously issued instance of this item. --%> + +
        Citation + value="<%= citation %>"> +  
         
        +<% + if (si.jumpToField != null && "relation_ispartofseries".equals(si.jumpToField)) + { +%> + +<% + } +%> + <%-- Enter the series and number assigned to this item by your community. --%> + +
         Series NameReport or Paper No. 
          + size=<%= lastNameWidth %> + value="<%= sn.getSeries() %>"> + + size=<%= firstNamesWidth %> + value="<%= sn.getNumber() %>"> + + <%=createLangMenu(DCSeriesLang, loc, "relation_ispartofseries_lang_"+i)%> + value="Remove This Value"> value="">"> 
         
        +<% + if (si.jumpToField != null && "identifier".equals(si.jumpToField)) + { +%> + +<% + } +%> + <%-- If the item has any identification numbers or codes associated with + it, please enter the types and the actual numbers or codes below. --%> + + +
        Identifiers
          +   size=34 + value="<%= currentValue %>"> +   value="Remove This Value"> value="">"> 
         
        + <%-- Select the type(s) of content you are submitting. To + select more than one value in the list, you may have to + hold down the "CTRL" or "Shift" key. --%> + +
        Type + +  
         
        + <%-- Select the language of the main content of the item. If the language does not appear in the list below, please + select "Other". If the content does not really have a language (for example, if it is a dataset or an image) + please select "N/A". --%> + +
        Language + +  
        +
        + +<%-- HACK: Need a space - is there a nicer way to do this than
        or a --%> +<%-- blank

        ? --%> +

         

        + +<%-- Hidden fields needed for submit servlet to know which item to deal with --%> + <%= SubmitServlet.getSubmissionParameters(si) %> + > +
        + + + + + + + + +
          + <%-- --%> + "> + + <%-- --%> + "> +     + <%-- --%> + "> +
        +
        + + diff -Naur dspace-1.2-source-devel/jsp/submit/edit-metadata-2.jsp dspace-1.2-source-devel/multi/submit/edit-metadata-2.jsp --- dspace-1.2-source-devel/jsp/submit/edit-metadata-2.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/edit-metadata-2.jsp 2005-03-07 13:12:23.000000000 -0200 @@ -1,276 +1,446 @@ -<%-- - - edit-metadata-2.jsp - - - - Version: $Revision: 1.8 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Edit metadata form page 2 - - - - Attributes to pass in to this page: - - submission.info - the SubmissionInfo object - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - Item item = si.submission.getItem(); - - final int formWidth = 50; - final int subjectWidth = 15; -%> - - - -
        - - - - - - -

        Submit: Describe Your Item

        - -

        Please fill further information about your submission below. - (More Help...)

        - -<%-- HACK: a
        tag seems to be the only way to convince certain --%> -<%-- browsers to center the table. --%> -
        - - -<%-- ================================================ --%> -<%-- Subject keywords --%> -<%-- ================================================ --%> - - - -<% - DCValue[] subjects = item.getDC("subject", null, Item.ANY); - int subjectFieldCount = subjects.length + 1; - - if (si.moreBoxesFor != null && si.moreBoxesFor.equals("subject")) - { - subjectFieldCount += 2; - } - - for (int i = 0; i < subjectFieldCount; i += 2) - { -%> - -<%-- HACK: nowrap used since browsers do not act on "white-space" CSS property --%> -<% - if (i == 0) - { -%> - -<% - } - else - { -%> - -<% - } -%> - - - -<% - } -%> - - - - - -<%-- ================================================ --%> -<%-- Abstract --%> -<%-- ================================================ --%> - - - -<% - // FIXME: (Maybe) assume one abstract - DCValue[] abstrArray = item.getDC("description", "abstract", Item.ANY); - String abstr = (abstrArray.length > 0 ? abstrArray[0].value : ""); -%> - - - - - - - - - -<%-- ================================================ --%> -<%-- Sponsorship --%> -<%-- ================================================ --%> - - - -<% - DCValue[] sponsorArray = item.getDC("description", "sponsorship", Item.ANY); - String sponsorship = (sponsorArray.length > 0 ? sponsorArray[0].value : ""); -%> - - - - - - - - - -<%-- ================================================ --%> -<%-- Other Description --%> -<%-- ================================================ --%> - - - -<% - DCValue[] descArray = item.getDC("description", null, Item.ANY); - String desc = (descArray.length > 0 ? descArray[0].value : ""); -%> - - - - - -
        -<% - if (si.jumpToField != null && si.jumpToField.equals("subject")) - { -%> - -<% - } -%> - Enter appropriate subject keywords or phrases below. -
        Subject Keywords  -<% - if (i < subjects.length) - { -%> -   -<% - } - else - { -%> - -<% - } -%> -    -<% - if (i + 1 < subjects.length) - { -%> -   -<% - } - else if (i + 2 >= subjectFieldCount) - { -%> -   -<% - } - else - { -%> - -<% - } -%> -
         
        - Enter the abstract of the item below. -
        Abstract - -
         
        - Enter the names of any sponsors and/or funding codes in the box below. -
        Sponsors - -
         
        - Enter any other description or comments in this box. -
        Description - -
        -
        - - -<%-- HACK: Need a space - is there a nicer way to do this than
        or a --%> -<%-- blank

        ? --%> -

         

        - -<%-- Hidden fields needed for submit servlet to know which item to deal with --%> - <%= SubmitServlet.getSubmissionParameters(si) %> - > -
        - - - - - - - - -
          - - - -     - -
        -
        - - - - +<%-- + - edit-metadata-2.jsp + - + - Version: $Revision: 1.8 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Edit metadata form page 2 + - + - Attributes to pass in to this page: + - submission.info - the SubmissionInfo object + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.content.DCLanguage" %> + +<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> +<%@ page import="org.apache.taglibs.standard.tag.common.fmt.BundleSupport" %> +<%@ page import="java.util.Locale" %> +<%@ page import="java.util.ResourceBundle" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + Item item = si.submission.getItem(); + + final int formWidth = 50; + final int subjectWidth = 15; + final int langNumber = 2; +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="edit-metadata-2.title"/> + + + +<% + //get Locale first + LocalizationContext locCtxt = null; + locCtxt = BundleSupport.getLocalizationContext(pageContext); + Locale loc = locCtxt.getLocale(); +%> + +<%! //Simple function to enable metadata lang menu + + static final String[] metaLangs = {"el", "en", ""}; //can add more + + + private String createLangMenu (DCLanguage dcl, Locale loc, String name) { + String output = ""; + output = "\n"; + return output; + } +%> + + +
        + + + + + + + <%--

        Submit: Describe Your Item

        --%> +

        + + <%--

        Please fill further information about your submission below. + (More Help...)

        --%> + + + + + +

        +

        + +<%-- HACK: a
        tag seems to be the only way to convince certain --%> +<%-- browsers to center the table. --%> +
        + + +<%-- ================================================ --%> +<%-- Subject keywords --%> +<%-- ================================================ --%> + + + +<% + DCValue[] subjects = item.getDC("subject", null, Item.ANY); + int subjectFieldCount = subjects.length + 1; + + if (si.moreBoxesFor != null && si.moreBoxesFor.equals("subject")) + { + subjectFieldCount += 2; + } + + for (int i = 0; i < subjectFieldCount; i += 2) + { +%> + +<%-- HACK: nowrap used since browsers do not act on "white-space" CSS property --%> +<% + if (i == 0) + { +%> + <%-- --%> + +<% + } + else + { +%> + +<% + } +%> + + + +<% + } +%> + + + + + +<%-- ================================================ --%> +<%-- Abstract --%> +<%-- ================================================ --%> + + + +<% + // FIXME: (Maybe) assume one abstract + DCValue[] abstrArray = item.getDC("description", "abstract", Item.ANY); + String abstr = (abstrArray.length > 0 ? abstrArray[0].value : ""); + DCLanguage abstr_lang = ( abstr.equals("") ? new DCLanguage("") : new DCLanguage (abstrArray[0].language)); +%> + + <%-- --%> + + + + + + + + + <% + + for (int i=1; i < langNumber; i++) { + abstr = (abstrArray.length > i ? abstrArray[i].value : ""); + abstr_lang = + ((abstrArray.length > i && abstrArray[i].language!=null) ? new DCLanguage(abstrArray[i].language) : new DCLanguage("") ); + %> + + + + + + + + + <% } %> + + + + + +<%-- ================================================ --%> +<%-- Sponsorship --%> +<%-- ================================================ --%> + + + +<% + DCValue[] sponsorArray = item.getDC("description", "sponsorship", Item.ANY); + String sponsorship = (sponsorArray.length > 0 ? sponsorArray[0].value : ""); + DCLanguage sponsor_lang = ( sponsorship.equals("") ? new DCLanguage("") : new DCLanguage (sponsorArray[0].language)); + +%> + + <%-- --%> + + + + + + +<% + for (int i=1; i < langNumber; i++) { + sponsorship = (sponsorArray.length > i ? sponsorArray[i].value : ""); + sponsor_lang = + ((sponsorArray.length > i && sponsorArray[i].language!=null) ? new DCLanguage(sponsorArray[i].language) : new DCLanguage("") ); + %> + + + + + + + +<% } %> + + + + +<%-- ================================================ --%> +<%-- Other Description --%> +<%-- ================================================ --%> + + + +<% + DCValue[] descArray = item.getDC("description", null, Item.ANY); + String desc = (descArray.length > 0 ? descArray[0].value : ""); + DCLanguage desc_lang = ( desc.equals("") ? new DCLanguage("") : new DCLanguage (descArray[0].language)); + +%> + + <%-- --%> + + + + + + + +<% + for (int i=1; i < langNumber; i++) { + desc = (descArray.length > i ? descArray[i].value : ""); + desc_lang = + ((descArray.length > i && descArray[i].language!=null) ? new DCLanguage(descArray[i].language) : new DCLanguage("") ); +%> + + + + + + + +<% } %> + + +
        +<% + if (si.jumpToField != null && si.jumpToField.equals("subject")) + { +%> + +<% + } +%> + <%-- Enter appropriate subject keywords or phrases below. --%> + +
        Subject Keywords   +<% + if (i < subjects.length) + { +%> + <%--   --%> + + <%=createLangMenu(new DCLanguage(subjects[i].language), loc, "subject_lang_"+i) %> +   + "> +<% + } + else + { +%> + + <%=createLangMenu(new DCLanguage("N/A"), loc, "subject_lang_"+i) %> +<% + } +%> +    +<% + if (i + 1 < subjects.length) + { +%> + <%--   --%> + + <%=createLangMenu(new DCLanguage (subjects[i+1].language), loc, "subject_lang_"+(i+1)) %> +   + "> +<% + } + else if (i + 2 >= subjectFieldCount) + { +%> + <%--   --%> + + <%=createLangMenu(new DCLanguage("N/A"), loc, "subject_lang_"+(i+1)) %> +   + "> + + +<% + } + else + { +%> + + <%=createLangMenu(new DCLanguage("N/A"), loc, "subject_lang_"+(i+1)) %> + +<% + } +%> +
         
        + <%-- Enter the abstract of the item below. --%> + +
        Abstract + + <%=createLangMenu(abstr_lang, loc, "description_abstract_lang_0") %> +
         
          + + <%=createLangMenu(abstr_lang, loc, "description_abstract_lang_"+i) %> +
         
         
        + <%-- Enter the names of any sponsors and/or funding codes in the box below. --%> + +
        Sponsors + + <%=createLangMenu(sponsor_lang, loc, "description_sponsorship_lang_0") %> + +
         
          + + <%=createLangMenu(sponsor_lang, loc, "description_sponsorship_lang_"+i) %> +
         
         
        + <%-- Enter any other description or comments in this box. --%> + +
        Description + + <%=createLangMenu(desc_lang, loc, "description_lang_0") %> +
         
          + + <%=createLangMenu(desc_lang, loc, "description_lang_"+i) %> +
         
        +
        + + +<%-- HACK: Need a space - is there a nicer way to do this than
        or a --%> +<%-- blank

        ? --%> +

         

        + +<%-- Hidden fields needed for submit servlet to know which item to deal with --%> + <%= SubmitServlet.getSubmissionParameters(si) %> + > +
        + + + + + + + + +
          + + "> + + + "> +     + + "> +
        +
        + + + + diff -Naur dspace-1.2-source-devel/jsp/submit/get-file-format.jsp dspace-1.2-source-devel/multi/submit/get-file-format.jsp --- dspace-1.2-source-devel/jsp/submit/get-file-format.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/get-file-format.jsp 2005-02-07 12:49:48.000000000 -0200 @@ -1,169 +1,205 @@ -<%-- - - get-file-format.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Select type of uploaded file - - - - Attributes to pass in to this page: - - submission.info - the SubmissionInfo object - - guessed.format - the system's guess as to the format - null if it - - doesn't know (BitstreamFormat) - - bitstream.formats - the (non-internal) formats known by the system - - (BitstreamFormat[]) - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.BitstreamFormat" %> -<%@ page import="org.dspace.content.Bundle" %> -<%@ page import="org.dspace.content.Item" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - BitstreamFormat guess = - (BitstreamFormat) request.getAttribute("guessed.format"); - BitstreamFormat[] formats = - (BitstreamFormat[]) request.getAttribute("bitstream.formats"); - - Item item = si.submission.getItem(); -%> - - - -
        - - - - - - -

        Submit: Select File Format

        - -

        Uploaded file: <%= si.bitstream.getName() %> (<%= si.bitstream.getSize() %> bytes)

        - -<% - if (guess == null) - { -%> -

        DSpace could not identify the format of this file.

        -<% - } - else - { -%> -

        DSpace recognized the file format as <%= guess.getShortDescription() %>. - Please be sure before you change this!

        - - - <%= SubmitServlet.getSubmissionParameters(si) %> - -

        -
        - -<%-- Option list put in a separate form --%> -
        -<% - } -%> - -

        Select the format of the file from the list below, for example "Adobe - PDF" or "Microsoft Word", OR if the format is not in the list, please describe - the format file in the input box below the list. - (More Help...)

        - -
        - -
        - -

        If the format is not in the above list, describe - it in the format below. Enter the name of the application you used to create - the file, and the version number of the application (for example, - "ACMESoft SuperApp version 1.5").

        - - - - - - -
        - File Format: - -<% - String desc = si.bitstream.getUserFormatDescription(); - if (desc == null) - { - desc = ""; - } -%> - -
        - - <%= SubmitServlet.getSubmissionParameters(si) %> - - -

        -
        -
        +<%-- + - get-file-format.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Select type of uploaded file + - + - Attributes to pass in to this page: + - submission.info - the SubmissionInfo object + - guessed.format - the system's guess as to the format - null if it + - doesn't know (BitstreamFormat) + - bitstream.formats - the (non-internal) formats known by the system + - (BitstreamFormat[]) + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.BitstreamFormat" %> +<%@ page import="org.dspace.content.Bundle" %> +<%@ page import="org.dspace.content.Item" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + BitstreamFormat guess = + (BitstreamFormat) request.getAttribute("guessed.format"); + BitstreamFormat[] formats = + (BitstreamFormat[]) request.getAttribute("bitstream.formats"); + + Item item = si.submission.getItem(); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="get-file-format.title"/> + + + +
        + + + + + + + <%--

        Submit: Select File Format

        --%> +

        + + <%--

        Uploaded file: <%= si.bitstream.getName() %> (<%= si.bitstream.getSize() %> bytes)

        --%> +

        <%= si.bitstream.getName() %> (<%= si.bitstream.getSize() %> bytes)

        + +<% + if (guess == null) + { +%> + <%--

        DSpace could not identify the format of this file.

        --%> +

        +<% + } + else + { +%> + <%--

        DSpace recognized the file format as <%= guess.getShortDescription() %>. + Please be sure before you change this!

        --%> +

        <%= guess.getShortDescription() %>. +

        + + + <%= SubmitServlet.getSubmissionParameters(si) %> + + <%--

        --%> +

        ">

        +
        + +<%-- Option list put in a separate form --%> +
        +<% + } +%> + + <%--

        Select the format of the file from the list below, for example "Adobe + PDF" or "Microsoft Word", OR if the format is not in the list, please describe + the format file in the input box below the list. + (More Help...)

        --%> + + + + + +

        +

        + +
        + +
        + + <%--

        If the format is not in the above list, describe + it in the format below. Enter the name of the application you used to create + the file, and the version number of the application (for example, + "ACMESoft SuperApp version 1.5").

        --%> +

        + + + + + + +
        + <%-- File Format: --%> + + +<% + String desc = si.bitstream.getUserFormatDescription(); + if (desc == null) + { + desc = ""; + } +%> + +
        + + <%= SubmitServlet.getSubmissionParameters(si) %> + + + <%--

        --%> +

        ">

        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/submit/initial-questions.jsp dspace-1.2-source-devel/multi/submit/initial-questions.jsp --- dspace-1.2-source-devel/jsp/submit/initial-questions.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/initial-questions.jsp 2005-02-07 12:54:25.000000000 -0200 @@ -1,157 +1,187 @@ -<%-- - - initial-questions.jsp - - - - Version: $Revision: 1.8 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Initial questions for keeping UI as simple as possible. - - - - Attributes to pass in: - - submission.info - the SubmissionInfo object - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> -<%@ page import="org.dspace.core.ConfigurationManager" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); -%> - - - -
        - - - - - - -

        Submit: Describe Your Item

        - -

        Please check the boxes next to the statements that apply to your - submission. - (More Help...)

        - -
        - - - - - - - -<% - // Don't display file or thesis questions in workflow mode - if (!SubmitServlet.isWorkflow(si)) - { -%> - - - -<% - if (ConfigurationManager.getBooleanProperty("webui.submit.blocktheses")) - { -%> - - - -<% - } - } -%> -
        - - - - - -
        >The item has more than one title, e.g. a translated title
        -
        - - - - - -
        >The item has been published or publicly distributed before
        -
        - - - - - -
        >The item consists of more than one file
        -
        - - - - - -
        The item is a thesis
        -
        -
        - -

         

        - -<%-- Hidden fields needed for submit servlet to know which item to deal with --%> - <%= SubmitServlet.getSubmissionParameters(si) %> - > -
        - - - - - - - -
        -   - - -     - -
        -
        -
        - -
        +<%-- + - initial-questions.jsp + - + - Version: $Revision: 1.8 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Initial questions for keeping UI as simple as possible. + - + - Attributes to pass in: + - submission.info - the SubmissionInfo object + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> +<%@ page import="org.dspace.core.ConfigurationManager" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="initial-questions.title"/> + + + + +
        + + + + + + + <%--

        Submit: Describe Your Item

        --%> +

        + + <%--

        Please check the boxes next to the statements that apply to your + submission. + (More Help...)

        --%> + + + + + +

        +

        + +
        + + + + + + + +<% + // Don't display file or thesis questions in workflow mode + if (!SubmitServlet.isWorkflow(si)) + { +%> + + + +<% + if (ConfigurationManager.getBooleanProperty("webui.submit.blocktheses")) + { +%> + + + +<% + } + } +%> +
        + + + + <%-- --%> + + +
        >The item has more than one title, e.g. a translated title
        +
        + + + + <%-- --%> + + +
        >The item has been published or publicly distributed before
        +
        + + + + <%-- --%> + + +
        >The item consists of more than one file
        +
        + + + + <%-- --%> + + +
        The item is a thesis
        +
        +
        + +

         

        + +<%-- Hidden fields needed for submit servlet to know which item to deal with --%> + <%= SubmitServlet.getSubmissionParameters(si) %> + > +
        + + + + + + + +
          + + + <%-- --%> + "> +     + <%-- --%> + "> +
        +
        +
        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/license-rejected.jsp dspace-1.2-source-devel/multi/submit/license-rejected.jsp --- dspace-1.2-source-devel/jsp/submit/license-rejected.jsp 2003-02-21 17:51:52.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/license-rejected.jsp 2004-11-23 13:28:54.000000000 -0200 @@ -1,64 +1,82 @@ -<%-- - - license-rejected.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:51 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - License rejected page - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Submit: License Rejected

        - -

        You have chosen not to grant the license to distribute your submission - via the DSpace system. Your submission has not been deleted and can be - accessed from the My DSpace page.

        - -

        If you wish to contact us to discuss the license, please use one - of the methods below:

        - - - -

        Go to My DSpace

        - -
        +<%-- + - license-rejected.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:51 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - License rejected page + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="license-rejected.title"/> + + + + + <%--

        Submit: License Rejected

        --%> +

        + + <%--

        You have chosen not to grant the license to distribute your submission + via the DSpace system. Your submission has not been deleted and can be + accessed from the My DSpace page.

        --%> +

        + + <%--

        If you wish to contact us to discuss the license, please use one + of the methods below:

        --%> +

        + + + + <%--

        Go to My DSpace

        --%> +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/no-theses.jsp dspace-1.2-source-devel/multi/submit/no-theses.jsp --- dspace-1.2-source-devel/jsp/submit/no-theses.jsp 2003-02-21 17:51:52.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/no-theses.jsp 2004-11-22 08:05:09.000000000 -0200 @@ -1,82 +1,102 @@ -<%-- - - no-theses.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2003/02/21 19:51:51 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - "No Theses" message - - - - This page displays a message informing the user that theses are not - - presently accepted in DSpace, and that their submission has been removed. - - FIX-ME: MIT-SPECIFIC - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Theses Not Accepted in DSpace

        - -

        DSpace does not currently accept individually-submitted - theses, but you are encouraged to use the separate electronic thesis - submission site supported by the Libraries and by MIT Information Systems to - submit your thesis to the Digital Library of - MIT Theses. To learn how to submit your thesis to that system, see Submitting - an Electronic Thesis at MIT.

        - -

        Because DSpace does not accept individually-submitted theses, your - submission will not proceed; any files you have uploaded for the current item - will not be stored.

        - -

        Please note that printed copies of your thesis are still the official - requirement for your degree. Due to important legal and record-keeping - reasons, it is likely that in the future DSpace will work directly with the - electronic thesis system to load groups of theses which have been officially - vetted and approved. Thanks for understanding.

        - -

        For more information please contact the DSpace site - administrators:

        - - - -

        Thank you for your interest in DSpace!

        - -
        +<%-- + - no-theses.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2003/02/21 19:51:51 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - "No Theses" message + - + - This page displays a message informing the user that theses are not + - presently accepted in DSpace, and that their submission has been removed. + - FIX-ME: MIT-SPECIFIC + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="no-theses.title"/> + + + + + <%--

        Theses Not Accepted in DSpace

        --%> +

        + + <%--

        DSpace does not currently accept individually-submitted + theses, but you are encouraged to use the separate electronic thesis + submission site supported by the Libraries and by MIT Information Systems to + submit your thesis to the Digital Library of + MIT Theses. To learn how to submit your thesis to that system, see Submitting + an Electronic Thesis at MIT.

        --%> +

        + + <%--

        Because DSpace does not accept individually-submitted theses, your + submission will not proceed; any files you have uploaded for the current item + will not be stored.

        --%> +

        + + <%--

        Please note that printed copies of your thesis are still the official + requirement for your degree. Due to important legal and record-keeping + reasons, it is likely that in the future DSpace will work directly with the + electronic thesis system to load groups of theses which have been officially + vetted and approved. Thanks for understanding.

        --%> +

        + + <%--

        For more information please contact the DSpace site + administrators:

        --%> +

        + + + + <%--

        Thank you for your interest in DSpace!

        --%> +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/progressbar.jsp dspace-1.2-source-devel/multi/submit/progressbar.jsp --- dspace-1.2-source-devel/jsp/submit/progressbar.jsp 2004-06-24 17:51:18.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/progressbar.jsp 2005-01-17 12:37:09.000000000 -0200 @@ -59,6 +59,11 @@ <%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> <%@ page import="org.dspace.license.CreativeCommons" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <% @@ -90,6 +95,7 @@ "Complete" }; + int step = Integer.parseInt(request.getParameter("current_stage")); int stageReached = Integer.parseInt(request.getParameter("stage_reached")); @@ -108,6 +114,9 @@ // Show previous (done by definition!) steps for (int i = 1; i < step; i++) { + + String msg = "progressbar.stepname"+i; + // Hack for skipping CC step if not enabled if (!CreativeCommons.isEnabled() && i==SubmitServlet.CC_LICENSE) { @@ -119,14 +128,14 @@ { %> <%-- HACK: border=0 for non-CSS compliant Netscape 4.x --%> - + <%= imageNames[i] %>-done.gif" value=" (Done) - " alt=" (Done) - "> <% } else { // User has reached final step, cannot jump back %> -  <%= stepNames[i] %> (Done) - + <%= imageNames[i] %>-done.gif" ALT=" (Done) - "> <% } } @@ -135,8 +144,9 @@ // which isn't shown in the progress bar if (step > 0) { + String msg = "progressbar.stepname"+step; %> -  <%= stepNames[step] %> (Current) - + <%= imageNames[step] %>-current.gif" ALT=" (Current) - "> <% } @@ -147,6 +157,8 @@ // Show next steps (some of which may have been done) for (int i = step + 1; i < lastStep; i++) { + String msg = "progressbar.stepname"+i; + // Hack for skipping CC step if not enabled if (!CreativeCommons.isEnabled() && i==SubmitServlet.CC_LICENSE) { @@ -157,14 +169,14 @@ // Stage has been previously accessed, so user may jump to it %> <%-- HACK: border=0 for non-CSS compliant Netscape 4.x --%> - + <%= imageNames[i] %>-done.gif" value=" (Done) - " alt=" (Done) - "> <% } else { // Stage hasn't been reached yet (can't be jumped to) %> -  <%= stepNames[i] %> (Not Done) - + <%= imageNames[i] %>-notdone.gif" ALT=" (Not Done) - "> <% } } diff -Naur dspace-1.2-source-devel/jsp/submit/review.jsp dspace-1.2-source-devel/multi/submit/review.jsp --- dspace-1.2-source-devel/jsp/submit/review.jsp 2004-06-25 10:52:34.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/review.jsp 2005-03-07 13:05:08.000000000 -0200 @@ -1,517 +1,773 @@ -<%-- - - review.jsp - - - - Version: $Revision: 1.13 $ - - - - Date: $Date: 2004/06/25 13:52:34 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Review submission page - - - - Attributes to pass in to this page: - - submission.info - the SubmissionInfo object - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="java.util.HashMap" %> -<%@ page import="java.util.Map" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.BitstreamFormat" %> -<%@ page import="org.dspace.content.DCDate" %> -<%@ page import="org.dspace.content.DCLanguage" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.core.Utils" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - Item item = si.submission.getItem(); - - // Names of each identifier type - Map identifierQualNames = new HashMap(); - identifierQualNames.put( "govdoc", "Gov't Doc #" ); - identifierQualNames.put( "uri", "URI" ); - identifierQualNames.put( "isbn", "ISBN" ); - identifierQualNames.put( "issn", "ISSN" ); - identifierQualNames.put( "ismn", "ISMN" ); - identifierQualNames.put( "other", "Other" ); -%> - - - -
        - - - - - -

        Submit: Verify Submission

        - -

        Not quite there yet, but nearly!

        - -

        Please spend a few minutes to examine what you've just submitted below. - If anything is wrong, please go back and correct it by using the buttons - next to the error, or by clicking on the progress bar at the top of the - page. - (More Help...)

        - -

        If everything is OK, please click the "Next" button at the bottom of the page.

        - -

        You can safely check the files you've uploaded - a new window will - be opened to display them.

        - - -<%-- ====================================================== --%> -<%-- INITIAL QUESTIONS --%> -<%-- ====================================================== --%> - - - - -<%-- ====================================================== --%> -<%-- DESCRIBE ITEM PAGE 1 ELEMENTS --%> -<%-- ====================================================== --%> - - - -<%-- ====================================================== --%> -<%-- DESCRIBE ITEM PAGE 2 ELEMENTS --%> -<%-- ====================================================== --%> - - - -<%-- ====================================================== --%> -<%-- UPLOADED_FILES --%> -<%-- ====================================================== --%> - - - - -
        - - - - - -
        - - - - - - - - - - - - - -
        Item has more than one title:<%= (si.submission.hasMultipleTitles() ? "Yes" : "No") %>
        Previously published item:<%= (si.submission.isPublishedBefore() ? "Yes" : "No") %>
        Item consists of more than one file:<%= (si.submission.hasMultipleFiles() ? "Yes" : "No") %>
        -
        - value="Correct one of these"> -
        -
        - - - - - -
        - - - - - -<% - DCValue[] titles = item.getDC("title", null, Item.ANY); - String title = "None"; - if (titles.length > 0) - { - title = titles[0].value; - } -%> - - - - -<% - if (si.submission.hasMultipleTitles()) - { - DCValue[] altTitles = item.getDC("title", "alternative", Item.ANY); -%> - - - - -<% - } - - if (si.submission.isPublishedBefore()) - { - DCValue[] dateIssued = item.getDC("date", "issued", Item.ANY); -%> - - - - - -<% - DCValue[] publisher = item.getDC("publisher", null, Item.ANY); -%> - - - - -<% - DCValue[] citation = item.getDC("identifier", "citation", Item.ANY); -%> - - - - -<% - } -%> - - - - - - - - -<% - DCValue[] typeDC = item.getDC("type", null, Item.ANY); - String type = "None"; - if (typeDC.length > 0) - { - type = typeDC[0].value; - } -%> - - - - -<% - DCValue[] langArray = item.getDC("language", "iso", null); - DCLanguage language = new DCLanguage(""); - if (langArray.length > 0) - { - language = new DCLanguage(langArray[0].value); - } -%> - - - - -
        Authors: -<% - DCValue[] authors = item.getDC("contributor", "author", Item.ANY); - if (authors.length == 0) - { -%> - None -<% - } - else - { - for (int i = 0; i < authors.length; i++) - { -%> - <%= Utils.addEntities(authors[i].value) %>
        -<% - } - } -%> -
        Title: - <%= Utils.addEntities(title) %> -
        Alternative Titles: -<% - if (altTitles.length == 0) - { -%> - None -<% - } - else - { - for(int i = 0; i < altTitles.length ; i++) - { -%> - <%= Utils.addEntities(altTitles[i].value) %>
        -<% - } - } -%> -
        Date Issued: -<% - if (dateIssued.length == 0) - { -%> - None -<% - } - else - { -%> - -<% - } -%> -
        Publisher: -<% - if (publisher.length == 0) - { -%> - None -<% - } - else - { -%> - <%= Utils.addEntities(publisher[0].value) %> -<% - } -%> -
        Citation: -<% - if (citation.length == 0) - { -%> - None -<% - } - else - { -%> - <%= Utils.addEntities(citation[0].value) %> -<% - } -%> -
        Series/Report No: -<% - DCValue[] seriesNumbers = item.getDC("relation","ispartofseries", Item.ANY); - if (seriesNumbers.length == 0) - { -%> - None -<% - } - else - { - for (int i = 0; i < seriesNumbers.length ; i++) - { -%> - <%= Utils.addEntities(seriesNumbers[i].value) %>
        -<% - } - } -%> -
        Identifiers: -<% - DCValue[] identifiers = item.getDC("identifier", Item.ANY, Item.ANY); - - for (int i = 0; i < identifiers.length; i++) - { - // Skip citation, handled above - if (!identifiers[i].qualifier.equals("citation")) - { -%> - <%= identifierQualNames.get(identifiers[i].qualifier) %>: <%= Utils.addEntities(identifiers[i].value) %>
        -<% - } - } -%> -
        Type: - <%= type %> -
        Language:<%= language.getDisplayName() %>
        -
        - value="Correct one of these"> -
        -
        - - - - - -
        - - - - - - - - - - - - - - - - - -
        Keywords: -<% - DCValue[] keywords = item.getDC("subject", null, Item.ANY); - - if (keywords.length == 0) - { -%> - None -<% - } - else - { - for (int i = 0; i < keywords.length; i++) - { -%> -<%= Utils.addEntities(keywords[i].value) %>
        -<% - } - } - - DCValue[] abstr = item.getDC("description", "abstract", Item.ANY); - DCValue[] sponsors = item.getDC("description", "sponsorship", Item.ANY); - DCValue[] otherDesc = item.getDC("description", null, Item.ANY); -%> -
        Abstract:<%= (abstr.length == 0 ? "None" : Utils.addEntities(abstr[0].value)) %>
        Sponsors:<%= (sponsors.length == 0 ? "None" : Utils.addEntities(sponsors[0].value)) %>
        Other Description:<%= (otherDesc.length == 0 ? "None" : Utils.addEntities(otherDesc[0].value)) %>
        -
        - value="Correct one of these"> -
        -
        - - - - - -
        - - - - - -
        <%= (si.submission.hasMultipleFiles() ? "Uploaded Files:" : "Uploaded File:") %> -<% - Bitstream[] bitstreams = item.getNonInternalBitstreams(); - - for (int i = 0; i < bitstreams.length ; i++) - { - // Work out whether to use /retrieve link for simple downloading, - // or /html link for HTML files - BitstreamFormat format = bitstreams[i].getFormat(); - String downloadLink = "retrieve/" + bitstreams[i].getID(); - if (format != null && format.getMIMEType().equals("text/html")) - { - downloadLink = "html/db-id/" + item.getID(); - } -%> - <%= bitstreams[i].getName() %> - <%= bitstreams[i].getFormatDescription() %> -<% - switch (format.getSupportLevel()) - { - case 0: - %>(Unknown)<% - break; - case 1: - %>(Known)<% - break; - case 2: - %>(Supported)<% - } -%> -
        -<% - } -%> -
        -
        -<% - // Can't edit files in workflow mode - if(!SubmitServlet.isWorkflow(si)) - { -%> - - value="<%= (si.submission.hasMultipleFiles() ? "Add or Remove a File" : "Upload a different file") %>"> -<% - } - else - { -%> - - value="Edit File Details"> -<% - } -%> -
        -
        - - <%= SubmitServlet.getSubmissionParameters(si) %> - > - -

         

        - -
        - - - - - - - - -
          - - - -     - -
        -
        - -
        - -
        +<%-- + - review.jsp + - + - Version: $Revision: 1.13 $ + - + - Date: $Date: 2004/06/25 13:52:34 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Review submission page + - + - Attributes to pass in to this page: + - submission.info - the SubmissionInfo object + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="java.util.HashMap" %> +<%@ page import="java.util.Map" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.BitstreamFormat" %> +<%@ page import="org.dspace.content.DCDate" %> +<%@ page import="org.dspace.content.DCLanguage" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.Utils" %> + +<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> +<%@ page import="org.apache.taglibs.standard.tag.common.fmt.BundleSupport" %> +<%@ page import="java.util.Locale" %> +<%@ page import="java.util.ResourceBundle" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + Item item = si.submission.getItem(); + + // Names of each identifier type + Map identifierQualNames = new HashMap(); + identifierQualNames.put("govdoc", "identifiers.type1"); + identifierQualNames.put("uri", "identifiers.type2"); + identifierQualNames.put("isbn", "identifiers.type3"); + identifierQualNames.put("issn", "identifiers.type4"); + identifierQualNames.put("ismn", "identifiers.type5"); + identifierQualNames.put("other", "identifiers.type6"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="review.title"/> + + + +<% + //get Locale first + LocalizationContext locCtxt = null; + locCtxt = BundleSupport.getLocalizationContext(pageContext); + Locale loc = locCtxt.getLocale(); +%> + + +
        + + + + + + <%--

        Submit: Verify Submission

        --%> +

        + + <%--

        Not quite there yet, but nearly!

        --%> + + <%--

        Please spend a few minutes to examine what you've just submitted below. + If anything is wrong, please go back and correct it by using the buttons + next to the error, or by clicking on the progress bar at the top of the + page. --%> +

        + <%-- (More Help...)

        --%> +

        + + <%--

        If everything is OK, please click the "Next" button at the bottom of the page.

        --%> +

        + + <%--

        You can safely check the files you've uploaded - a new window will + be opened to display them.

        --%> +

        + + + +<%-- ====================================================== --%> +<%-- INITIAL QUESTIONS --%> +<%-- ====================================================== --%> + + +<%-- Check if item has more than one title... --%> + + <% + if(si.submission.hasMultipleTitles()) + { + %> + + + + <% + } + else + { + %> + + + + <% + } + %> + + + +<%-- Check if item has been published previously... --%> + + <% + if(si.submission.isPublishedBefore()) + { + %> + + + + <% + } + else + { + %> + + + + <% + } + %> + + +<%-- Check if item consists of more than one file... --%> + + + <% + if(si.submission.hasMultipleFiles()) + { + %> + + + + + + + + + + <% + } + else + { + %> + + + + + + + + + + <% + } + %> + + + + + + + +<%-- ====================================================== --%> +<%-- DESCRIBE ITEM PAGE 1 ELEMENTS --%> +<%-- ====================================================== --%> + + + +<%-- ====================================================== --%> +<%-- DESCRIBE ITEM PAGE 2 ELEMENTS --%> +<%-- ====================================================== --%> + + + +<%-- ====================================================== --%> +<%-- UPLOADED_FILES --%> +<%-- ====================================================== --%> + + + + + + +
        + + + + + +
        + + + <%-- --%> + + <%-- --%> + + + + <%-- --%> + + <%-- --%> + + + + <%-- --%> + + <%-- --%> + + +
        Item has more than one title:<%= (si.submission.hasMultipleTitles() ? "Yes" : "No") %>
        Previously published item:<%= (si.submission.isPublishedBefore() ? "Yes" : "No") %>
        Item consists of more than one file:<%= (si.submission.hasMultipleFiles() ? "Yes" : "No") %>
        +
        + <%-- value="Correct one of these"> --%> + value=""> +
        +
        + + + + + +
        + + + <%-- --%> + + + + +<% + DCValue[] titles = item.getDC("title", null, Item.ANY); + if (titles.length > 0) + { + String title = titles[0].value; +%> + + + + +<% + } + else + { +%> + + + + +<% + } +%> + +<% + if (si.submission.hasMultipleTitles()) + { + DCValue[] altTitles = item.getDC("title", "alternative", Item.ANY); +%> + + <%-- --%> + + + +<% + } + + if (si.submission.isPublishedBefore()) + { + DCValue[] dateIssued = item.getDC("date", "issued", Item.ANY); +%> + + + <%-- --%> + + + +<% + DCValue[] publisher = item.getDC("publisher", null, Item.ANY); +%> + + <%-- --%> + + + +<% + DCValue[] citation = item.getDC("identifier", "citation", Item.ANY); +%> + + <%-- --%> + + + +<% + } +%> + + <%-- --%> + + + + + <%-- --%> + + + +<% + + DCValue[] typeDC = item.getDC("type", null, loc.toString()); +%> + + + + + +<% + DCValue[] langArray = item.getDC("language", "iso", Item.ANY); + DCLanguage language = new DCLanguage(""); + String unsLang = "langList."; + if (langArray.length > 0) + { + language = new DCLanguage(langArray[0].value); + unsLang += langArray[0].value; + } + +%> + + <%-- --%> + + + +
        Authors: +<% + DCValue[] authors = item.getDC("contributor", "author", Item.ANY); + if (authors.length == 0) + { +%> + +<% + } + else + { + for (int i = 0; i < authors.length; i++) + { +%> + <%= ( authors[i].language.equals("") ? "" : "("+ authors[i].language + ") ") %> <%= Utils.addEntities(authors[i].value) %>
        +<% + } + } +%> +
        + <%= ( titles[0].language.equals("") ? "" : "("+titles[0].language + ") ") %><%= Utils.addEntities(title) %> +
        + +
        Alternative Titles: +<% + if (altTitles.length == 0) + { +%> + +<% + } + else + { + for(int i = 0; i < altTitles.length ; i++) + { +%> + <%= ( altTitles[i].language.equals("") ? "" : "("+altTitles[i].language + ") ") %> <%= Utils.addEntities(altTitles[i].value) %>
        +<% + } + } +%> +
        Date Issued: +<% + if (dateIssued.length == 0) + { +%> + +<% + } + else + { +%> + +<% + } +%> +
        Publisher: +<% + if (publisher.length == 0) + { +%> + +<% + } + else + { + for (int i=0; i < publisher.length; i++) { +%> + <%= ( publisher[i].language.equals("") ? "" : "("+ publisher[i].language + ") ") %> <%= Utils.addEntities(publisher[i].value) %>
        +<% + }} +%> +
        Citation: +<% + if (citation.length == 0) + { +%> + +<% + } + else + { +%> + <%= Utils.addEntities(citation[0].value) %> +<% + } +%> +
        Series/Report No: +<% + DCValue[] seriesNumbers = item.getDC("relation","ispartofseries", item.ANY); + if (seriesNumbers.length == 0) + { +%> + +<% + } + else + { + for (int i = 0; i < seriesNumbers.length ; i++) + { +%> + <%= ( seriesNumbers[i].language.equals("") ? "" : "("+seriesNumbers[i].language + ") ") %> <%= Utils.addEntities(seriesNumbers[i].value) %>
        +<% + } + } +%> +
        Identifiers: +<% + DCValue[] identifiers = item.getDC("identifier", Item.ANY, Item.ANY); + + if (identifiers.length==0 || identifiers[0].qualifier.equals("citation")) + { +%> + +<% } else { + for (int i = 0; i < identifiers.length; i++) + { + // Skip citation, handled above + if (!identifiers[i].qualifier.equals("citation")) + { +%> + : <%= Utils.addEntities(identifiers[i].value) %>
        +<% + } + } + } +%> +
        + +<% + if (typeDC.length > 0) + { + for (int i=0; i + + <%= type %>
        + +<% + } + } + else + { +%> + +<% + } +%> +
        Language: + +<% +if (loc.getLanguage()=="el") { //display unsupported localized names +%> + +<% + +} +else { + out.print(language.getDisplayName(loc)); +} +%> +
        +
        + <%-- value="Correct one of these"> --%> + value=""> +
        +
        + + + + + +
        + + + <%-- --%> + + + + + + + <%-- --%> + + <%-- --%> + + + + + + <%-- --%> + + <%-- --%> + + + + + + + + + + +
        Keywords: +<% + DCValue[] keywords = item.getDC("subject", null, Item.ANY); + + if (keywords.length == 0) + { +%> + +<% + } + else + { + for (int i = 0; i < keywords.length; i++) + { +%> + <%= ( keywords[i].language.equals("") ? "" : "("+keywords[i].language + ") ") %> <%= Utils.addEntities(keywords[i].value) %>
        +<% + } + } + + DCValue[] abstr = item.getDC("description", "abstract", Item.ANY); + DCValue[] sponsors = item.getDC("description", "sponsorship", Item.ANY); + DCValue[] otherDesc = item.getDC("description", null, Item.ANY); +%> +
        Abstract:<%= (abstr.length == 0 ? "None" : Utils.addEntities(abstr[0].value)) %> + +<% + if (abstr.length > 0) { + for (int i=0; i < abstr.length; i++) { +%> + + <%= ( abstr[i].language.equals("") ? "" : "("+abstr[i].language + ") ") %><%=Utils.addEntities(abstr[i].value)%> +
        + + + +<% } } else { +%> + + + +<% } %> +
        Sponsors: <%= (sponsors.length == 0 ? "None" : Utils.addEntities(sponsors[0].value)) %> + +<% + if (sponsors.length > 0) { + for (int i=0; i < sponsors.length; i++) { +%> + <%= ( sponsors[i].language.equals("") ? "" : "("+sponsors[i].language + ") ") %> <%=Utils.addEntities(sponsors[0].value)%> +
        +<% } } else { +%> + + +<% } %> +
        +<% + if (otherDesc.length > 0) { + for (int i=0; i < otherDesc.length; i++) { +%> + <%= ( otherDesc[i].language.equals("") ? "" : "("+otherDesc[i].language + ") ") %> <%=Utils.addEntities(otherDesc[0].value)%> +
        + +<% } } else { +%> + + + +<% } %> +
        +
        + <%-- value="Correct one of these"> --%> + value=""> +
        +
        + + + + + +
        + + + + + +
        +<% + Bitstream[] bitstreams = item.getNonInternalBitstreams(); + + for (int i = 0; i < bitstreams.length ; i++) + { + // Work out whether to use /retrieve link for simple downloading, + // or /html link for HTML files + BitstreamFormat format = bitstreams[i].getFormat(); + String downloadLink = "retrieve/" + bitstreams[i].getID(); + if (format != null && format.getMIMEType().equals("text/html")) + { + downloadLink = "html/db-id/" + item.getID(); + } +%> + <%= bitstreams[i].getName() %> - <%= bitstreams[i].getFormatDescription() %> +<% + switch (format.getSupportLevel()) + { + case 0: + %><% + break; + case 1: + %><% + break; + case 2: + %><% + } +%> +
        +<% + } +%> +
        +
        +<% + // Can't edit files in workflow mode + if(!SubmitServlet.isWorkflow(si)) + { +%> + <%-- + value="<%= (si.submission.hasMultipleFiles() ? "Add or Remove a File" : "Upload a different file") %>"> --%> + + value=""> +<% + } + else + { +%> + <%-- + value="Edit File Details"> --%> + + value=""> +<% + } +%> +
        +
        + + <%= SubmitServlet.getSubmissionParameters(si) %> + > + +

         

        + +
        + + + + + + + + +
          + <%-- --%> + "> + + <%-- --%> + "> +     + <%-- --%> + "> +
        +
        + +
        + +
        + + diff -Naur dspace-1.2-source-devel/jsp/submit/saved.jsp dspace-1.2-source-devel/multi/submit/saved.jsp --- dspace-1.2-source-devel/jsp/submit/saved.jsp 2003-02-21 17:51:52.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/saved.jsp 2004-11-23 13:32:23.000000000 -0200 @@ -1,60 +1,77 @@ -<%-- - - saved.jsp - - - - Version: $Revision: 1.5 $ - - - - Date: $Date: 2003/02/21 19:51:51 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Submission saved message - displayed whenever the user has clicked - - "cancel/save" during a submission and elected to save the item. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Submission Saved

        - -

        Your submission has been saved for you to finish later. You can continue - the submission by going to your "My DSpace" page and clicking on the - relevant "Resume" button.

        - -

        Go to My DSpace

        - -
        +<%-- + - saved.jsp + - + - Version: $Revision: 1.5 $ + - + - Date: $Date: 2003/02/21 19:51:51 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Submission saved message - displayed whenever the user has clicked + - "cancel/save" during a submission and elected to save the item. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="saved.title"/> + + + + + <%--

        Submission Saved

        --%> +

        + + <%--

        Your submission has been saved for you to finish later. You can continue + the submission by going to your "My DSpace" page and clicking on the + relevant "Resume" button.

        --%> +

        + + <%--

        Go to My DSpace

        --%> +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/select-collection.jsp dspace-1.2-source-devel/multi/submit/select-collection.jsp --- dspace-1.2-source-devel/jsp/submit/select-collection.jsp 2004-06-16 17:11:30.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/select-collection.jsp 2005-02-07 12:59:49.000000000 -0200 @@ -1,116 +1,145 @@ -<%-- - - select-collection.jsp - - - - Version: $Revision: 1.9 $ - - - - Date: $Date: 2004/06/16 20:11:29 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - UI page for selection of collection. - - - - Required attributes: - - collections - Array of collection objects to show in the drop-down. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Collection[] collections = - (Collection[]) request.getAttribute("collections"); -%> - - - - - - - - -

        Submit: Choose Collection

        - -

        Select the collection you wish to submit an item to from the list - below, then click "Next". - (More Help...)

        - -
        -<%-- HACK: a
        tag seems to be the only way to convince certain --%> -<%-- browsers to center the table. --%> -
        - - - - - -
        Collection - -
        - - <%-- Hidden field indicating the step --%> - -
        - - - - - - - - -
          - -     - -
        - - -
        - - - +<%-- + - select-collection.jsp + - + - Version: $Revision: 1.9 $ + - + - Date: $Date: 2004/06/16 20:11:29 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - UI page for selection of collection. + - + - Required attributes: + - collections - Array of collection objects to show in the drop-down. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Collection[] collections = + (Collection[]) request.getAttribute("collections"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="select-collection.title"/> + + + + + + + + + + <%--

        Submit: Choose Collection

        --%> +

        + + <%--

        Select the collection you wish to submit an item to from the list + below, then click "Next". + (More Help...)

        --%> + + + + + + + +

        +

        + +
        +<%-- HACK: a
        tag seems to be the only way to convince certain --%> +<%-- browsers to center the table. --%> +
        + + + <%-- --%> + + + +
        Collection + +
        + + <%-- Hidden field indicating the step --%> + +
        + + + + + + + + +
          + <%-- --%> + "> +     + <%-- --%> + "> +
        + + +
        + + + diff -Naur dspace-1.2-source-devel/jsp/submit/show-license.jsp dspace-1.2-source-devel/multi/submit/show-license.jsp --- dspace-1.2-source-devel/jsp/submit/show-license.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/show-license.jsp 2005-02-07 13:05:16.000000000 -0200 @@ -1,102 +1,129 @@ -<%-- - - show-license.jsp - - - - Version: $Revision: 1.7 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show the user a license which they may grant or reject - - - - Attributes to pass in: - - submission.info - the SubmissionInfo object - - license - the license text to display - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - String license = (String) request.getAttribute("license"); -%> - - - -
        - - - - - - -

        Submit: Grant DSpace Distribution License

        - -

        There is one last step: In order for DSpace to reproduce, translate and distribute your - submission worldwide, your agreement to the following terms is necessary. - Please take a moment to read the terms of this license, and click on one of the - buttons at the bottom of the page. By clicking on the "Grant License" - button, you indicate that you grant the following terms of the license. - (More Help...)

        - -

        Not granting the license will not delete your submission. - Your item will remain in your "My DSpace" page. You can then either remove - the submission from the system, or agree to the license later once any - queries you might have are resolved.

        - - - - - -
        -
        <%= license %>
        -
        - - <%= SubmitServlet.getSubmissionParameters(si) %> - > - -
        -

        -

        -
        -
        -
        +<%-- + - show-license.jsp + - + - Version: $Revision: 1.7 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show the user a license which they may grant or reject + - + - Attributes to pass in: + - submission.info - the SubmissionInfo object + - license - the license text to display + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + String license = (String) request.getAttribute("license"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="show-license.title"/> + + + + +
        + + + + + + + <%--

        Submit: Grant DSpace Distribution License

        --%> +

        + + <%--

        There is one last step: In order for DSpace to reproduce, translate and distribute your + submission worldwide, your agreement to the following terms is necessary. + Please take a moment to read the terms of this license, and click on one of the + buttons at the bottom of the page. By clicking on the "Grant License" + button, you indicate that you grant the following terms of the license. + (More Help...)

        --%> + + + + + +

        +

        + + <%--

        Not granting the license will not delete your submission. + Your item will remain in your "My DSpace" page. You can then either remove + the submission from the system, or agree to the license later once any + queries you might have are resolved.

        --%> +

        + + + + + +
        +
        <%= license %>
        +
        + + <%= SubmitServlet.getSubmissionParameters(si) %> + > + +
        + <%--

        +

        --%> +

        ">

        +

        ">

        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/submit/show-uploaded-file.jsp dspace-1.2-source-devel/multi/submit/show-uploaded-file.jsp --- dspace-1.2-source-devel/jsp/submit/show-uploaded-file.jsp 2004-06-16 16:22:02.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/show-uploaded-file.jsp 2005-02-07 13:30:23.000000000 -0200 @@ -1,218 +1,271 @@ -<%-- - - show-uploaded-file.jsp - - - - Version: $Revision: 1.12 $ - - - - Date: $Date: 2004/06/16 19:22:01 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show uploaded file (single-file submission mode) - - - - Attributes to pass in - - submission.info - the SubmissionInfo object - - just.uploaded - Boolean indicating whether the user has just - - uploaded a file OK - - show.checksums - Boolean indicating whether to show checksums - - - - FIXME: Merely iterates through bundles, treating all bit-streams as - - separate documents. Shouldn't be a problem for early adopters. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.BitstreamFormat" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - boolean justUploaded = ((Boolean) request.getAttribute("just.uploaded")).booleanValue(); - boolean showChecksums = ((Boolean) request.getAttribute("show.checksums")).booleanValue(); - - // Get the bitstream - Bitstream[] all = si.submission.getItem().getNonInternalBitstreams(); - Bitstream bitstream = all[0]; - BitstreamFormat format = bitstream.getFormat(); -%> - - - -
        - - - - - - -<% - if (justUploaded) - { -%> -

        Submit: File Uploaded Successfully

        - -

        Your file was successfully uploaded.

        -<% - } - else - { -%> -

        Submit: Uploaded File

        -<% - } -%> -

        Here are the details of the file you have uploaded. Please check the - details before going to the next step. - (More Help...)

        - - - - - - -<% - if (showChecksums) - { -%> - -<% - } -%> - - - - - -<% - if (showChecksums) - { -%> - -<% - } -%> - -
        FileSizeFile FormatChecksum
        <%= bitstream.getName() %><%= bitstream.getSize() %> bytes -<% - String description = bitstream.getFormatDescription(); - String supportLevel = "supported"; - - if (format.getSupportLevel() == 1) - { - supportLevel = "known"; - } - - if (format.getSupportLevel() == 0) - { - supportLevel = "unsupported"; - } - - // Full param to dspace:popup must be single variable - String supportLevelLink = "/help/formats.jsp#" + supportLevel; -%> - <%= description %> (<%= supportLevel %>) - - <%= bitstream.getChecksum() %> (<%= bitstream.getChecksumAlgorithm() %>) -
        - -
        -

        - -

        -
        - -
        -

        - -

        -
        - -
        -<%-- Show information about how to verify correct upload --%> -

        You can verify that the file has been uploaded correctly by:

        -
          -
        • Clicking on the filename above. This will download the file in a - new browser window, so that you can check the contents.
        • -<% - if (showChecksums) - { -%> -
        • Comparing the checksum displayed above with a checksum worked out on - your local computer. They should be exactly the same. - Click here to find out how to do this.
        • -<% - } - else - { -%> -
        • The system can calculate a checksum you can verify. - Click here for more information.
        • -<% - } -%> -
        -
        - -<%-- Hidden fields needed for submit servlet to know which item to deal with --%> - <%= SubmitServlet.getSubmissionParameters(si) %> - > - -<%-- HACK: Center used to align table; CSS and align=center ignored by some browsers --%> -
        - - - - - - - - -
          - - - -     - -
        -
        -
        - -
        - +<%-- + - show-uploaded-file.jsp + - + - Version: $Revision: 1.12 $ + - + - Date: $Date: 2004/06/16 19:22:01 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show uploaded file (single-file submission mode) + - + - Attributes to pass in + - submission.info - the SubmissionInfo object + - just.uploaded - Boolean indicating whether the user has just + - uploaded a file OK + - show.checksums - Boolean indicating whether to show checksums + - + - FIXME: Merely iterates through bundles, treating all bit-streams as + - separate documents. Shouldn't be a problem for early adopters. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.BitstreamFormat" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + boolean justUploaded = ((Boolean) request.getAttribute("just.uploaded")).booleanValue(); + boolean showChecksums = ((Boolean) request.getAttribute("show.checksums")).booleanValue(); + + // Get the bitstream + Bitstream[] all = si.submission.getItem().getNonInternalBitstreams(); + Bitstream bitstream = all[0]; + BitstreamFormat format = bitstream.getFormat(); +%> + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="show-uploaded-file.title"/> + + + + +
        + + + + + + +<% + if (justUploaded) + { +%> + <%--

        Submit: File Uploaded Successfully

        --%> +

        + + <%--

        Your file was successfully uploaded.

        --%> +

        +<% + } + else + { +%> + <%--

        Submit: Uploaded File

        --%> +

        +<% + } +%> + <%--

        Here are the details of the file you have uploaded. Please check the + details before going to the next step. + (More Help...)

        --%> + + + + + +

        +

        + + + + <%-- + + --%> + + + +<% + if (showChecksums) + { +%> + <%-- --%> + +<% + } +%> + + + + + +<% + if (showChecksums) + { +%> + +<% + } +%> + +
        FileSizeFile FormatChecksum
        <%= bitstream.getName() %><%= bitstream.getSize() %> bytes +<% + String description = bitstream.getFormatDescription(); + String supportLevel = "supported"; + + if (format.getSupportLevel() == 1) + { + supportLevel = "known"; +%> + + + +<% + } + + if (format.getSupportLevel() == 0) + { + supportLevel = "unsupported"; +%> + + + +<% + } + + + // Full param to dspace:popup must be single variable + String supportLevelLink = "/help/formats.jsp#" + supportLevel; +%> + <%= description %> () + + <%= bitstream.getChecksum() %> (<%= bitstream.getChecksumAlgorithm() %>) +
        + +
        +

        + <%-- --%> + "> +

        +
        + +
        +

        + <%-- --%> + "> +

        +
        + +
        +<%-- Show information about how to verify correct upload --%> + <%--

        You can verify that the file has been uploaded correctly by:

        --%> +

        +
          + <%--
        • Clicking on the filename above. This will download the file in a + new browser window, so that you can check the contents.
        • --%> +
        • +<% + if (showChecksums) + { +%> + <%--
        • Comparing the checksum displayed above with a checksum worked out on + your local computer. They should be exactly the same. + Click here to find out how to do this.
        • --%> + +
        • +
        • +<% + } + else + { +%> + <%--
        • The system can calculate a checksum you can verify. + Click here for more information.
        • --%> +
        • + ">
        • +<% + } +%> +
        +
        + +<%-- Hidden fields needed for submit servlet to know which item to deal with --%> + <%= SubmitServlet.getSubmissionParameters(si) %> + > + +<%-- HACK: Center used to align table; CSS and align=center ignored by some browsers --%> +
        + + + + + + + + +
          + <%-- --%> + "> + + <%-- --%> + "> +     + <%-- --%> + "> +
        +
        +
        + +
        + diff -Naur dspace-1.2-source-devel/jsp/submit/thesis-removed-workaround.jsp dspace-1.2-source-devel/multi/submit/thesis-removed-workaround.jsp --- dspace-1.2-source-devel/jsp/submit/thesis-removed-workaround.jsp 2003-02-21 17:51:52.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/thesis-removed-workaround.jsp 2004-11-22 08:07:13.000000000 -0200 @@ -1,68 +1,85 @@ -<%-- - - thesis-removed-workaround.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:51 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Submission removed message - this is displayed when the user has checked - - the "This is a thesis" option on the first submission page, had their - - submission removed, used the back button to go back to the submission - - page, and tried carry on. Normally this would result in an integrity error - - since the workspace ID is no longer valid but in this special case we - - will display a decent message. - - - - This page displays a message informing the user that theses are not - - presently accepted in DSpace, and that their submission has been removed. - - FIXME: MIT-SPECIFIC - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - -

        Submission Stopped: Theses Not Accepted in DSpace

        - -

        Since DSpace does not accept theses, your submission has been stopped. - To start submitting something else click below.

        - -

        - Start a new submission

        - -
        +<%-- + - thesis-removed-workaround.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:51 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Submission removed message - this is displayed when the user has checked + - the "This is a thesis" option on the first submission page, had their + - submission removed, used the back button to go back to the submission + - page, and tried carry on. Normally this would result in an integrity error + - since the workspace ID is no longer valid but in this special case we + - will display a decent message. + - + - This page displays a message informing the user that theses are not + - presently accepted in DSpace, and that their submission has been removed. + - FIXME: MIT-SPECIFIC + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="thesis-removed-workaround.title"/> + + + + + <%--

        Submission Stopped: Theses Not Accepted in DSpace

        --%> +

        + + <%--

        Since DSpace does not accept theses, your submission has been stopped. + To start submitting something else click below.

        --%> +

        + +

        + <%-- Start a new submission

        --%> +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/submit/upload-error.jsp dspace-1.2-source-devel/multi/submit/upload-error.jsp --- dspace-1.2-source-devel/jsp/submit/upload-error.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/upload-error.jsp 2004-11-22 08:07:28.000000000 -0200 @@ -1,86 +1,103 @@ -<%-- - - upload-error.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - List of uploaded files - - - - Attributes to pass in to this page: - - submission.info - the SubmissionInfo object - - - - FIXME: Merely iterates through bundles, treating all bit-streams as - - separate documents. Shouldn't be a problem for early adopters. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); -%> - - - -
        - - - - - - -

        Submit: Error Uploading File

        - -

        There was a problem uploading your file. Either the filename you entered - was incorrect, or there was a network problem which prevented the file from - reaching us correctly. Please try again.

        - - <%= SubmitServlet.getSubmissionParameters(si) %> - -<%-- HACK:
        tag needed for broken Netscape 4.78 behaviour --%> -
        -

        -
        - - - +<%-- + - upload-error.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - List of uploaded files + - + - Attributes to pass in to this page: + - submission.info - the SubmissionInfo object + - + - FIXME: Merely iterates through bundles, treating all bit-streams as + - separate documents. Shouldn't be a problem for early adopters. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="upload-error.title"/> + + + + +
        + + + + + + + <%--

        Submit: Error Uploading File

        --%> +

        + + <%--

        There was a problem uploading your file. Either the filename you entered + was incorrect, or there was a network problem which prevented the file from + reaching us correctly. Please try again.

        --%> +

        + + <%= SubmitServlet.getSubmissionParameters(si) %> + +<%-- HACK:
        tag needed for broken Netscape 4.78 behaviour --%> +
        + <%--

        --%> +

        ">

        +
        + + + diff -Naur dspace-1.2-source-devel/jsp/submit/upload-file-list.jsp dspace-1.2-source-devel/multi/submit/upload-file-list.jsp --- dspace-1.2-source-devel/jsp/submit/upload-file-list.jsp 2004-06-16 16:23:14.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/upload-file-list.jsp 2005-02-07 13:45:21.000000000 -0200 @@ -52,6 +52,12 @@ --%> <%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> <%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> <%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> @@ -72,37 +78,77 @@ -
        + + + + <fmt:message key="general.title"/>: + <fmt:message key="upload-file-list.title"/> + + + + + + -

        Submit: <%= (justUploaded ? "File Uploaded Successfully" : "Uploaded Files") %>

        + <%--

        Submit: <%= (justUploaded ? "File Uploaded Successfully" : "Uploaded Files") %>

        --%> +

        + <%-- <%= (justUploaded ? "File Uploaded Successfully" : "Uploaded Files") %> --%> + <% + if (justUploaded) + { + %> + + <% + } + else + { + %> + + <% + } + %> +

        <% if (justUploaded) { %> -

        Your file was successfully uploaded.

        + <%--

        Your file was successfully uploaded.

        --%> +

        <% } %> -

        The table below shows the files you have uploaded for this item. (More Help...)

        + <%--

        The table below shows the files you have uploaded for this item. (More Help...)

        --%> + + + + + +

        - + <%-- - + --%> + + + + + <% if (showChecksums) { %> - + <%-- --%> + <% } @@ -133,16 +179,29 @@ BitstreamFormat format = bitstreams[i].getFormat(); String description = bitstreams[i].getFormatDescription(); String supportLevel = "supported"; - - if(format.getSupportLevel() == 1) - { - supportLevel = "known"; - } - - if(format.getSupportLevel() == 0) - { - supportLevel = "unsupported"; - } + %> + + + + <% + if(format.getSupportLevel() == 1) + { + supportLevel = "known"; + %> + + + + <% + } + else + { + supportLevel = "unsupported"; + %> + + + + <% + } // Full param to dspace:popup must be single variable String supportLevelLink = "/help/formats.jsp#" + supportLevel; @@ -159,14 +218,34 @@ <% // Checksum @@ -186,7 +265,8 @@ String column = (showChecksums ? "Even" : "Odd"); %> <% } @@ -208,24 +288,31 @@ if (!SubmitServlet.isWorkflow(si)) { %> -

        You can verify that the file(s) have been uploaded correctly by:

        + <%--

        You can verify that the file(s) have been uploaded correctly by:

        • Clicking on the filenames above. This will download the file in a - new browser window, so that you can check the contents.
        • + new browser window, so that you can check the contents. --%> +

          +
            +
          • <% if (showChecksums) { %> -
          • Comparing checksums displayed above with checksums worked out on + <%--
          • Comparing checksums displayed above with checksums worked out on your local computer. They should be exactly the same. - Click here to find out how to do this.
          • + Click here to find out how to do this. --%> +
          • +
          • <% } else { %> -
          • The system can calculate a checksum you can verify. - Click here for more information.
          • + <%--
          • The system can calculate a checksum you can verify. + Click here for more information.
          • --%> +
          • + ">
          • <% } %> @@ -247,7 +334,8 @@ if (!SubmitServlet.isWorkflow(si)) { %> -

            + <%--

            --%> +

            ">

            <% } %> @@ -255,14 +343,17 @@
        Primary
        bitstream
        Primary
        bitstream
        File Size DescriptionFile FormatFile FormatChecksumChecksum<%= bitstreams[i].getName() %> <%= bitstreams[i].getSize() %> bytes - <%= (bitstreams[i].getDescription() == null || bitstreams[i].getDescription().equals("") + <%-- <%= (bitstreams[i].getDescription() == null || bitstreams[i].getDescription().equals("") ? "None" - : bitstreams[i].getDescription()) %> - + : bitstreams[i].getDescription()) %> --%> + + <% + if (bitstreams[i].getDescription() == null || bitstreams[i].getDescription().equals("")) + { + %> + + <% + } + else + { + bitstreams[i].getDescription(); + } + %> + + + + + <%-- --%> + "> - <%= description %> (<%= supportLevel %>) - + <%-- <%= description %> (<%= supportLevel %>) --%> + <%= description %> () + <%-- --%> + "> - + <%-- --%> + ">
          - + <%-- --%> + "> - + <%-- --%> + ">     - + <%-- --%> + ">
        diff -Naur dspace-1.2-source-devel/jsp/submit/verify-prune.jsp dspace-1.2-source-devel/multi/submit/verify-prune.jsp --- dspace-1.2-source-devel/jsp/submit/verify-prune.jsp 2004-02-23 16:32:42.000000000 -0200 +++ dspace-1.2-source-devel/multi/submit/verify-prune.jsp 2004-11-22 08:08:03.000000000 -0200 @@ -1,148 +1,170 @@ -<%-- - - verify-prune.jsp - - - - Version: $Revision: 1.6 $ - - - - Date: $Date: 2004/02/23 18:32:42 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Verify that it's OK to "prune" the item after changing the answer to a - - question on the first page - - - - Attributes to pass in: - - submission.info - the SubmissionInfo object - - multiple.titles, published.before, multiple.files - Booleans, indicating - - the user's choices on the initial questions page - - will.remove.titles, will.remove.date, will.remove.files - Booleans, - - indicating consequences of new answers to questions - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> -<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - SubmissionInfo si = - (SubmissionInfo) request.getAttribute("submission.info"); - - boolean multipleTitles = ((Boolean) request.getAttribute("multiple.titles")).booleanValue(); - boolean publishedBefore = ((Boolean) request.getAttribute("published.before")).booleanValue(); - boolean multipleFiles = ((Boolean) request.getAttribute("multiple.files")).booleanValue(); - - boolean willRemoveTitles = ((Boolean) request.getAttribute("will.remove.titles")).booleanValue(); - boolean willRemoveDate = ((Boolean) request.getAttribute("will.remove.date")).booleanValue(); - boolean willRemoveFiles = ((Boolean) request.getAttribute("will.remove.files")).booleanValue(); - - String buttonPressed = (String) request.getAttribute("button.pressed"); -%> - - - -

        Submit: Caution

        - -

        The changes you've made to the first "Describe Your Item" page - will affect your submission:

        - -<% - if (willRemoveTitles) - { -%> -

        You've indicated that your submission does not have alternative titles, - but you've already entered some. If you proceed with this change, the - alternative titles you've entered will be removed.

        -<% - } - - if (willRemoveDate) - { -%> -

        You've indicated that your submission has not been published or publicly - distributed before, but you've already entered an issue date, publisher - and/or citation. If you proceed, this information will be removed, and - DSpace will assign an issue date.

        -<% - } - - if (willRemoveFiles) - { -%> -

        You've indicated that the item you're submitting consists of only a single - file, but you've already uploaded more than one file. If you proceed, only - the first file you uploaded will be kept, and the rest will be discarded by - the system. (The files on your local hard drive will not be affected.)

        -<% - } -%> - -

        Are you sure you want to proceed with the changes?

        - -

         

        - - - -<%-- Embed necessary information --%> - - - - - - - -<%-- Pass through original button press --%> - - - - <%= SubmitServlet.getSubmissionParameters(si) %> - -<%-- Note: These submit buttons' names don't start with "submit", so the - -- Previously passed in button will be picked up --%> -
        - - - - - -
        - - - -
        -
        - -
        +<%-- + - verify-prune.jsp + - + - Version: $Revision: 1.6 $ + - + - Date: $Date: 2004/02/23 18:32:42 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Verify that it's OK to "prune" the item after changing the answer to a + - question on the first page + - + - Attributes to pass in: + - submission.info - the SubmissionInfo object + - multiple.titles, published.before, multiple.files - Booleans, indicating + - the user's choices on the initial questions page + - will.remove.titles, will.remove.date, will.remove.files - Booleans, + - indicating consequences of new answers to questions + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.SubmitServlet" %> +<%@ page import="org.dspace.app.webui.util.SubmissionInfo" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + SubmissionInfo si = + (SubmissionInfo) request.getAttribute("submission.info"); + + boolean multipleTitles = ((Boolean) request.getAttribute("multiple.titles")).booleanValue(); + boolean publishedBefore = ((Boolean) request.getAttribute("published.before")).booleanValue(); + boolean multipleFiles = ((Boolean) request.getAttribute("multiple.files")).booleanValue(); + + boolean willRemoveTitles = ((Boolean) request.getAttribute("will.remove.titles")).booleanValue(); + boolean willRemoveDate = ((Boolean) request.getAttribute("will.remove.date")).booleanValue(); + boolean willRemoveFiles = ((Boolean) request.getAttribute("will.remove.files")).booleanValue(); + + String buttonPressed = (String) request.getAttribute("button.pressed"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="verify-prune.title"/> + + + + + <%--

        Submit: Caution

        --%> +

        + + <%--

        The changes you've made to the first "Describe Your Item" page + will affect your submission:

        --%> +

        + +<% + if (willRemoveTitles) + { +%> + <%--

        You've indicated that your submission does not have alternative titles, + but you've already entered some. If you proceed with this change, the + alternative titles you've entered will be removed.

        --%> +

        +<% + } + + if (willRemoveDate) + { +%> + <%--

        You've indicated that your submission has not been published or publicly + distributed before, but you've already entered an issue date, publisher + and/or citation. If you proceed, this information will be removed, and + DSpace will assign an issue date.

        --%> +

        +<% + } + + if (willRemoveFiles) + { +%> + <%--

        You've indicated that the item you're submitting consists of only a single + file, but you've already uploaded more than one file. If you proceed, only + the first file you uploaded will be kept, and the rest will be discarded by + the system. (The files on your local hard drive will not be affected.)

        --%> +

        +<% + } +%> + + <%--

        Are you sure you want to proceed with the changes?

        --%> +

        + +

         

        + +
        + +<%-- Embed necessary information --%> + + + + + + + +<%-- Pass through original button press --%> + + + + <%= SubmitServlet.getSubmissionParameters(si) %> + +<%-- Note: These submit buttons' names don't start with "submit", so the + -- Previously passed in button will be picked up --%> +
        + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/tombstone.jsp dspace-1.2-source-devel/multi/tombstone.jsp --- dspace-1.2-source-devel/jsp/tombstone.jsp 2003-02-21 17:51:46.000000000 -0200 +++ dspace-1.2-source-devel/multi/tombstone.jsp 2004-11-22 07:48:59.000000000 -0200 @@ -1,63 +1,74 @@ -<%-- - - tombstone.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2003/02/21 19:51:46 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Display a tombstone indicating that an item has been withdrawn. - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - - - - -

        Item Withdrawn

        - -

        The item you are trying to access has been withdrawn from DSpace. If you - have any questions, please contact the administrators.

        - - - -

        - Go to the DSpace home page -

        - -
        +<%-- + - tombstone.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2003/02/21 19:51:46 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Display a tombstone indicating that an item has been withdrawn. + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="tombstone.title"/> + + + + +

        + +

        + + + +

        + +

        + +
        diff -Naur dspace-1.2-source-devel/jsp/tools/confirm-delete-item.jsp dspace-1.2-source-devel/multi/tools/confirm-delete-item.jsp --- dspace-1.2-source-devel/jsp/tools/confirm-delete-item.jsp 2004-02-26 18:38:54.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/confirm-delete-item.jsp 2004-12-16 15:09:38.000000000 -0200 @@ -1,92 +1,114 @@ -<%-- - - confirm-delete-item.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/02/26 20:38:53 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm deletion of a item - - - - Attributes: - - item - item we may delete - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditItemServlet" %> -<%@ page import="org.dspace.content.Item" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - String handle = (String) request.getAttribute("handle"); - Item item = (Item) request.getAttribute("item"); -%> - - - -

        Delete Item: <%= (handle == null ? String.valueOf(item.getID()) : handle) %>

        - -

        Are you sure this item should be completely deleted? Caution: - At present, no tombstone would be left.

        - - - -
        - - - -
        - - - - - -
        - - - -
        -
        -
        -
        - +<%-- + - confirm-delete-item.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/02/26 20:38:53 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm deletion of a item + - + - Attributes: + - item - item we may delete + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditItemServlet" %> +<%@ page import="org.dspace.content.Item" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + String handle = (String) request.getAttribute("handle"); + Item item = (Item) request.getAttribute("item"); +%> + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="confirm-delete-item.parenttitle"/>: + <fmt:message key="confirm-delete-item.title"/> + + + + + <%--

        Delete Item: <%= (handle == null ? String.valueOf(item.getID()) : handle) %>

        --%> +

        : <%= (handle == null ? String.valueOf(item.getID()) : handle) %>

        + + <%--

        Are you sure this item should be completely deleted? Caution: + At present, no tombstone would be left.

        --%> +

        + + + +
        + + + +
        + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        +
        +
        + diff -Naur dspace-1.2-source-devel/jsp/tools/confirm-withdraw-item.jsp dspace-1.2-source-devel/multi/tools/confirm-withdraw-item.jsp --- dspace-1.2-source-devel/jsp/tools/confirm-withdraw-item.jsp 2004-02-26 18:38:54.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/confirm-withdraw-item.jsp 2004-12-16 15:08:49.000000000 -0200 @@ -1,91 +1,115 @@ -<%-- - - confirm-withdraw-item.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/02/26 20:38:53 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Confirm withdrawal of a item - - - - Attributes: - - item - item we may withdraw - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.app.webui.servlet.admin.EditItemServlet" %> -<%@ page import="org.dspace.content.Item" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - String handle = (String) request.getAttribute("handle"); - Item item = (Item) request.getAttribute("item"); -%> - - - -

        Withdraw Item: <%= (handle == null ? String.valueOf(item.getID()) : handle) %>

        - -

        Are you sure this item should be withdrawn from the archive?

        - - - -
        - - - -
        - - - - - -
        - - - -
        -
        -
        -
        - +<%-- + - confirm-withdraw-item.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/02/26 20:38:53 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Confirm withdrawal of a item + - + - Attributes: + - item - item we may withdraw + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.app.webui.servlet.admin.EditItemServlet" %> +<%@ page import="org.dspace.content.Item" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + String handle = (String) request.getAttribute("handle"); + Item item = (Item) request.getAttribute("item"); +%> + + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="confirm-withdraw-item.parenttitle"/>: + <fmt:message key="confirm-withdraw-item.title"/> + + + + + + <%--

        Withdraw Item: <%= (handle == null ? String.valueOf(item.getID()) : handle) %>

        --%> +

        : <%= (handle == null ? String.valueOf(item.getID()) : handle) %>

        + + <%--

        Are you sure this item should be withdrawn from the archive?

        --%> +

        + + + +
        + + + +
        + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        +
        +
        + diff -Naur dspace-1.2-source-devel/jsp/tools/edit-item-form.jsp dspace-1.2-source-devel/multi/tools/edit-item-form.jsp --- dspace-1.2-source-devel/jsp/tools/edit-item-form.jsp 2004-06-22 12:27:18.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/edit-item-form.jsp 2005-02-04 12:37:27.000000000 -0200 @@ -1,361 +1,424 @@ -<%-- - - edit-item-form.jsp - - - - Version: $Revision: 1.4 $ - - - - Date: $Date: 2004/06/22 15:27:17 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Show form allowing edit of collection metadata - - - - Attributes: - - item - item to edit - - collections - collections the item is in, if any - - handle - item's Handle, if any (String) - - dc.types - DCType[] - all DC types in the registry - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.util.Date" %> -<%@ page import="java.util.HashMap" %> -<%@ page import="java.util.Map" %> - -<%@ page import="org.dspace.administer.DCType" %> -<%@ page import="org.dspace.app.webui.servlet.admin.AuthorizeAdminServlet" %> -<%@ page import="org.dspace.app.webui.servlet.admin.EditItemServlet" %> -<%@ page import="org.dspace.content.Bitstream" %> -<%@ page import="org.dspace.content.BitstreamFormat" %> -<%@ page import="org.dspace.content.Bundle" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.DCDate" %> -<%@ page import="org.dspace.content.DCValue" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.core.ConfigurationManager" %> - -<% - Item item = (Item) request.getAttribute("item"); - String handle = (String) request.getAttribute("handle"); - Collection[] collections = (Collection[]) request.getAttribute("collections"); - DCType[] dcTypes = (DCType[]) request.getAttribute("dc.types"); -%> - - -

        Edit Item

        - -

        PLEASE NOTE: These changes are not validated in any way. - You are responsible for entering the data in the correct format. - If you are not sure what the format is, please do NOT make changes.

        - -

        More help...

        - -
        - - - - - - - - - - - - - - - - - - - - - - -<%-- =========================================================== - Edit item's policies - =========================================================== --%> - - - - - -
        Item internal ID:<%= item.getID() %> -<% - if (!item.isWithdrawn()) - { -%> -
        - - - -
        -<% - } - else - { -%> -
        - - - -
        -<% - } -%> -
        -
        - - - -
        -
        Handle:<%= (handle == null ? "None" : handle) %>
        Last modified:
        In Collections: -<% for (int i = 0; i < collections.length; i++) { %> - <%= collections[i].getMetadata("name") %>
        -<% } %> -
        Item page: -<% if (handle == null) { %> - N/A -<% } else { - String url = ConfigurationManager.getProperty("dspace.url") + "/handle/" + handle; %> - <%= url %> -<% } %> -
        Item's Authorizations: -
        - "> - - -
        -
        -
        - -<% - - - if (item.isWithdrawn()) - { -%> -

        This item was withdrawn from DSpace

        -<% - } -%> -

         

        - - -
        - - - - - - - - -<% - DCValue[] dcv = item.getDC(Item.ANY, Item.ANY, Item.ANY); - String row = "even"; - - // Keep a count of the number of values of each element+qualifier - // key is "element" or "element_qualifier" (String) - // values are Integers - number of values that element/qualifier so far - Map dcCounter = new HashMap(); - - for (int i = 0; i < dcv.length; i++) - { - // Find out how many values with this element/qualifier we've found - - String key = dcv[i].element + - (dcv[i].qualifier == null ? "" : "_" + dcv[i].qualifier); - - Integer count = (Integer) dcCounter.get(key); - if (count == null) - { - count = new Integer(0); - } - - // Increment counter in map - dcCounter.put(key, new Integer(count.intValue() + 1)); - - // We will use two digits to represent the counter number in the parameter names. - // This means a string sort can be used to put things in the correct order even - // if there are >= 10 values for a particular element/qualifier. Increase this to - // 3 digits if there are ever >= 100 for a single element/qualifer! :) - String sequenceNumber = count.toString(); - - while (sequenceNumber.length() < 2) - { - sequenceNumber = "0" + sequenceNumber; - } - %> - - - - - - - -<% row = (row.equals("odd") ? "even" : "odd"); - } %> - - - - - - - - - -
        ElementQualifierValueLanguage 
        <%= dcv[i].element %>  <%= (dcv[i].qualifier == null ? "" : dcv[i].qualifier) %> - - - " size=5> - - -
         
        - - - - - - - -
        - -

         

        - -

        Bitstreams

        - -

        Note: Changes to the bitstreams will not be automatically reflected in the - Dublin Core metadata above (e.g. format.extent, format.mimetype). - You will need to update this by hand.

        - -

        Also note that if the "user format description" field isn't empty, the format will - always be set to "Unknown", so clear the user format description before changing the - format field.

        - - - - - - - - - - - -<% - Bundle[] bundles = item.getBundles(); - row = "even"; - - for (int i = 0; i < bundles.length; i++) - { - Bitstream[] bitstreams = bundles[i].getBitstreams(); - for (int j = 0; j < bitstreams.length; j++) - { - // Parameter names will include the bundle and bitstream ID - // e.g. "bitstream_14_18_desc" is the description of bitstream 18 in bundle 14 - String key = bundles[i].getID() + "_" + bitstreams[j].getID(); - BitstreamFormat bf = bitstreams[j].getFormat(); -%> - - <% if (bundles[i].getName().equals("ORIGINAL")) - { %> - - <% } else { %> - - <% } %> - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } - } -%> -
        Primary
        Bitstream
        NameSourceDescriptionFormatUser Format Description 
        - - <% if (bundles[i].getPrimaryBitstreamID() == bitstreams[j].getID()) { %> - <%="checked" %> - <% } %> > - - "> - - "> - - "> - - (<%= bf.getShortDescription() %>) - - "> - - View  -
        - -

        - -

         

        - - - -
        - - - - - -
        - - - -
        -
        -
        -
        +<%-- + - edit-item-form.jsp + - + - Version: $Revision: 1.4 $ + - + - Date: $Date: 2004/06/22 15:27:17 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Show form allowing edit of collection metadata + - + - Attributes: + - item - item to edit + - collections - collections the item is in, if any + - handle - item's Handle, if any (String) + - dc.types - DCType[] - all DC types in the registry + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.util.Date" %> +<%@ page import="java.util.HashMap" %> +<%@ page import="java.util.Map" %> + +<%@ page import="org.dspace.administer.DCType" %> +<%@ page import="org.dspace.app.webui.servlet.admin.AuthorizeAdminServlet" %> +<%@ page import="org.dspace.app.webui.servlet.admin.EditItemServlet" %> +<%@ page import="org.dspace.content.Bitstream" %> +<%@ page import="org.dspace.content.BitstreamFormat" %> +<%@ page import="org.dspace.content.Bundle" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.DCDate" %> +<%@ page import="org.dspace.content.DCValue" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.ConfigurationManager" %> + +<% + Item item = (Item) request.getAttribute("item"); + String handle = (String) request.getAttribute("handle"); + Collection[] collections = (Collection[]) request.getAttribute("collections"); + DCType[] dcTypes = (DCType[]) request.getAttribute("dc.types"); +%> + + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="edit-item-form.parenttitle"/>: + <fmt:message key="edit-item-form.title"/> + + + + <%--

        Edit Item

        --%> +

        + + <%--

        PLEASE NOTE: These changes are not validated in any way. + You are responsible for entering the data in the correct format. + If you are not sure what the format is, please do NOT make changes.

        --%> +

        + + <%--

        More help...

        --%> + + + + + + + +

        + +
        + + + <%-- --%> + + + + + + <%-- --%> + + + + <%-- --%> + + + + + <%-- --%> + + + + + + <%-- --%> + + + +<%-- =========================================================== + Edit item's policies + =========================================================== --%> + + <%-- --%> + + + + +
        Item internal ID:<%= item.getID() %> +<% + if (!item.isWithdrawn()) + { +%> +
        + + + <%-- --%> + "> +
        +<% + } + else + { +%> +
        + + + <%-- --%> + "> +
        +<% + } +%> +
        +
        + + + <%-- --%> + "> +
        +
        Handle:<%= (handle == null ? "None" : handle) %>
        Last modified:
        In Collections: +<% for (int i = 0; i < collections.length; i++) { %> + <%= collections[i].getMetadata("name") %>
        +<% } %> +
        Item page: +<% if (handle == null) { %> + +<% } else { + String url = ConfigurationManager.getProperty("dspace.url") + "/handle/" + handle; %> + <%= url %> +<% } %> +
        Item's Authorizations: +
        + "> + + <%-- --%> + "> +
        +
        +
        + +<% + + + if (item.isWithdrawn()) + { +%> + <%--

        This item was withdrawn from DSpace

        --%> +

        +<% + } +%> +

         

        + + +
        + + + <%-- + + + --%> + + + + + + +<% + DCValue[] dcv = item.getDC(Item.ANY, Item.ANY, Item.ANY); + String row = "even"; + + // Keep a count of the number of values of each element+qualifier + // key is "element" or "element_qualifier" (String) + // values are Integers - number of values that element/qualifier so far + Map dcCounter = new HashMap(); + + for (int i = 0; i < dcv.length; i++) + { + // Find out how many values with this element/qualifier we've found + + String key = dcv[i].element + + (dcv[i].qualifier == null ? "" : "_" + dcv[i].qualifier); + + Integer count = (Integer) dcCounter.get(key); + if (count == null) + { + count = new Integer(0); + } + + // Increment counter in map + dcCounter.put(key, new Integer(count.intValue() + 1)); + + // We will use two digits to represent the counter number in the parameter names. + // This means a string sort can be used to put things in the correct order even + // if there are >= 10 values for a particular element/qualifier. Increase this to + // 3 digits if there are ever >= 100 for a single element/qualifer! :) + String sequenceNumber = count.toString(); + + while (sequenceNumber.length() < 2) + { + sequenceNumber = "0" + sequenceNumber; + } + %> + + + + + + + +<% row = (row.equals("odd") ? "even" : "odd"); + } %> + + + + + + + + + +
        ElementQualifierValueLanguage 
        <%= dcv[i].element %>  <%= (dcv[i].qualifier == null ? "" : dcv[i].qualifier) %> + + + " size=5> + + <%-- --%> + "> +
         
        + + + + + + + <%-- --%> + "> +
        + +

         

        + + <%--

        Bitstreams

        --%> +

        + + <%--

        Note: Changes to the bitstreams will not be automatically reflected in the + Dublin Core metadata above (e.g. format.extent, format.mimetype). + You will need to update this by hand.

        --%> +

        format.extent, format.mimetype). +

        + + <%--

        Also note that if the "user format description" field isn't empty, the format will + always be set to "Unknown", so clear the user format description before changing the + format field.

        --%> +

        + + + + <%-- + + + + + --%> + + + + + + + + + +<% + Bundle[] bundles = item.getBundles(); + row = "even"; + + for (int i = 0; i < bundles.length; i++) + { + Bitstream[] bitstreams = bundles[i].getBitstreams(); + for (int j = 0; j < bitstreams.length; j++) + { + // Parameter names will include the bundle and bitstream ID + // e.g. "bitstream_14_18_desc" is the description of bitstream 18 in bundle 14 + String key = bundles[i].getID() + "_" + bitstreams[j].getID(); + BitstreamFormat bf = bitstreams[j].getFormat(); +%> + + <% if (bundles[i].getName().equals("ORIGINAL")) + { %> + + <% } else { %> + + <% } %> + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } + } +%> +
        Primary
        Bitstream
        NameSourceDescriptionFormatUser Format Description
         
        + + <% if (bundles[i].getPrimaryBitstreamID() == bitstreams[j].getID()) { %> + <%="checked" %> + <% } %> > + + "> + + "> + + "> + + (<%= bf.getShortDescription() %>) + + "> + + <%-- View  --%> +  "> +
        + + <%--

        --%> +

        ">

        + +

         

        + + + +
        + + + + + +
        + <%-- --%> + "> + + <%-- --%> + "> +
        +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/tools/eperson-list.jsp dspace-1.2-source-devel/multi/tools/eperson-list.jsp --- dspace-1.2-source-devel/jsp/tools/eperson-list.jsp 2004-05-25 16:07:52.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/eperson-list.jsp 2004-12-13 12:05:13.000000000 -0200 @@ -1,215 +1,279 @@ -<%-- - - eperson-list.jsp - - - - Version: $Revision: 1.3 $ - - - - Date: $Date: 2004/05/25 19:07:51 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of E-people, with pagination - - - - Attributes: - - - - epeople - EPerson[] - all epeople to browse - - sortby - Integer - field to sort by (constant from EPerson.java) - - first - Integer - index of first eperson to display - - multiple - if non-null, this is for selecting multiple epeople - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> - -<% - int PAGESIZE = 50; - - EPerson[] epeople = - (EPerson[]) request.getAttribute("epeople"); - int sortBy = ((Integer)request.getAttribute("sortby" )).intValue(); - int first = ((Integer)request.getAttribute("first")).intValue(); - boolean multiple = (request.getAttribute("multiple") != null); - - // Make sure we won't run over end of list - int last = first + PAGESIZE; - if (last >= epeople.length) last = epeople.length - 1; - - // Index of first eperson on last page - int jumpEnd = ((epeople.length - 1) / PAGESIZE) * PAGESIZE; - - // Now work out values for next/prev page buttons - int jumpFiveBack = first - PAGESIZE * 5; - if (jumpFiveBack < 0) jumpFiveBack = 0; - - int jumpOneBack = first - PAGESIZE; - if (jumpOneBack < 0) jumpOneBack = 0; - - int jumpOneForward = first + PAGESIZE; - if (jumpOneForward > epeople.length) jumpOneForward = first; - - int jumpFiveForward = first + PAGESIZE * 5; - if (jumpFiveForward > epeople.length) jumpFiveForward = jumpEnd; - - // What's the link? - String sortByParam = "lastname"; - if (sortBy == EPerson.EMAIL) sortByParam = "email"; - if (sortBy == EPerson.ID) sortByParam = "id"; - - String jumpLink = request.getContextPath() + "/tools/eperson-list?multiple=" + multiple + "&sortby=" + sortByParam + "&first="; - String sortLink = request.getContextPath() + "/tools/eperson-list?multiple=" + multiple + "&first=" + first + "&sortby="; -%> - - - - - Select E-people - - - - - - - - -

        E-people <%= first + 1 %>-<%= last + 1 %> of <%= epeople.length %>

        - -<% - if (multiple) - { %> -

        Clicking on the 'Add' button next to an e-person will add that - e-person to the list on the main form.

        -<% } %> - -<%-- Controls for jumping around list--%> - - - - - - - - - -
        First< 5 Pages< 1 Page1 Page >5 Pages >Last
        -
        - -
        <%-- Will never actually be posted, it's just so buttons will appear --%> - - - - - - - - - - -<% - String row = "even"; - - String buttonText = (multiple ? "Add" : "Select"); - // If this is a dialogue to select a *single* e-person, we want - // to clear any existing entry in the e-person list, and - // to close this window when a 'select' button is clicked - String clearList = (multiple ? "" : "clearEPeople();"); - String closeWindow = (multiple ? "" : "window.close();"); - - - for (int i = first; i <= last; i++) - { - EPerson e = epeople[i]; - // Make sure no quotes in full name will mess up our Javascript - String fullname = e.getFullName().replace('\'', ' '); -%> - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
         <%= sortBy == EPerson.ID ? "ID ↑" : "ID" %><%= sortBy == EPerson.EMAIL ? "E-mail ↑" : "E-mail" %><%= sortBy == EPerson.LASTNAME ? "Last Name ↑" : "Last Name" %>First Name
        <%= e.getID() %><%= e.getEmail() %> - <%= (e.getLastName() == null ? "" : e.getLastName()) %> - - <%= (e.getFirstName() == null ? "" : e.getFirstName()) %> -
        - -
        - -<%-- Controls for jumping around list--%> - - - - - - - - - -
        First< 5 Pages< 1 Page1 Page >5 Pages >Last
        - -

        - -
        - - - +<%-- + - eperson-list.jsp + - + - Version: $Revision: 1.3 $ + - + - Date: $Date: 2004/05/25 19:07:51 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of E-people, with pagination + - + - Attributes: + - + - epeople - EPerson[] - all epeople to browse + - sortby - Integer - field to sort by (constant from EPerson.java) + - first - Integer - index of first eperson to display + - multiple - if non-null, this is for selecting multiple epeople + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> + +<% + int PAGESIZE = 50; + + EPerson[] epeople = + (EPerson[]) request.getAttribute("epeople"); + int sortBy = ((Integer)request.getAttribute("sortby" )).intValue(); + int first = ((Integer)request.getAttribute("first")).intValue(); + boolean multiple = (request.getAttribute("multiple") != null); + + // Make sure we won't run over end of list + int last = first + PAGESIZE; + if (last >= epeople.length) last = epeople.length - 1; + + // Index of first eperson on last page + int jumpEnd = ((epeople.length - 1) / PAGESIZE) * PAGESIZE; + + // Now work out values for next/prev page buttons + int jumpFiveBack = first - PAGESIZE * 5; + if (jumpFiveBack < 0) jumpFiveBack = 0; + + int jumpOneBack = first - PAGESIZE; + if (jumpOneBack < 0) jumpOneBack = 0; + + int jumpOneForward = first + PAGESIZE; + if (jumpOneForward > epeople.length) jumpOneForward = first; + + int jumpFiveForward = first + PAGESIZE * 5; + if (jumpFiveForward > epeople.length) jumpFiveForward = jumpEnd; + + // What's the link? + String sortByParam = "lastname"; + if (sortBy == EPerson.EMAIL) sortByParam = "email"; + if (sortBy == EPerson.ID) sortByParam = "id"; + + String jumpLink = request.getContextPath() + "/tools/eperson-list?multiple=" + multiple + "&sortby=" + sortByParam + "&first="; + String sortLink = request.getContextPath() + "/tools/eperson-list?multiple=" + multiple + "&first=" + first + "&sortby="; +%> + + + + + <%-- Select E-people --%> + + + + + + + + + + <%--

        E-people <%= first + 1 %>-<%= last + 1 %> of <%= epeople.length %>

        --%> +

        <%= first + 1 %>-<%= last + 1 %> <%= epeople.length %>

        + +<% + if (multiple) + { %> + <%--

        Clicking on the 'Add' button next to an e-person will add that + e-person to the list on the main form.

        --%> +

        +<% } %> + +<%-- Controls for jumping around list--%> + + + <%-- + + + + + --%> + + + + + + + +
        First< 5 Pages< 1 Page1 Page >5 Pages >Last< 5 < 1 1 >5 >
        +
        + +
        <%-- Will never actually be posted, it's just so buttons will appear --%> + + + + + + + <%-- --%> + + + <%-- --%> + + + + + <%-- Text for button "Add" (or "Select")...--%> + + <% + if(multiple) + { + %> + + + + <% + } + else + { + %> + + + + <% + } + %> + +<% + String row = "even"; + + // If this is a dialogue to select a *single* e-person, we want + // to clear any existing entry in the e-person list, and + // to close this window when a 'select' button is clicked + String clearList = (multiple ? "" : "clearEPeople();"); + String closeWindow = (multiple ? "" : "window.close();"); + + + for (int i = first; i <= last; i++) + { + EPerson e = epeople[i]; + // Make sure no quotes in full name will mess up our Javascript + String fullname = e.getFullName().replace('\'', ' '); +%> + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
         <%= sortBy == EPerson.ID ? "ID ↑" : "ID" %><%= sortBy == EPerson.EMAIL ? "E-mail ↑" : "E-mail" %><%= sortBy == EPerson.LASTNAME ? "Last Name ↑" : "Last Name" %> + <% + if(sortBy == EPerson.LASTNAME) + { + %> + + + <% + } + else + { + %> + + <% + } + %> + + First Name
        " onClick="javascript:<%= clearList %>addEPerson(<%= e.getID() %>, '<%= e.getEmail() %>', '<%= fullname %>');<%= closeWindow %>"><%= e.getID() %><%= e.getEmail() %> + <%= (e.getLastName() == null ? "" : e.getLastName()) %> + + <%= (e.getFirstName() == null ? "" : e.getFirstName()) %> +
        + +
        + +<%-- Controls for jumping around list--%> + + + <%-- + + + + + + --%> + + + + + + + +
        First< 5 Pages< 1 Page1 Page >5 Pages >Last< 5 < 1 1 >5 >
        + + <%--

        --%> +

        " onClick="window.close();">

        + +
        + + + diff -Naur dspace-1.2-source-devel/jsp/tools/get-item-id.jsp dspace-1.2-source-devel/multi/tools/get-item-id.jsp --- dspace-1.2-source-devel/jsp/tools/get-item-id.jsp 2004-06-08 16:01:30.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/get-item-id.jsp 2005-02-07 13:56:35.000000000 -0200 @@ -1,88 +1,126 @@ -<%-- - - get-item-id.jsp - - - - Version: $Revision: 1.2 $ - - - - Date: $Date: 2004/06/08 19:01:29 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Form requesting a Handle or internal item ID for item editing - - - - Attributes: - - invalid.id - if this attribute is present, display error msg - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.core.ConfigurationManager" %> - - -

        Edit or Delete Item

        - -<% - if (request.getAttribute("invalid.id") != null) { %> -

        The ID you entered isn't a valid item ID. If you're trying to - edit a community or collection, you need to use the - communities/collections admin page.

        -<% } %> - -

        Enter the Handle or internal item ID of the item you want to edit or - delete. More help...

        - -
        -
        - - - - - - - - - - -
        Handle: - /" size=12> - -
        Internal ID: - - -
        -
        -
        -
        +<%-- + - get-item-id.jsp + - + - Version: $Revision: 1.2 $ + - + - Date: $Date: 2004/06/08 19:01:29 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Form requesting a Handle or internal item ID for item editing + - + - Attributes: + - invalid.id - if this attribute is present, display error msg + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.core.ConfigurationManager" %> + + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="get-item-id.parenttitle"/>: + <fmt:message key="get-item-id.title"/> + + + + + <%--

        Edit or Delete Item

        --%> +

        + +<% + if (request.getAttribute("invalid.id") != null) { %> + <%--

        The ID you entered isn't a valid item ID. If you're trying to + edit a community or collection, you need to use the --%> +

        + <%-- communities/collections admin page.

        --%> + .

        +<% } %> + + <%--

        Enter the Handle or internal item ID of the item you want to edit or + delete. More help...

        --%> + + + + + + + +

        + +
        +
        + + + <%-- --%> + + + + + + <%-- --%> + + + +
        Handle: + /" size=12> + <%-- --%> + "> +
        Internal ID: + + <%-- --%> + "> +
        +
        +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/tools/group-edit.jsp dspace-1.2-source-devel/multi/tools/group-edit.jsp --- dspace-1.2-source-devel/jsp/tools/group-edit.jsp 2004-06-08 16:01:30.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/group-edit.jsp 2005-02-04 12:50:52.000000000 -0200 @@ -1,99 +1,130 @@ -<%-- - - group_edit.jsp - - - - $Id: group-edit.jsp,v 1.3 2004/06/08 19:01:29 rtansley Exp $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Show contents of a group (name, epeople) - - - - Attributes: - - group - group to be edited - - - - Returns: - - cancel - if user wants to cancel - - add_eperson - go to group_eperson_select.jsp to choose eperson - - change_name - alter name & redisplay - - eperson_remove - remove eperson & redisplay - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - Group group = (Group) request.getAttribute("group"); - EPerson [] epeople = (EPerson []) request.getAttribute("members"); - -%> - - - - - - - - -
        -

        Edit Group : <%=group.getName()%> (<%=group.getID()%>)

        -
        - Help... -
        - -
        -
        - -

        Name:

        - -

        Current Group Members

        - - - - -
        - -

        - -
        -
        +<%-- + - group_edit.jsp + - + - $Id: group-edit.jsp,v 1.3 2004/06/08 19:01:29 rtansley Exp $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Show contents of a group (name, epeople) + - + - Attributes: + - group - group to be edited + - + - Returns: + - cancel - if user wants to cancel + - add_eperson - go to group_eperson_select.jsp to choose eperson + - change_name - alter name & redisplay + - eperson_remove - remove eperson & redisplay + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + + <%@ page isELIgnored ="false" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + Group group = (Group) request.getAttribute("group"); + EPerson [] epeople = (EPerson []) request.getAttribute("members"); + +%> + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="group-edit.parenttitle"/>: + <fmt:message key="group-edit.title"/> + + + + + + + + + + +
        + <%--

        Edit Group : <%=group.getName()%> (<%=group.getID()%>)

        --%> +

        : <%=group.getName()%> (<%=group.getID()%>)

        +
        + <%-- Help... --%> + + + + + + +
        + +
        +
        + + <%--

        Name:

        --%> +

        + + <%--

        Current Group Members

        --%> +

        + + + + +
        + + <%--

        --%> +

        " onclick="javascript:finishEPerson();">

        + +
        +
        +
        diff -Naur dspace-1.2-source-devel/jsp/tools/group-list.jsp dspace-1.2-source-devel/multi/tools/group-list.jsp --- dspace-1.2-source-devel/jsp/tools/group-list.jsp 2004-06-08 16:01:30.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/group-list.jsp 2005-02-04 12:54:14.000000000 -0200 @@ -1,127 +1,159 @@ -<%-- - - group_list.jsp - - - - $Id: group-list.jsp,v 1.2 2004/06/08 19:01:29 rtansley Exp $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display list of Groups, with 'edit' and 'delete' buttons next to them - - - - Attributes: - - - - groups - Group [] of groups to work on - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="org.dspace.eperson.EPerson" %> -<%@ page import="org.dspace.eperson.Group" %> - -<% - Group[] groups = - (Group[]) request.getAttribute("groups"); -%> - - - - - - - - -
        -

        Group Editor

        -
        - Help... -
        - -

        Note that you do not need to manually add users to the "anonymous" - group - all users are members implicitly.

        - -

        Warning - if you try to delete a group that is referred to by an - authorization policy or is a workflow group you will get an internal - server error.

        - -

        -

        - -
        -

        - - - - - - - - - -<% - String row = "even"; - for (int i = 0; i < groups.length; i++) - { -%> - - - - - - - - -<% - row = (row.equals("odd") ? "even" : "odd"); - } -%> -
        IDName  
        <%= groups[i].getID() %> - <%= groups[i].getName() %> - - - - - -
        - - - -
        +<%-- + - group_list.jsp + - + - $Id: group-list.jsp,v 1.2 2004/06/08 19:01:29 rtansley Exp $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display list of Groups, with 'edit' and 'delete' buttons next to them + - + - Attributes: + - + - groups - Group [] of groups to work on + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page isELIgnored ="false" %> + +<%@ page import="org.dspace.eperson.EPerson" %> +<%@ page import="org.dspace.eperson.Group" %> + +<% + Group[] groups = + (Group[]) request.getAttribute("groups"); +%> + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="group-list.parenttitle"/>: + <fmt:message key="group-list.title"/> + + + + + + + + + + +
        + <%--

        Group Editor

        --%> +

        +
        + <%-- Help... --%> + + + + + + +
        + + <%--

        Note that you do not need to manually add users to the "anonymous" + group - all users are members implicitly.

        --%> +

        + + <%--

        Warning - if you try to delete a group that is referred to by an + authorization policy or is a workflow group you will get an internal + server error.

        --%> +

        + +

        +

        + <%-- --%> + "> +
        +

        + + + + + <%-- --%> + + + + + +<% + String row = "even"; + for (int i = 0; i < groups.length; i++) + { +%> + + + + + + + + +<% + row = (row.equals("odd") ? "even" : "odd"); + } +%> +
        IDName  
        <%= groups[i].getID() %> + <%= groups[i].getName() %> + + + <%-- --%> + "> + + <%-- --%> + "> +
        + + +
        +
        diff -Naur dspace-1.2-source-devel/jsp/tools/itemmap-browse.jsp dspace-1.2-source-devel/multi/tools/itemmap-browse.jsp --- dspace-1.2-source-devel/jsp/tools/itemmap-browse.jsp 2004-08-05 18:42:18.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/itemmap-browse.jsp 2005-01-28 14:48:06.000000000 -0200 @@ -1,149 +1,182 @@ -<%-- - - itemmap-browse.jsp - - - - Version: $ $ - - - - Date: $ $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display the results of an item browse - - - - Attributes to pass in: - - - - items - sorted Map of Items to display - - collection - Collection we're managing - - collections - Map of Collections, keyed by collection_id - - browsetext - text to display at the top - - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.net.URLEncoder" %> -<%@ page import="java.util.Iterator" %> -<%@ page import="java.util.Map" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Item" %> - -<% - Collection collection = (Collection)request.getAttribute("collection"); - Map items = (Map)request.getAttribute("items"); - Map collections = (Map)request.getAttribute("collections"); - String browsetext = (String)request.getAttribute("browsetext"); - Boolean showcollection = new Boolean(false); - String browsetype = (String)request.getAttribute("browsetype"); -%> - - - -

        Browse <%=browsetext%>

        - -

        Check the box next to items you wish to add or remove, and choose 'add' or 'remove'.

        - -
        - - - - - - - -
        - - - - - - - - <% if(showcollection.booleanValue()) { %> - - - <% } else { %> - -<% - String row = "even"; - Iterator i = items.keySet().iterator(); - - while( i.hasNext() ) - { - Item item = (Item)items.get(i.next()); -%> - - - - - -<% if( showcollection.booleanValue() ) { %> -<%-- not currently implemented --%> - - -<% } else { %> - - -<% } %> - -
        DateFirst AuthorTitleAction Remove - <% } %> -
        - <%= item.getDC("date", "issued", Item.ANY)[0].value %> - - <%= item.getDC("contributor", Item.ANY, Item.ANY)[0].value %> - - <%= item.getDC("title", null, Item.ANY)[0].value %> <%= collection.getID() %> - <%= item.getDC("title", null, Item.ANY)[0].value %> - -<% } - - row = (row.equals("odd") ? "even" : "odd"); -%> -
        - - - - - - -
        - -
        - -
        +<%-- + - itemmap-browse.jsp + - + - Version: $ $ + - + - Date: $ $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display the results of an item browse + - + - Attributes to pass in: + - + - items - sorted Map of Items to display + - collection - Collection we're managing + - collections - Map of Collections, keyed by collection_id + - browsetext - text to display at the top + + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.net.URLEncoder" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.Map" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> + +<% + Collection collection = (Collection)request.getAttribute("collection"); + Map items = (Map)request.getAttribute("items"); + Map collections = (Map)request.getAttribute("collections"); + String browsetext = (String)request.getAttribute("browsetext"); + Boolean showcollection = new Boolean(false); + String browsetype = (String)request.getAttribute("browsetype"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="itemmap-browse.title"/> + + + +<% String browsemsg = "itemmap-browse.browsetype." + browsetype; + String browsetxt = "itemmap-browse.browsetext." + browsetype; +%> + + <%--

        Browse <%=browsetext%>

        --%> +

        + + <%--

        Check the box next to items you wish to add or remove, and choose 'add' or 'remove'.

        --%> +

        + +
        + + + + + + + <%-- --%> + + +
        "/>">">
        + + + + + <%-- + + --%> + + + + <% if(showcollection.booleanValue()) { %> + <%-- + --%> + + + <% } else { %> + + + <%-- +<% + String row = "even"; + Iterator i = items.keySet().iterator(); + + while( i.hasNext() ) + { + Item item = (Item)items.get(i.next()); +%> + + + + + +<% if( showcollection.booleanValue() ) { %> +<%-- not currently implemented --%> + + +<% } else { %> + + +<% } %> + +
        DateFirst AuthorTitleAction Remove "/>" --%> + <% } %> +
        + <%= item.getDC("date", "issued", Item.ANY)[0].value %> + + <%= item.getDC("contributor", Item.ANY, Item.ANY)[0].value %> + + <%= item.getDC("title", null, Item.ANY)[0].value %> <%= collection.getID() %> + <%= item.getDC("title", null, Item.ANY)[0].value %> + +<% } + + row = (row.equals("odd") ? "even" : "odd"); +%> +
        + + + + <%-- --%> + + + <%-- --%> + + +
        "/>">">
        + +
        + +
        diff -Naur dspace-1.2-source-devel/jsp/tools/itemmap-info.jsp dspace-1.2-source-devel/multi/tools/itemmap-info.jsp --- dspace-1.2-source-devel/jsp/tools/itemmap-info.jsp 2004-04-05 13:15:10.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/itemmap-info.jsp 2005-01-28 14:20:38.000000000 -0200 @@ -1,76 +1,109 @@ -<%-- - - itemmap-info.jsp - - - - Version: $ $ - - - - Date: $ $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Display information with a 'continue' button. (Maybe a cancel?) - - - - Attributes to pass in: - - - - collection - Collection we're managing - - message - String to output - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.net.URLEncoder" %> -<%@ page import="java.util.Iterator" %> -<%@ page import="java.util.Map" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.core.ConfigurationManager" %> - -<% - Collection collection = (Collection)request.getAttribute("collection"); - String message = (String)request.getAttribute("message"); -%> - - - -

        Item Map Info

        - -

        <%=message%>

        - -
        - - -
        -
        +<%-- + - itemmap-info.jsp + - + - Version: $ $ + - + - Date: $ $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Display information with a 'continue' button. (Maybe a cancel?) + - + - Attributes to pass in: + - + - collection - Collection we're managing + - message - String to output + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.net.URLEncoder" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.Map" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.ConfigurationManager" %> + +<% + Collection collection = (Collection)request.getAttribute("collection"); + String message = (String)request.getAttribute("message"); + String [] itemIDs = (String []) request.getAttribute("item_ids"); + String msgkey1 = "itemmap-info.action1."+(String) request.getAttribute("action"); + String msgkey2 = "itemmap-info.action2."+(String) request.getAttribute("action"); + +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="itemmap-info.title"/> + + + + + <%--

        Item Map Info

        --%> +

        + +

        + <% if (itemIDs == null) + { + %><% + } + else{ + for (int j=0; j +
        <%=i%> + <%} + } %> + +

        + +
        + + <%-- --%> + "> +
        +
        diff -Naur dspace-1.2-source-devel/jsp/tools/itemmap-main.jsp dspace-1.2-source-devel/multi/tools/itemmap-main.jsp --- dspace-1.2-source-devel/jsp/tools/itemmap-main.jsp 2004-08-05 18:42:18.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/itemmap-main.jsp 2005-01-27 15:00:42.000000000 -0200 @@ -1,177 +1,202 @@ -<%-- - - itemmap-main.jsp - - - - Version: $ $ - - - - Date: $ $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - - -<%-- - - Display the main page for item mapping (status and controls) - - - - Attributes to pass in: - - - - collection - Collection we're managing - - collections - Map of Collections, keyed by collection_id - - collection_counts - Map of Collection IDs to counts - - count_native - how many items are in collection - - count_import - how many items are 'virtual' - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<%@ page import="java.net.URLEncoder" %> -<%@ page import="java.util.Iterator" %> -<%@ page import="java.util.Map" %> -<%@ page import="org.dspace.content.Collection" %> -<%@ page import="org.dspace.content.Item" %> -<%@ page import="org.dspace.core.ConfigurationManager" %> - -<% - Collection collection = (Collection)request.getAttribute("collection"); - int count_native = - ((Integer)request.getAttribute("count_native")).intValue(); - int count_import = - ((Integer)request.getAttribute("count_import")).intValue(); - Map items = (Map)request.getAttribute("items"); - Map collections = (Map)request.getAttribute("collections"); - Map collection_counts = (Map)request.getAttribute("collection_counts"); - Collection [] all_collections = (Collection[]) - request.getAttribute("all_collections"); -%> - - - -

        Item Mapper - Map Items from Other Collections

        - -

        Collection: "<%=collection.getMetadata("name")%>"

        - -

        There are <%=count_native%> items owned by this collection, and - <%=count_import%> items mapped in from other collections.

        - -<%-- -

        Quick Add Item:

        - -

        Enter the Handle or internal item ID of the item you want to add:

        - -
        - - -
        - - - - - - - - - - -
        Handle: - /" size=12> - -
        Internal ID: - - -
        -
        -
        - -

        Import an entire collection

        -
        - - - - -
        ---%> - -

        Import By Author Match

        - Enter part of an author's name for a list of matching items
        - -
        - - - -
        -
        - -

        Browse Items Imported From Collections:

        - -

        Click on collection names to browse for items to remove that were mapped in from that collection.

        - -<% - String row = "even"; - Iterator colKeys = collections.keySet().iterator(); - - if(!colKeys.hasNext()) - { -%> -

        This collection has no items mapped into it.

        -<% - } - - - while( colKeys.hasNext() ) - { - Collection myCollection = (Collection)collections.get(colKeys.next()); - String myTitle = myCollection.getMetadata("name"); - int cid = collection.getID(); - int myID = myCollection.getID(); - int myCount = ((Integer)collection_counts.get( - new Integer(myID))).intValue(); - - String myLink = request.getContextPath()+"/tools/itemmap?action=browse"; -%> -

        <%=myTitle%> (<%=myCount%>)

        -<% } %> -
        - +<%-- + - itemmap-main.jsp + - + - Version: $ $ + - + - Date: $ $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + + +<%-- + - Display the main page for item mapping (status and controls) + - + - Attributes to pass in: + - + - collection - Collection we're managing + - collections - Map of Collections, keyed by collection_id + - collection_counts - Map of Collection IDs to counts + - count_native - how many items are in collection + - count_import - how many items are 'virtual' + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<%@ page import="java.net.URLEncoder" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.Map" %> +<%@ page import="org.dspace.content.Collection" %> +<%@ page import="org.dspace.content.Item" %> +<%@ page import="org.dspace.core.ConfigurationManager" %> + +<% + Collection collection = (Collection)request.getAttribute("collection"); + int count_native = + ((Integer)request.getAttribute("count_native")).intValue(); + int count_import = + ((Integer)request.getAttribute("count_import")).intValue(); + Map items = (Map)request.getAttribute("items"); + Map collections = (Map)request.getAttribute("collections"); + Map collection_counts = (Map)request.getAttribute("collection_counts"); + Collection [] all_collections = (Collection[]) + request.getAttribute("all_collections"); +%> + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="itemmap-main.title"/> + + + + + <%--

        Item Mapper - Map Items from Other Collections

        --%> +

        + + <%--

        Collection: "<%=collection.getMetadata("name")%>"

        --%> +

        "<%=collection.getMetadata("name")%>"

        + + <%--

        There are <%=count_native%> items owned by this collection, and + <%=count_import%> items mapped in from other collections.

        --%> +

        <%=count_native%> + <%=count_import%>

        + +<%-- +

        Quick Add Item:

        + +

        Enter the Handle or internal item ID of the item you want to add:

        + +
        + + +
        + + + + + + + + + + +
        Handle: + /" size=12> + +
        Internal ID: + + +
        +
        +
        + +

        Import an entire collection

        +
        + + + + +
        + --%> + + <%--

        Import By Author Match

        + Enter part of an author's name for a list of matching items
        --%> +

        +
        + +
        + + + <%-- --%> + + "> +
        +
        + + <%--

        Browse Items Imported From Collections:

        --%> +

        + + <%--

        Click on collection names to browse for items to remove that were mapped in from that collection.

        --%> +

        + +<% + String row = "even"; + Iterator colKeys = collections.keySet().iterator(); + + if(!colKeys.hasNext()) + { +%> + <%--

        This collection has no items mapped into it.

        --%> +

        +<% + } + + + while( colKeys.hasNext() ) + { + Collection myCollection = (Collection)collections.get(colKeys.next()); + String myTitle = myCollection.getMetadata("name"); + int cid = collection.getID(); + int myID = myCollection.getID(); + int myCount = ((Integer)collection_counts.get( + new Integer(myID))).intValue(); + + String myLink = request.getContextPath()+"/tools/itemmap?action=browse"; +%> +

        <%=myTitle%> (<%=myCount%>)

        +<% } %> +
        + diff -Naur dspace-1.2-source-devel/jsp/tools/upload-bitstream.jsp dspace-1.2-source-devel/multi/tools/upload-bitstream.jsp --- dspace-1.2-source-devel/jsp/tools/upload-bitstream.jsp 2004-02-26 18:38:54.000000000 -0200 +++ dspace-1.2-source-devel/multi/tools/upload-bitstream.jsp 2004-12-16 15:04:29.000000000 -0200 @@ -1,73 +1,96 @@ -<%-- - - upload-bitstream.jsp - - - - Version: $Revision: 1.1 $ - - - - Date: $Date: 2004/02/26 20:38:53 $ - - - - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts - - Institute of Technology. All rights reserved. - - - - Redistribution and use in source and binary forms, with or without - - modification, are permitted provided that the following conditions are - - met: - - - - - Redistributions of source code must retain the above copyright - - notice, this list of conditions and the following disclaimer. - - - - - Redistributions in binary form must reproduce the above copyright - - notice, this list of conditions and the following disclaimer in the - - documentation and/or other materials provided with the distribution. - - - - - Neither the name of the Hewlett-Packard Company nor the name of the - - Massachusetts Institute of Technology nor the names of their - - contributors may be used to endorse or promote products derived from - - this software without specific prior written permission. - - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - - DAMAGE. - --%> - -<%-- - - Form to upload a bitstream - - - - Attributes: - - item - the item the bitstream will be added to - --%> - -<%@ page contentType="text/html;charset=UTF-8" %> - -<%@ page import="org.dspace.content.Item" %> - -<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> - -<% - Item item = (Item) request.getAttribute("item"); -%> - - - -

        Upload Bitstream

        - -

        Select the bitstream to upload

        - -
        -

        - -

        - - - -

        -
        -
        +<%-- + - upload-bitstream.jsp + - + - Version: $Revision: 1.1 $ + - + - Date: $Date: 2004/02/26 20:38:53 $ + - + - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts + - Institute of Technology. All rights reserved. + - + - Redistribution and use in source and binary forms, with or without + - modification, are permitted provided that the following conditions are + - met: + - + - - Redistributions of source code must retain the above copyright + - notice, this list of conditions and the following disclaimer. + - + - - Redistributions in binary form must reproduce the above copyright + - notice, this list of conditions and the following disclaimer in the + - documentation and/or other materials provided with the distribution. + - + - - Neither the name of the Hewlett-Packard Company nor the name of the + - Massachusetts Institute of Technology nor the names of their + - contributors may be used to endorse or promote products derived from + - this software without specific prior written permission. + - + - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + - DAMAGE. + --%> + +<%-- + - Form to upload a bitstream + - + - Attributes: + - item - the item the bitstream will be added to + --%> + +<%@ page contentType="text/html;charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" + prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" + prefix="fmt" %> + +<%@ page import="org.dspace.content.Item" %> + +<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> + +<% + Item item = (Item) request.getAttribute("item"); +%> + + + + + + + + + + <fmt:message key="general.title"/>: + <fmt:message key="upload-bitstream.parenttitle"/>: + <fmt:message key="upload-bitstream.title"/> + + + + + <%--

        Upload Bitstream

        --%> +

        + + <%--

        Select the bitstream to upload

        --%> +

        + +
        +

        + +

        + + + + +

        ">

        +
        + +
        +
        diff -Naur dspace-1.2-source-devel/jsp/utils.js dspace-1.2-source-devel/multi/utils.js --- dspace-1.2-source-devel/jsp/utils.js 2004-04-01 16:46:12.000000000 -0200 +++ dspace-1.2-source-devel/multi/utils.js 2004-12-06 16:45:17.000000000 -0200 @@ -52,12 +52,12 @@ // Add to list of e-people on this page -- invoked by eperson popup window function addEPerson(id, email, name) { - var newplace = window.document.forms[0].eperson_id.options.length; + var newplace = window.document.forms[1].eperson_id.options.length; // First we check to see if e-person is already there - for (var i = 0; i < window.document.forms[0].eperson_id.options.length; i++) + for (var i = 0; i < window.document.forms[1].eperson_id.options.length; i++) { - if (window.document.forms[0].eperson_id.options[i].value == id) + if (window.document.forms[1].eperson_id.options[i].value == id) { newplace = -1; } @@ -65,7 +65,7 @@ if (newplace > -1) { - window.document.forms[0].eperson_id.options[newplace] = new Option(name + " (" + email + ")", id); + window.document.forms[1].eperson_id.options[newplace] = new Option(name + " (" + email + ")", id); } } @@ -73,7 +73,7 @@ // on pages with a dspace:selecteperson element in them function finishEPerson() { - selectAll(window.document.forms[0].eperson_id); + selectAll(window.document.forms[1].eperson_id); if (popupWindow != null) {