Merge pull request DageTeam#102 from Flickster42490/HomePage

[feat](dashboard): add subject line to email alerts
gtdeng · Oct 14, 2015 · 1ec05b8 · 1ec05b8
2 parents a3775ce + ba43870
commit 1ec05b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/components/FlaggedEmail.jsx b/src/components/FlaggedEmail.jsx
@@ -67,9 +67,10 @@ var FlaggedEmail = React.createClass({
  <div style={{'width':'100%'}}>
  <div className='container' style={this.styles.rows}>
  <div style={{'float':'left', 'width':'25%'}}>
- <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'bolder'}}>To</span>: {this.props.recipient}</div>
- <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'bolder'}}>From</span>: {this.props.sender}</div>
- <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'bolder'}}>Date</span>: {this.props.sendTime}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>To</span>: {this.props.recipient}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>From</span>: {this.props.sender}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>Subject</span>: {this.props.subject}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>Date</span>: {this.props.sendTime}</div>
  {markNoButton}
  </div>
  { oneFLButtonsBlock }
@@ -85,9 +86,10 @@ var FlaggedEmail = React.createClass({
  <div>
  <div className='container' style={this.styles.rows}>
  <div style={{'float':'left', 'width':'25%'}}>
- <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'bolder'}}>To</span>: {this.props.recipient}</div>
- <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'bolder'}}>From</span>: {this.props.sender}</div>
- <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'bolder'}}>Date</span>: {this.props.sendTime}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>To</span>: {this.props.recipient}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>From</span>: {this.props.sender}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>Subject</span>: {this.props.subject}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>Date</span>: {this.props.sendTime}</div>
  {markNoButton}
  </div>
  { allFLButtonsBlock }
@@ -103,9 +105,10 @@ var FlaggedEmail = React.createClass({
  <div>
  <div className='container' style={this.styles.rows}>
  <div style={{'float':'left', 'width':'25%'}}>
- <div className='heading' style={{'verticalAlign':'middle'}}>To: {this.props.recipient}</div>
- <div className='heading' style={{'verticalAlign':'middle'}}>From: {this.props.sender}</div>
- <div className='heading' style={{'verticalAlign':'middle'}}>Date: {this.props.sendTime}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>To</span>: {this.props.recipient}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>From</span>: {this.props.sender}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>Subject</span>: {this.props.subject}</div>
+ <div className='heading' style={{'verticalAlign':'middle'}}><span style={{'fontWeight':'500'}}>Date</span>: {this.props.sendTime}</div>
  {markNoButton}
  </div>
  { fullEmailButtonsBlock }

diff --git a/src/components/FlaggedEmailList.jsx b/src/components/FlaggedEmailList.jsx
@@ -15,6 +15,7 @@ var FlaggedEmailList = React.createClass({
  sender = {email.sender}
  recipient = {email.recipient}
  sendTime = {email.sendTime}
+ subject = {email.subject}
  flags = {email.flags}
  body = {email.body}
  focusLevel = {email.focusLevel}