Merge r7065, r7066 from the release 1.2 maintenance branch

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;
 }

webapp/web/css/vitro.css

@@ -24,3 +24,46 @@ 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;
+}

webapp/web/js/imageUpload/imageUploadUtils.js

@@ -2,12 +2,10 @@
 
 $(document).ready(function(){
 
-  // Confirmation alert for photo deletion
+  // Confirmation alert for photo deletion in image upload and individual templates
-  $('a.thumbnail').click(function(){
+  $('#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;
   });
-
 });
-
-

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>    
-        <a href="${individual.imageUrl}"><img class="individual-photo2" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>            
+        <a href="${individual.imageUrl}"><img class="individual-photo" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>            
         <@p.editingLinks mainImage.statements[0] showEditLinks /> 
     <#else>
         <@p.addLinkWithLabel mainImage showEditLinks "Photo" /> 
         <#if placeholderImage?has_content>
-            <img class="individual-photo2" src="${placeholderImage}" title = "no image" alt="placeholder image" width="115" /> 
+            <img class="individual-photo" src="${placeholderImage}" title = "no image" alt="placeholder image" width="115" /> 
         </#if>                                                      
     </#if>