Skip to content

Commit 13b48bd

Browse files
bgrueningbgruening
committed
Merge branch 'master' into uwsgi
2 parents 49d1c7e + f12bd01 commit 13b48bd

File tree

12 files changed

+185
-203
lines changed

12 files changed

+185
-203
lines changed

‎README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
11
# HiCBrowser : A simple web browser to visualize Hi-C and other genomic tracks
2-
Fidel Ramirez,José Villaveces,Vivek Bhardwaj
32

3+
Fidel Ramirez, José Villaveces, Vivek Bhardwaj
44

55
## Installation
66

77
You can install HiCBrowser using pip :
88

9-
```r
9+
```
1010
pip install git+git//github.com/maxplanck-ie/HiCBrowse@master
1111
```
1212

1313
You can also download/clone this GitHub repository and run the setup.py script inside :
1414

15-
16-
```r
15+
```
1716
cd HiCBrowser
1817
python setup.py install -f
1918
```
2019

20+
If you have Docker installed on your computer you can also use our [Docker HiCBrowser Image](https://github.com/maxplanck-ie/docker-hicbrowser). You can start a production ready HiCBrowser instance with:
21+
22+
```
23+
docker run --rm -i -t -p 80:80 bgruening/docker-hicbrowser
24+
```
25+
26+
For more information about the Docker image please refer to https://github.com/maxplanck-ie/docker-hicbrowser#usage
27+
2128

2229
## Usage
2330

‎hicbrowser/client/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ This project aims to visualize gene expression profiles in the context of mitoch
3131
// 3. Initialize application!
3232
App.init({
3333
browser_example: 'X:3800000-4340000',
34-
gene_example: 'mof',
35-
icon: '/static/img/fly.svg'
34+
gene_example: 'mof'
3635
});
3736
3837
// Alternatively use the default configuration:

‎hicbrowser/client/html/index.html

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,26 @@
1616

1717
<body>
1818

19-
<!-- Page Header -->
20-
<!-- Set your background image for this header on the line below. -->
21-
<!-- build:[style] background-image:url(/static/img/banner.png) -->
22-
<header class="intro-header" style="background-image: url(../static/img/banner.png)">
23-
<!-- /build -->
19+
<header class="intro-header" style="background-image: url(../static/img/banner.jpg)">
20+
<div class="row">
21+
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
22+
<div class="site-heading">
23+
<div class="search-box">
24+
<div class="row">
25+
<div class="col-md-2">
26+
<div class="fly">
27+
<img src="/static/img/circose.png">
28+
</div>
29+
</div>
30+
<div class="col-md-9 col-md-offset-1">
31+
<h1>HiCBrowser</h1>
32+
</div>
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
</div>
38+
</div>
2439
</header>
2540

2641
<!-- Content -->
@@ -67,8 +82,7 @@
6782

6883
App.init({
6984
browser_example: 'X:3800000-4340000',
70-
gene_example: 'mof',
71-
icon: '/static/img/fly.svg'
85+
gene_example: 'mof'
7286
});
7387

7488
</script>

‎hicbrowser/client/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ var Search = require('./js/views/search');
1010
var Index = require('./js/views/index');
1111
var GeneView = require('./js/views/gene');
1212
var BrowserView = require('./js/views/browser');
13-
var Intro = require('./js/views/intro-header');
1413

1514
App = {};
1615

@@ -21,7 +20,6 @@ App.views.search = new Search({el:'#search'});
2120
App.views.index = new Index({el:'#content'});
2221
App.views.gene = new GeneView({el:'#content'});
2322
App.views.browser = new BrowserView({el:'#content'});
24-
App.views.intro = new Intro({el:'.intro-header'});
2523

2624
// Models
2725
App.models = {};
@@ -52,6 +50,5 @@ App.init = function(config){
5250
$('[data-toggle="tooltip"]').tooltip();
5351

5452
// Render initial views
55-
App.views.intro.render(App.config);
5653
App.views.search.render(App.config);
5754
};

‎hicbrowser/client/js/templates.js

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hicbrowser/client/js/views/intro-header.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎hicbrowser/client/templates/introHeader.hbs

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎hicbrowser/static/img/banner.jpg

22.5 KB
Loading

0 commit comments

Comments
 (0)