litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Browse source
This commit is contained in:
brianjlowe 2013-10-15 15:48:30 -04:00
commit 1b0185758c
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
View file

@ -108,9 +108,9 @@ public class GroupedPropertyList extends BaseTemplateModel {
if (editing) { if (editing) {
mergeAllPossibleDataProperties(propertyList); mergeAllPossibleDataProperties(propertyList);
propertyList = correctLanguageForProperties(propertyList);
} }
propertyList = correctLanguageForProperties(propertyList);
sort(propertyList); sort(propertyList);
// Put the list into groups // Put the list into groups

12
webapp/web/error.jsp
View file

@ -5,7 +5,19 @@
<%@ page import="com.oreilly.servlet.ServletUtils,edu.cornell.mannlib.vitro.webapp.web.*" %> <%@ page import="com.oreilly.servlet.ServletUtils,edu.cornell.mannlib.vitro.webapp.web.*" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean"%> <%@page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean"%>
<%@page import="org.apache.commons.logging.Log"%>
<%@page import="org.apache.commons.logging.LogFactory"%>
<% <%
// We have seen that this page can throw its own error.
// Before it does so, be sure that we have written the original error to the log.
Object c = request.getAttribute("javax.servlet.jsp.jspException");
if (c instanceof Throwable) {
Throwable cause = (Throwable) c;
Log log = LogFactory.getLog(this.getClass());
log.error("Error: ", cause);
}
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
ApplicationBean appBean = vreq.getAppBean(); ApplicationBean appBean = vreq.getAppBean();
String themeDir = appBean.getThemeDir(); String themeDir = appBean.getThemeDir();

2
webapp/web/js/vitroUtils.js
View file

@ -5,7 +5,7 @@ $(document).ready(function(){
// Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing // Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing
// pages, overwrites $. // pages, overwrites $.
// fade out welcome-message when user logs in // fade out welcome-message when user logs in
$.extend(this, i18nStrings); jQuery.extend(this, i18nStrings);
jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500); jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500);