Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gy4443
chemotion_eln_server
Commits
c4fe05a7
Commit
c4fe05a7
authored
Aug 18, 2015
by
Marco Sehrer
Browse files
Change layout to element-tabs
parent
1e98c4b3
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/components/App.js
View file @
c4fe05a7
...
...
@@ -76,14 +76,16 @@ export default class App extends React.Component {
<
Row
>
<
Navigation
/>
<
/Row
>
<
Row
>
<
Col
sm
=
{
3
}
md
=
{
3
}
lg
=
{
3
}
>
<
ElementFilter
/>
<
/Col
>
<
Col
sm
=
{
9
}
md
=
{
9
}
lg
=
{
9
}
>
<
ManagingActions
/>
<
/Col
>
<
/Row
>
{
// <Row>
// <Col sm={3} md={3} lg={3}>
// <ElementFilter />
// </Col>
// <Col sm={9} md={9} lg={9}>
// <ManagingActions />
// </Col>
// </Row>
}
<
Row
>
<
Col
sm
=
{
3
}
md
=
{
3
}
lg
=
{
3
}
>
<
CollectionTree
/>
...
...
@@ -92,6 +94,8 @@ export default class App extends React.Component {
<
Elements
/>
<
/Col
>
<
Col
sm
=
{
2
}
md
=
{
2
}
lg
=
{
2
}
>
<
ManagingActions
/>
<
br
/>
<
ContextActions
/>
<
/Col
>
<
/Row
>
...
...
app/assets/javascripts/components/ElementsTable.js
View file @
c4fe05a7
...
...
@@ -55,7 +55,7 @@ export default class ElementsTable extends React.Component {
currentElement
=
state
.
currentElement
}
let
elementsDidChange
=
!
deepEqual
(
elements
,
this
.
state
.
elements
);
let
elementsDidChange
=
elements
&&
!
deepEqual
(
elements
,
this
.
state
.
elements
);
let
currentElementDidChange
=
!
deepEqual
(
currentElement
,
this
.
state
.
currentElement
);
let
pagination
=
UIStore
.
getState
().
pagination
;
...
...
app/assets/javascripts/components/List.js
View file @
c4fe05a7
import
React
from
'
react
'
;
import
ElementsTable
from
'
./ElementsTable
'
;
import
{
TabbedArea
,
TabPane
}
from
'
react-bootstrap
'
;
export
default
class
List
extends
React
.
Component
{
constructor
(
props
)
{
...
...
@@ -8,7 +9,14 @@ export default class List extends React.Component {
render
()
{
return
(
<
ElementsTable
type
=
'
sample
'
/>
<
TabbedArea
defaultActiveKey
=
{
1
}
>
<
TabPane
eventKey
=
{
1
}
tab
=
'
Samples
'
>
<
ElementsTable
type
=
'
sample
'
/>
<
/TabPane
>
<
TabPane
eventKey
=
{
2
}
tab
=
'
Reactions
'
disabled
>
TabPane
2
content
<
/TabPane
>
<
TabPane
eventKey
=
{
3
}
tab
=
'
Wellplates
'
disabled
>
TabPane
3
content
<
/TabPane
>
<
/TabbedArea
>
)
}
}
app/assets/javascripts/components/managing_actions/ShareButton.js
View file @
c4fe05a7
...
...
@@ -13,7 +13,7 @@ export default class ShareButton extends React.Component {
render
()
{
return
(
<
Button
onClick
=
{
this
.
showShareModal
.
bind
(
this
)}
>
Share
<
/Button
>
<
Button
block
onClick
=
{
this
.
showShareModal
.
bind
(
this
)}
>
Share
<
/Button
>
)
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment