merge -r 905:908 -r 922 -c 946 -r 984:986 -r 1014:1029 from 1048 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

productMods/edit/forms/css/customForm.css

@@ -104,3 +104,7 @@ option {
     width: 30%;
 }
 
+/* fix bad alignment in IE 6 and 7 */
+.or, .cancel{
+vertical-align:top;
+}

productMods/edit/forms/unsupportedBrowserMessage.jsp

@@ -8,7 +8,7 @@
 
 <div id="ie67DisableWrapper">
 	<div id="ie67DisableContent">
-		<img src="${themeDir}siteIcons/iconAlertBig.png" alt="Alert Icon"/>
+		<img src="${themeDir}site_icons/iconAlertBig.png" alt="Alert Icon"/>
 		<p>This form is not supported for use in versions of Internet Explorer below 8. Please upgrade to Internet Explorer 8, or
 		switch to another browser, such as FireFox.</p>
 	</div>

themes/vivo-basic/css/individual.css

@@ -224,6 +224,8 @@ img.screenshot {
 }
 
 #personWrap div.propsCategory div.propsItem { /* being more specific here to leave borders off ungrouped (single) properties */
+
+
 /*    border-top: 1px solid #fff;*/
 /*    border-bottom: 1px solid #f0ede4;*/
     border-bottom: 1px solid #f2f2f2;

themes/vivo-basic/css/login.css

@@ -1,181 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* styles for log in */
-#formLogin{
-	width:300px;
-	padding:0px;
-	margin:0px;
-	text-align:left;
-	background-color:#FFF;
-	
-}
-
-.noOutterBox{
-	width:340px;
-	padding:0px;
-	border: none;
-	margin:0px;
-	
-	
-}
-
-#formLogin h2 {
-font-size:1.3em;
-line-height:1em;
-margin-top:0px;
-margin-bottom:1em;
-color:#111;
-}
-
-
-#formLogin h6 {
-font-size:1.2em;
-line-height:1em;
-margin-top:0px;
-margin-bottom:1em;
-color:#111;
-}
-
-#formLogin form {
-margin: 0;
-padding: 0;
-
-}
-
-#formLogin label{
-display:block;
-margin-bottom:0.5em;
-font-weight:bold;
-
-
-}
-
-#formLogin label span{
-color:#900;
-
-
-}
-
-#formLogin input{
-display:block;
-margin-bottom:1.5em;
-width: 200px;
-
-}
-#formLogin textarea{
-width: 300px;
-display:block;
-margin-bottom:1.5em;
-
-
-}
-
-#formLogin .checkBox{
-display:inline;
-width:1em;
-margin-bottom: 1em;
-
-}
-#formLogin p.small{
-	font-size: 0.8em;
-	
-}
-
-
-
-#formLogin input.submit{
-
-	width: auto;
-	padding: 0 0.9em;
-	display:inline;
-	
-}
-
-.requestAccount{
-	padding: 1em 0 0 2em;
-	margin-bottom:0;
-}
-
-.requestAccountNoOutterBox{
-	padding: 1em 0 0 0;
-	margin-bottom:0;
-}
-
-#errorAlert{
-	color:#900;
-	padding:0px;
-	margin-bottom:5px;
-	
-	height:30px;
-	
-}
-
-
-#errorAlert img{
-	float:left;
-	margin:0;
-	padding:0;
-	vertical-align:middle;
-	
-	
-}
-
-#errorAlert  p{
-padding-left:35px;
-font-size:0.9em;
-line-height:30px;
-	
-}
-
-
-##confirmationAlert {
-	color:#169f43;
-	padding:0px;
-	margin-bottom:5px;
-	
-	height:30px;
-	
-}
-
-
-##confirmationAlert  img{
-	float:left;
-	margin:0;
-	padding:0;
-	vertical-align:middle;
-	
-	
-}
-
-#confirmationAlert   p{
-padding-left:30px;
-font-size:0.9em;
-line-height:30px;
-	
-}
-
-.formFieldAlert{
-	border:2px solid #900;
-}
-
-.red{
-color:#900;	
-}
-
-/* In IE6/7, .hidden defined in screen.css doesn't override
- * display: inline-block defined for #adminDashboard .pageBodyGroup,
- * so define again with context selector here.
- */
-#adminDashboard .pageBodyGroup.hidden {
-    display: none !important;   
-}
-
-p.passwordNote{
-margin:0;
-padding:0;
-margin-top:-8px;
-font-size:0.8em;
-color:#615e5e;	
-}
-
-

themes/vivo-basic/css/screen.css

@@ -277,6 +277,8 @@ div.description { margin-bottom: 1.5em; }
 /*  margin-bottom: .75em;*/
   padding: 4px 12px;
   float: left;
+  /* Fixes in IE6 the cut off text for data and object property names for individual display property groups. */
+  *padding-left:24px !important;
 }
 
 .propsItem,
@@ -745,29 +747,37 @@ display:none !important;
 style for those with javascript disable
 ************************/
 
-#javascriptDisableWrapper{
+#javascriptDisableWrapper, ie67DisableWrapper{
 margin-top:15px;
 width:500px;
 height:300px;
 }
 
-#javascriptDisableContent{
+#javascriptDisableContent, #ie67DisableContent{
 width:500px;
 height:100px;
 border:3px solid #bee6f8;
 }
-#javascriptDisableContent img{
+#ie67DisableContent{
+width:80%;
+margin-bottom:200px;
+}
+#javascriptDisableContent img, #ie67DisableContent img{
 float:left;
 margin-top:36px;
 margin-left:30px;
 }
 
-#javascriptDisableContent p{
+#javascriptDisableContent p, #ie67DisableContent p{
 font-size:1.1em;
 color:#384c5d;	
 line-height:100px;
 padding-left:65px;
 }
+#ie67DisableContent p{
+line-height:normal;
+padding-top:36px;
+}
 
 
 /* styles for error alerts */

themes/vivo-basic/css/uploadImages.css

@@ -1,9 +1,9 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 /* styles for uploading a picture */
+
 #photoUploadContainer{
 	margin-left: 0px;
-	width:500px;
 	height:280px;
 	background:#fff;
 	padding:15px;
@@ -32,6 +32,8 @@
 	
 }
 
+
+
 #photoUploadForm form label{
 	display:block;
 	padding-bottom:10px;
@@ -91,7 +93,7 @@
 
 #photoDeletingContainer{
 	margin-left: 0px;
-	width:500px;
+	width:720px;
 	height:330px;
 	background:#fff;
 	border:1px solid grey;
@@ -103,7 +105,6 @@
 	color:#900;
 	padding:0px;
 	margin-bottom:5px;
-	
 	height:30px;
 	
 }
@@ -114,8 +115,6 @@
 	margin:0;
 	padding:0;
 	vertical-align:middle;	
-	
-	
 }
 
 #errorAlert  p{
@@ -123,6 +122,7 @@ padding-left:35px;
 font-size:0.9em;
 line-height:30px;
 
+	
 }
 
 a{
@@ -134,12 +134,16 @@ color:#FF7700;
 }
 
 a.cancelUpload:hover {
-color:#FFF;
+	color:#FFF;
-background-color:#FF7700;
+	background-color:#FF7700;
 }
 
 a.cancelUpload:active {
-color:#FF7700;
+	color:#FF7700;
+}
+.or{
+	display:inline;
+	vertical-align:middle;
 }