From 750f54a71d14f354a0a2a700b246b5069132f908 Mon Sep 17 00:00:00 2001 From: Alvaro del Castillo Date: Thu, 11 Jun 2015 18:46:55 +0200 Subject: [PATCH] Added search field feature. Change-Id: I6d0e4cbcc74c61165705756b073c8d0562a8ced2 --- browser/company.html | 21 + browser/country.html | 27 +- browser/css/typeahead.css | 68 ++ browser/data_sources.html | 27 +- browser/demographics.html | 27 +- browser/index.html | 21 + browser/irc-contributors.html | 27 +- browser/irc-repos.html | 27 +- browser/irc.html | 27 +- browser/its-companies.html | 27 +- browser/its-contributors.html | 27 +- browser/its-repos.html | 27 +- browser/its-states.html | 27 +- browser/its.html | 27 +- browser/lib/search.js | 231 ++++++ browser/lib/typeahead.jquery.js | 1155 ++++++++++++++++++++++++++ browser/mls-companies.html | 27 +- browser/mls-contributors.html | 27 +- browser/mls-countries.html | 27 +- browser/mls-repos.html | 27 +- browser/mls.html | 24 +- browser/navbar.html | 41 +- browser/people.html | 26 +- browser/project.html | 27 +- browser/project_map.html | 27 +- browser/qaforums-contributors.html | 27 +- browser/qaforums-tags.html | 27 +- browser/qaforums.html | 27 +- browser/repository.html | 27 +- browser/scm-companies.html | 27 +- browser/scm-contributors.html | 27 +- browser/scm-countries.html | 27 +- browser/scm-repos.html | 27 +- browser/scm.html | 21 + browser/scr-companies.html | 27 +- browser/scr-countries.html | 27 +- browser/scr-repos.html | 27 +- browser/scr.html | 27 +- browser/storyboard-companies.html | 67 +- browser/storyboard-contributors.html | 26 +- browser/storyboard.html | 21 + browser/wiki-contributors.html | 27 +- browser/wiki.html | 27 +- templates/body.template | 21 + templates/common/navbar.tmpl | 41 +- 45 files changed, 2390 insertions(+), 231 deletions(-) create mode 100644 browser/css/typeahead.css create mode 100644 browser/lib/search.js create mode 100644 browser/lib/typeahead.jquery.js diff --git a/browser/company.html b/browser/company.html index 2b19a92b..514adfe9 100644 --- a/browser/company.html +++ b/browser/company.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -99,10 +105,25 @@ ================================================== --> + + + + + + + diff --git a/browser/country.html b/browser/country.html index de6b345c..3c32f925 100644 --- a/browser/country.html +++ b/browser/country.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -140,14 +146,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/css/typeahead.css b/browser/css/typeahead.css new file mode 100644 index 00000000..379a7850 --- /dev/null +++ b/browser/css/typeahead.css @@ -0,0 +1,68 @@ +.typeahead, +.tt-query, +.tt-hint { + width: 300px; + height: 25px; + padding: 8px 12px; + font-size: 14px; + line-height: 20px; + border: 2px solid #ccc; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + outline: none; +} + +.typeahead { + background-color: #fff; +} + +.typeahead:focus { + border: 2px solid #0097cf; +} + +.tt-query { + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} + +.tt-hint { + color: #999 +} + +.tt-dropdown-menu { + width: 422px; + margin-top: 12px; + padding: 8px 0; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2); + -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2); + box-shadow: 0 5px 10px rgba(0,0,0,.2); +} + +.tt-suggestion { + padding: 3px 20px; + font-size: 12px; + line-height: 24px; +} + +.tt-suggestion.tt-cursor { + color: #fff; + background-color: #0097cf; + +} + +.tt-suggestion p { + margin: 0; +} + +#scrollable-dropdown-menu .tt-dropdown-menu { + max-height: 150px; + overflow-y: auto; +} diff --git a/browser/data_sources.html b/browser/data_sources.html index e3d9dbaf..4e479413 100644 --- a/browser/data_sources.html +++ b/browser/data_sources.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -272,14 +278,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/demographics.html b/browser/demographics.html index 54163e9f..78b24771 100644 --- a/browser/demographics.html +++ b/browser/demographics.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -85,14 +91,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/index.html b/browser/index.html index 792d45cd..86750f30 100644 --- a/browser/index.html +++ b/browser/index.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -82,10 +88,25 @@ ================================================== --> + + + + + + + diff --git a/browser/irc-contributors.html b/browser/irc-contributors.html index 36bb265a..8c9b6da7 100644 --- a/browser/irc-contributors.html +++ b/browser/irc-contributors.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -64,14 +70,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/irc-repos.html b/browser/irc-repos.html index e6d6020b..efccb12d 100644 --- a/browser/irc-repos.html +++ b/browser/irc-repos.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/irc.html b/browser/irc.html index 5aba3cb5..cdb3fbdf 100644 --- a/browser/irc.html +++ b/browser/irc.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -111,14 +117,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/its-companies.html b/browser/its-companies.html index 85f6105f..c6916925 100644 --- a/browser/its-companies.html +++ b/browser/its-companies.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/its-contributors.html b/browser/its-contributors.html index eb7fbf0a..ed741fd5 100644 --- a/browser/its-contributors.html +++ b/browser/its-contributors.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -65,14 +71,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/its-repos.html b/browser/its-repos.html index 2d1b304f..6e0298a8 100644 --- a/browser/its-repos.html +++ b/browser/its-repos.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/its-states.html b/browser/its-states.html index d57960b4..75449ee6 100644 --- a/browser/its-states.html +++ b/browser/its-states.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -165,14 +171,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/its.html b/browser/its.html index 8233750a..d2e47791 100644 --- a/browser/its.html +++ b/browser/its.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -158,14 +164,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/lib/search.js b/browser/lib/search.js new file mode 100644 index 00000000..6854e196 --- /dev/null +++ b/browser/lib/search.js @@ -0,0 +1,231 @@ +/* + * Copyright (C) 2012-2014 Bitergia + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * This file is a part of the VizGrimoireJS package + * + * Authors: + * Alvaro del Castillo San Felix + * + */ + +var Search = {}; + +(function() { + + var search_data = {}; + + function getAllItemsData() { + data = []; + // People + identities = Report.getPeopleIdentities(); + $.each(identities, function(pos, object) { + // Some dirty comes in people identities + if (typeof object.name !== 'string') {return;} + // data.push(DataProcess.hideEmail(object.email)); + if (data.indexOf(object.name) === -1) { + data.push(object.name); + } + }); + // Domains + $.each(Report.getDataSources(), function(pos, ds) { + domains = ds.getDomainsData(); + $.each(domains, function(pos1, domain) { + if (data.indexOf(domain) === -1) { + data.push(domain); + } + }); + }); + // Organizations + $.each(Report.getDataSources(), function(pos, ds) { + organizations = ds.getCompaniesData(); + $.each(organizations, function(pos1, organization) { + if (data.indexOf(organization) === -1) { + data.push(organization); + } + }); + }); + return data; + } + + function selectedItem(item) { + // Search items in all places and build URL according to it + var found = false, place = null, id = null, data_source = null; + + // People + identities = Report.getPeopleIdentities(); + $.each(identities, function(pos, object) { + if (typeof object.name !== 'string') {return;} + if (item === object.name) { + found = true; + place = "people"; + id = pos; + return false; + } + if (found) {return false;} + }); + + // Domains + $.each(Report.getDataSources(), function(pos, ds) { + domains = ds.getDomainsData(); + $.each(domains, function(pos1, domain) { + if (item === domain) { + found = true; + place = "domain"; + id = pos; + data_source = ds; + return false; + } + }); + if (found) {return false;} + }); + + // Organizations + $.each(Report.getDataSources(), function(pos, ds) { + organizations = ds.getCompaniesData(); + $.each(organizations, function(pos1, organization) { + if (item === organization) { + found = true; + place = "organization"; + id = pos; + data_source = ds; + return false; + } + }); + if (found) {return false;} + }); + + if (found) { + if (place === "people") { + var url = "people.html?id="+id; + window.open(url,"_self"); + } + else if (place === "domain") { + var url = "domain.html?domain="+item; + window.open(url,"_self"); + } + else if (place === "organization") { + var url = "company.html?company="+item; + window.open(url,"_self"); + } + } + return item; + } + + function substringMatcher(strs) { + return function findMatches(q, cb) { + var matches, substrRegex; + + // an array that will be populated with substring matches + matches = []; + + // regex used to determine if a string contains the substring `q` + substrRegex = new RegExp(q, 'i'); + + // iterate through the pool of strings and for any string that + // contains the substring `q`, add it to the `matches` array + $.each(strs, function(i, str) { + if (substrRegex.test(str)) { + // the typeahead jQuery plugin expects suggestions to a + // JavaScript object, refer to typeahead docs for more info + matches.push({ value: str }); + } + }); + cb(matches); + }; + } + + + function displaySearch(div) { + html += '
'; + html = ''; + html += '
'; + $("#"+div).html(html); + + data_source = getAllItemsData(); + + $('.typeahead').typeahead({ + hint: true, + highlight: true, + minLength: 1 + }, + { + name: "Search", + displayKey: 'value', + source: substringMatcher(data_source) + }); + $('.typeahead').bind('typeahead:selected', function(obj, datum, name) { + selectedItem(datum.value); + }); + } + + function waitNavBar () { + // navmenu class should exists + var divs = $(".navmenu"); + if (divs.length > 0) { + Search.displaySearch(); + } + else { + setTimeout(waitNavBar, 500); + } + } + + function loadSearchDataOld (cb) { + project = Report.getParameterByName("project"); + + var sonar_json = "data/json/"+project+"-sonar-prj-static.json"; + var grimoirelib_json = "data/json/"+project+"-grimoirelib-prj-static.json"; + var pmi_json = "data/json/"+project+"-pmi-prj-static.json"; + + $.when($.getJSON(sonar_json),$.getJSON(grimoirelib_json),$.getJSON(pmi_json) + ).done(function(sonar, grimoirelib, pmi) { + sonar_metrics = sonar[0]; + grimoirelib_metrics = grimoirelib[0]; + pmi_metrics = convert_boris_json(pmi[0]); + // First approach + metrics.product_metrics = sonar_metrics; + metrics.process_metrics = grimoirelib_metrics; + metrics.usage_metrics = pmi_metrics; + cb(); + }).fail(function() { + alert("Can't read Polarys JSON files. Review: " + + sonar_json + " " + grimoirelib_json + " " + pmi_json); + }); + } + + Search.displaySearch = function() { + var mark = "Search"; + var divs = $("."+mark); + if (divs.length > 0) { + var unique = 0; + $.each(divs, function(id, div) { + div.id = mark + (unique++); + displaySearch(div.id); + }); + } + }; + + + Search.build = function() { + waitNavBar(); + }; +})(); + +Loader.data_ready(function() { + Search.build(); +}); diff --git a/browser/lib/typeahead.jquery.js b/browser/lib/typeahead.jquery.js new file mode 100644 index 00000000..ab1d5dc7 --- /dev/null +++ b/browser/lib/typeahead.jquery.js @@ -0,0 +1,1155 @@ +/*! + * typeahead.js 0.10.2 + * https://github.com/twitter/typeahead.js + * Copyright 2013-2014 Twitter, Inc. and other contributors; Licensed MIT + */ + +(function($) { + var _ = { + isMsie: function() { + return /(msie|trident)/i.test(navigator.userAgent) ? navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false; + }, + isBlankString: function(str) { + return !str || /^\s*$/.test(str); + }, + escapeRegExChars: function(str) { + return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); + }, + isString: function(obj) { + return typeof obj === "string"; + }, + isNumber: function(obj) { + return typeof obj === "number"; + }, + isArray: $.isArray, + isFunction: $.isFunction, + isObject: $.isPlainObject, + isUndefined: function(obj) { + return typeof obj === "undefined"; + }, + bind: $.proxy, + each: function(collection, cb) { + $.each(collection, reverseArgs); + function reverseArgs(index, value) { + return cb(value, index); + } + }, + map: $.map, + filter: $.grep, + every: function(obj, test) { + var result = true; + if (!obj) { + return result; + } + $.each(obj, function(key, val) { + if (!(result = test.call(null, val, key, obj))) { + return false; + } + }); + return !!result; + }, + some: function(obj, test) { + var result = false; + if (!obj) { + return result; + } + $.each(obj, function(key, val) { + if (result = test.call(null, val, key, obj)) { + return false; + } + }); + return !!result; + }, + mixin: $.extend, + getUniqueId: function() { + var counter = 0; + return function() { + return counter++; + }; + }(), + templatify: function templatify(obj) { + return $.isFunction(obj) ? obj : template; + function template() { + return String(obj); + } + }, + defer: function(fn) { + setTimeout(fn, 0); + }, + debounce: function(func, wait, immediate) { + var timeout, result; + return function() { + var context = this, args = arguments, later, callNow; + later = function() { + timeout = null; + if (!immediate) { + result = func.apply(context, args); + } + }; + callNow = immediate && !timeout; + clearTimeout(timeout); + timeout = setTimeout(later, wait); + if (callNow) { + result = func.apply(context, args); + } + return result; + }; + }, + throttle: function(func, wait) { + var context, args, timeout, result, previous, later; + previous = 0; + later = function() { + previous = new Date(); + timeout = null; + result = func.apply(context, args); + }; + return function() { + var now = new Date(), remaining = wait - (now - previous); + context = this; + args = arguments; + if (remaining <= 0) { + clearTimeout(timeout); + timeout = null; + previous = now; + result = func.apply(context, args); + } else if (!timeout) { + timeout = setTimeout(later, remaining); + } + return result; + }; + }, + noop: function() {} + }; + var html = { + wrapper: '', + dropdown: '', + dataset: '
', + suggestions: '', + suggestion: '
' + }; + var css = { + wrapper: { + position: "relative", + display: "inline-block" + }, + hint: { + position: "absolute", + top: "0", + left: "0", + borderColor: "transparent", + boxShadow: "none" + }, + input: { + position: "relative", + verticalAlign: "top", + backgroundColor: "transparent" + }, + inputWithNoHint: { + position: "relative", + verticalAlign: "top" + }, + dropdown: { + position: "absolute", + top: "100%", + left: "0", + zIndex: "100", + display: "none" + }, + suggestions: { + display: "block" + }, + suggestion: { + whiteSpace: "nowrap", + cursor: "pointer" + }, + suggestionChild: { + whiteSpace: "normal" + }, + ltr: { + left: "0", + right: "auto" + }, + rtl: { + left: "auto", + right: " 0" + } + }; + if (_.isMsie()) { + _.mixin(css.input, { + backgroundImage: "url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)" + }); + } + if (_.isMsie() && _.isMsie() <= 7) { + _.mixin(css.input, { + marginTop: "-1px" + }); + } + var EventBus = function() { + var namespace = "typeahead:"; + function EventBus(o) { + if (!o || !o.el) { + $.error("EventBus initialized without el"); + } + this.$el = $(o.el); + } + _.mixin(EventBus.prototype, { + trigger: function(type) { + var args = [].slice.call(arguments, 1); + this.$el.trigger(namespace + type, args); + } + }); + return EventBus; + }(); + var EventEmitter = function() { + var splitter = /\s+/, nextTick = getNextTick(); + return { + onSync: onSync, + onAsync: onAsync, + off: off, + trigger: trigger + }; + function on(method, types, cb, context) { + var type; + if (!cb) { + return this; + } + types = types.split(splitter); + cb = context ? bindContext(cb, context) : cb; + this._callbacks = this._callbacks || {}; + while (type = types.shift()) { + this._callbacks[type] = this._callbacks[type] || { + sync: [], + async: [] + }; + this._callbacks[type][method].push(cb); + } + return this; + } + function onAsync(types, cb, context) { + return on.call(this, "async", types, cb, context); + } + function onSync(types, cb, context) { + return on.call(this, "sync", types, cb, context); + } + function off(types) { + var type; + if (!this._callbacks) { + return this; + } + types = types.split(splitter); + while (type = types.shift()) { + delete this._callbacks[type]; + } + return this; + } + function trigger(types) { + var type, callbacks, args, syncFlush, asyncFlush; + if (!this._callbacks) { + return this; + } + types = types.split(splitter); + args = [].slice.call(arguments, 1); + while ((type = types.shift()) && (callbacks = this._callbacks[type])) { + syncFlush = getFlush(callbacks.sync, this, [ type ].concat(args)); + asyncFlush = getFlush(callbacks.async, this, [ type ].concat(args)); + syncFlush() && nextTick(asyncFlush); + } + return this; + } + function getFlush(callbacks, context, args) { + return flush; + function flush() { + var cancelled; + for (var i = 0; !cancelled && i < callbacks.length; i += 1) { + cancelled = callbacks[i].apply(context, args) === false; + } + return !cancelled; + } + } + function getNextTick() { + var nextTickFn; + if (window.setImmediate) { + nextTickFn = function nextTickSetImmediate(fn) { + setImmediate(function() { + fn(); + }); + }; + } else { + nextTickFn = function nextTickSetTimeout(fn) { + setTimeout(function() { + fn(); + }, 0); + }; + } + return nextTickFn; + } + function bindContext(fn, context) { + return fn.bind ? fn.bind(context) : function() { + fn.apply(context, [].slice.call(arguments, 0)); + }; + } + }(); + var highlight = function(doc) { + var defaults = { + node: null, + pattern: null, + tagName: "strong", + className: null, + wordsOnly: false, + caseSensitive: false + }; + return function hightlight(o) { + var regex; + o = _.mixin({}, defaults, o); + if (!o.node || !o.pattern) { + return; + } + o.pattern = _.isArray(o.pattern) ? o.pattern : [ o.pattern ]; + regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly); + traverse(o.node, hightlightTextNode); + function hightlightTextNode(textNode) { + var match, patternNode; + if (match = regex.exec(textNode.data)) { + wrapperNode = doc.createElement(o.tagName); + o.className && (wrapperNode.className = o.className); + patternNode = textNode.splitText(match.index); + patternNode.splitText(match[0].length); + wrapperNode.appendChild(patternNode.cloneNode(true)); + textNode.parentNode.replaceChild(wrapperNode, patternNode); + } + return !!match; + } + function traverse(el, hightlightTextNode) { + var childNode, TEXT_NODE_TYPE = 3; + for (var i = 0; i < el.childNodes.length; i++) { + childNode = el.childNodes[i]; + if (childNode.nodeType === TEXT_NODE_TYPE) { + i += hightlightTextNode(childNode) ? 1 : 0; + } else { + traverse(childNode, hightlightTextNode); + } + } + } + }; + function getRegex(patterns, caseSensitive, wordsOnly) { + var escapedPatterns = [], regexStr; + for (var i = 0; i < patterns.length; i++) { + escapedPatterns.push(_.escapeRegExChars(patterns[i])); + } + regexStr = wordsOnly ? "\\b(" + escapedPatterns.join("|") + ")\\b" : "(" + escapedPatterns.join("|") + ")"; + return caseSensitive ? new RegExp(regexStr) : new RegExp(regexStr, "i"); + } + }(window.document); + var Input = function() { + var specialKeyCodeMap; + specialKeyCodeMap = { + 9: "tab", + 27: "esc", + 37: "left", + 39: "right", + 13: "enter", + 38: "up", + 40: "down" + }; + function Input(o) { + var that = this, onBlur, onFocus, onKeydown, onInput; + o = o || {}; + if (!o.input) { + $.error("input is missing"); + } + onBlur = _.bind(this._onBlur, this); + onFocus = _.bind(this._onFocus, this); + onKeydown = _.bind(this._onKeydown, this); + onInput = _.bind(this._onInput, this); + this.$hint = $(o.hint); + this.$input = $(o.input).on("blur.tt", onBlur).on("focus.tt", onFocus).on("keydown.tt", onKeydown); + if (this.$hint.length === 0) { + this.setHint = this.getHint = this.clearHint = this.clearHintIfInvalid = _.noop; + } + if (!_.isMsie()) { + this.$input.on("input.tt", onInput); + } else { + this.$input.on("keydown.tt keypress.tt cut.tt paste.tt", function($e) { + if (specialKeyCodeMap[$e.which || $e.keyCode]) { + return; + } + _.defer(_.bind(that._onInput, that, $e)); + }); + } + this.query = this.$input.val(); + this.$overflowHelper = buildOverflowHelper(this.$input); + } + Input.normalizeQuery = function(str) { + return (str || "").replace(/^\s*/g, "").replace(/\s{2,}/g, " "); + }; + _.mixin(Input.prototype, EventEmitter, { + _onBlur: function onBlur() { + this.resetInputValue(); + this.trigger("blurred"); + }, + _onFocus: function onFocus() { + this.trigger("focused"); + }, + _onKeydown: function onKeydown($e) { + var keyName = specialKeyCodeMap[$e.which || $e.keyCode]; + this._managePreventDefault(keyName, $e); + if (keyName && this._shouldTrigger(keyName, $e)) { + this.trigger(keyName + "Keyed", $e); + } + }, + _onInput: function onInput() { + this._checkInputValue(); + }, + _managePreventDefault: function managePreventDefault(keyName, $e) { + var preventDefault, hintValue, inputValue; + switch (keyName) { + case "tab": + hintValue = this.getHint(); + inputValue = this.getInputValue(); + preventDefault = hintValue && hintValue !== inputValue && !withModifier($e); + break; + + case "up": + case "down": + preventDefault = !withModifier($e); + break; + + default: + preventDefault = false; + } + preventDefault && $e.preventDefault(); + }, + _shouldTrigger: function shouldTrigger(keyName, $e) { + var trigger; + switch (keyName) { + case "tab": + trigger = !withModifier($e); + break; + + default: + trigger = true; + } + return trigger; + }, + _checkInputValue: function checkInputValue() { + var inputValue, areEquivalent, hasDifferentWhitespace; + inputValue = this.getInputValue(); + areEquivalent = areQueriesEquivalent(inputValue, this.query); + hasDifferentWhitespace = areEquivalent ? this.query.length !== inputValue.length : false; + if (!areEquivalent) { + this.trigger("queryChanged", this.query = inputValue); + } else if (hasDifferentWhitespace) { + this.trigger("whitespaceChanged", this.query); + } + }, + focus: function focus() { + this.$input.focus(); + }, + blur: function blur() { + this.$input.blur(); + }, + getQuery: function getQuery() { + return this.query; + }, + setQuery: function setQuery(query) { + this.query = query; + }, + getInputValue: function getInputValue() { + return this.$input.val(); + }, + setInputValue: function setInputValue(value, silent) { + this.$input.val(value); + silent ? this.clearHint() : this._checkInputValue(); + }, + resetInputValue: function resetInputValue() { + this.setInputValue(this.query, true); + }, + getHint: function getHint() { + return this.$hint.val(); + }, + setHint: function setHint(value) { + this.$hint.val(value); + }, + clearHint: function clearHint() { + this.setHint(""); + }, + clearHintIfInvalid: function clearHintIfInvalid() { + var val, hint, valIsPrefixOfHint, isValid; + val = this.getInputValue(); + hint = this.getHint(); + valIsPrefixOfHint = val !== hint && hint.indexOf(val) === 0; + isValid = val !== "" && valIsPrefixOfHint && !this.hasOverflow(); + !isValid && this.clearHint(); + }, + getLanguageDirection: function getLanguageDirection() { + return (this.$input.css("direction") || "ltr").toLowerCase(); + }, + hasOverflow: function hasOverflow() { + var constraint = this.$input.width() - 2; + this.$overflowHelper.text(this.getInputValue()); + return this.$overflowHelper.width() >= constraint; + }, + isCursorAtEnd: function() { + var valueLength, selectionStart, range; + valueLength = this.$input.val().length; + selectionStart = this.$input[0].selectionStart; + if (_.isNumber(selectionStart)) { + return selectionStart === valueLength; + } else if (document.selection) { + range = document.selection.createRange(); + range.moveStart("character", -valueLength); + return valueLength === range.text.length; + } + return true; + }, + destroy: function destroy() { + this.$hint.off(".tt"); + this.$input.off(".tt"); + this.$hint = this.$input = this.$overflowHelper = null; + } + }); + return Input; + function buildOverflowHelper($input) { + return $('').css({ + position: "absolute", + visibility: "hidden", + whiteSpace: "pre", + fontFamily: $input.css("font-family"), + fontSize: $input.css("font-size"), + fontStyle: $input.css("font-style"), + fontVariant: $input.css("font-variant"), + fontWeight: $input.css("font-weight"), + wordSpacing: $input.css("word-spacing"), + letterSpacing: $input.css("letter-spacing"), + textIndent: $input.css("text-indent"), + textRendering: $input.css("text-rendering"), + textTransform: $input.css("text-transform") + }).insertAfter($input); + } + function areQueriesEquivalent(a, b) { + return Input.normalizeQuery(a) === Input.normalizeQuery(b); + } + function withModifier($e) { + return $e.altKey || $e.ctrlKey || $e.metaKey || $e.shiftKey; + } + }(); + var Dataset = function() { + var datasetKey = "ttDataset", valueKey = "ttValue", datumKey = "ttDatum"; + function Dataset(o) { + o = o || {}; + o.templates = o.templates || {}; + if (!o.source) { + $.error("missing source"); + } + if (o.name && !isValidName(o.name)) { + $.error("invalid dataset name: " + o.name); + } + this.query = null; + this.highlight = !!o.highlight; + this.name = o.name || _.getUniqueId(); + this.source = o.source; + this.displayFn = getDisplayFn(o.display || o.displayKey); + this.templates = getTemplates(o.templates, this.displayFn); + this.$el = $(html.dataset.replace("%CLASS%", this.name)); + } + Dataset.extractDatasetName = function extractDatasetName(el) { + return $(el).data(datasetKey); + }; + Dataset.extractValue = function extractDatum(el) { + return $(el).data(valueKey); + }; + Dataset.extractDatum = function extractDatum(el) { + return $(el).data(datumKey); + }; + _.mixin(Dataset.prototype, EventEmitter, { + _render: function render(query, suggestions) { + if (!this.$el) { + return; + } + var that = this, hasSuggestions; + this.$el.empty(); + hasSuggestions = suggestions && suggestions.length; + if (!hasSuggestions && this.templates.empty) { + this.$el.html(getEmptyHtml()).prepend(that.templates.header ? getHeaderHtml() : null).append(that.templates.footer ? getFooterHtml() : null); + } else if (hasSuggestions) { + this.$el.html(getSuggestionsHtml()).prepend(that.templates.header ? getHeaderHtml() : null).append(that.templates.footer ? getFooterHtml() : null); + } + this.trigger("rendered"); + function getEmptyHtml() { + return that.templates.empty({ + query: query, + isEmpty: true + }); + } + function getSuggestionsHtml() { + var $suggestions, nodes; + $suggestions = $(html.suggestions).css(css.suggestions); + nodes = _.map(suggestions, getSuggestionNode); + $suggestions.append.apply($suggestions, nodes); + that.highlight && highlight({ + node: $suggestions[0], + pattern: query + }); + return $suggestions; + function getSuggestionNode(suggestion) { + var $el; + $el = $(html.suggestion).append(that.templates.suggestion(suggestion)).data(datasetKey, that.name).data(valueKey, that.displayFn(suggestion)).data(datumKey, suggestion); + $el.children().each(function() { + $(this).css(css.suggestionChild); + }); + return $el; + } + } + function getHeaderHtml() { + return that.templates.header({ + query: query, + isEmpty: !hasSuggestions + }); + } + function getFooterHtml() { + return that.templates.footer({ + query: query, + isEmpty: !hasSuggestions + }); + } + }, + getRoot: function getRoot() { + return this.$el; + }, + update: function update(query) { + var that = this; + this.query = query; + this.canceled = false; + this.source(query, render); + function render(suggestions) { + if (!that.canceled && query === that.query) { + that._render(query, suggestions); + } + } + }, + cancel: function cancel() { + this.canceled = true; + }, + clear: function clear() { + this.cancel(); + this.$el.empty(); + this.trigger("rendered"); + }, + isEmpty: function isEmpty() { + return this.$el.is(":empty"); + }, + destroy: function destroy() { + this.$el = null; + } + }); + return Dataset; + function getDisplayFn(display) { + display = display || "value"; + return _.isFunction(display) ? display : displayFn; + function displayFn(obj) { + return obj[display]; + } + } + function getTemplates(templates, displayFn) { + return { + empty: templates.empty && _.templatify(templates.empty), + header: templates.header && _.templatify(templates.header), + footer: templates.footer && _.templatify(templates.footer), + suggestion: templates.suggestion || suggestionTemplate + }; + function suggestionTemplate(context) { + return "

" + displayFn(context) + "

"; + } + } + function isValidName(str) { + return /^[_a-zA-Z0-9-]+$/.test(str); + } + }(); + var Dropdown = function() { + function Dropdown(o) { + var that = this, onSuggestionClick, onSuggestionMouseEnter, onSuggestionMouseLeave; + o = o || {}; + if (!o.menu) { + $.error("menu is required"); + } + this.isOpen = false; + this.isEmpty = true; + this.datasets = _.map(o.datasets, initializeDataset); + onSuggestionClick = _.bind(this._onSuggestionClick, this); + onSuggestionMouseEnter = _.bind(this._onSuggestionMouseEnter, this); + onSuggestionMouseLeave = _.bind(this._onSuggestionMouseLeave, this); + this.$menu = $(o.menu).on("click.tt", ".tt-suggestion", onSuggestionClick).on("mouseenter.tt", ".tt-suggestion", onSuggestionMouseEnter).on("mouseleave.tt", ".tt-suggestion", onSuggestionMouseLeave); + _.each(this.datasets, function(dataset) { + that.$menu.append(dataset.getRoot()); + dataset.onSync("rendered", that._onRendered, that); + }); + } + _.mixin(Dropdown.prototype, EventEmitter, { + _onSuggestionClick: function onSuggestionClick($e) { + this.trigger("suggestionClicked", $($e.currentTarget)); + }, + _onSuggestionMouseEnter: function onSuggestionMouseEnter($e) { + this._removeCursor(); + this._setCursor($($e.currentTarget), true); + }, + _onSuggestionMouseLeave: function onSuggestionMouseLeave() { + this._removeCursor(); + }, + _onRendered: function onRendered() { + this.isEmpty = _.every(this.datasets, isDatasetEmpty); + this.isEmpty ? this._hide() : this.isOpen && this._show(); + this.trigger("datasetRendered"); + function isDatasetEmpty(dataset) { + return dataset.isEmpty(); + } + }, + _hide: function() { + this.$menu.hide(); + }, + _show: function() { + this.$menu.css("display", "block"); + }, + _getSuggestions: function getSuggestions() { + return this.$menu.find(".tt-suggestion"); + }, + _getCursor: function getCursor() { + return this.$menu.find(".tt-cursor").first(); + }, + _setCursor: function setCursor($el, silent) { + $el.first().addClass("tt-cursor"); + !silent && this.trigger("cursorMoved"); + }, + _removeCursor: function removeCursor() { + this._getCursor().removeClass("tt-cursor"); + }, + _moveCursor: function moveCursor(increment) { + var $suggestions, $oldCursor, newCursorIndex, $newCursor; + if (!this.isOpen) { + return; + } + $oldCursor = this._getCursor(); + $suggestions = this._getSuggestions(); + this._removeCursor(); + newCursorIndex = $suggestions.index($oldCursor) + increment; + newCursorIndex = (newCursorIndex + 1) % ($suggestions.length + 1) - 1; + if (newCursorIndex === -1) { + this.trigger("cursorRemoved"); + return; + } else if (newCursorIndex < -1) { + newCursorIndex = $suggestions.length - 1; + } + this._setCursor($newCursor = $suggestions.eq(newCursorIndex)); + this._ensureVisible($newCursor); + }, + _ensureVisible: function ensureVisible($el) { + var elTop, elBottom, menuScrollTop, menuHeight; + elTop = $el.position().top; + elBottom = elTop + $el.outerHeight(true); + menuScrollTop = this.$menu.scrollTop(); + menuHeight = this.$menu.height() + parseInt(this.$menu.css("paddingTop"), 10) + parseInt(this.$menu.css("paddingBottom"), 10); + if (elTop < 0) { + this.$menu.scrollTop(menuScrollTop + elTop); + } else if (menuHeight < elBottom) { + this.$menu.scrollTop(menuScrollTop + (elBottom - menuHeight)); + } + }, + close: function close() { + if (this.isOpen) { + this.isOpen = false; + this._removeCursor(); + this._hide(); + this.trigger("closed"); + } + }, + open: function open() { + if (!this.isOpen) { + this.isOpen = true; + !this.isEmpty && this._show(); + this.trigger("opened"); + } + }, + setLanguageDirection: function setLanguageDirection(dir) { + this.$menu.css(dir === "ltr" ? css.ltr : css.rtl); + }, + moveCursorUp: function moveCursorUp() { + this._moveCursor(-1); + }, + moveCursorDown: function moveCursorDown() { + this._moveCursor(+1); + }, + getDatumForSuggestion: function getDatumForSuggestion($el) { + var datum = null; + if ($el.length) { + datum = { + raw: Dataset.extractDatum($el), + value: Dataset.extractValue($el), + datasetName: Dataset.extractDatasetName($el) + }; + } + return datum; + }, + getDatumForCursor: function getDatumForCursor() { + return this.getDatumForSuggestion(this._getCursor().first()); + }, + getDatumForTopSuggestion: function getDatumForTopSuggestion() { + return this.getDatumForSuggestion(this._getSuggestions().first()); + }, + update: function update(query) { + _.each(this.datasets, updateDataset); + function updateDataset(dataset) { + dataset.update(query); + } + }, + empty: function empty() { + _.each(this.datasets, clearDataset); + this.isEmpty = true; + function clearDataset(dataset) { + dataset.clear(); + } + }, + isVisible: function isVisible() { + return this.isOpen && !this.isEmpty; + }, + destroy: function destroy() { + this.$menu.off(".tt"); + this.$menu = null; + _.each(this.datasets, destroyDataset); + function destroyDataset(dataset) { + dataset.destroy(); + } + } + }); + return Dropdown; + function initializeDataset(oDataset) { + return new Dataset(oDataset); + } + }(); + var Typeahead = function() { + var attrsKey = "ttAttrs"; + function Typeahead(o) { + var $menu, $input, $hint; + o = o || {}; + if (!o.input) { + $.error("missing input"); + } + this.isActivated = false; + this.autoselect = !!o.autoselect; + this.minLength = _.isNumber(o.minLength) ? o.minLength : 1; + this.$node = buildDomStructure(o.input, o.withHint); + $menu = this.$node.find(".tt-dropdown-menu"); + $input = this.$node.find(".tt-input"); + $hint = this.$node.find(".tt-hint"); + $input.on("blur.tt", function($e) { + var active, isActive, hasActive; + active = document.activeElement; + isActive = $menu.is(active); + hasActive = $menu.has(active).length > 0; + if (_.isMsie() && (isActive || hasActive)) { + $e.preventDefault(); + $e.stopImmediatePropagation(); + _.defer(function() { + $input.focus(); + }); + } + }); + $menu.on("mousedown.tt", function($e) { + $e.preventDefault(); + }); + this.eventBus = o.eventBus || new EventBus({ + el: $input + }); + this.dropdown = new Dropdown({ + menu: $menu, + datasets: o.datasets + }).onSync("suggestionClicked", this._onSuggestionClicked, this).onSync("cursorMoved", this._onCursorMoved, this).onSync("cursorRemoved", this._onCursorRemoved, this).onSync("opened", this._onOpened, this).onSync("closed", this._onClosed, this).onAsync("datasetRendered", this._onDatasetRendered, this); + this.input = new Input({ + input: $input, + hint: $hint + }).onSync("focused", this._onFocused, this).onSync("blurred", this._onBlurred, this).onSync("enterKeyed", this._onEnterKeyed, this).onSync("tabKeyed", this._onTabKeyed, this).onSync("escKeyed", this._onEscKeyed, this).onSync("upKeyed", this._onUpKeyed, this).onSync("downKeyed", this._onDownKeyed, this).onSync("leftKeyed", this._onLeftKeyed, this).onSync("rightKeyed", this._onRightKeyed, this).onSync("queryChanged", this._onQueryChanged, this).onSync("whitespaceChanged", this._onWhitespaceChanged, this); + this._setLanguageDirection(); + } + _.mixin(Typeahead.prototype, { + _onSuggestionClicked: function onSuggestionClicked(type, $el) { + var datum; + if (datum = this.dropdown.getDatumForSuggestion($el)) { + this._select(datum); + } + }, + _onCursorMoved: function onCursorMoved() { + var datum = this.dropdown.getDatumForCursor(); + this.input.setInputValue(datum.value, true); + this.eventBus.trigger("cursorchanged", datum.raw, datum.datasetName); + }, + _onCursorRemoved: function onCursorRemoved() { + this.input.resetInputValue(); + this._updateHint(); + }, + _onDatasetRendered: function onDatasetRendered() { + this._updateHint(); + }, + _onOpened: function onOpened() { + this._updateHint(); + this.eventBus.trigger("opened"); + }, + _onClosed: function onClosed() { + this.input.clearHint(); + this.eventBus.trigger("closed"); + }, + _onFocused: function onFocused() { + this.isActivated = true; + this.dropdown.open(); + }, + _onBlurred: function onBlurred() { + this.isActivated = false; + this.dropdown.empty(); + this.dropdown.close(); + }, + _onEnterKeyed: function onEnterKeyed(type, $e) { + var cursorDatum, topSuggestionDatum; + cursorDatum = this.dropdown.getDatumForCursor(); + topSuggestionDatum = this.dropdown.getDatumForTopSuggestion(); + if (cursorDatum) { + this._select(cursorDatum); + $e.preventDefault(); + } else if (this.autoselect && topSuggestionDatum) { + this._select(topSuggestionDatum); + $e.preventDefault(); + } + }, + _onTabKeyed: function onTabKeyed(type, $e) { + var datum; + if (datum = this.dropdown.getDatumForCursor()) { + this._select(datum); + $e.preventDefault(); + } else { + this._autocomplete(true); + } + }, + _onEscKeyed: function onEscKeyed() { + this.dropdown.close(); + this.input.resetInputValue(); + }, + _onUpKeyed: function onUpKeyed() { + var query = this.input.getQuery(); + this.dropdown.isEmpty && query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.moveCursorUp(); + this.dropdown.open(); + }, + _onDownKeyed: function onDownKeyed() { + var query = this.input.getQuery(); + this.dropdown.isEmpty && query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.moveCursorDown(); + this.dropdown.open(); + }, + _onLeftKeyed: function onLeftKeyed() { + this.dir === "rtl" && this._autocomplete(); + }, + _onRightKeyed: function onRightKeyed() { + this.dir === "ltr" && this._autocomplete(); + }, + _onQueryChanged: function onQueryChanged(e, query) { + this.input.clearHintIfInvalid(); + query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.empty(); + this.dropdown.open(); + this._setLanguageDirection(); + }, + _onWhitespaceChanged: function onWhitespaceChanged() { + this._updateHint(); + this.dropdown.open(); + }, + _setLanguageDirection: function setLanguageDirection() { + var dir; + if (this.dir !== (dir = this.input.getLanguageDirection())) { + this.dir = dir; + this.$node.css("direction", dir); + this.dropdown.setLanguageDirection(dir); + } + }, + _updateHint: function updateHint() { + var datum, val, query, escapedQuery, frontMatchRegEx, match; + datum = this.dropdown.getDatumForTopSuggestion(); + if (datum && this.dropdown.isVisible() && !this.input.hasOverflow()) { + val = this.input.getInputValue(); + query = Input.normalizeQuery(val); + escapedQuery = _.escapeRegExChars(query); + frontMatchRegEx = new RegExp("^(?:" + escapedQuery + ")(.+$)", "i"); + match = frontMatchRegEx.exec(datum.value); + match ? this.input.setHint(val + match[1]) : this.input.clearHint(); + } else { + this.input.clearHint(); + } + }, + _autocomplete: function autocomplete(laxCursor) { + var hint, query, isCursorAtEnd, datum; + hint = this.input.getHint(); + query = this.input.getQuery(); + isCursorAtEnd = laxCursor || this.input.isCursorAtEnd(); + if (hint && query !== hint && isCursorAtEnd) { + datum = this.dropdown.getDatumForTopSuggestion(); + datum && this.input.setInputValue(datum.value); + this.eventBus.trigger("autocompleted", datum.raw, datum.datasetName); + } + }, + _select: function select(datum) { + this.input.setQuery(datum.value); + this.input.setInputValue(datum.value, true); + this._setLanguageDirection(); + this.eventBus.trigger("selected", datum.raw, datum.datasetName); + this.dropdown.close(); + _.defer(_.bind(this.dropdown.empty, this.dropdown)); + }, + open: function open() { + this.dropdown.open(); + }, + close: function close() { + this.dropdown.close(); + }, + setVal: function setVal(val) { + if (this.isActivated) { + this.input.setInputValue(val); + } else { + this.input.setQuery(val); + this.input.setInputValue(val, true); + } + this._setLanguageDirection(); + }, + getVal: function getVal() { + return this.input.getQuery(); + }, + destroy: function destroy() { + this.input.destroy(); + this.dropdown.destroy(); + destroyDomStructure(this.$node); + this.$node = null; + } + }); + return Typeahead; + function buildDomStructure(input, withHint) { + var $input, $wrapper, $dropdown, $hint; + $input = $(input); + $wrapper = $(html.wrapper).css(css.wrapper); + $dropdown = $(html.dropdown).css(css.dropdown); + $hint = $input.clone().css(css.hint).css(getBackgroundStyles($input)); + $hint.val("").removeData().addClass("tt-hint").removeAttr("id name placeholder").prop("disabled", true).attr({ + autocomplete: "off", + spellcheck: "false" + }); + $input.data(attrsKey, { + dir: $input.attr("dir"), + autocomplete: $input.attr("autocomplete"), + spellcheck: $input.attr("spellcheck"), + style: $input.attr("style") + }); + $input.addClass("tt-input").attr({ + autocomplete: "off", + spellcheck: false + }).css(withHint ? css.input : css.inputWithNoHint); + try { + !$input.attr("dir") && $input.attr("dir", "auto"); + } catch (e) {} + return $input.wrap($wrapper).parent().prepend(withHint ? $hint : null).append($dropdown); + } + function getBackgroundStyles($el) { + return { + backgroundAttachment: $el.css("background-attachment"), + backgroundClip: $el.css("background-clip"), + backgroundColor: $el.css("background-color"), + backgroundImage: $el.css("background-image"), + backgroundOrigin: $el.css("background-origin"), + backgroundPosition: $el.css("background-position"), + backgroundRepeat: $el.css("background-repeat"), + backgroundSize: $el.css("background-size") + }; + } + function destroyDomStructure($node) { + var $input = $node.find(".tt-input"); + _.each($input.data(attrsKey), function(val, key) { + _.isUndefined(val) ? $input.removeAttr(key) : $input.attr(key, val); + }); + $input.detach().removeData(attrsKey).removeClass("tt-input").insertAfter($node); + $node.remove(); + } + }(); + (function() { + var old, typeaheadKey, methods; + old = $.fn.typeahead; + typeaheadKey = "ttTypeahead"; + methods = { + initialize: function initialize(o, datasets) { + datasets = _.isArray(datasets) ? datasets : [].slice.call(arguments, 1); + o = o || {}; + return this.each(attach); + function attach() { + var $input = $(this), eventBus, typeahead; + _.each(datasets, function(d) { + d.highlight = !!o.highlight; + }); + typeahead = new Typeahead({ + input: $input, + eventBus: eventBus = new EventBus({ + el: $input + }), + withHint: _.isUndefined(o.hint) ? true : !!o.hint, + minLength: o.minLength, + autoselect: o.autoselect, + datasets: datasets + }); + $input.data(typeaheadKey, typeahead); + } + }, + open: function open() { + return this.each(openTypeahead); + function openTypeahead() { + var $input = $(this), typeahead; + if (typeahead = $input.data(typeaheadKey)) { + typeahead.open(); + } + } + }, + close: function close() { + return this.each(closeTypeahead); + function closeTypeahead() { + var $input = $(this), typeahead; + if (typeahead = $input.data(typeaheadKey)) { + typeahead.close(); + } + } + }, + val: function val(newVal) { + return !arguments.length ? getVal(this.first()) : this.each(setVal); + function setVal() { + var $input = $(this), typeahead; + if (typeahead = $input.data(typeaheadKey)) { + typeahead.setVal(newVal); + } + } + function getVal($input) { + var typeahead, query; + if (typeahead = $input.data(typeaheadKey)) { + query = typeahead.getVal(); + } + return query; + } + }, + destroy: function destroy() { + return this.each(unattach); + function unattach() { + var $input = $(this), typeahead; + if (typeahead = $input.data(typeaheadKey)) { + typeahead.destroy(); + $input.removeData(typeaheadKey); + } + } + } + }; + $.fn.typeahead = function(method) { + if (methods[method]) { + return methods[method].apply(this, [].slice.call(arguments, 1)); + } else { + return methods.initialize.apply(this, arguments); + } + }; + $.fn.typeahead.noConflict = function noConflict() { + $.fn.typeahead = old; + return this; + }; + })(); +})(window.jQuery); \ No newline at end of file diff --git a/browser/mls-companies.html b/browser/mls-companies.html index de71ac78..f2b0c77f 100644 --- a/browser/mls-companies.html +++ b/browser/mls-companies.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/mls-contributors.html b/browser/mls-contributors.html index e03f69d6..ba539282 100644 --- a/browser/mls-contributors.html +++ b/browser/mls-contributors.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -65,14 +71,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/mls-countries.html b/browser/mls-countries.html index 9af4ca3a..682bdf05 100644 --- a/browser/mls-countries.html +++ b/browser/mls-countries.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/mls-repos.html b/browser/mls-repos.html index 2eac191e..4be3ff7e 100644 --- a/browser/mls-repos.html +++ b/browser/mls-repos.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/mls.html b/browser/mls.html index 676cedef..824e605f 100644 --- a/browser/mls.html +++ b/browser/mls.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -142,14 +148,26 @@ ================================================== --> + + + + + + + - - - diff --git a/browser/navbar.html b/browser/navbar.html index ab8ee559..9c42a533 100644 --- a/browser/navbar.html +++ b/browser/navbar.html @@ -3,43 +3,16 @@
- - -
-
+
- +
@@ -50,12 +23,8 @@
-
- - +
diff --git a/browser/people.html b/browser/people.html index 4ebc2f08..56558e23 100644 --- a/browser/people.html +++ b/browser/people.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -76,15 +82,27 @@ ================================================== --> + + + + + + + - - - - + diff --git a/browser/project.html b/browser/project.html index 58788c9c..84b57664 100644 --- a/browser/project.html +++ b/browser/project.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -73,14 +79,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/project_map.html b/browser/project_map.html index 53073a52..8e3c1ca0 100644 --- a/browser/project_map.html +++ b/browser/project_map.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -54,14 +60,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/qaforums-contributors.html b/browser/qaforums-contributors.html index 8c3d9e4a..6a42c76d 100644 --- a/browser/qaforums-contributors.html +++ b/browser/qaforums-contributors.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -64,14 +70,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/qaforums-tags.html b/browser/qaforums-tags.html index c29f7966..62df20a7 100644 --- a/browser/qaforums-tags.html +++ b/browser/qaforums-tags.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/qaforums.html b/browser/qaforums.html index c707f756..51442aee 100644 --- a/browser/qaforums.html +++ b/browser/qaforums.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -181,14 +187,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/repository.html b/browser/repository.html index c3f2f12b..8fdaa560 100644 --- a/browser/repository.html +++ b/browser/repository.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -70,14 +76,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scm-companies.html b/browser/scm-companies.html index 7826c607..4655ee2c 100644 --- a/browser/scm-companies.html +++ b/browser/scm-companies.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scm-contributors.html b/browser/scm-contributors.html index 107deb19..a8843ec2 100644 --- a/browser/scm-contributors.html +++ b/browser/scm-contributors.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -67,14 +73,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scm-countries.html b/browser/scm-countries.html index 1c173c5f..2d739968 100644 --- a/browser/scm-countries.html +++ b/browser/scm-countries.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scm-repos.html b/browser/scm-repos.html index dcccbbc9..6df15a79 100644 --- a/browser/scm-repos.html +++ b/browser/scm-repos.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scm.html b/browser/scm.html index 5c8d880b..1ade1be3 100644 --- a/browser/scm.html +++ b/browser/scm.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -163,10 +169,25 @@ ================================================== --> + + + + + + + diff --git a/browser/scr-companies.html b/browser/scr-companies.html index cbedf28e..63ffeae9 100644 --- a/browser/scr-companies.html +++ b/browser/scr-companies.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scr-countries.html b/browser/scr-countries.html index 9dc7032f..bd51e61d 100644 --- a/browser/scr-countries.html +++ b/browser/scr-countries.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scr-repos.html b/browser/scr-repos.html index 0b8318ed..f90a71d0 100644 --- a/browser/scr-repos.html +++ b/browser/scr-repos.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/scr.html b/browser/scr.html index 6eb9278a..60bbe357 100644 --- a/browser/scr.html +++ b/browser/scr.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -157,14 +163,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/storyboard-companies.html b/browser/storyboard-companies.html index 177fe6a2..f5e6094f 100644 --- a/browser/storyboard-companies.html +++ b/browser/storyboard-companies.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -33,21 +39,21 @@
-

Some charts and tables for top companies in the project, and a summary of the evolution of their participation with links to more detailed information per company

+

REPLACE_TEXT

-
-
+
@@ -56,21 +62,21 @@
-
+
-
+
@@ -79,13 +85,13 @@
-
+
-
+
@@ -103,14 +109,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/storyboard-contributors.html b/browser/storyboard-contributors.html index c3c6428c..7adcfcbd 100644 --- a/browser/storyboard-contributors.html +++ b/browser/storyboard-contributors.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -65,15 +71,27 @@ ================================================== --> + + + + + + + - - - - + diff --git a/browser/storyboard.html b/browser/storyboard.html index a6ff4f31..10e61062 100644 --- a/browser/storyboard.html +++ b/browser/storyboard.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -170,10 +176,25 @@ ================================================== --> + + + + + + + diff --git a/browser/wiki-contributors.html b/browser/wiki-contributors.html index 3f872718..f7eb59f7 100644 --- a/browser/wiki-contributors.html +++ b/browser/wiki-contributors.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -63,14 +69,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/browser/wiki.html b/browser/wiki.html index ef69b4b0..f02e682e 100644 --- a/browser/wiki.html +++ b/browser/wiki.html @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -122,14 +128,27 @@ ================================================== --> + + + + + + + + - - - - + diff --git a/templates/body.template b/templates/body.template index df22064d..a6c78782 100644 --- a/templates/body.template +++ b/templates/body.template @@ -6,6 +6,9 @@ + + + @@ -16,6 +19,9 @@ + + + @@ -41,10 +47,25 @@ ================================================== --> + + + + + + + REPLACE_WEBSTATS diff --git a/templates/common/navbar.tmpl b/templates/common/navbar.tmpl index ab8ee559..9c42a533 100644 --- a/templates/common/navbar.tmpl +++ b/templates/common/navbar.tmpl @@ -3,43 +3,16 @@
- - -
-
+
- +
@@ -50,12 +23,8 @@
-
- - +