LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: Some bug fixes for the PageModels Editor 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5620 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 79753dca01
pull/2/head
jensp 2018-07-31 17:58:55 +00:00
parent a09c3cb7eb
commit 7d00c674c7
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms-js/src/main/typescript/ccm-cms/ccm-cms-pagemodelseditor.tsx
View File

@ -188,7 +188,7 @@ class ItemListComponentEditorDialog extends React.Component<
<label htmlFor={`${idPrefix}descending`}> <label htmlFor={`${idPrefix}descending`}>
Descending? Descending?
</label> </label>
<input checked={this.props.component.descending} <input checked={this.state.descending}
id={`${idPrefix}descending`} id={`${idPrefix}descending`}
onChange={this.handleChange} onChange={this.handleChange}
type="checkbox" /> type="checkbox" />
@ -200,15 +200,15 @@ class ItemListComponentEditorDialog extends React.Component<
onChange={this.handleChange} onChange={this.handleChange}
size={64} size={64}
type="text" type="text"
value={this.props.component.limitToType}/> value={this.state.limitToType}/>
<label htmlFor={`$idPrefix}pageSize`}> <label htmlFor={`{$idPrefix}pageSize`}>
Page size Page size
</label> </label>
<input id={`${idPrefix}pageSize`} <input id={`${idPrefix}pageSize`}
min="1" min="1"
onChange={this.handleChange} onChange={this.handleChange}
type="number" type="number"
value={this.props.component.pageSize}/> value={this.state.pageSize}/>
<label htmlFor={`${idPrefix}listOrder`}> <label htmlFor={`${idPrefix}listOrder`}>
List Order List Order
</label> </label>
@ -216,8 +216,8 @@ class ItemListComponentEditorDialog extends React.Component<
id={`${idPrefix}listOrder`} id={`${idPrefix}listOrder`}
onChange={this.handleListOrderChange} onChange={this.handleListOrderChange}
rows={5}> rows={5}>
{Array.isArray(this.props.component.listOrder) ? ( {Array.isArray(this.state.listOrder) ? (
this.props.component.listOrder.join("\n") this.state.listOrder.join("\n")
) : ( ) : (
"" ""
)} )}

5
ccm-pagemodelseditor/src/main/typescript/ccm-pagemodelseditor/PageModelsEditor.tsx
View File

@ -797,6 +797,11 @@ class ContainerModelComponent
this.fetchComponents(); this.fetchComponents();
} }
public componentDidUpdate() {
this.fetchComponents();
}
public render(): React.ReactNode { public render(): React.ReactNode {
return <li> return <li>

22
ccm-theme-foundry/src/main/resources/themes/foundry/foundry/styles/admin.css
View File

@ -2073,12 +2073,13 @@ div.errorPanel {
left: 5em; left: 5em;
} */ } */
li.componentModelEditor dialog.dialogClosed { li.componentModelEditor dialog.dialogClosed
li.componentModelEditor dialog {
display: none; display: none;
} }
li.componentModelEditor dialog.dialogExpanded { li.componentModelEditor dialog.dialogExpanded,
li.componentModelEditor dialog[open] {
border: 2px solid #ccc; border: 2px solid #ccc;
border-radius: 3rem; border-radius: 3rem;
@ -2097,7 +2098,8 @@ li.componentModelEditor dialog.dialogExpanded {
z-index: 1000; z-index: 1000;
} }
li.componentModelEditor dialog.dialogExpanded button.closeButton { li.componentModelEditor dialog.dialogExpanded button.closeButton,
li.componentModelEditor dialog[open] button.closeButton {
background-color: transparent; background-color: transparent;
@ -2130,7 +2132,8 @@ li.componentModelEditor dl dd {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
li.componentModelEditor dialog.dialogExpanded h1 { li.componentModelEditor dialog.dialogExpanded h1,
li.componentModelEditor dialog[open] h1 {
background-color: #0776a0; background-color: #0776a0;
@ -2158,13 +2161,18 @@ li.componentModelEditor dialog.dialogExpanded h1 {
li.componentModelEditor dialog.dialogExpanded input, li.componentModelEditor dialog.dialogExpanded input,
li.componentModelEditor dialog.dialogExpanded label, li.componentModelEditor dialog.dialogExpanded label,
li.componentModelEditor dialog.dialogExpanded textarea { li.componentModelEditor dialog.dialogExpanded textarea,
li.componentModelEditor dialog[open] input,
li.componentModelEditor dialog[open] label,
li.componentModelEditor dialog[open] textarea {
display: block; display: block;
} }
li.componentModelEditor dialog.dialogExpanded input, li.componentModelEditor dialog.dialogExpanded input,
li.componentModelEditor dialog.dialogExpanded textarea { li.componentModelEditor dialog.dialogExpanded textarea,
li.componentModelEditor dialog[open] input,
li.componentModelEditor dialog[open] textarea {
margin-bottom: 1em; margin-bottom: 1em;
} }