Merge #3680 from ethcore/jg-container-title

Simplify Container title rendering
openethereum · Nov 30, 2016 · f1b3463 · f1b3463
2 parents 79e7947 + 6f24010
commit f1b3463
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 22 deletions.
diff --git a/js/src/views/Contract/Events/events.js b/js/src/views/Contract/Events/events.js
@@ -16,7 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 
-import { Container, ContainerTitle } from '../../../ui';
+import { Container } from '../../../ui';
 
 import Event from './Event';
 import styles from '../contract.css';
@@ -48,8 +48,7 @@ export default class Events extends Component {
     });
 
     return (
-      <Container>
-        <ContainerTitle title='events' />
+      <Container title='events'>
         <table className={ styles.events }>
           <tbody>{ list }</tbody>
         </table>

diff --git a/js/src/views/Contract/Queries/queries.js b/js/src/views/Contract/Queries/queries.js
@@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
 import { Card, CardTitle, CardText } from 'material-ui/Card';
 
 import InputQuery from './inputQuery';
-import { Container, ContainerTitle, Input, InputAddress } from '../../../ui';
+import { Container, Input, InputAddress } from '../../../ui';
 
 import styles from './queries.css';
 
@@ -55,8 +55,7 @@ export default class Queries extends Component {
       .map((fn) => this.renderInputQuery(fn));
 
     return (
-      <Container>
-        <ContainerTitle title='queries' />
+      <Container title='queries'>
         <div className={ styles.methods }>
           <div className={ styles.vMethods }>
             { noInputQueries }

diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js
@@ -19,7 +19,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
 
-import { Button, Container, ContainerTitle, ParityBackground } from '../../../ui';
+import { Button, Container, ParityBackground } from '../../../ui';
 
 import { updateBackground } from '../actions';
 
@@ -55,8 +55,7 @@ class Background extends Component {
 
   render () {
     return (
-      <Container>
-        <ContainerTitle title='Background Pattern' />
+      <Container title='Background Pattern'>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
             <div>The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.</div>

diff --git a/js/src/views/Settings/Parity/parity.js b/js/src/views/Settings/Parity/parity.js
@@ -17,7 +17,7 @@
 import React, { Component, PropTypes } from 'react';
 import { MenuItem } from 'material-ui';
 
-import { Select, Container, ContainerTitle } from '../../../ui';
+import { Select, Container } from '../../../ui';
 
 import layout from '../layout.css';
 
@@ -43,8 +43,7 @@ export default class Parity extends Component {
 
   render () {
     return (
-      <Container>
-        <ContainerTitle title='Parity' />
+      <Container title='Parity'>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
             <div>Control the Parity node settings and mode of operation via this interface.</div>

diff --git a/js/src/views/Settings/Proxy/proxy.js b/js/src/views/Settings/Proxy/proxy.js
@@ -16,7 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 
-import { Container, ContainerTitle } from '../../../ui';
+import { Container } from '../../../ui';
 
 import layout from '../layout.css';
 import styles from './proxy.css';
@@ -31,8 +31,7 @@ export default class Proxy extends Component {
     const proxyurl = `${dappsUrl}/proxy/proxy.pac`;
 
     return (
-      <Container>
-        <ContainerTitle title='Proxy' />
+      <Container title='Proxy'>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
             <div>The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.</div>

diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
@@ -19,7 +19,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { Checkbox } from 'material-ui';
 
-import { Container, ContainerTitle } from '../../../ui';
+import { Container } from '../../../ui';
 
 import { toggleView } from '../actions';
 
@@ -34,8 +34,7 @@ class Views extends Component {
 
   render () {
     return (
-      <Container>
-        <ContainerTitle title='Views' />
+      <Container title='Views'>
         <div className={ layout.layout }>
           <div className={ layout.overview }>
             <div>Manage the available application views, using only the parts of the application that is applicable to you.</div>

diff --git a/js/src/views/Status/components/Debug/Debug.js b/js/src/views/Status/components/Debug/Debug.js
@@ -20,7 +20,7 @@ import AvPlay from 'material-ui/svg-icons/av/play-arrow';
 import AvReplay from 'material-ui/svg-icons/av/replay';
 import ReorderIcon from 'material-ui/svg-icons/action/reorder';
 
-import { Container, ContainerTitle } from '../../../../ui';
+import { Container } from '../../../../ui';
 
 import styles from './Debug.css';
 
@@ -42,9 +42,7 @@ export default class Debug extends Component {
     const { devLogsLevels } = nodeStatus;
 
     return (
-      <Container>
-        <ContainerTitle
-          title='Node Logs' />
+      <Container title='Node Logs'>
         { this.renderActions() }
         <h2 className={ styles.subheader }>
           { devLogsLevels || '-' }