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
-
-
-
-
+<%--
+ - 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")); %>
+
+
+
+
+
+ <%
+
+ }
+ %>
+
+
+
+
+
+
+
+
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 --%>
-
-
- 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 --%>
+
+
+ <%-- 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 --%>
-
-
-
-
- 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 --%>
+
+
+
+
+ <%-- 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 --%>
-
-
-
-
-
- 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 --%>
+
+
+
+
+
+ <%-- 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) { %>
-  %>/retrieve/<%= logo.getID() %>)
-<% } %> |
-
-
-
- <%-- Search/Browse --%>
-
-
-
-
- |
-<%-- HACK: used for Netscape 4.x, which doesn't accept align=center
- for a paragraph with a button in it --%>
-
-
-
- |
-
- |
-
-
-
-
- <%= intro %>
-
-
-
- <%= copyright %>
-
-
-<% if(admin_button || editor_button ) { %>
-
-
-
-
-
- |
- Admin Tools
- |
- |
-
-<% if( admin_button ) { %>
-
- |
-
- |
-
-<% } %>
-
-<% if( editor_button ) { %>
-
- |
-
- |
-
-<% if(submitters != null) { %>
-
- |
-
- |
-
-<% } %>
-
- |
- 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) { %>
+
+<% } %> |
+
+
+
+ <%-- Search/Browse --%>
+
+
+
+
+ |
+<%-- HACK: used for Netscape 4.x, which doesn't accept align=center
+ for a paragraph with a button in it --%>
+
+
+
+ |
+
+ |
+
+
+
+
+ <%= intro %>
+
+
+
+ <%= copyright %>
+
+
+<% if(admin_button || editor_button ) { %>
+
+
+
+
+
+ |
+ <%--Admin Tools--%>
+
+ |
+ |
+
+<% if( admin_button ) { %>
+
+ |
+
+ |
+
+<% } %>
+
+<% if( editor_button ) { %>
+
+ |
+
+ |
+
+<% if(submitters != null) { %>
+
+ |
+
+ |
+
+<% } %>
+
+ |
+ <%--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) { %>
-
-<% } %> |
-
-
-
-
- <%-- Search/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) { %>
+
+<% } %> |
+
+
+
+
+ <%-- Search/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( "