Skip to content
Snippets Groups Projects
Commit 135c026b authored by kaloyane's avatar kaloyane
Browse files

[LMS-2269] CSS improvements working for all browsers (Chrome, Safari, Firefox and IE8 tested). 

SVN: 21754
parent 4f950cd5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 389 additions and 10 deletions
screening/source/html/portal/browse-assays.html
+ 9
− 6
View file @ 135c026b
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
function relocate(expPermId) { function relocate(expPermId) {
// -- For infectome.org site: // -- For infectome.org site:
// var host = "https://infectome.org/openbis" // var host = "https://infectome.org/openbis/index.html"
// -- For testing locally: // -- For testing locally:
var host = "http://127.0.0.1:8888/openbis-test-screening/index.html" var host = "http://127.0.0.1:8888/openbis-test-screening/index.html"
// -- For testing on the sprint server: // -- For testing on the sprint server:
//var host = "https://sprint-openbis.ethz.ch:8446/openbis" //var host = "https://sprint-openbis.ethz.ch:8446/openbis/index.html"
url = host + "?viewMode=embedded#action=FEATURE_VECTOR_SUMMARY&experimentPermId="+expPermId url = host + "?viewMode=embedded#action=FEATURE_VECTOR_SUMMARY&experimentPermId="+expPermId
...@@ -15,7 +15,11 @@ function relocate(expPermId) { ...@@ -15,7 +15,11 @@ function relocate(expPermId) {
queryDiv.style.display = "none" queryDiv.style.display = "none"
resultFrame = document.getElementById('resultFrame') resultFrame = document.getElementById('resultFrame')
resultFrame.src = url if (resultFrame.location) {
resultFrame.location = url // IE8
} else {
resultFrame.src = url
}
resultDiv = document.getElementById('result') resultDiv = document.getElementById('result')
resultDiv.style.display = "block" resultDiv.style.display = "block"
...@@ -24,7 +28,7 @@ function relocate(expPermId) { ...@@ -24,7 +28,7 @@ function relocate(expPermId) {
</head> </head>
<body> <body>
<div id="query" style="display: block;"> <div id="query">
Choose an assay to see all the genes and results for them: Choose an assay to see all the genes and results for them:
<table> <table>
<tr><td><a href=javascript:relocate("20100702163316757-131164")>Assay 1</a></td></tr> <tr><td><a href=javascript:relocate("20100702163316757-131164")>Assay 1</a></td></tr>
...@@ -33,7 +37,6 @@ Choose an assay to see all the genes and results for them: ...@@ -33,7 +37,6 @@ Choose an assay to see all the genes and results for them:
</table> </table>
</div> </div>
<div id="result" style="display: none"> <div id="result" style="display: none">
<iframe id="resultFrame" width="100%" height=700 frameborder="0" vspace="0" hspace="0" marginwidth="0" <iframe id="resultFrame"/>
marginheight="0" scrolling="no"/>
</div> </div>
</body> </body>
\ No newline at end of file
screening/source/html/portal/find-gene.html
+ 8
− 4
View file @ 135c026b
...@@ -6,11 +6,11 @@ function findGene() ...@@ -6,11 +6,11 @@ function findGene()
var assay = document.getElementById('assay').value var assay = document.getElementById('assay').value
// -- For infectome.org site: // -- For infectome.org site:
// var host = "https://infectome.org/openbis" // var host = "https://infectome.org/openbis/index.html"
// -- For testing locally: // -- For testing locally:
var host = "http://127.0.0.1:8888/openbis-test-screening/index.html" var host = "http://127.0.0.1:8888/openbis-test-screening/index.html"
// -- For testing on the sprint server: // -- For testing on the sprint server:
//var host = "https://sprint-openbis.ethz.ch:8446/openbis" //var host = "https://sprint-openbis.ethz.ch:8446/openbis/index.html"
var url = host + "?viewMode=embedded#action=WELL_SEARCH&isExactSearch=false&showCombinedResults=false"+ var url = host + "?viewMode=embedded#action=WELL_SEARCH&isExactSearch=false&showCombinedResults=false"+
"&types=GENE&items=" + gene "&types=GENE&items=" + gene
...@@ -23,7 +23,11 @@ function findGene() ...@@ -23,7 +23,11 @@ function findGene()
queryDiv.style.display = "none" queryDiv.style.display = "none"
resultFrame = document.getElementById('resultFrame') resultFrame = document.getElementById('resultFrame')
resultFrame.src = url if (resultFrame.location) {
resultFrame.location = url // IE8
} else {
resultFrame.src = url
}
resultDiv = document.getElementById('result') resultDiv = document.getElementById('result')
resultDiv.style.display = "block" resultDiv.style.display = "block"
} }
...@@ -66,6 +70,6 @@ function findGene() ...@@ -66,6 +70,6 @@ function findGene()
</form> </form>
</div> </div>
<div id="result" style="display: none"> <div id="result" style="display: none">
<iframe id="resultFrame" width="100%" height=700 frameborder="0" vspace="0" hspace="0" marginwidth="0" marginheight="0" scrolling="no" /> <iframe id="resultFrame"/>
</div> </div>
</body> </body>
screening/source/html/portal/weebly-template/header_background.gif 0 → 100644
+ 0
− 0
View file @ 135c026b
screening/source/html/portal/weebly-template/header_background.gif

68 B

screening/source/html/portal/weebly-template/index.html 0 → 100644
+ 51
− 0
View file @ 135c026b
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>%%TITLE%%</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- force IE to go to document mode IE8 standards (and avoid the dreadful quirks-mode) -->
<meta http-equiv="X-UA-Compatible" content="IE=edge" >
<link rel="stylesheet" type="text/css" href="main_style.css">
<!--[if IE 7]>
<style>
p {
line-height:18px;
padding-bottom:0px;
}
h1 {
font-size:20px;
font-weight:bold;
color:#272e34;
padding-bottom:0px;
}
h2 {
font-size:14px;
font-weight:bold;
color:#272e34;
padding-bottom:0px;
}
</style>
<![endif]-->
</head>
<body>
<div id="wrapper">
<div id="header">
<div class="wsite-header"></div>
<div id="sitename">%%TITLE%%</div>
</div>
<div id="navigation">
<div id="navigation">%%MENU%%</div>
</div>
<div id="content-wrapper">
<div id="contents-body">
<div id="contents">%%CONTENT%%</div>
</div>
<div id="contents-bottom"></div>
<div id="footer">
<div id="footer-contents">%%WEEBLYFOOTER%%<div>
</div>
</div>
</div>
</body>
</html>
screening/source/html/portal/weebly-template/main_style.css 0 → 100644
+ 321
− 0
View file @ 135c026b
*|* {
margin:0pt;
padding:0pt;
}
html {
height: 100%;
}
body {
background: transparent url(header_background.gif) repeat-x center top;
background-color:#fff;
font-family:"lucida grande", arial, sans-serif;
font-size:12px;
color:#666666;
margin:0;
padding:0;
height: 100%;
}
p {
line-height:1.5;
padding-bottom:12px;
}
h1 {
font-size:20px;
font-weight:bold;
color:#272e34;
line-height:1.5;
}
h2 {
font-size:14px;
font-weight:bold;
color:#272e34;
}
#wrapper {
width:95%;
margin:0pt auto;
}
#header {
float:left;
width:100%;
height:87px;
margin-bottom:5px;
}
.weebly_header {
float:left;
background:transparent;
margin-top:5px;
}
#sitename {
float:left;
height:63px;
width:100%;
font-family:"times new roman", times, serif;
font-size:30px;
color:#fff;
font-weight:normal;
padding-top:25px;
position:relative;
z-index: 20;
}
#content-wrapper {
float:left;
width:100%;
}
#contents-body {
float:left;
width:100%;
padding:20px 20px 10px 0px;
background-color:#ffffff;
}
*html #contents-body {
float:left;
width:100%;
padding:10px 18px 10px 19px;
background-color:#ffffff;
margin-top:-5px;
}
#navigation {
float:left;
height:34px;
width:100%;
position:relative;
z-index: 20;
}
#navigation ul {
float:left;
padding:0px 10px 0 0;
height:31px;
margin-left:0;
}
#navigation li {
float:left;
display:inline;
font-family:"lucida grande", arial, sans-serif;
text-align:center;
font-size:1em;
font-weight:bold;
height:15px;
padding:5px 15px 10px 5px;
margin-right:3px;
}
*html #navigation li {
margin-right:4px;
padding-right:15px;
padding-bottom:9px;
}
#active {
background: transparent url(tab_left.gif) no-repeat left top;
padding:5px 13px 6px 4px;
height:31px;
color:#333;
font-weight:bold;
}
*html #active {
padding-right:15px;
}
#active a {
background: transparent url(tab_right.gif) no-repeat right top;
padding:5px 14px 10px 10px;
}
#navigation a:link {
color:#fff;
text-decoration:none;
}
#navigation a:hover {
color:#fff;
text-decoration:none;
}
#navigation a:visited {
color:#fff;
text-decoration:none;
}
#active a:link {
color:#333;
text-decoration:none;
}
#active a:hover {
color:#333;
text-decoration:none;
}
#active a:visited {
color:#333;
text-decoration:none;
}
a:link, a:hover, a:visited {
color:#af5211;
font-weight:normal;
text-decoration:none;
}
#header-image {
float:left;
width:100%;
height:260px;
padding:1px;
margin-bottom:25px;
border:1px solid #e5e5e5;
}
#image {
width:100%;
height:260px;
}
#contents {
width:100%;
}
#contents-bottom {
float:left;
width:100%;
height:10px;
}
#footer {
float:left;
width:100%;
margin:20px 0 30px 0;
}
#footer-contents {
float:left;
color:#666666;
text-align:right;
font-family:"lucida grande", "lucida sans", arial, sans-serif;
padding:7px 10px 0 0px;
width:100%;
height:28px;
z-index: 20;
}
/****************************** flyout menus ******************************/
#weebly-menus .weebly-menu-wrap {
z-index: 5000;
}
#weebly-menus .weebly-menu {
padding: 0;
margin: 0;
list-style: none;
}
#weebly-menus .weebly-menu li {
float: left;
clear: left;
width: 170px;
text-align: left;
}
#weebly-menus .weebly-menu li a {
position: relative;
display: block;
width: 100%;
background: #f9f9f8;
border-right: 1px solid #ccc;
border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
text-decoration: none;
font-size: 13px;
font-weight: normal;
line-height:1;
padding:5px;
color: #000;
}
#weebly-menus .weebly-menu li a:hover {
background: #e3e3e3;
}
#weebly-menus span.weebly-menu-title {
display: block;
padding: 5px 10px;
}
/****************************** flyout menus ******************************/
#weebly-menus .weebly-menu-wrap {
z-index: 5000;
}
#weebly-menus .weebly-menu {
padding: 0;
margin: 0;
list-style: none;
}
#weebly-menus .weebly-menu li {
float: left;
clear: left;
width: 170px;
text-align: left;
}
#weebly-menus .weebly-menu li a {
position: relative;
display: block;
width: 100%;
background: #f9f9f8;
border-right: 1px solid #ccc;
border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
text-decoration: none;
font-size: 13px;
font-weight: normal;
line-height:1;
padding:5px;
color: #000;
}
#weebly-menus .weebly-menu li a:hover {
background: #e3e3e3;
}
#weebly-menus span.weebly-menu-title {
display: block;
padding: 5px 10px;
}
#weebly-menus span.weebly-menu-more {
background: transparent url(http://images.weebly.com/weebly/images/submenu_arrow.gif) no-repeat center top;
display: block;
position: absolute;
right: 5px;
top: 0;
font-family: Courier;
height: 28px;
line-height: 28px;
padding:5px 0 5px 0;
}
#weebly-menus span.weebly-menu-more {
background: transparent url(http://images.weebly.com/weebly/images/submenu_arrow.gif) no-repeat center top;
display: block;
position: absolute;
right: 5px;
top: 0;
font-family: Courier;
height: 28px;
line-height: 28px;
padding:5px 0 5px 0;
}
/****************************** IFRAME/OpenBIS Styles ******************************/
#query {
display: block;
}
#resultFrame {
background: transparent url(header_background.gif) repeat-x center top;
box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -ms-box-sizing: border-box;
position: absolute;
top: 0; left: 0; width: 100%; height: 100%;
border: none;
padding-top: 120px;
}
screening/source/html/portal/weebly-template/tab_left.gif 0 → 100644
+ 0
− 0
View file @ 135c026b
screening/source/html/portal/weebly-template/tab_left.gif

107 B

screening/source/html/portal/weebly-template/tab_right.gif 0 → 100644
+ 0
− 0
View file @ 135c026b
screening/source/html/portal/weebly-template/tab_right.gif

183 B

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment