Skip to content

Commit

Permalink
Feature/orebro tsm 2 (#1281)
Browse files Browse the repository at this point in the history
* Several changes to new-admin and new-client. Menueditor and panelmenu

* Solved state of tree columns in admin dokumenth.

* Events in submenu admin and client

* If state then...

* Cleaning code

* Removed komments and added headlines

* Removed comments from code

* Removed som code that was not needed

* Changed from 3 components to one

* Rewrite of `MenuConnectionSelector` to simplify further development

Also got rid of some warnings, like `justify` no longer supported etc.

* Refactored connection handlers in PanelMenu

---------

Co-authored-by: Henrik Hallberg <43059093+Hallbergs@users.noreply.github.com>
  • Loading branch information
Sunix71 and Hallbergs authored Feb 15, 2023
1 parent e8d9a8d commit 45eb4ca
Show file tree
Hide file tree
Showing 4 changed files with 257 additions and 268 deletions.
14 changes: 10 additions & 4 deletions new-admin/src/views/tools/MenuEditor/menuEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,15 @@ class ToolOptions extends Component {
this.addNewItem();
};

getHeader = (canSave) => {
//getHeader = (canSave) => {
getHeader = () => {
const { classes } = this.props;
return (
<Grid
className={classes.header}
spacing={1}
alignItems="center"
justify="flex-end"
justifyContent="flex-end"
container
>
<Grid xs={1} item>
Expand All @@ -349,8 +350,14 @@ class ToolOptions extends Component {
<Grid xs={3} item>
<Typography variant="h5">Inställningar</Typography>
</Grid>
<Grid xs={4} item>
<Typography variant="h5">Dokument</Typography>
</Grid>
<Grid xs={2} item>
<Typography variant="h5">Kartlänk</Typography>
</Grid>
<Grid xs={2} item>
<Typography variant="h5">Koppling</Typography>
<Typography variant="h5">Extern länk</Typography>
</Grid>

<Grid ref={this.buttonHeaderRef} xs={4} item>
Expand All @@ -364,7 +371,6 @@ class ToolOptions extends Component {
<ColorButtonBlue
variant="contained"
className="btn"
disabled={!canSave}
onClick={this.onSaveMenuEditsClick}
startIcon={<SaveIcon />}
>
Expand Down
Loading

0 comments on commit 45eb4ca

Please sign in to comment.