From 34fe391afbe18f89d774137f82620024f697ab6a Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 3 Aug 2016 12:08:10 +0200
Subject: add view all button, add dropdown for contentviews

---
 .../ContentView/ShowFullContentButton.jsx          | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 web/src/js/components/ContentView/ShowFullContentButton.jsx

(limited to 'web/src/js/components/ContentView/ShowFullContentButton.jsx')

diff --git a/web/src/js/components/ContentView/ShowFullContentButton.jsx b/web/src/js/components/ContentView/ShowFullContentButton.jsx
new file mode 100644
index 00000000..a0217d32
--- /dev/null
+++ b/web/src/js/components/ContentView/ShowFullContentButton.jsx
@@ -0,0 +1,29 @@
+import React, { Component, PropTypes } from 'react'
+import { connect } from 'react-redux'
+import { render } from 'react-dom';
+import Button from '../common/Button';
+import { setShowFullContent } from '../../ducks/ui/flow'
+
+
+
+ShowFullContentButton.propTypes = {
+        setShowFullContent: PropTypes.func.isRequired,
+        showFullContent: PropTypes.bool.isRequired
+}
+
+function ShowFullContentButton ( {setShowFullContent, showFullContent} ){
+
+    return (
+        !showFullContent && <Button isXs={true} onClick={() => setShowFullContent(true)} text="Show full content"/>
+    )
+}
+
+export default connect(
+    state => ({
+        showFullContent: state.ui.flow.showFullContent
+    }),
+    {
+        setShowFullContent
+    }
+)(ShowFullContentButton)
+
-- 
cgit v1.2.3


From fd7b6b958e7da1073b68a13e817ceaacaf6ad28c Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 3 Aug 2016 15:40:23 +0200
Subject: litte style changes

---
 web/src/js/components/ContentView/ShowFullContentButton.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/src/js/components/ContentView/ShowFullContentButton.jsx')

diff --git a/web/src/js/components/ContentView/ShowFullContentButton.jsx b/web/src/js/components/ContentView/ShowFullContentButton.jsx
index a0217d32..17e61be4 100644
--- a/web/src/js/components/ContentView/ShowFullContentButton.jsx
+++ b/web/src/js/components/ContentView/ShowFullContentButton.jsx
@@ -14,7 +14,7 @@ ShowFullContentButton.propTypes = {
 function ShowFullContentButton ( {setShowFullContent, showFullContent} ){
 
     return (
-        !showFullContent && <Button isXs={true} onClick={() => setShowFullContent(true)} text="Show full content"/>
+        !showFullContent && <Button className="view-all-content-btn" isXs={true} onClick={() => setShowFullContent(true)} text="Show full content"/>
     )
 }
 
-- 
cgit v1.2.3


From adfdcc9391ed70202a1b4af65259a89634f36fa0 Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Tue, 9 Aug 2016 08:40:24 +0200
Subject: added hints from mhils

---
 web/src/js/components/ContentView/ShowFullContentButton.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/src/js/components/ContentView/ShowFullContentButton.jsx')

diff --git a/web/src/js/components/ContentView/ShowFullContentButton.jsx b/web/src/js/components/ContentView/ShowFullContentButton.jsx
index 17e61be4..acb094a7 100644
--- a/web/src/js/components/ContentView/ShowFullContentButton.jsx
+++ b/web/src/js/components/ContentView/ShowFullContentButton.jsx
@@ -14,7 +14,7 @@ ShowFullContentButton.propTypes = {
 function ShowFullContentButton ( {setShowFullContent, showFullContent} ){
 
     return (
-        !showFullContent && <Button className="view-all-content-btn" isXs={true} onClick={() => setShowFullContent(true)} text="Show full content"/>
+        !showFullContent && <Button className="view-all-content-btn btn-xs" onClick={() => setShowFullContent(true)} text="Show full content"/>
     )
 }
 
-- 
cgit v1.2.3


From 8b43972b95f002e8a5d8a85b7a53f43f16711362 Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 10 Aug 2016 10:49:27 +0200
Subject: move content to redux, add lines to view

---
 web/src/js/components/ContentView/ShowFullContentButton.jsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'web/src/js/components/ContentView/ShowFullContentButton.jsx')

diff --git a/web/src/js/components/ContentView/ShowFullContentButton.jsx b/web/src/js/components/ContentView/ShowFullContentButton.jsx
index acb094a7..676068e9 100644
--- a/web/src/js/components/ContentView/ShowFullContentButton.jsx
+++ b/web/src/js/components/ContentView/ShowFullContentButton.jsx
@@ -11,16 +11,23 @@ ShowFullContentButton.propTypes = {
         showFullContent: PropTypes.bool.isRequired
 }
 
-function ShowFullContentButton ( {setShowFullContent, showFullContent} ){
+function ShowFullContentButton ( {setShowFullContent, showFullContent, visibleLines, contentLines} ){
 
     return (
-        !showFullContent && <Button className="view-all-content-btn btn-xs" onClick={() => setShowFullContent(true)} text="Show full content"/>
+        !showFullContent &&
+            <div>
+                <Button className="view-all-content-btn btn-xs" onClick={() => setShowFullContent(true)} text="Show full content"/>
+                <span className="pull-right"> {visibleLines}/{contentLines} are visible &nbsp; </span>
+            </div>
     )
 }
 
 export default connect(
     state => ({
-        showFullContent: state.ui.flow.showFullContent
+        showFullContent: state.ui.flow.showFullContent,
+        visibleLines: state.ui.flow.maxContentLines,
+        contentLines: state.ui.flow.content.length
+
     }),
     {
         setShowFullContent
-- 
cgit v1.2.3

