diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java index cb24cf169..29340b517 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java @@ -53,7 +53,7 @@ public class ImageUploadController extends FreemarkerHttpServlet { private static final String DEFAULT_NAMESPACE = ConfigurationProperties .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. */ public static final int MAXIMUM_FILE_SIZE = 6 * 1024 * 1024; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java index d0c331d89..67d5ca875 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java @@ -75,7 +75,7 @@ public class UrlDirective extends BaseTemplateDirectiveModel { map.put("params", params); List examples = new ArrayList(); - examples.add("<@" + name + " path=\"/images/dummyImages/person.thumbnail.jpg\" />"); + examples.add("<@" + name + " path=\"/images/placeholders/person.thumbnail.jpg\" />"); map.put("examples", examples); return mergeToHelpTemplate(map, env); diff --git a/webapp/web/images/dummyImages/person.thumbnail.jpg b/webapp/web/images/dummyImages/person.thumbnail.jpg deleted file mode 100644 index 008b7449f..000000000 Binary files a/webapp/web/images/dummyImages/person.thumbnail.jpg and /dev/null differ diff --git a/webapp/web/js/menupage/browseByVClass.js b/webapp/web/js/menupage/browseByVClass.js index 0f9e01eb1..136a77ac9 100644 --- a/webapp/web/js/menupage/browseByVClass.js +++ b/webapp/web/js/menupage/browseByVClass.js @@ -66,13 +66,12 @@ var browseByVClass = { $.getJSON(url, function(results) { $.each(results.individuals, function(i, item) { - // alert(results.individuals[i].label); indivLabel = results.individuals[i].label; indivUri = results.individuals[i].URI; // test for individual image is not currently functional // since the image is not yet included in the JSON results if ( !results.individuals[i].image ) { - indivImage = browseByVClass.baseUrl + '/images/dummyImages/person.thumbnail.jpg'; + indivImage = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg'; } else { indivImage = results.individuals[i].image; } @@ -107,7 +106,7 @@ var browseByVClass = { } }; -$(document).ready(function() { +$(document).ready(function() { browseByVClass.onLoad(); browseByVClass.defaultVClass(); }); \ No newline at end of file diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp index 45bdee8db..8ac507d53 100644 --- a/webapp/web/templates/entity/entityBasic.jsp +++ b/webapp/web/templates/entity/entityBasic.jsp @@ -142,7 +142,7 @@ if (showSelfEdits || showCuratorEdits) {
- ${imageLinks} diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl index 8f1d73fda..73a55f6ea 100644 --- a/webapp/web/templates/freemarker/body/individual/individual.ftl +++ b/webapp/web/templates/freemarker/body/individual/individual.ftl @@ -20,7 +20,7 @@ <#if individual.thumbUrl??> ${individual.name} <#elseif individual.person> - placeholder image + placeholder image