localhots/empact
1
0
Fork 0
Code Releases Activity

New time selector proto

Browse Source
This commit is contained in:
Gregory Eremin
2015-03-16 17:46:18 +07:00
parent fe4cc7b845
commit 5a716f8338
6 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/scripts/src/app.jsx
+3 -4
View File
@@ -77,7 +77,6 @@ var App = React.createClass({
<Menu orgs={this.state.orgs} teams={this.state.teams} />
<Router.RouteHandler />
</div>
<WeekIntervalSelector />
</div>
);
}
@@ -112,7 +111,7 @@ var Menu = React.createClass({
return (
<div className="menu">
<ul>
<li key="empact">
<li className="empact">
<Link to="org" params={this.getParams()} className="logo-button">
<div className="logo e">e</div>
<div className="logo m">m</div>
@@ -122,9 +121,9 @@ var Menu = React.createClass({
<div className="logo t">t</div>
</Link>
</li>
<li key="orgs-header" className="nav header">Organizations:</li>
<li className="nav header">Organizations:</li>
{this.props.orgs.map(renderOrg)}
<li key="teams-header" className="nav header">Teams:</li>
<li className="nav header">Teams:</li>
{this.props.teams.map(renderTeam)}
</ul>
</div>
app/scripts/src/charts/bar_chart.jsx
+1 -1
View File
@@ -120,7 +120,7 @@ var BarChart = React.createClass({
return (
<div className="barchart-container">
<div className="whatsgoingon">
This bar chart represents <em>{words.items[this.state.item]}</em> {words.actions[this.state.item]} <em>{who}</em> {words.item[subject]} from <em>W11, Mar 9</em> to <em>W18, Apr 27</em>
This bar chart represents <em>{words.items[this.state.item]}</em> {words.actions[this.state.item]} <em>{who}</em> {words.item[subject]} from <em className="date">Mar 9</em> to <em className="date">Apr 27</em>
</div>
<div className="filters">
<Selector thing="sort"
app/scripts/src/charts/stacked_area_chart.jsx
+1 -1
View File
@@ -196,7 +196,7 @@ var StackedAreaChart = React.createClass({
return (
<div className="sachart-container">
<div className="whatsgoingon">
This stacked area chart represents <em>{words.items[this.state.item]}</em> {words.actions[this.state.item]} <em>{who}</em> {words.item[subject]} from <em>W11, Mar 9</em> to <em>W18, Apr 27</em>
This stacked area chart represents <em>{words.items[this.state.item]}</em> {words.actions[this.state.item]} <em>{who}</em> {words.item[subject]} from <em className="date">Mar 9</em> to <em className="date">Apr 27</em>
</div>
<div className="filters">
<Selector thing="sort"