Permalink
Browse files

major changes to layout in progress. d3 totally removed, will be buil…

…ding a separate module to replace that later. range select disabled for now, until fixes come in. still some tweaks to do with selection of filters, but all new display works, and new settings available to allow to restrict the search bar to specific field and to provide a sort order list too
  • Loading branch information...
1 parent 5befe9a commit 45434dbec10dcf2e1afd27ae67536c4963759c55 @markmacgillivray markmacgillivray committed Oct 2, 2012
View
@@ -20,10 +20,6 @@
<link rel="stylesheet" href="css/style.css">
- <script type="text/javascript" src="vendor/d3/d3.min.js"></script>
- <script type="text/javascript" src="vendor/d3/d3.geom.min.js?2.1.3"></script>
- <script type="text/javascript" src="vendor/d3/d3.layout.min.js?2.1.3"></script>
-
<script type="text/javascript">
jQuery(document).ready(function($) {
$('.facet-view-simple').facetview({
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -18,10 +18,6 @@
<link rel="stylesheet" href="css/facetview.css">
- <script type="text/javascript" src="vendor/d3/d3.min.js"></script>
- <script type="text/javascript" src="vendor/d3/d3.geom.min.js?2.1.3"></script>
- <script type="text/javascript" src="vendor/d3/d3.layout.min.js?2.1.3"></script>
-
<script type="text/javascript">
jQuery(document).ready(function($) {
$('.facet-view-simple').facetview({
View
@@ -18,10 +18,6 @@
<link rel="stylesheet" href="css/facetview.css">
- <script type="text/javascript" src="vendor/d3/d3.min.js"></script>
- <script type="text/javascript" src="vendor/d3/d3.geom.min.js?2.1.3"></script>
- <script type="text/javascript" src="vendor/d3/d3.layout.min.js?2.1.3"></script>
-
<script type="text/javascript">
jQuery(document).ready(function($) {
$('.facet-view-simple').facetview({
View
@@ -1,2 +0,0 @@
-_site
-node_modules
View
No changes.
View
@@ -1,26 +0,0 @@
-Copyright (c) 2010, Michael Bostock
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-* The name Michael Bostock may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
@@ -1,261 +0,0 @@
-# See the README for installation instructions.
-
-NODE_PATH ?= ./node_modules
-JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
-JS_TESTER = $(NODE_PATH)/vows/bin/vows
-
-all: \
- d3.js \
- d3.min.js \
- d3.chart.js \
- d3.chart.min.js \
- d3.layout.js \
- d3.layout.min.js \
- d3.csv.js \
- d3.csv.min.js \
- d3.geo.js \
- d3.geo.min.js \
- d3.geom.js \
- d3.geom.min.js \
- d3.time.js \
- d3.time.min.js \
- package.json
-
-# Modify this rule to build your own custom release.
-# Run `make d3.custom.min.js` to produce the minified version.
-
-d3.custom.js: \
- d3.js \
- d3.geom.js \
- d3.layout.js
-
-.INTERMEDIATE d3.js: \
- src/start.js \
- d3.core.js \
- d3.scale.js \
- d3.svg.js \
- d3.behavior.js \
- src/end.js
-
-d3.core.js: \
- src/compat/date.js \
- src/compat/style.js \
- src/core/core.js \
- src/core/array.js \
- src/core/this.js \
- src/core/functor.js \
- src/core/rebind.js \
- src/core/ascending.js \
- src/core/descending.js \
- src/core/min.js \
- src/core/max.js \
- src/core/sum.js \
- src/core/quantile.js \
- src/core/zip.js \
- src/core/bisect.js \
- src/core/first.js \
- src/core/last.js \
- src/core/nest.js \
- src/core/keys.js \
- src/core/values.js \
- src/core/entries.js \
- src/core/permute.js \
- src/core/merge.js \
- src/core/split.js \
- src/core/collapse.js \
- src/core/range.js \
- src/core/requote.js \
- src/core/round.js \
- src/core/xhr.js \
- src/core/text.js \
- src/core/json.js \
- src/core/html.js \
- src/core/xml.js \
- src/core/ns.js \
- src/core/dispatch.js \
- src/core/format.js \
- src/core/ease.js \
- src/core/event.js \
- src/core/interpolate.js \
- src/core/uninterpolate.js \
- src/core/rgb.js \
- src/core/hsl.js \
- src/core/selection.js \
- src/core/selection-select.js \
- src/core/selection-selectAll.js \
- src/core/selection-attr.js \
- src/core/selection-classed.js \
- src/core/selection-style.js \
- src/core/selection-property.js \
- src/core/selection-text.js \
- src/core/selection-html.js \
- src/core/selection-append.js \
- src/core/selection-insert.js \
- src/core/selection-remove.js \
- src/core/selection-data.js \
- src/core/selection-enter.js \
- src/core/selection-enter-select.js \
- src/core/selection-filter.js \
- src/core/selection-map.js \
- src/core/selection-sort.js \
- src/core/selection-on.js \
- src/core/selection-each.js \
- src/core/selection-call.js \
- src/core/selection-empty.js \
- src/core/selection-node.js \
- src/core/selection-transition.js \
- src/core/selection-root.js \
- src/core/transition.js \
- src/core/transition-select.js \
- src/core/transition-selectAll.js \
- src/core/transition-attr.js \
- src/core/transition-style.js \
- src/core/transition-text.js \
- src/core/transition-remove.js \
- src/core/transition-delay.js \
- src/core/transition-duration.js \
- src/core/transition-each.js \
- src/core/transition-transition.js \
- src/core/timer.js \
- src/core/noop.js
-
-d3.scale.js: \
- src/scale/scale.js \
- src/scale/nice.js \
- src/scale/linear.js \
- src/scale/bilinear.js \
- src/scale/polylinear.js \
- src/scale/log.js \
- src/scale/pow.js \
- src/scale/sqrt.js \
- src/scale/ordinal.js \
- src/scale/category.js \
- src/scale/quantile.js \
- src/scale/quantize.js
-
-d3.svg.js: \
- src/svg/svg.js \
- src/svg/arc.js \
- src/svg/line.js \
- src/svg/line-radial.js \
- src/svg/area.js \
- src/svg/area-radial.js \
- src/svg/chord.js \
- src/svg/diagonal.js \
- src/svg/diagonal-radial.js \
- src/svg/mouse.js \
- src/svg/touches.js \
- src/svg/symbol.js \
- src/svg/axis.js
-
-d3.behavior.js: \
- src/behavior/behavior.js \
- src/behavior/drag.js \
- src/behavior/zoom.js
-
-d3.chart.js: \
- src/start.js \
- src/chart/chart.js \
- src/chart/box.js \
- src/chart/bullet.js \
- src/chart/horizon.js \
- src/chart/qq.js \
- src/end.js
-
-d3.layout.js: \
- src/start.js \
- src/layout/layout.js \
- src/layout/bundle.js \
- src/layout/chord.js \
- src/layout/force.js \
- src/layout/partition.js \
- src/layout/pie.js \
- src/layout/stack.js \
- src/layout/histogram.js \
- src/layout/hierarchy.js \
- src/layout/pack.js \
- src/layout/cluster.js \
- src/layout/tree.js \
- src/layout/treemap.js \
- src/end.js
-
-d3.geo.js: \
- src/start.js \
- src/geo/geo.js \
- src/geo/azimuthal.js \
- src/geo/albers.js \
- src/geo/bonne.js \
- src/geo/equirectangular.js \
- src/geo/mercator.js \
- src/geo/type.js \
- src/geo/path.js \
- src/geo/bounds.js \
- src/geo/circle.js \
- src/geo/greatArc.js \
- src/geo/greatCircle.js \
- src/end.js
-
-d3.csv.js: \
- src/start.js \
- src/csv/csv.js \
- src/csv/parse.js \
- src/csv/format.js \
- src/end.js
-
-d3.time.js: \
- src/start.js \
- src/time/time.js \
- src/time/format.js \
- src/time/format-utc.js \
- src/time/format-iso.js \
- src/time/range.js \
- src/time/second.js \
- src/time/seconds.js \
- src/time/minute.js \
- src/time/minutes.js \
- src/time/hour.js \
- src/time/hours.js \
- src/time/day.js \
- src/time/days.js \
- src/time/week.js \
- src/time/weeks.js \
- src/time/month.js \
- src/time/months.js \
- src/time/year.js \
- src/time/years.js \
- src/time/scale.js \
- src/time/scale-utc.js \
- src/end.js
-
-d3.geom.js: \
- src/start.js \
- src/geom/geom.js \
- src/geom/contour.js \
- src/geom/hull.js \
- src/geom/polygon.js \
- src/geom/voronoi.js \
- src/geom/delaunay.js \
- src/geom/quadtree.js \
- src/end.js
-
-test: all
- @$(JS_TESTER)
-
-%.min.js: %.js Makefile
- @rm -f $@
- $(JS_COMPILER) < $< > $@
-
-d3.js d3%.js: Makefile
- @rm -f $@
- cat $(filter %.js,$^) > $@
- @chmod a-w $@
-
-install:
- mkdir -p node_modules
- npm install
-
-package.json: d3.js
- node src/package.js > $@
-
-clean:
- rm -f d3*.js
Oops, something went wrong.

0 comments on commit 45434db

Please sign in to comment.