diff --git a/app/pages/organization/organization-container.jsx b/app/pages/organization/organization-container.jsx index b74b9147d6..b02f92ad52 100644 --- a/app/pages/organization/organization-container.jsx +++ b/app/pages/organization/organization-container.jsx @@ -227,6 +227,7 @@ class OrganizationContainer extends React.Component { } render() { + const { user } = this.context; const { children, params } = this.props; const { collaboratorView, @@ -256,7 +257,8 @@ class OrganizationContainer extends React.Component { organizationProjects, projectAvatars, quoteObject, - toggleCollaboratorView: this.toggleCollaboratorView + toggleCollaboratorView: this.toggleCollaboratorView, + user }); } else if (fetchingOrganization) { return ( diff --git a/app/pages/organization/talk/index.jsx b/app/pages/organization/talk/index.jsx new file mode 100644 index 0000000000..a4174f2787 --- /dev/null +++ b/app/pages/organization/talk/index.jsx @@ -0,0 +1,32 @@ +import React from 'react'; +import { Helmet } from 'react-helmet'; +import { Link } from 'react-router'; +import counterpart from 'counterpart'; +import TalkBreadcrumbs from '../../../talk/breadcrumbs'; +import TalkSearchInput from '../../../talk/search-input'; +import TalkFootnote from '../../../talk/footnote'; + +export default function OrgTalkPage(props) { + const { organization, user } = props; + const section = `org-${organization.id}`; + const pageTitle = `${organization.display_name} ยป ${counterpart('orgTalk.title')}`; + return ( + <div className="project-text-content talk project"> + <Helmet title={pageTitle} /> + <div className="content-container"> + <h1 className="talk-main-link"> + <Link to={`/organizations/${props.organization.slug}/talk`}> + {organization.display_name} Talk + </Link> + </h1> + <TalkBreadcrumbs {...props} /> + + <TalkSearchInput {...props} /> + + {React.cloneElement(props.children, { section, organization, user })} + + <TalkFootnote /> + </div> + </div> + ); +} diff --git a/app/router.cjsx b/app/router.cjsx index 4677a6b551..71552fd4d4 100644 --- a/app/router.cjsx +++ b/app/router.cjsx @@ -207,6 +207,18 @@ module.exports = <IndexRoute component={(require './pages/organization/organization-page').default} /> <Route path="home" component={ONE_UP_REDIRECT} /> <Route path="stats" component={(require './pages/organization/stats').default} /> + <Route path="talk" component={require('./pages/organization/talk').default}> + <IndexRoute component={require './talk/init'} /> + <Route path="recents" component={require './talk/recents'} /> + <Route path="not-found" component={NotFoundPage} /> + <Route path="search" component={require './talk/search'} /> + <Route path="moderations" component={require './talk/moderations'} /> + <Route path="subjects/:id" component={SubjectPageController} /> + <Route path="recents/:board" component={require './talk/recents'} /> + <Route path="tags/:tag" component={require './talk/tags'} /> + <Route path=":board" component={require './talk/board'} /> + <Route path=":board/:discussion" component={require './talk/discussion'} /> + </Route> </Route> <Route path="notifications" component={NotificationsPage} />