knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#73,app][s]: integrate timeline into multiview and app.

Browse Source
This commit is contained in:
Rufus Pollock
2012-05-22 17:01:39 +01:00
parent 61b1482d99
commit 1394b9affa
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/index.html
View File

@@ -15,6 +15,7 @@
<!--[if lte IE 8]> <!--[if lte IE 8]>
<link rel="stylesheet" href="../vendor/leaflet/0.3.1/leaflet.ie.css" /> <link rel="stylesheet" href="../vendor/leaflet/0.3.1/leaflet.ie.css" />
<![endif]--> <![endif]-->
<link rel="stylesheet" href="../vendor/timeline/20120520/css/timeline.css">
<!-- Recline CSS components --> <!-- Recline CSS components -->
<link rel="stylesheet" href="../css/data-explorer.css"> <link rel="stylesheet" href="../css/data-explorer.css">
@@ -37,6 +38,7 @@
<script type="text/javascript" src="../vendor/jquery.mustache.js"></script> <script type="text/javascript" src="../vendor/jquery.mustache.js"></script>
<script type="text/javascript" src="../vendor/bootstrap/2.0.2/bootstrap.js"></script> <script type="text/javascript" src="../vendor/bootstrap/2.0.2/bootstrap.js"></script>
<script type="text/javascript" src="../vendor/leaflet/0.3.1/leaflet.js"></script> <script type="text/javascript" src="../vendor/leaflet/0.3.1/leaflet.js"></script>
<script type="text/javascript" src="../vendor/timeline/20120520/js/timeline.js"></script>
<!-- recline library --> <!-- recline library -->
<!-- in normal use would just the single recline.js library file. However, for testing it <!-- in normal use would just the single recline.js library file. However, for testing it
@@ -55,6 +57,7 @@
<script type="text/javascript" src="../src/view-graph.js"></script> <script type="text/javascript" src="../src/view-graph.js"></script>
<script type="text/javascript" src="../src/view-map.js"></script> <script type="text/javascript" src="../src/view-map.js"></script>
<script type="text/javascript" src="../src/view-transform-dialog.js"></script> <script type="text/javascript" src="../src/view-transform-dialog.js"></script>
<script type="text/javascript" src="../src/view-timeline.js"></script>
<!-- non-library javascript specific to this demo --> <!-- non-library javascript specific to this demo -->
<script type="text/javascript" src="js/app.js"></script> <script type="text/javascript" src="js/app.js"></script>

4
app/style/demo.css
View File

@@ -11,3 +11,7 @@ body {
height: 550px; height: 550px;
} }
.recline-timeline .vmm-timeline {
height: 550px;
}

7
src/view.js
View File

@@ -205,6 +205,13 @@ my.DataExplorer = Backbone.View.extend({
model: this.model, model: this.model,
state: this.state.get('view-map') state: this.state.get('view-map')
}), }),
}, {
id: 'timeline',
label: 'Timeline',
view: new my.Timeline({
model: this.model,
state: this.state.get('view-timeline')
}),
}]; }];
} }
// these must be called after pageViews are created // these must be called after pageViews are created