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 
I haven't a clue what git is trying to do. I kind of miss svn at this point.
This commit is contained in:
tworrall 2012-11-16 16:02:47 -05:00
commit 11a83c4c1c
17 changed files with 35 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

1
webapp/web/error.jsp
View file

@ -13,7 +13,6 @@
request.setAttribute("bodyJsp", "/errorbody.jsp");
request.setAttribute("title", "Error");
request.setAttribute("css", "");
request.setAttribute("appBean", appBean);
request.setAttribute("themeDir", themeDir);
%>

9
webapp/web/js/imageUpload/validateUpload.js
View file

@ -1,9 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
function validate_upload_file(form_passed){
if (form_passed.datafile.value == "") {
alert ("Please browse and select a photo");
return false;
}
}

3
webapp/web/templates/page/basicPage.jsp
View file

@ -38,9 +38,6 @@
if (request.getAttribute("css") == null){
e+="basicPage.jsp expects that request parameter 'css' be set to css to include in page.\n";
}
if( request.getAttribute("appBean") == null){
e+="basicPage.jsp expects that request attribute 'appBean' be set.\n";
}
if( e.length() > 0 ){
throw new JspException(e);
}

3
webapp/web/templates/page/blankPage.jsp
View file

@ -31,9 +31,6 @@
if (request.getAttribute("css") == null){
e+="basicPage.jsp expects that request parameter 'css' be set to css to include in page.\n";
}
if( request.getAttribute("appBean") == null){
e+="basicPage.jsp expects that request attribute 'appBean' be set.\n";
}
if( e.length() > 0 ){
throw new JspException(e);
}