Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
VILLASframework
VILLASweb
Commits
bc963c26
Commit
bc963c26
authored
Jul 19, 2019
by
Sonja Happ
Browse files
upstream merge from develop, align fix for href warnings
parents
9b682307
4f8231e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/components/editable-header.js
View file @
bc963c26
...
...
@@ -85,8 +85,8 @@ class EditableHeader extends React.Component {
<
FormControl
type
=
'
text
'
bsSize
=
'
large
'
value
=
{
this
.
state
.
title
}
onChange
=
{
this
.
onChange
}
style
=
{
editStyle
}
autoFocus
/>
<
/form
>
<
Button
onClick
=
{
this
.
save
}
><
Icon
icon
=
'
check
'
style
=
{
iconStyle
}
/></
Button
>
<
Button
onClick
=
{
this
.
cancel
}
><
Icon
icon
=
'
times
'
style
=
{
iconStyle
}
/></
Button
>
<
Button
bsStyle
=
"
link
"
onClick
=
{
this
.
save
}
><
Icon
icon
=
'
check
'
style
=
{
iconStyle
}
/></
Button
>
<
Button
bsStyle
=
"
link
"
onClick
=
{
this
.
cancel
}
><
Icon
icon
=
'
times
'
style
=
{
iconStyle
}
/></
Button
>
<
/div>
;
}
...
...
@@ -95,7 +95,7 @@ class EditableHeader extends React.Component {
{
this
.
state
.
title
}
<
/h1
>
<
Button
onClick
=
{
this
.
edit
}
><
Icon
icon
=
'
edit
'
style
=
{
iconStyle
}
/></
Button
>
<
Button
bsStyle
=
"
link
"
onClick
=
{
this
.
edit
}
><
Icon
icon
=
'
edit
'
style
=
{
iconStyle
}
/></
Button
>
<
/div>
;
}
}
...
...
src/components/table.js
View file @
bc963c26
...
...
@@ -74,7 +74,7 @@ class CustomTable extends Component {
if
(
linkKey
&&
data
[
linkKey
]
!=
null
)
{
cell
.
push
(
<
Link
to
=
{
child
.
props
.
link
+
data
[
linkKey
]}
>
{
content
}
<
/Link>
)
;
}
else
if
(
child
.
props
.
clickable
)
{
cell
.
push
(
<
Button
onClick
=
{()
=>
child
.
props
.
onClick
(
index
)}
>
{
content
}
<
/Button>
)
;
cell
.
push
(
<
Button
bsStyle
=
"
link
"
onClick
=
{()
=>
child
.
props
.
onClick
(
index
)}
>
{
content
}
<
/Button>
)
;
}
else
{
cell
.
push
(
content
);
}
...
...
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