diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css
index d152f3270..d3ac9faa4 100644
--- a/webapp/web/css/login.css
+++ b/webapp/web/css/login.css
@@ -62,40 +62,6 @@ h3.internal-auth{
margin-bottom: 0;
padding-bottom: 0;
}
-#error-alert{
- color: #900;
- padding: 10px;
- margin-bottom: 5px;
- height: 30px;
-}
-#error-alert img {
- float:left;
- margin: 0;
- padding: 0;
- vertical-align: middle;
-}
-#error-alert p {
- padding-left: 30px;
- font-size: 0.9em;
- line-height: 30px;
-}
-#confirmation-alert {
- color: #169f43;
- padding: 0px;
- margin-bottom: 5px;
- height: 30px;
-}
-#confirmation-alert img {
- float: left;
- margin: 0;
- padding: 0;
- vertical-align: middle;
-}
-#confirmation-alert p {
- padding-left: 30px;
- font-size: 0.9em;
- line-height: 30px;
-}
.formFieldAlert {
border: 2px solid #900;
}
diff --git a/webapp/web/css/vitro.css b/webapp/web/css/vitro.css
index c680d88ef..22d0d0232 100644
--- a/webapp/web/css/vitro.css
+++ b/webapp/web/css/vitro.css
@@ -23,4 +23,47 @@ Miscellaneous
.hidden {
display: none !important;
+}
+
+/************************
+User feedback
+************************/
+#error-alert{
+ color: #900;
+ padding: 10px;
+ margin-bottom: 5px;
+ height: 30px;
+}
+#error-alert img {
+ float:left;
+ margin: 0;
+ padding: 0;
+ vertical-align: middle;
+}
+#error-alert p {
+ padding-left: 30px;
+ font-size: 0.9em;
+ line-height: 30px;
+}
+#confirmation-alert {
+ color: #169f43;
+ padding: 0px;
+ margin-bottom: 5px;
+ height: 30px;
+}
+#confirmation-alert img {
+ float: left;
+ margin: 0;
+ padding: 0;
+ vertical-align: middle;
+}
+#confirmation-alert p {
+ padding-left: 30px;
+ font-size: 0.9em;
+ line-height: 30px;
+}
+#flash-message{
+ background-color: #7285a0;
+ padding: 0.5em;
+ margin-bottom: 10px;
}
\ No newline at end of file
diff --git a/webapp/web/js/imageUpload/imageUploadUtils.js b/webapp/web/js/imageUpload/imageUploadUtils.js
index ef5d5295c..90c7029d5 100644
--- a/webapp/web/js/imageUpload/imageUploadUtils.js
+++ b/webapp/web/js/imageUpload/imageUploadUtils.js
@@ -2,12 +2,10 @@
$(document).ready(function(){
- // Confirmation alert for photo deletion
- $('a.thumbnail').click(function(){
+ // Confirmation alert for photo deletion in image upload and individual templates
+ $('#photoUploadDefaultImage a.thumbnail,#share-contact a:eq(2)').click(function(){
+ //$('#share-contact a [title="delete this relationship"]').click(function(){
var answer = confirm('Are you sure you want to delete your photo?');
return answer;
});
-
-});
-
-
+});
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index b6cdb1112..069725d05 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -118,12 +118,12 @@ name will be used as the label. -->
<#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case).
If there's a mainImage statement but no thumbnail image, treat it as if there is no image. -->
<#if (mainImage.statements)?has_content && thumbUrl?has_content>
-
+
<@p.editingLinks mainImage.statements[0] showEditLinks />
<#else>
<@p.addLinkWithLabel mainImage showEditLinks "Photo" />
<#if placeholderImage?has_content>
-
+
#if>
#if>