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

NIHVIVO-1838: Fixed some browser issues in IE 6 and 7

Browse source
This commit is contained in:
mb863 2011-01-20 18:31:23 +00:00
parent 18e4c6dcd8
commit 8019766830
9 changed files with 91 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/web/css/browseIndex.css
View file

@ -4,6 +4,8 @@
/* INDIVIDUAL LIST ------> */ /* INDIVIDUAL LIST ------> */
.individualList ul.individualData li{ .individualList ul.individualData li{
padding-bottom: 0; padding-bottom: 0;
display: inline;
padding-right: .3em;
} }
.pagination { .pagination {
display: inline-block; display: inline-block;
@ -25,10 +27,6 @@
.individualList ul.individualData { .individualList ul.individualData {
display: inline; display: inline;
} }
.individualList ul.individualData li {
display: inline;
padding-right: .3em;
}
.individualList ul.individualData li.last { .individualList ul.individualData li.last {
border: none; border: none;
} }

7
webapp/web/css/edit.css
View file

@ -4,6 +4,13 @@ label{
display: block; display: block;
margin-top: .5em; margin-top: .5em;
} }
label.inline {
display: inline;
font-weight: normal;
}
input.block{
display: block;
}
textarea{ textarea{
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }

137
webapp/web/css/individual/individual.css
View file

@ -4,64 +4,29 @@
/* CSS Document */ /* CSS Document */
/* ADMIN PANEL------> */ /* ADMIN PANEL------> */
div.admin{ #admin{
color: #fff; font-size: .8em;
background: #aaa; background-color: #f2f9fb;
padding: 6px; padding-top: 0;
height: 1%; /* IE likes this */
width: 98%; /* and this */
} }
div.panelContents{ #admin h3{
color: #777; display: inline-block;
background: #efebe6; background-color: #2a98bd;
/*display: none;*/ padding: 3px 6px 3px 10px;
padding: 12px;
}
div.top{
margin: 0;
padding: 0 24px 0 0;
background: #efebe6;
}
div.bottom{
margin: 0 -12px;
position: relative;
bottom: -16px;
padding: 6px 12px 8px 12px;
}
.admin h3{
font-size: 1em;
text-transform: uppercase;
font-weight: bold;
color: #ddd;
background: #aaa;
line-height: 2em;
margin: 0 !important; /* fix for IE6 */
margin-right: -24px;
padding: 0 12px;
width: 100% !important; /* fix for IE6 */
width: auto;
}
.admin p{
margin-bottom: .25em;
}
.admin a:link,
.admin a:visited{
color: #fff; color: #fff;
margin-bottom: 5px;
} }
.panelContents a:link, #admin .uri-link {
.panelContents a:visited{ color: #888c8c;
color: #777; padding-left: 11px;
padding-bottom: 5px;
} }
.admin a:hover, #admin a.edit-individual{
.admin a:active { padding-left: 5px;
color: #000; border-left: none;
} }
#loginPanel ul { #admin a{
margin: 0; color: #2a98bc;
}
#loginPanel li {
list-style-type: none;
margin-bottom: .5em;
} }
/* <------ INDIVIDUAL INTRO FOR ANY CLASS*/ /* <------ INDIVIDUAL INTRO FOR ANY CLASS*/
#individual-intro{ #individual-intro{
@ -80,21 +45,19 @@ div.bottom{
#individual-intro #individual-info h3{ #individual-intro #individual-info h3{
padding-bottom: 5px; padding-bottom: 5px;
margin-top: 5px; margin-top: 5px;
clear: both;
} }
#individual-intro #share-contact h3{ #individual-intro #share-contact h3{
padding-bottom: .3em; padding-bottom: .3em;
margin-top: 0; margin-top: 0;
padding-top: 0;
} }
#individual-intro .icon-rdf{ #individual-intro a.icon-rdf{
font-size: 1.125em; font-size: 1.125em;
} }
#individual-intro .individual-overview{ #individual-intro .individual-overview{
margin-bottom: 10px; margin-bottom: 10px;
} }
#individual-intro ul#individual-tools{
margin-bottom: 10px;
}
/* <------ INDIVIDUAL INTRO FOR PERSON*/ /* <------ INDIVIDUAL INTRO FOR PERSON*/
#individual-intro-person{ #individual-intro-person{
float: left; float: left;
@ -102,8 +65,9 @@ div.bottom{
margin-top: 0.5em; margin-top: 0.5em;
margin-bottom: 30px; margin-bottom: 30px;
} }
/* <------ INDIVIDUAL INTRO LEFT CONTENT */ /* <------ INDIVIDUAL INTRO - LEFT SIDE CONTENT */
#share-contact{ #share-contact{
position: relative;
width: 166px; width: 166px;
float: left; float: left;
padding-left: 0.5em; padding-left: 0.5em;
@ -114,35 +78,34 @@ div.bottom{
padding-bottom: .3em; padding-bottom: .3em;
font-size: 1em; font-size: 1em;
line-height: 1.2em; line-height: 1.2em;
padding-top: 0;
} }
#share-contact img.individual-photo{ #share-contact img.individual-photo{
width: 160px; width: 160px;
height: 160px; height: 160px;
float: left;
} }
ul#individual-tools-people{ ul#individual-tools-people{
margin-top: 5px; margin-top: 5px;
height: 27px; height: 20px;
padding-bottom: 20px; padding-bottom: 20px;
list-style-type: none; list-style-type: none;
clear: both; clear: both;
margin-bottom: 15px;
} }
ul#individual-tools-people li{ ul#individual-tools-people li{
position: relative; position: relative;
display: block; display: block;
padding-right: 14px; padding-right: 7px;
float: left; float: left;
margin-bottom: 20px;
} }
ul#individual-tools{ ul#individual-tools{
color: #8AA149 margin-bottom: 10px;
height: 20px;
} }
ul#individual-tools li{ ul#individual-tools li{
padding-right: 14px; padding-right: 9px;
} float: left;
ul#individual-tools-people a.icon-rdf-people{
position: absolute;
font-size: 1.125em;
top: 13px;
} }
ul#individual-email{ ul#individual-email{
clear: both; clear: both;
@ -178,7 +141,7 @@ ul#individual-phone li:first-child{
} }
#individual-intro ul.individual-urls li{ #individual-intro ul.individual-urls li{
font-size: .875em; font-size: .875em;
line-height: 1.3em; line-height: 1.7em;
clear: left; clear: left;
} }
ul.individual-urls-people{ ul.individual-urls-people{
@ -190,11 +153,11 @@ ul.individual-urls-people li{
font-size: .875em; font-size: .875em;
line-height: 1.3em; line-height: 1.3em;
} }
/* <------ INDIVIDUAL RIGHT CONTENT */ /* <------ INDIVIDUAL INTRO - RIGHT SIDE CONTENT */
#individual-info{ #individual-info{
width: 69%; width: 69%;
float: left; float: left;
padding: 10px 0 0 10px; padding: 0 0 0 10px;
} }
#individual-info h1.fn{ #individual-info h1.fn{
padding-bottom: 12px; padding-bottom: 12px;
@ -227,19 +190,13 @@ ul#individual-areas li{
float: left; float: left;
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
border-right: 1px solid #5e6363;
} }
ul#individual-areas li:first-child{ ul#individual-areas li:first-child{
padding-left: 0; padding-left: 0;
} }
ul#individual-areas li{
float:left;
border-right: 1px solid #5e6363;
padding-right: 10px;
padding-left: 10px;
}
/* <------ INDIVIDUAL VISUALIZATION */ /* <------ INDIVIDUAL VISUALIZATION */
#publications-visualization{ #publications-visualization{
margin-top: 35px;
float: right; float: right;
width: 226px; width: 226px;
} }
@ -341,6 +298,7 @@ article.property h3{
article.property ul.property-list li.subclass h3 { article.property ul.property-list li.subclass h3 {
border-bottom: none; border-bottom: none;
padding: 10px 10px 10px 0; padding: 10px 10px 10px 0;
background-color: #fff;
} }
article.property .data-property-statement{ article.property .data-property-statement{
padding: 10px 20px 10px 20px; padding: 10px 20px 10px 20px;
@ -354,10 +312,17 @@ article.property ul.property-list{
article.property ul.property-list li{ article.property ul.property-list li{
line-height: 1.2em; line-height: 1.2em;
padding: 10px 20px 5px 20px; padding: 10px 20px 5px 20px;
background-color: #fff;
} }
article.property ul.subclass-property-list{ article.property ul.subclass-property-list{
margin-left: 0; margin-left: 0;
}#share-contact h3 }
#share-contact h3{
margin-top: 15px;
padding-bottom: .3em;
font-size: 1em;
line-height: 1em;
}
article.property ul.subclass-property-list li{ article.property ul.subclass-property-list li{
line-height: 1.2em; line-height: 1.2em;
padding: 0 20px 10px 20px; padding: 0 20px 10px 20px;
@ -383,3 +348,15 @@ article.property ul.subclass-property-list li{
.delete-individual{ .delete-individual{
vertical-align: middle; vertical-align: middle;
} }
.thumb-edit-links{
position: absolute;
top 0;
right: 22px;
/* background: rgba(255, 255, 255, 0.8);*/
background: #fff;
margin-top: 143px;
padding: 0 6px 0 0;
}
.middle{
vertical-align: middle;
}

1
webapp/web/css/uploadImages.css
View file

@ -90,5 +90,4 @@
} }
.or{ .or{
display: inline; display: inline;
vertical-align: middle;
} }

BIN
webapp/web/images/individual/scroll-up.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 237 B

BIN
webapp/web/images/individual/uriIcon.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 589 B

39
webapp/web/jenaIngest/connectDB.jsp
View file

@ -7,35 +7,34 @@
<form action="ingest" method="post"> <form action="ingest" method="post">
<input type="hidden" name="action" value="connectDB"/> <input type="hidden" name="action" value="connectDB"/>
<label for="JDBC URL">JDBC URL</label>
<input type="text" style="width:80%;" name="jdbcUrl" value="jdbc:mysql://localhost/"/>
<input type="text" style="width:80%;" name="jdbcUrl" value="jdbc:mysql://localhost/"/> <label for="username">Username</label>
<p>JDBC URL</p>
<input type="text" name="username"/> <input type="text" name="username"/>
<p>username</p>
<input type="password" name="password"/> <label for="password">Password</label>
<p>password</p> <input type="password" name="password" class="block"/>
<input id="tripleStoreRDB" name="tripleStore" type="radio" checked="checked" value="RDB"/>
<label for="tripleStoreRDB" class="inline">Jena RDB</label>
<input id="tripleStoreRDB" name="tripleStore" type="radio" checked="checked" value="RDB"/> <input id="tripleStoreSDB" name="tripleStore" type="radio" value="SDB"/>
<label for="tripleStoreRDB">Jena RDB</label> <label for="tripleStoreRDB" class="inline">Jena SDB (hash layout)</label>
<input id="tripleStoreSDB" name="tripleStore" type="radio" value="SDB"/>
<label for="tripleStoreRDB">Jena SDB (hash layout)</label>
<select name="dbType"> <label for="database type">Database type</label>
<c:forEach items="${requestScope.dbTypes}" var="typeName"> <select name="dbType">
<c:choose> <c:forEach items="${requestScope.dbTypes}" var="typeName">
<c:when test="${typeName eq 'MySQL'}"> <c:choose>
<option value="${typeName}" selected="selected">${typeName}</option> <c:when test="${typeName eq 'MySQL'}">
</c:when> <option value="${typeName}" selected="selected">${typeName}</option>
</c:when>
<c:otherwise> <c:otherwise>
<option value="${typeName}">${typeName}</option> <option value="${typeName}">${typeName}</option>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:forEach> </c:forEach>
</select> </select>
<p>database type</p>
<input id="submit" type="submit" value="Connect Database" /> <input id="submit" type="submit" value="Connect Database" />

2
webapp/web/js/imageUpload/imageUploadUtils.js
View file

@ -3,7 +3,7 @@
$(document).ready(function(){ $(document).ready(function(){
// Confirmation alert for photo deletion in image upload and individual templates // Confirmation alert for photo deletion in image upload and individual templates
$('#photoUploadDefaultImage a.thumbnail,#share-contact a[title="delete this entry"]').click(function(){ $('#photoUploadDefaultImage a.thumbnail').click(function(){
var answer = confirm('Are you sure you want to delete your photo?'); var answer = confirm('Are you sure you want to delete your photo?');
return answer; return answer;
}); });

2
webapp/web/js/jquery_plugins/supersleight.js vendored
View file

@ -7,7 +7,7 @@ var supersleight = function() {
var root = false; var root = false;
var applyPositioning = true; var applyPositioning = true;
// path to a transparent GIF image // path to a transparent GIF image
var shim = '../images/x.gif'; var shim = './images/x.gif';
var fnLoadPngs = function() { var fnLoadPngs = function() {
// if supersleight.limitTo called, limit to specified id // if supersleight.limitTo called, limit to specified id