blob42/nvd3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
833 Commits 6 Branches 8 Tags 20 MiB
2350f4a60b
Commit Graph

464 Commits

Author SHA1 Message Date
Bob Monteverde
88d538287b Issue #41 fixed legend height updating available height on line plus bar chart 2012-07-12 00:28:02 -04:00
Bob Monteverde
2274156100 Issue #44 Limiting legend to 50% width on line plus bar 2012-07-12 00:24:23 -04:00
Bob Monteverde
f46328a585 Merging in Pull Request #53 2012-07-11 20:46:59 -04:00
Bob Monteverde
2634e157cf Merging in Pull Request #51 2012-07-11 20:41:48 -04:00
Itay Neeman
0355c9cbe5 Make lineWithFocusChart have consistent x and y value getters 
lineWithFocusChart uses two separate line charts, and this change
ensures that any x/y value getter (e.g. `chart.x(...)`) set on the main
line chart is also migrated to the focus chart.
 2012-07-11 10:06:57 -07:00
Alexandre Rocha Lima e Marcondes
d513dee197 * Interpolation on line and line related charts 2012-07-10 16:27:20 -03:00
Bob Monteverde
8cc955c29c whitespace cleanup in scatterChart 2012-07-10 01:44:57 -04:00
Bob Monteverde
58de184cf9 slight tweaks to scatterChart and css 2012-07-10 01:39:58 -04:00
Bob Monteverde
89172ff42e Fix issue where disabled series show up when magnify is enabled 2012-07-10 01:25:27 -04:00
Bob Monteverde
bfb1f2db25 Cleaning up scatterChart, fixed a few issues that had no tickets 2012-07-10 01:15:23 -04:00
Bob Monteverde
631e50f684 trying out common comment structure in scatter, soon the rest will have it 2012-07-10 00:16:26 -04:00
Bob Monteverde
c6e4ffb5c5 Stage 1 of cleanup continued 2012-07-09 22:57:12 -04:00
Bob Monteverde
53401adab5 Merging in Pull Request #43 fixiing Issue #42 MultibarChart set to stacked, the controls default value is wrong 2012-07-09 00:16:40 -04:00
Bob Monteverde
292256bab7 Merging in Pull Request #46 allow updating delay for multiBarChart 2012-07-09 00:12:16 -04:00
Bob Monteverde
35ba44bd9f Issue #38 let user set custom scales on the satckedAreaChart 2012-07-09 00:02:29 -04:00
Luke Steensen
a7c4b0fe06 regenerate compiled files 
also undo mistake deletion from last commit
 2012-07-06 15:48:32 -05:00
Jun Lin
d1f7cdf286 fixed #42 set multibar default to stacked, the controls default value is wrong 2012-07-06 09:13:56 +08:00
Philip Roberts
a04cc0fa07 Fix accidental semicolon in var list causing 
variables afterwards to be globals in multiBarChart.

Fixes #35.
 2012-07-05 13:04:10 +01:00
Bob Monteverde
6a35569ca2 LOTS of tweaks to discreteBar and Axis. Only pad for the correct values if showValues, reduce unnused margins, prevent overlapping labels on axis with showMaxMin 2012-07-03 17:14:52 -04:00
Bob Monteverde
5dcc2b7402 fixed incorrect api name, valueFormat, NOT valuesFormat 2012-07-02 16:46:56 -04:00
Bob Monteverde
04e68e9295 fixed issue with max and min labels overlapping on y axis 2012-07-02 14:36:34 -04:00
Bob Monteverde
e7a8665705 fixing issues with labels not being positions correctly in firefox 2012-07-02 14:19:04 -04:00
Bob Monteverde
feed538cee configurable open and close options now in api 2012-07-02 12:43:04 -04:00
Bob Monteverde
879cf06e09 Removed shape from scatter, replaced with getShape, defaults to function(d) { return d.shape || 'circle' } 2012-07-01 05:17:45 -04:00
Bob Monteverde
52eec9b46f working on fixing multibar x axis with showMaxMin is false 2012-07-01 03:08:25 -04:00
Bob Monteverde
5d5488dbb6 Fix issue where pie chart lets you disable all series then series doesn;t come back when re-enabled 2012-07-01 02:09:28 -04:00
Bob Monteverde
9d726ac9ab some updates to the pie css to make interaction sexier 2012-07-01 02:05:07 -04:00
Bob Monteverde
09a55af5f5 Pie charts should use the same data as discreteBar for ease of switching between 2012-07-01 01:39:53 -04:00
Bob Monteverde
ecb80cb4b8 If Max / Min contains 'NaN' don't show it on axis 2012-06-30 04:26:44 -04:00
Bob Monteverde
6c66e371e5 fix default height on bulletChart 2012-06-30 04:18:56 -04:00
Bob Monteverde
6da248bd19 defined local variable container in bulletChart 2012-06-30 04:16:40 -04:00
Bob Monteverde
94d44b7cec If you don't set width, bullet chart gets container's.. height is static but can be changed manually 2012-06-30 04:07:50 -04:00
Bob Monteverde
c5dad2c36a fixing variable name 2012-06-30 03:36:51 -04:00
Bob Monteverde
d57bd67074 reworked bullet a little bit and created bulletChart 2012-06-30 03:17:21 -04:00
Bob Monteverde
e07921f473 Added rotate labels functionality, but text-anchor: end is not working, auto switches to middle 2012-06-30 01:51:32 -04:00
Bob Monteverde
df34fb7bad minifying 2012-06-29 16:00:11 -04:00
Bob Monteverde
4ab57cb38f Issue #19 Fixing label offset for FF, and increasing the disatnce from vertical axis maxand min from 8 to 10 to prevent overlap 2012-06-29 14:59:15 -04:00
Bob Monteverde
daee31b61a minifying new pie and pieChart 2012-06-29 14:29:03 -04:00
Will McKenzie
8a26f292f1 Enabled configuration of open and close icons in indentedTree 
Added chart.iconOpen and chart.iconClose in the same format as
chart.tableClass etc that will return the current setting for either
icon value unless an argument is supplied, in which case they will
replace the settng with the new value and return the chart.
 2012-06-29 17:14:18 +01:00
Bob Monteverde
42aa8ad2ca if no offset element is given, assume 0 on pieChart, because pieChart uses mouse position for tooltips right now 2012-06-28 19:27:34 -04:00
Bob Monteverde
3071b32de3 added pieChart.js to makefile and minifying 2012-06-28 19:16:23 -04:00
Bob Monteverde
f5db7e43a8 Cleaned up the pie implementation a little more, and moved the old pie to deprecated. Will be making pieChart.js shortly that will have an optional legend and tooltips built in. 2012-06-28 17:14:53 -04:00
Tsyren Ochirov
eb8f9f48fb tooltip optional base container 2012-06-28 11:42:26 +04:00
Bob Monteverde
debb64def2 updated indexify function, instead of returning a new data object stores the new cumulative y value at d.display.y, keeping the original at d.y 2012-06-27 15:37:18 -04:00
Bob Monteverde
f2cd0ed629 Moved cumulativeLine.js to deprecared, cumulativeLineChart.js is the up to date version of it 2012-06-27 15:09:29 -04:00
Bob Monteverde
b396b0e155 updated line implementation to be consistent with other models 2012-06-27 14:38:23 -04:00
Bob Monteverde
25883d2a5e removing the delay on the horizontal bar for now, also making sure 0 ticks are never removed from the axis 2012-06-26 15:33:09 -04:00
Bob Monteverde
d1c2f59cd9 trying out a chart.container idea to get a reference to the DOM element the chart is plotted in to help with a auto resize functionality, and may have other uses 2012-06-26 13:12:17 -04:00
Bob Monteverde
c494172fe2 Added Max/Min to horizontal axes, on by default, but can be disabled with showMaxMin(false) on the axis component 2012-06-26 12:31:16 -04:00
Bob Monteverde
755af6e9d4 Issue #11 major refactor of stackedArea, still need to tweak some things, BUT now works with custom accessors 2012-06-26 03:57:01 -04:00
Bob Monteverde
ea31b3ab1c Issue #10 fixed distributions from showing disabled points 2012-06-26 01:24:34 -04:00
Bob Monteverde
1ff25d0bfe trickling down the tickFormatter from the main y and x axes to the view finder axes - minifying 2012-06-25 17:18:12 -04:00
Bob Monteverde
72c91548de don't hide axis on horizontal bar 2012-06-25 15:08:25 -04:00
Bob Monteverde
a72645dbe4 Issue #9 Fixed issue with distributions not accurate when series are disabled. Also made distributions fade out when removed 2012-06-25 14:58:08 -04:00
Bob Monteverde
879c1db200 turning off showMaxMin on the ordinal horizontlal bar axis 2012-06-25 13:40:58 -04:00
Bob Monteverde
c856a295e4 axis Max and Min now animate from where they would have appeared wih previous scale 2012-06-24 05:07:26 -04:00
Jeremy Grosser
6132155dc2 Expose x2Axis and y2Axis for lineWithFocusChart instances 2012-06-23 23:46:49 -07:00
Bob Monteverde
b55910786d Axes now show Max and Min by default... need to rebind this on all the charts.. will do that soon 2012-06-23 20:30:35 -04:00
Bob Monteverde
cf0d7bb799 fixed distributions and scatter hover 2012-06-23 01:24:25 -04:00
Bob Monteverde
48a0e7c5b0 Intial distribution abstraction complete and implemented into the scatterChart 2012-06-22 19:52:07 -04:00
Bob Monteverde
57a30a1bed minifying 2012-06-22 15:03:44 -04:00
Bob Monteverde
0659ebee02 minify 2012-06-21 16:37:15 -04:00
Bob Monteverde
4ab9b0a305 options is now columns in the indentedTree, but still considering breaking this down further 2012-06-21 15:33:40 -04:00
Bob Monteverde
772c5e660b default widths on table columns are now in percent, but user can voerride with anything 2012-06-21 14:04:15 -04:00
Bob Monteverde
851bc9749a Removing highlight class from table rows... still need to update API to remove the options object 2012-06-21 13:21:44 -04:00
Bob Monteverde
e7f0aef0ec Forgot to minify indentedtree changes 2012-06-21 13:14:37 -04:00
Bob Monteverde
e15206f2a9 Created the initial code for an HTML indented tree... will be changing API and styles for it shortly 2012-06-20 20:25:04 -04:00
Bob Monteverde
a019088aac Added legendDblclick event in legend.dispatch 2012-06-20 17:15:28 -04:00
Bob Monteverde
b9a8e0baaa Colors no longer have a ahrd limit of 10 or 20, they are dependant on how many colors are fed to teh chart, the default being 10 or 20, but suer can difine as many as they want 2012-06-20 17:04:30 -04:00
Bob Monteverde
8bbf9f1631 Issue #7 - Fixed tooltip positions in Firefox (and hopefully in IE9) 2012-06-20 02:38:19 -04:00
Bob Monteverde
f24490f1e3 Added align options, defualting to true, to align up each row of legend. WARNING may make legen take up MORE ROWS. 2012-06-19 20:21:04 -04:00
Bob Monteverde
6bbe097e04 Stacked ares in stream mode now shows the same tooltips as stacked 2012-06-19 16:00:22 -04:00
Bob Monteverde
a940b0d65a Added optional delay to multibar chart to ne consistent with the horizontal multibar 2012-06-19 15:15:40 -04:00
Bob Monteverde
2f155b88c8 Some tweak to the horizontal multi bar, now the staggered delay is option, defaulting to 1200ms divided by the number of x values 2012-06-19 14:32:31 -04:00
Bob Monteverde
a10101744d discrete bar chart no longer animates horizontally, only vertically 2012-06-18 19:11:49 -04:00
Bob Monteverde
8d9f496286 LinePlusFocus now rescales when series are removed. Also moved a couple more files to deprecated, and removed from Makefile 2012-06-18 15:42:45 -04:00
Bob Monteverde
51fc28358b New lineWithFocusChart, and example 2012-06-18 13:36:12 -04:00
Bob Monteverde
f6bc583e9a Fixed error from dist Lines on mouseover then line disable... same problem that was with points on hover 2012-06-18 09:58:59 -04:00
Bob Monteverde
6e4eaea547 Fixed major bug that throws lots of errors everytime a point is overed over then transitioned... this was 95% of all errors seen in console 2012-06-18 02:47:21 -04:00
Bob Monteverde
34850d6c54 Scatter now use's d3's symbol to use different shapes, changed css, points on line charts are now completely hidden untill hover. 2012-06-18 02:11:42 -04:00
Bob Monteverde
9e54787e40 Fixed animation speed double after re-zero drag 2012-06-17 22:36:56 -04:00
Bob Monteverde
834caa51df Fixed cumualtive line legend click toggle of series 2012-06-17 22:31:49 -04:00
Bob Monteverde
d4c6351aa6 Added cumulativeLineChart to Makefile 2012-06-17 22:25:04 -04:00
Bob Monteverde
e28f6f5ae7 Fixing tooltip positions accoutning for margin 2012-06-17 14:51:45 -04:00
Bob Monteverde
6b9b4431da Corrected the gravity of the Y axis tooltip 2012-06-17 14:48:21 -04:00
Bob Monteverde
56e61b814a fixing scatter position to account for offset 2012-06-17 14:38:42 -04:00
Bob Monteverde
f18c20ac27 Fixing dual scatter tooltip position 2012-06-17 14:31:10 -04:00
Bob Monteverde
5b6ff09e99 Switched scatter plot to dual tooltips 2012-06-17 14:18:10 -04:00
Bob Monteverde
ead4f5b723 Getting stuff ready to be cleaned, moving stuff that will be deleted into the deprecated folder 2012-06-16 07:02:45 -04:00
Bob Monteverde
beb2e1cf0e Added linePlusBarChart to Makefile 2012-06-16 03:12:42 -04:00
Bob Monteverde
601d598b34 Created scatterplotChart and example 2012-06-15 19:48:03 -04:00
Bob Monteverde
bfcdae6dde Fixed multiBar exit transition 2012-06-15 17:25:11 -04:00
Bob Monteverde
854347afab Added update function to multibar chart 2012-06-15 16:17:45 -04:00
Bob Monteverde
c374e078fc Added color to multiBarWithLegend 2012-06-15 14:07:37 -04:00
Bob Monteverde
542dc094f9 Fixed legend height and margin.top issue in the ready to go charts. Also re organized code a little bit for consistency 2012-06-15 12:47:47 -04:00
Bob Monteverde
2cb05b38d0 Some minor tweaks to fix the enable/disable series ability on satckedArea 2012-06-14 15:55:37 -04:00
Bob Monteverde
ddb98f6b59 added stackedAreaChart to Makefile, and minified 2012-06-14 14:42:40 -04:00
Bob Monteverde
ea597f30e1 attempting to fix random bug woth stacked area paths on removal 2012-06-14 01:53:27 -04:00
Bob Monteverde
b4ca744451 Lots of little bug and consistency fixes that are appearing as I create more examples 2012-06-14 01:18:12 -04:00
Bob Monteverde
dc337a37ac Fixed value label position on transition on multiBarHorizontal 2012-06-12 14:28:28 -04:00
Bob Monteverde
e67e72a882 minifying 2012-06-12 14:03:47 -04:00
Bob Monteverde
85d3545f7a Added discreteBarHorizontalChart to makefile 2012-06-12 12:41:16 -04:00
Bob Monteverde
9251f3b74c minifying 2012-06-12 02:55:38 -04:00
Bob Monteverde
f5e6a54592 Minifying latest work 2012-06-12 02:28:52 -04:00
Bob Monteverde
c85020dcef Added missing source file from last commit, merged into makefile 2012-06-09 15:45:21 -04:00
Bob Monteverde
525ecded4d Getting rid of charts collection, merging tooltips directly in complete charts, no need for separate charts collection 2012-06-09 02:51:41 -04:00
Bob Monteverde
2a9642dccc Added discreteBarChart...ready to go chart wrapper for discrete bar. Initial cut. 2012-06-08 17:45:21 -04:00
Bob Monteverde
28f64a5272 Split up the multibar to a discrete bar and multi bar implementations 2012-06-08 17:21:08 -04:00
Bob Monteverde
3cd3798af1 Fixed tooltips on horizontal multibar 2012-06-06 16:13:55 -04:00
Bob Monteverde
fa32acdf51 added multiBarHorizontal and multiBarHorizontalWithLegend to Makefile, and minified 2012-06-06 15:39:53 -04:00
Bob Monteverde
facfdb27c7 Updated Makefile to account for cumulativeLineChart name change 2012-06-05 16:10:19 -04:00
Bob Monteverde
c06fb49fff added resize y axis toggle to cumulative line 2012-06-01 12:23:03 -04:00
Bob Monteverde
037332dfda minor tweak to clipEdge, and updated multiBar to have fancy staggered transition 2012-05-31 08:02:40 -04:00
Bob Monteverde
9a57039cd3 minifying src, forgot to in last commit 2012-05-31 04:00:08 -04:00
Bob Monteverde
749e0d8198 minifying src, forgot to in last commit 2012-05-31 03:40:30 -04:00
Bob Monteverde
030b99070c renamed dispatch point**** to element*** to be consistent with the others, cleaned up scatter, line, and stacked area to utilize scatter's scales, fixed a couple of remaps 2012-05-31 03:40:10 -04:00
Bob Monteverde
7857c4ab6b added multiBarWithLegend to makefile, and tweaked the animation a little on the multibar 2012-05-30 16:08:06 -04:00
Bob Monteverde
6746682e88 Fixed problem with y pos and height calculations with groups/stacked bar chart 2012-05-29 17:25:00 -04:00
Bob Monteverde
5d515963e8 Fixed issue with stacked multiBar. Still need to implement fancy transition from stacked to grouped, and back 2012-05-29 03:57:22 -04:00
Bob Monteverde
0f7a531784 added multiBar and stackedAreaChart to makefile, and minified. A few random fixes in a few core models 2012-05-29 03:42:25 -04:00
Bob Monteverde
b806a46f91 Using category20 colors instead of category10, now the default colors work with up to 20 series, will deal with more later 2012-05-29 00:35:31 -04:00
Bob Monteverde
9ff72baad4 Fixed x and y point distribution on scatterWithLegend.js 2012-05-28 20:06:08 -04:00
Bob Monteverde
e528a47c1a Fixed issue with new line implementation where getX and getY don;t trickle down to the scatter 2012-05-28 19:25:39 -04:00
Bob Monteverde
04f4427945 Cleaning up stackedArea code to be consistent with line and scatter 2012-05-28 18:31:26 -04:00
Bob Monteverde
2741676827 removed the distributions from scatter model to the scatterWithLegend.. making scatter.js perform as best as possible for use as an interactive layer 2012-05-28 02:03:23 -04:00
Bob Monteverde
a702ab5bae stackedArea chart now uses the scatter overlayed, not the line. Updates to examples, made the X and Y distrivutions on the scatter options, defaulting to off. Some minor changes to the sparklin example 2012-05-27 19:52:28 -04:00
Bob Monteverde
648306aede Added new interactive sparklinePlus example, updated sparkline model and bullet model 2012-05-26 13:26:47 -04:00
Bob Monteverde
fd585afc17 Got most of the needed functionality in the bullet chart. Has protovis style triangle, and working toooltips 2012-05-26 04:55:32 -04:00
Bob Monteverde
e90f611215 minified last commit, updates to linePlusBar model and example 2012-05-24 17:02:14 -04:00
Bob Monteverde
e0b0cc7b0c Put the points-clip mask in the defs section on the scatter 2012-05-24 08:19:38 -04:00
Bob Monteverde
d9505e32f9 Cleaned up the core scatter and line implementations, made consistent with each other, sped things up a bit by delaying rendering and updating of the interactive layer 2012-05-24 07:48:35 -04:00
Bob Monteverde
3d422139f6 Added linePlusBar.js to Makefile and minified with it 2012-05-24 03:35:55 -04:00
Bob Monteverde
f945e85423 Some tweaks to linePlusBar, and removed the delayed update of the interactive layer on the line chart, may slow things down, testing to see if its necessary 2012-05-24 03:25:24 -04:00
Bob Monteverde
8edf7136c4 implemented new voronoi clipping technique on the line chart 2012-05-23 15:51:30 -04:00
Bob Monteverde
fc0af97d0e Instead of having a clipPath for every point on a voronoi, have a single clipping mask of all the points at once, HUGE speed increase 2012-05-23 03:00:54 -04:00
Bob Monteverde
864f79dc34 updated chart examples to work with new no-jQuery tooltips and resizing 2012-05-17 17:11:01 -04:00
Bob Monteverde
9352d35cfc merging in pull request from @Nathanaela removing jQuery dependence, added pie chart model, some other useful changes 2012-05-17 16:35:57 -04:00
Bob Monteverde
b34a7b409d Added right and top axes orientations. Made lineWithFourAxes as an example that will not be minified into nvd3, just for reference 2012-05-17 15:47:36 -04:00
Bob Monteverde
5491aef3cf Some minor updates, and removal of log statements that were used for debugging 2012-05-17 14:00:20 -04:00
Bob Monteverde
7995783c4a merged yaxis and axis into 1 implementation, will add top and right oriantations soon 2012-05-17 02:04:33 -04:00
Bob Monteverde
86c7300826 X axis now adjust thenumber of ticks based on the width of the axis on the cumulativeLine model 2012-05-14 17:30:40 -04:00
Bob Monteverde
ff9ca0d293 Added cumulativeLineChartDaily chart and example, modified cumulativeLine.js to pass in the point index to getX and getY functions, which is used because the dates are not linear in daily 2012-05-14 17:09:45 -04:00
Bob Monteverde
83d56ef755 Added lineChartDaily example, and modified line and lineWithLegend models to feed getX and getY x,i not just i 2012-05-14 15:23:11 -04:00
Nathanael Anderson
61313ade5d Fix for Bar/Pie chart not showing updated data... 2012-05-14 12:14:12 -05:00
Bob Monteverde
4737ead469 disabled hovering on stackedArea chart when the point has 0 value.. or very close to 0 2012-05-11 16:57:54 -04:00
Bob Monteverde
c79ca5c761 disabled legend hover effect on cumulative line model, and added cumulative line to the Makefile 2012-05-11 16:01:51 -04:00
Nathanael Anderson
a37fa26fb6 Fix for Pie Title duplication 
Fix for Pie redraw of chart on resize (kind of a hack)
 2012-05-11 14:27:55 -05:00
Nathanael Anderson
f79e78be6e Pie/Bar chart fixes/enhancments 2012-05-10 17:13:31 -05:00
Bob Monteverde
d22eb5a396 Made the line edge clipping optional, defaulting to false. But is still required for the lineWithFocus example 2012-05-10 13:57:11 -04:00
Nathanael Anderson
b72d51858a Updated pie/bar charts to support tooltips 
Updated pie/bar charts to have click handlers
Updated bar chart to allow negative values.
 2012-05-10 11:10:15 -05:00
Nathanael Anderson
6af91f885c Updated Bar chart to use variable for Label/Data Element 
Created Pie Chart
 2012-05-09 14:08:25 -05:00
Nathanael Anderson
22225147ab Reworked library to remove jquery dependancies 
renamed nvtooltip.js to tooltip.js and put it into the nv namespace
Added a batch file for building on windows.
 2012-05-07 07:53:51 -05:00
Bob Monteverde
454c5e4605 Drastic speed increase with line.js, needed for stackedAre chart 2012-04-08 02:59:44 -04:00
Bob Monteverde
66fa17551b lots of changes with nv.chart.line, not 100% set with the API yet, but the new lineChart.html example should be 100 times easier to use than lineWithLegend.html example 2012-04-05 05:18:21 -04:00
Bob Monteverde
4e7475da73 Added another layer of abstraction to take care of all the glue and make the chart api extremely simple. First try, so not entirely complete, but does function. 2012-04-05 01:24:39 -04:00
Bob Monteverde
91215e2d15 Removed color from stacked controls, fixed width issue in firefox 2012-04-03 11:46:30 -04:00
Bob Monteverde
0815745c8e Added stacked area charts to makefile and minified 2012-04-03 11:20:55 -04:00
Bob Monteverde
9dee21ece8 working on monthEnd axis ticks in cumualtive example 2012-03-27 16:55:15 -04:00
Bob Monteverde
02cd979f76 again, forgot to minify before commit 2012-03-23 21:09:28 -04:00
Bob Monteverde
d2dc88e962 Now paths and points move as they transition out with the scales 2012-03-23 15:16:59 -04:00
Bob Monteverde
0fbc206d77 forgot to minify last commit 2012-03-22 19:28:13 -04:00
Bob Monteverde
d1ae59f84e Fixed a minor naming issue 2012-03-21 18:20:54 -04:00
Bob Monteverde
e45bc92b60 Minor change to intro, outro, and gitignore 2012-03-21 18:03:18 -04:00
Bob Monteverde
cc7aedcbe2 Initial public commit, merging files from private repo 2012-03-20 19:43:21 -04:00