Skip to content

Commit

Permalink
[#1897] Further UI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
loicsans committed Feb 19, 2016
1 parent 50663e4 commit 42d8f9f
Show file tree
Hide file tree
Showing 6 changed files with 568 additions and 202 deletions.
6 changes: 3 additions & 3 deletions akvo/rsr/static/scripts-src/my-results.js
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ var IndicatorPeriodEntry = React.createClass({displayName: 'IndicatorPeriodEntry
if (this.props.parent || this.props.child) {
var projectId = this.props.findProjectOfResult(this.relation(), this.props.selectedIndicator.result);
return (
React.DOM.td( {className:"period-td"},
React.DOM.td( {className:"period-td parentProject"},
React.DOM.a( {href:"/myrsr/results/" + projectId + "/#" + this.props.selectedIndicator.result + "," + this.props.selectedIndicator.id + "," + this.props.period.id },
periodDisplay
), " ", pendingUpdates, " ", hover
Expand All @@ -949,13 +949,13 @@ var IndicatorPeriodEntry = React.createClass({displayName: 'IndicatorPeriodEntry
if (this.props.parent || this.props.child) {
projectId = this.props.findProjectOfResult(this.relation(), this.props.selectedIndicator.result);
return (
React.DOM.td( {className:"actions-td"},
React.DOM.td( {className:"actions-td childProject"},
React.DOM.a( {href:"/myrsr/results/" + projectId + "/#" + this.props.selectedIndicator.result + "," + this.props.selectedIndicator.id + "," + this.props.period.id }, i18n.update), " | ", React.DOM.a( {onClick:this.lockPeriod}, i18n.lock_period)
)
);
} else {
return (
React.DOM.td( {className:"actions-td"},
React.DOM.td( {className:"actions-td childProject"},
React.DOM.a( {onClick:this.switchPeriod}, i18n.update), " | ", React.DOM.a( {onClick:this.lockPeriod}, i18n.lock_period)
)
);
Expand Down
6 changes: 3 additions & 3 deletions akvo/rsr/static/scripts-src/my-results.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ var IndicatorPeriodEntry = React.createClass({
if (this.props.parent || this.props.child) {
var projectId = this.props.findProjectOfResult(this.relation(), this.props.selectedIndicator.result);
return (
<td className="period-td">
<td className="period-td parentProject">
<a href={"/myrsr/results/" + projectId + "/#" + this.props.selectedIndicator.result + "," + this.props.selectedIndicator.id + "," + this.props.period.id }>
{periodDisplay}
</a> {pendingUpdates} {hover}
Expand All @@ -949,13 +949,13 @@ var IndicatorPeriodEntry = React.createClass({
if (this.props.parent || this.props.child) {
projectId = this.props.findProjectOfResult(this.relation(), this.props.selectedIndicator.result);
return (
<td className="actions-td">
<td className="actions-td childProject">
<a href={"/myrsr/results/" + projectId + "/#" + this.props.selectedIndicator.result + "," + this.props.selectedIndicator.id + "," + this.props.period.id }>{i18n.update}</a> | <a onClick={this.lockPeriod}>{i18n.lock_period}</a>
</td>
);
} else {
return (
<td className="actions-td">
<td className="actions-td childProject">
<a onClick={this.switchPeriod}>{i18n.update}</a> | <a onClick={this.lockPeriod}>{i18n.lock_period}</a>
</td>
);
Expand Down
2 changes: 1 addition & 1 deletion akvo/rsr/static/styles-src/library.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
/* Media Queries
========================================================================== */
/* Placeholder
========================================================================== */
========================================================================== */
Loading

0 comments on commit 42d8f9f

Please sign in to comment.