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

Renamed "dummyImages" to "placeholders"

Browse source
This commit is contained in:
nac26 2011-01-04 00:17:35 +00:00
parent b0b65d14e3
commit 155629db58
6 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
View file

@ -53,7 +53,7 @@ public class ImageUploadController extends FreemarkerHttpServlet {
private static final String DEFAULT_NAMESPACE = ConfigurationProperties private static final String DEFAULT_NAMESPACE = ConfigurationProperties
.getProperty("Vitro.defaultNamespace"); .getProperty("Vitro.defaultNamespace");
public static final String DUMMY_THUMBNAIL_URL = "/images/dummyImages/person.thumbnail.jpg"; public static final String DUMMY_THUMBNAIL_URL = "/images/placeholders/person.thumbnail.jpg";
/** Limit file size to 6 megabytes. */ /** Limit file size to 6 megabytes. */
public static final int MAXIMUM_FILE_SIZE = 6 * 1024 * 1024; public static final int MAXIMUM_FILE_SIZE = 6 * 1024 * 1024;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java
View file

@ -75,7 +75,7 @@ public class UrlDirective extends BaseTemplateDirectiveModel {
map.put("params", params); map.put("params", params);
List<String> examples = new ArrayList<String>(); List<String> examples = new ArrayList<String>();
examples.add("<@" + name + " path=\"/images/dummyImages/person.thumbnail.jpg\" />"); examples.add("<@" + name + " path=\"/images/placeholders/person.thumbnail.jpg\" />");
map.put("examples", examples); map.put("examples", examples);
return mergeToHelpTemplate(map, env); return mergeToHelpTemplate(map, env);

BIN
webapp/web/images/dummyImages/person.thumbnail.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

3
webapp/web/js/menupage/browseByVClass.js
View file

@ -66,13 +66,12 @@ var browseByVClass = {
$.getJSON(url, function(results) { $.getJSON(url, function(results) {
$.each(results.individuals, function(i, item) { $.each(results.individuals, function(i, item) {
// alert(results.individuals[i].label);
indivLabel = results.individuals[i].label; indivLabel = results.individuals[i].label;
indivUri = results.individuals[i].URI; indivUri = results.individuals[i].URI;
// test for individual image is not currently functional // test for individual image is not currently functional
// since the image is not yet included in the JSON results // since the image is not yet included in the JSON results
if ( !results.individuals[i].image ) { if ( !results.individuals[i].image ) {
indivImage = browseByVClass.baseUrl + '/images/dummyImages/person.thumbnail.jpg'; indivImage = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg';
} else { } else {
indivImage = results.individuals[i].image; indivImage = results.individuals[i].image;
} }

2
webapp/web/templates/entity/entityBasic.jsp
View file

@ -142,7 +142,7 @@ if (showSelfEdits || showCuratorEdits) {
<div class="datatypeProperties"> <div class="datatypeProperties">
<div class="datatypePropertyValue"> <div class="datatypePropertyValue">
<div class="statementWrap thumbnail"> <div class="statementWrap thumbnail">
<img src="<c:url value='/images/dummyImages/person.thumbnail.jpg'/>" <img src="<c:url value='/images/placeholders/person.thumbnail.jpg'/>"
title="no image" alt="" width="115"/> title="no image" alt="" width="115"/>
<c:if test="${showEdits}"> <c:if test="${showEdits}">
<span class="editLinks">${imageLinks}</span> <span class="editLinks">${imageLinks}</span>

2
webapp/web/templates/freemarker/body/individual/individual.ftl
View file

@ -20,7 +20,7 @@
<#if individual.thumbUrl??> <#if individual.thumbUrl??>
<a href="${individual.imageUrl}"><img class="individual-photo2" src="${individual.thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a> <a href="${individual.imageUrl}"><img class="individual-photo2" src="${individual.thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>
<#elseif individual.person> <#elseif individual.person>
<img class="individual-photo2" src="${urls.images}/dummyImages/person.thumbnail.jpg" title = "no image" alt="placeholder image" width="115" /> <img class="individual-photo2" src="${urls.images}/placeholders/person.thumbnail.jpg" title = "no image" alt="placeholder image" width="115" />
</#if> </#if>
<nav role="navigation"> <nav role="navigation">