aboutsummaryrefslogtreecommitdiff
path: root/src/web/js/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/web/js/components')
-rw-r--r--src/web/js/components/Navbar.react.js8
-rw-r--r--src/web/js/components/RightPanel.react.js12
2 files changed, 10 insertions, 10 deletions
diff --git a/src/web/js/components/Navbar.react.js b/src/web/js/components/Navbar.react.js
index 08716977..67e9ed56 100644
--- a/src/web/js/components/Navbar.react.js
+++ b/src/web/js/components/Navbar.react.js
@@ -38,13 +38,13 @@ JarrNavBar = React.createClass({
if(this.state.modalType == 'addFeed') {
heading = 'Add a new feed';
action = '/feed/bookmarklet';
- placeholder = "Site or feed url, we'll sort it out later ;)";
+ placeholder = "Site or feed url";
body = <Input name="url" type="text" placeholder={placeholder} />;
} else {
heading = 'Add a new category';
action = '/category/create';
body = <Input name="name" type="text"
- placeholder="Name, there isn't much more to it" />;
+ placeholder="Name" />;
}
return (<Modal show={this.state.showModal} onHide={this.close}>
<form action={action} method="POST">
@@ -70,7 +70,7 @@ JarrNavBar = React.createClass({
this.setState({showModal: true, modalType: 'addCategory'});
},
render: function() {
- return (<Navbar fixedTop inverse id="jarrnav">
+ return (<Navbar fixedTop inverse id="jarrnav" fluid staticTop={true}>
{this.getModal()}
<Navbar.Header>
<Navbar.Brand>
@@ -78,6 +78,7 @@ JarrNavBar = React.createClass({
</Navbar.Brand>
<Navbar.Toggle />
</Navbar.Header>
+ <Navbar.Collapse>
<Nav pullRight>
{this.buttonFetch()}
<NavItem className="jarrnavitem"
@@ -116,6 +117,7 @@ JarrNavBar = React.createClass({
</MenuItem>
</NavDropdown>
</Nav>
+ </Navbar.Collapse>
</Navbar>
);
},
diff --git a/src/web/js/components/RightPanel.react.js b/src/web/js/components/RightPanel.react.js
index 39b06f38..97a7c461 100644
--- a/src/web/js/components/RightPanel.react.js
+++ b/src/web/js/components/RightPanel.react.js
@@ -172,10 +172,10 @@ var Article = React.createClass({
getBody: function() {
return (<div className="panel-body">
{this.getCore()}
- <div dangerouslySetInnerHTML={
+ <div id="article-content" dangerouslySetInnerHTML={
{__html: this.props.obj.content}} />
</div>);
- },
+ }
});
var Feed = React.createClass({
@@ -317,8 +317,6 @@ var Feed = React.createClass({
<dd><JarrTime stamp={this.props.obj.last_stamp}
text={this.props.obj.last_retrieved} />
</dd>
- <dt>Number of articles</dt>
- <dd>{this.props.obj.nb_articles}</dd>
</dl>
{this.getErrorFields()}
{this.getCategorySelect()}
@@ -423,9 +421,9 @@ var RightPanel = React.createClass({
key={this.state.category.id} />);
}
- return (<Col id="right-panel" xsOffset={4} smOffset={4}
- mdOffset={7} lgOffset={6}
- xs={8} sm={8} md={5} lg={6}>
+ return (<Col id="right-panel" xsHidden
+ smOffset={4} mdOffset={7} lgOffset={6}
+ sm={8} md={5} lg={6}>
{breadcrum}
{cntnt}
</Col>
bgstack15