diff options
Diffstat (limited to 'src/web/js')
| -rw-r--r-- | src/web/js/actions/MiddlePanelActions.js | 1 | ||||
| -rw-r--r-- | src/web/js/components/MiddlePanel.react.js | 5 | ||||
| -rw-r--r-- | src/web/js/components/Navbar.react.js | 7 | ||||
| -rw-r--r-- | src/web/js/components/RightPanel.react.js | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/web/js/actions/MiddlePanelActions.js b/src/web/js/actions/MiddlePanelActions.js index efae516a..3704e7ec 100644 --- a/src/web/js/actions/MiddlePanelActions.js +++ b/src/web/js/actions/MiddlePanelActions.js @@ -140,6 +140,7 @@ var MiddlePanelActions = { data: JSON.stringify(filters), url: "/mark_all_as_read", success: function (payload) { + console.log(payload); JarrDispatcher.dispatch({ type: ActionTypes.MARK_ALL_AS_READ, articles: payload.articles, diff --git a/src/web/js/components/MiddlePanel.react.js b/src/web/js/components/MiddlePanel.react.js index 561802aa..f6e44777 100644 --- a/src/web/js/components/MiddlePanel.react.js +++ b/src/web/js/components/MiddlePanel.react.js @@ -35,7 +35,8 @@ var TableLine = React.createClass({ icon = <Glyphicon glyph="ban-circle" />; } var title = (<a href={'/article/redirect/' + this.props.article_id} - onClick={this.openRedirectLink} target="_blank"> + onClick={this.openRedirectLink} target="_blank" + title={this.props.feed_title}> {icon} {this.props.feed_title} </a>); var read = (<Glyphicon glyph={this.state.read?"check":"unchecked"} @@ -49,7 +50,7 @@ var TableLine = React.createClass({ } // FIXME https://github.com/yahoo/react-intl/issues/189 // use FormattedRelative when fixed, will have to upgrade to ReactIntlv2 - return (<div className={clsses} onClick={this.loadArticle}> + return (<div className={clsses} onClick={this.loadArticle} title={this.props.title}> <h5><strong>{title}</strong></h5> <JarrTime text={this.props.date} stamp={this.props.timestamp} /> diff --git a/src/web/js/components/Navbar.react.js b/src/web/js/components/Navbar.react.js index a5dedcf9..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"> @@ -105,6 +105,9 @@ JarrNavBar = React.createClass({ <MenuItem href="/user/profile"> <Glyphicon glyph="user" />Profile </MenuItem> + <MenuItem href="/user/management"> + <Glyphicon glyph="cog" />Your data + </MenuItem> <MenuItem href="/about"> <Glyphicon glyph="question-sign" />About </MenuItem> diff --git a/src/web/js/components/RightPanel.react.js b/src/web/js/components/RightPanel.react.js index f765607a..97a7c461 100644 --- a/src/web/js/components/RightPanel.react.js +++ b/src/web/js/components/RightPanel.react.js @@ -35,7 +35,6 @@ var PanelMixin = { </Button>); } btn_grp = (<ButtonGroup bsSize="small"> - {this.getExtraButton()} {edit_button} {rem_button} </ButtonGroup>); @@ -193,7 +192,6 @@ var Feed = React.createClass({ {'title': 'Category', 'type': 'ignore', 'key': 'category_id'}, ], getTitle: function() {return this.props.obj.title;}, - getExtraButton: function() {return null;}, getFilterRow: function(i, filter) { return (<dd key={'d' + i + '-' + this.props.obj.id} className="input-group filter-row"> @@ -353,7 +351,6 @@ var Category = React.createClass({ if(this.props.obj.id != 0) {return true;} else {return false;} }, - getExtraButton: function () {return null;}, isRemovable: function() {return this.isEditable();}, obj_type: 'category', fields: [{'title': 'Category name', 'type': 'string', 'key': 'name'}], |