Skip to content

[Bug 865378] Add support for multiple Y axises. #1333

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.

Sign up for GitHub

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

Closed
mythmon wants to merge 5 commits into from
Closed

[Bug 865378] Add support for multiple Y axises. #1333

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a8ac3f
Unminify d3.
mythmon May 2, 2013
acbb56f
[Bug 865378] Add support for multiple Y axises.
mythmon Apr 30, 2013
0091047
Get rid of all the `div.y-axis`s.
mythmon May 3, 2013
02c41e5
fixes
mythmon May 3, 2013
b2b1ec6
Alphabetize css.
mythmon May 3, 2013
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
1 change: 0 additions & 1 deletion apps/dashboards/templates/dashboards/contributors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ <h2>{{ _('Helpful Votes') }}</h2>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
</div>

@mythmon mythmon May 3, 2013

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Divs like this are automatically added now.

@rlr rlr May 3, 2013

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at some point I thought you had all these divs added from js?

@mythmon mythmon May 3, 2013

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not all of them, just some. I tried to do all of them, but ran into some issues and decided not to spend more time on it.

</div>
</section>
Expand Down
1 change: 0 additions & 1 deletion apps/dashboards/templates/dashboards/localization.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ <h2>{{ _('Helpful Votes') }}</h2>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
</div>
</div>
</section>
Expand Down
5 changes: 0 additions & 5 deletions apps/kpi/templates/kpi/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ <h2>{{ _('Helpful Votes') }}</h2>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
</div>
</div>

Expand All @@ -88,7 +87,6 @@ <h2>{{ _('Active Contributors') }}</h2>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
</div>
</div>

Expand Down Expand Up @@ -156,7 +154,6 @@ <h2>{{ _('Search Clickthrough Rate') }}</h2>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
</div>
</div>

Expand All @@ -183,7 +180,6 @@ <h2>{{ _('Daily Unique Visitors') }}</h2>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
</div>
</div>
</section>
Expand All @@ -198,7 +194,6 @@ <h2>{{ _('L10n Coverage') }}</h2>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
</div>
</div>

Expand Down
7 changes: 4 additions & 3 deletions apps/questions/templates/questions/stats.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ <h1>{{ _('Question Statistics') }}</h1>
<div id="topic-stats" data-graph="{{ graph|json }}">
<h2 class="grid_12">{{ _('Topics') }}</h2>

<div class="graph-container grid_9 alpha">
<div class="graph"></div>
<div class="y-axis"></div>
<div class="grid_9 alpha">
<div class="graph-container">
<div class="graph"></div>
</div>

@mythmon mythmon May 3, 2013

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this so that the automatically added y-axises won't break the layout.

</div>

<div class="controls grid_3 omega">
Expand Down
1 change: 0 additions & 1 deletion apps/wiki/templates/wiki/history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ <h1 class="title">{{ _('History of {title}')|fe(title=document.title) }}</h1>
<div class="graph-container">
<div class="slider"></div>
<div class="graph"></div>
<div class="y-axis"></div>
<div class="timelines"></div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion bundles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
),
'rickshaw': (
'js/libs/jqueryui.js',
'js/libs/d3.v3.min.js',
'js/libs/d3.js',
'js/libs/d3.layout.min.js',
'js/libs/rickshaw.js',
'js/rickshaw_utils.js',
Expand Down
12 changes: 9 additions & 3 deletions media/js/historycharts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,31 @@
name: gettext('Yes'),
slug: 'yes',
func: k.Graph.identity('yes'),
color: '#21de2b'
color: '#21de2b',
axisGroup: 'votes'
},
{
name: gettext('No'),
slug: 'no',
func: k.Graph.identity('no'),
color: '#de2b21'
color: '#de2b21',
axisGroup: 'votes'
},
{
name: gettext('Percent'),
slug: 'percent',
func: k.Graph.percentage('yes', 'no'),
color: '#2b21de'
color: '#2b21de',
axisGroup: 'percent'
}
];

$container.show();
var graph = new k.Graph($container, {
data: data,
graph: {
width: 600
},
options: {
legend: false,
sets: true,
Expand Down
Loading