Merge branch 'master' of asdf.us:swimmer

1 files changed, 7 insertions, 6 deletions

diff --git a/frontend/app/views/page/page.container.js b/frontend/app/views/page/page.container.js
index dc85f5e..0ad9806 100644
--- a/frontend/app/views/page/page.container.js
+++ b/frontend/app/views/page/page.container.js
@@ -9,13 +9,13 @@ import './cursors.css'
 import actions from 'app/actions'
 import { Loader } from 'app/common'
 
-import * as graphActions from '../graph/graph.actions'
+import * as graphActions from 'app/views/graph/graph.actions'
 import * as pageActions from './page.actions'
 
-import PageEdit from '../graph/components/page.edit'
-import TileNew from './components/tile.new'
-import TileEdit from './components/tile.edit'
-import TileList from './components/tile.list'
+import PageEdit from 'app/views/graph/components/page.edit'
+import TileNew from 'app/views/tile/components/tile.new'
+import TileEdit from 'app/views/tile/components/tile.edit'
+import TileList from 'app/views/tile/components/tile.list'
 
 import PageHeader from './components/page.header'
 import PageEditor from './components/page.editor'
@@ -44,6 +44,7 @@ class PageContainer extends Component {
     this.props.pageActions.showGraphAndPageIfUnloaded(this.props.match.params)
     .then(data => {
       actions.site.setSiteTitle(data.res.title)
+      this.props.pageActions.loadPopups(data.res, {})
       if (!data.res.tiles.length) {
         this.props.pageActions.showAddTileForm()
       } else {
@@ -70,7 +71,7 @@ class PageContainer extends Component {
         <PageHeader />
         <div className='body'>
           <PageEditor />
-          <div className='sidebar'>
+          <div className={this.props.page.editor.sidebarOnRight ? 'sidebar' : 'sidebar left'}>
             {this.props.graph.editor.editingPage && <PageEdit />}
             {this.props.page.editor.addingTile && <TileNew />}
             {this.props.page.editor.editingTile && <TileEdit />}