Skip to content

Commit 8450a17

Browse files
imedinaimedina
committed
Merge branch 'develop'
2 parents b418433 + afabba9 commit 8450a17

File tree

9 files changed

+365
-43
lines changed

9 files changed

+365
-43
lines changed

‎lib/jsorolla

Submodule jsorolla updated 22 files

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "iva",
3-
"version": "1.0.0-rc2",
3+
"version": "1.0.0-rc3",
44
"description": "IVA description",
55
"repository": {
66
"type": "git",

‎src/about.html

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!--
2+
~ Copyright 2015-2016 OpenCB
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
17+
<dom-module id="about-web">
18+
<template>
19+
<!--<style include="jso-styles">-->
20+
<style>
21+
.about-center {
22+
margin: auto;
23+
width: 65%;
24+
text-align: justify;
25+
font-size: 16px;
26+
color: #797979;
27+
}
28+
</style>
29+
30+
<!-- This is where main application is rendered -->
31+
<div class="about-center">
32+
<h1>About</h1>
33+
<hr>
34+
35+
</div>
36+
</template>
37+
38+
<script>
39+
40+
class About extends Polymer.Element {
41+
42+
constructor() {
43+
super();
44+
}
45+
46+
static get is() {
47+
return 'about-web';
48+
}
49+
50+
static get properties() {
51+
return {
52+
version: {
53+
type: String
54+
}
55+
}
56+
}
57+
58+
_attachDom(dom) {
59+
this.appendChild(dom);
60+
}
61+
62+
}
63+
64+
customElements.define(About.is, About);
65+
</script>
66+
</dom-module>

‎src/conf/config.js

+14-9
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const opencga = {
7777

7878
const application = {
7979
title: "IVA",
80-
version: "v1.0.0-rc2",
80+
version: "v1.0.0-rc3",
8181
logo: "img/opencb-logo.png",
8282
// The order, title and nested submenus are respected
8383
menu: [
@@ -285,14 +285,19 @@ const application = {
285285
settings: {
286286
visibility: "public",
287287
},
288-
about: [
289-
{name: "Documentation", url: "http://docs.opencb.org/display/iva/IVA+Home", icon: "fa fa-book"},
290-
{name: "Tutorial", url: "http://docs.opencb.org/display/iva/Tutorials", icon: ""},
291-
{name: "Source code", url: "https://github.com/opencb/iva", icon: "fa fa-github"},
292-
{name: "Releases", url: "https://github.com/opencb/iva/releases", icon: ""},
293-
{name: "Contact", url: "http://docs.opencb.org/display/iva/About", icon: "fa fa-envelope"},
294-
{name: "FAQ", url: "", icon: ""},
295-
],
288+
about: {
289+
dropdown: true,
290+
links: [
291+
{id: "documentation", name: "Documentation", url: "http://docs.opencb.org/display/iva/IVA+Home", icon: "fa fa-book"},
292+
{id: "tutorial", name: "Tutorial", url: "http://docs.opencb.org/display/iva/Tutorials", icon: ""},
293+
{id: "code", name: "Source code", url: "https://github.com/opencb/iva", icon: "fa fa-github"},
294+
{id: "releases", name: "Releases", url: "https://github.com/opencb/iva/releases", icon: ""},
295+
{id: "about", name: "About", url: "http://docs.opencb.org/display/iva/About", icon: "fa fa-envelope"},
296+
{id: "terms", name: "Terms", url: "http://docs.opencb.org/display/iva/About", icon: "fa fa-envelope"},
297+
{id: "contact", name: "Contact", url: "http://docs.opencb.org/display/iva/About", icon: "fa fa-envelope"},
298+
{id: "faq", name: "FAQ", url: "", icon: ""},
299+
]
300+
},
296301
login: {
297302
visible: true,
298303
},

‎src/contact.html

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!--
2+
~ Copyright 2015-2016 OpenCB
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
17+
<dom-module id="contact-web">
18+
<template>
19+
<!--<style include="jso-styles">-->
20+
<style>
21+
.contact-center {
22+
margin: auto;
23+
width: 65%;
24+
text-align: justify;
25+
font-size: 16px;
26+
color: #797979;
27+
}
28+
</style>
29+
30+
<!-- This is where main application is rendered -->
31+
<div class="contact-center">
32+
<h1>Contact</h1>
33+
<hr>
34+
35+
</div>
36+
</template>
37+
38+
<script>
39+
40+
class Contact extends Polymer.Element {
41+
42+
constructor() {
43+
super();
44+
}
45+
46+
static get is() {
47+
return 'contact-web';
48+
}
49+
50+
static get properties() {
51+
return {
52+
version: {
53+
type: String
54+
}
55+
}
56+
}
57+
58+
_attachDom(dom) {
59+
this.appendChild(dom);
60+
}
61+
62+
}
63+
64+
customElements.define(Contact.is, Contact);
65+
</script>
66+
</dom-module>

‎src/faq.html

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!--
2+
~ Copyright 2015-2016 OpenCB
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
17+
<dom-module id="faq-web">
18+
<template>
19+
<!--<style include="jso-styles">-->
20+
<style>
21+
.faq-center {
22+
margin: auto;
23+
width: 65%;
24+
text-align: justify;
25+
font-size: 16px;
26+
color: #797979;
27+
}
28+
</style>
29+
30+
<!-- This is where main application is rendered -->
31+
<div class="faq-center">
32+
<h1>Frequently Asked Questions</h1>
33+
<hr>
34+
35+
</div>
36+
</template>
37+
38+
<script>
39+
40+
class Faq extends Polymer.Element {
41+
42+
constructor() {
43+
super();
44+
}
45+
46+
static get is() {
47+
return 'faq-web';
48+
}
49+
50+
static get properties() {
51+
return {
52+
version: {
53+
type: String
54+
}
55+
}
56+
}
57+
58+
_attachDom(dom) {
59+
this.appendChild(dom);
60+
}
61+
62+
}
63+
64+
customElements.define(Faq.is, Faq);
65+
</script>
66+
</dom-module>

‎src/index.html

+6
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@
148148
<script type="text/javascript" src="../lib/jsorolla/src/core/svg.js"></script>
149149
<script type="text/javascript" src="../lib/jsorolla/src/core/region.js"></script>
150150

151+
<script type="text/javascript" src="../lib/jsorolla/src/core/tracks/FeatureTrack.js"></script>
152+
<script type="text/javascript" src="../lib/jsorolla/src/core/tracks/CoverageTrack.js"></script>
153+
<script type="text/javascript" src="../lib/jsorolla/src/core/tracks/GeneTrack.js"></script>
154+
<script type="text/javascript" src="../lib/jsorolla/src/core/tracks/renderers/CoverageRenderer.js"></script>
155+
<!--<script type="text/javascript" src="../lib/jsorolla/src/core/tracks/renderers/GeneRenderer.js"></script>-->
156+
151157
<script type="text/javascript" src="../lib/jsorolla/src/core/cache/indexeddb-cache.js"></script>
152158
<script type="text/javascript" src="../lib/jsorolla/src/core/cache/file-feature-cache.js"></script>
153159
<script type="text/javascript" src="../lib/jsorolla/src/core/cache/feature-chunk-cache.js"></script>

0 commit comments

Comments
 (0)