diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 58aecbb..95a3a48 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -48,10 +48,10 @@ const SmartNav = Store.createSmartComponent(React.createClass({
-
+
Share
-
+
diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx
index 1643b23..04ca300 100644
--- a/client/homebrew/pages/printPage/printPage.jsx
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -1,6 +1,10 @@
const React = require('react');
const _ = require('lodash');
const cx = require('classnames');
+
+
+const BrewRenderer = require('homebrewery/brewRenderer/brewRenderer.jsx');
+
const Markdown = require('homebrewery/markdown.js');
const Headtags = require('vitreum/headtags');
@@ -30,7 +34,7 @@ const PrintPage = React.createClass({
});
}catch(e){}
}
- if(this.props.query.dialog) window.print();
+ //if(this.props.query.dialog) window.print();
},
//TODO: Print page shouldn't replicate functionality in brew renderer
renderStyle : function(){
@@ -58,8 +62,9 @@ const PrintPage = React.createClass({
return
-
-
-
+ //if(this.props.brew.version == 1) return
;
+ return
{this.renderStyle()}
-
-
- {this.renderPages()}
-
- {this.renderPageInfo()}
- {this.renderPPRmsg()}
+ {this.renderPages()}
}
});
diff --git a/shared/homebrewery/brewRenderer/brewRenderer.less b/shared/homebrewery/brewRenderer/brewRenderer.less
index bde82aa..ac6790e 100644
--- a/shared/homebrewery/brewRenderer/brewRenderer.less
+++ b/shared/homebrewery/brewRenderer/brewRenderer.less
@@ -1,39 +1,2 @@
@import (less) './shared/homebrewery/phb_style/phb.less';
-.pane{
- position : relative;
-}
-.brewRenderer{
- overflow-y : scroll;
- .pageInfo{
- position : absolute;
- right : 17px;
- bottom : 0;
- z-index : 1000;
- padding : 8px 10px;
- background-color : #333;
- font-size : 10px;
- font-weight : 800;
- color : white;
- }
- .ppr_msg{
- position : absolute;
- left : 0px;
- bottom : 0;
- z-index : 1000;
- padding : 8px 10px;
- background-color : #333;
- font-size : 10px;
- font-weight : 800;
- color : white;
- }
- .pages{
- margin : 30px 0px;
- &>.phb{
- margin-right : auto;
- margin-bottom : 30px;
- margin-left : auto;
- box-shadow : 1px 4px 14px #000;
- }
- }
-}
\ No newline at end of file
diff --git a/shared/homebrewery/brewView/brewView.jsx b/shared/homebrewery/brewView/brewView.jsx
new file mode 100644
index 0000000..10b0984
--- /dev/null
+++ b/shared/homebrewery/brewView/brewView.jsx
@@ -0,0 +1,82 @@
+
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+
+//const ErrorBar = require('./errorBar/errorBar.jsx');
+
+const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx');
+//const Store = require('homebrewery/brew.store.js');
+
+const PAGE_HEIGHT = 1056;
+
+
+const BrewRenderer = require('../brewRenderer/brewRenderer.jsx');
+
+
+const BrewView = React.createClass({
+ getDefaultProps: function() {
+ return {
+ brew : {
+ text : '',
+ style : ''
+ },
+
+
+ };
+ },
+ getInitialState: function() {
+ const pages = this.props.brew.text.split('\\page');
+
+ return {
+ viewablePageNumber: 0,
+ //height : 0,
+ //isMounted : false,
+ pages : pages,
+ };
+ },
+
+ //height : 0,
+ pageHeight : PAGE_HEIGHT,
+
+ componentWillReceiveProps: function(nextProps) {
+ //if(this.refs.pages && this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight;
+
+ const pages = nextProps.brew.text.split('\\page');
+ this.setState({
+ pages : pages,
+ //usePPR : pages.length >= PPR_THRESHOLD
+ })
+ },
+
+
+ handleScroll : function(e){
+ this.setState({
+ viewablePageNumber : Math.floor(e.target.scrollTop / PAGE_HEIGHT) //this.pageHeight)
+ });
+ },
+
+ renderPageInfo : function(){
+ return
+ {this.state.viewablePageNumber + 1} / {this.state.pages.length}
+
+ },
+
+
+ render: function(){
+ return
+
+
+
+
+ {this.renderPageInfo()}
+
+ }
+});
+
+module.exports = BrewView;
diff --git a/shared/homebrewery/brewView/brewView.less b/shared/homebrewery/brewView/brewView.less
new file mode 100644
index 0000000..a3ff533
--- /dev/null
+++ b/shared/homebrewery/brewView/brewView.less
@@ -0,0 +1,42 @@
+.pane{
+ position : relative;
+}
+
+.brewView{
+ overflow-y : scroll;
+ height : 100%;
+
+ .pageInfo{
+ position : absolute;
+ right : 17px;
+ bottom : 0;
+ z-index : 1000;
+ padding : 8px 10px;
+ background-color : #333;
+ font-size : 10px;
+ font-weight : 800;
+ color : white;
+ }
+ /*
+ .ppr_msg{
+ position : absolute;
+ left : 0px;
+ bottom : 0;
+ z-index : 1000;
+ padding : 8px 10px;
+ background-color : #333;
+ font-size : 10px;
+ font-weight : 800;
+ color : white;
+ }
+ */
+ .brewRenderer{
+ margin : 30px 0px;
+ &>.phb{
+ margin-right : auto;
+ margin-bottom : 30px;
+ margin-left : auto;
+ box-shadow : 1px 4px 14px #000;
+ }
+ }
+}
diff --git a/shared/homebrewery/brewView/brewView.smart.jsx b/shared/homebrewery/brewView/brewView.smart.jsx
new file mode 100644
index 0000000..a062779
--- /dev/null
+++ b/shared/homebrewery/brewView/brewView.smart.jsx
@@ -0,0 +1,11 @@
+//const Actions = require('homebrewery/brew.actions.js');
+const Store = require('homebrewery/brew.store.js');
+
+const BrewView = require('./brewView.jsx')
+
+module.exports = Store.createSmartComponent(BrewView, ()=>{
+ return {
+ brew : Store.getBrew()
+
+ };
+});
\ No newline at end of file