Skip to content

Feature/mobile layout #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,25 @@
</nav>

<div class="container">
<div id="list" class="control control-sidebar"></div>
<div id="facets" class="control control-sidebar"></div>

<aside id="sidebar" class="sidebar">
<div class="sidebar-toggle"><a href="#"></a></div>
<nav class="sidebar-nav">
<ul class="items">
<li><a data-select="list" class="sidebar-action active" href="#">List</a></li>
<li><a data-select="facets" class="sidebar-action" href="#">Filter</a></li>
</ul>
</nav>
<div id="list" class="control sidebar-item"></div>
<div id="facets" class="control sidebar-item"></div>
</aside>

<div id="map"></div>

<div id="info" class="control">
<button type="button" class="close">&times;</button>
</div>

</div>

<div class="modal fade" id="about" tabindex="-1" role="dialog" aria-labelledby="aboutLabel" aria-hidden="true">
Expand Down
1 change: 1 addition & 0 deletions src/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ define(function(require) {
require('ui/list').attachTo('#list');
require('ui/facet').attachTo('#facets');
require('ui/loading').attachTo('#loading');
require('ui/sidebar').attachTo('#sidebar');
require('ui/project').attachTo(document);
require('data/facet').attachTo(document);
require('data/analytics').attachTo(document);
Expand Down
14 changes: 3 additions & 11 deletions src/ui/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ define(function(require, exports, module) {
'use strict';
var flight = require('flight');
var L = require('leaflet');
var $ = require('jquery');
var _ = require('lodash');
var timedWithObject = require('timed_with_object');

Expand Down Expand Up @@ -37,22 +38,13 @@ define(function(require, exports, module) {
this.configureMap = function(ev, config) {
this.trigger('mapStarted', {});
// if list or facets are emabled, give the map less space
var addition = 0;
if (config.facets) {
addition += 300;
$('body').addClass('has-facets');
}
if (config.list) {
addition += 300;
$('body').addClass('has-list');
}

if (addition > 0) {
window.setTimeout(function() {
if (this.map) {
this.$node.css('left', '+=' + addition);
this.map.invalidateSize();
}
}.bind(this), 50);
}

var mapConfig = config.map;

Expand Down
80 changes: 80 additions & 0 deletions src/ui/sidebar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
define(function(require, exports, module) {
'use strict';
var flight = require('flight');
var $ = require('jquery');
var _ = require('lodash');


module.exports = flight.component(function sidebar() {

var potentialSidebarItems = ['facets', 'list'];
var presentItems = [];

this.defaultAttrs({
toggleButtons: '.sidebar-action',
sidebarItems: '.sidebar-item',
sidebarToggle: '.sidebar-toggle'
});

this.configureSidebar = function(e, config){
var configAttr = _.keys(config);
presentItems = _.intersection(potentialSidebarItems, configAttr);

var $sidebar = this.$node;

// add class .sidebar-items-X based on active sidebar items
$sidebar.addClass('sidebar-items-'+presentItems.length);
// activate configured sidebar items
_.each(presentItems, function(item){
$sidebar.find(item).show();
$sidebar.find('[data-select="'+item+'"]').parent().show();
});

if( presentItems.length === 1) {
$sidebar.find('.sidebar-nav').hide();
$sidebar.addClass('no-tabs');
}
};

this.showItem = function(e, elemObj) {
// generic toggle fn for sidebar tabs
e.preventDefault();
var $el = $(elemObj.el);
var itemTitle = $el.data('select');
this.select('sidebarItems').hide();
this.$node.find('#'+itemTitle).show();
this.select('toggleButtons').removeClass('active');
$el.addClass('active');
};

this.showFullSidebar = function() {
var $sidebar = this.$node;
_.each(presentItems, function(item){
$sidebar.find(item).show();
});
};

this.toggleHiddenSidebar = function(e) {
e.preventDefault();
this.$node.toggleClass('open');
$('.sidebar-toggle').toggleClass('active');
};

this.after('initialize', function() {
this.on(document, 'config', this.configureSidebar);

this.on('click', {
toggleButtons: this.showItem,
sidebarToggle: this.toggleHiddenSidebar
});


$(window).on('resize', function(){
if( document.body.clientWidth > 955 ) {
this.showFullSidebar();
}
}.bind(this));

});
});
});
Loading