diff --git a/.gitignore b/.gitignore index bc7c182c..76a5efdd 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store sandbox/* .*.swp +_site/* diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 00000000..7605bbcf --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1,77 @@ + + + + + {{ page.title }} - Recline Data Explorer and Library + + + + + + + + + + + +{{content}} + + + + + diff --git a/app/index.html b/app/index.html index c91f9462..48df1faf 100644 --- a/app/index.html +++ b/app/index.html @@ -98,8 +98,8 @@

Welcome to the Recline Data Explorer

-

The Data Explorer is an application for exploring - and working with data built in pure javascript and html. In basic operation it's much like a spreadsheet - though it's +

Recline allows you to explore and work with data in your browser and then share with others

+ In basic operation it's much like a spreadsheet - though it's feature set is a little different. In particular, the Data Explorer provides:
diff --git a/app/js/app.js b/app/js/app.js index 675914c8..4070c841 100755 --- a/app/js/app.js +++ b/app/js/app.js @@ -128,14 +128,17 @@ var ExplorerApp = Backbone.View.extend({ $('.modal.js-import-dialog-url').modal('hide'); var $form = $(e.target); var source = $form.find('input[name="source"]').val(); + var datasetInfo = { + id: 'my-dataset', + url: source, + webstore_url: source + }; var type = $form.find('select[name="backend_type"]').val(); - var dataset = new recline.Model.Dataset({ - id: 'my-dataset', - url: source, - webstore_url: source - }, - type - ); + if (type === 'csv' || type === 'excel') { + datasetInfo.format = type; + type = 'dataproxy'; + } + var dataset = new recline.Model.Dataset(datasetInfo, type); this.createExplorer(dataset); }, diff --git a/css/site.css b/css/site.css index bbdd302d..63242ea2 100644 --- a/css/site.css +++ b/css/site.css @@ -110,28 +110,10 @@ a.dotted:hover { background-color: #bc130e \9; } -a.btn-large.showtitle[title] { - position:relative; - margin-bottom:26px; - min-width:117px; -} -a.btn-large.showtitle[title]:after { - content: attr(title); - position:absolute; - bottom:-26px; - left:0px; - font-size:12px; - height:26px; - line-height:26px; - min-width:145px; - text-align:center; -} - .btn-large .icon-large { height:25px; width:25px; - margin-top:-2px; - margin-left:-25px; + margin-top:-4px; margin-right:7px; } .btn-large .icon-white.icon-large { @@ -177,12 +159,16 @@ a.btn-large.showtitle[title]:after { box-shadow: none; } +body { + padding-top: 60px; +} + section { padding-top:20px; } -.page-header { - margin-top:50px; +.home-page.page-header { + margin-top:-10px; background: #2d2d2d; /* Old browsers */ background: -moz-linear-gradient(top, #2d2d2d 0%, #040404 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2d2d2d), color-stop(100%,#040404)); /* Chrome,Safari4+ */ @@ -197,31 +183,31 @@ section { border:none; font-family:'Open Sans', Helvetica, Arial, sans-serif; } -.page-header a { +.home-page.page-header a { color:#FFF; } -.page-header a.dotted { +.home-page.page-header a.dotted { border-color:#FFF; } -.page-header .container { +.home-page.page-header .container { background-image: url(images/header-screen.png); background-repeat: no-repeat; background-position: -3px 0px; } -.page-header .inner { +.home-page.page-header .inner { padding:0px 0px 30px 40px; font-size:16px; } -.page-header .inner ol { +.home-page.page-header .inner ol { list-style-type:upper-latin; font-size:20px; font-style:italic; } -.page-header .inner .header-button { +.home-page.page-header .inner .header-button { display:inline-block; } -.page-header:after { +.home-page.page-header:after { margin-top:-14px; } @@ -229,15 +215,6 @@ section.grey { background-color:#f5f5f5; } -section:after { - content: " "; - height:14px; - display:block; - background-image: url(images/zigzags.png); - background-repeat: repeat-x; - background-position: center 1px; -} - section.grey:after { background-position: center -50px; } @@ -245,6 +222,7 @@ section.grey:after { .footer { background-color:#040404; color:#CCC; + margin-top: 30px; } .footer:before { content: " "; diff --git a/index.html b/index.html index c9bc3261..b7d55bba 100644 --- a/index.html +++ b/index.html @@ -1,34 +1,9 @@ - - - - - Recline Data Explorer and Library +--- +layout: default +title: Home +--- - - - - - - - - - - -
+ diff --git a/src/view-graph.js b/src/view-graph.js index d9fe7873..e858a51d 100644 --- a/src/view-graph.js +++ b/src/view-graph.js @@ -301,6 +301,12 @@ my.Graph = Backbone.View.extend({ $("#flot-tooltip").remove(); var x = item.datapoint[0]; var y = item.datapoint[1]; + // it's horizontal so we have to flip + if (self.state.attributes.graphType === 'bars') { + var _tmp = x; + x = y; + y = _tmp; + } // convert back from 'index' value on x-axis (e.g. in cases where non-number values) if (self.model.currentDocuments.models[x]) { x = self.model.currentDocuments.models[x].get(self.state.attributes.group);