2 files changed, 36 insertions, 8 deletions
diff --git a/web/src/js/components/ContentView/ContentViewOptions.jsx b/web/src/js/components/ContentView/ContentViewOptions.jsx
new file mode 100644
index 00000000..fed3a088
--- /dev/null
+++ b/web/src/js/components/ContentView/ContentViewOptions.jsx
@@ -0,0 +1,31 @@
+import React, { PropTypes } from 'react'
+import { connect } from 'react-redux'
+import ViewSelector from './ViewSelector'
+import UploadContentButton from './UploadContentButton'
+import DownloadContentButton from './DownloadContentButton'
+
+ContentViewOptions.propTypes = {
+    flow: React.PropTypes.object.isRequired,
+    message: React.PropTypes.object.isRequired,
+}
+
+function ContentViewOptions(props) {
+    const { flow, message, uploadContent, readonly, contentViewDescription } = props
+    return (
+        <div className="view-options">
+            <ViewSelector message={message}/>
+            &nbsp;
+            <DownloadContentButton flow={flow} message={message}/>
+            &nbsp;
+            <UploadContentButton uploadContent={uploadContent}/>
+            &nbsp;
+            <span>{contentViewDescription}</span>
+        </div>
+    )
+}
+
+export default connect(
+    state => ({
+        contentViewDescription: state.ui.flow.viewDescription
+    })
+)(ContentViewOptions)
diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx
index 43aece46..3db77af4 100644
--- a/web/src/js/components/ContentView/ContentViews.jsx
+++ b/web/src/js/components/ContentView/ContentViews.jsx
@@ -30,9 +30,8 @@ function Edit({ content, onChange }) {
 Edit = ContentLoader(Edit)
 
 class ViewServer extends Component {
-    constructor(props){
-        super(props)
-        this.maxLines = 80
+    static defaultProps = {
+        maxLines: 80,
     }
 
     componentWillMount(){
@@ -50,14 +49,12 @@ class ViewServer extends Component {
 
         props.setContentViewDescription(props.contentView != this.data.description ? this.data.description : '')
 
-        let isFullContentShown = this.data.lines.length < this.maxLines
+        let isFullContentShown = this.data.lines.length < props.maxLines
         if (isFullContentShown) props.setShowFullContent(true)
     }
     render() {
-        const {content, contentView, message} = this.props
-
-        let lines = this.props.showFullContent ? this.data.lines : this.data.lines.slice(0, this.maxLines)
-
+        const {content, contentView, message, maxLines} = this.props
+        let lines = this.props.showFullContent ? this.data.lines : this.data.lines.slice(0, maxLines)
         return <div>
                 <pre>
                     {lines.map((line, i) =>