Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changing prompt style for SecMan permissions to modal, adapting Appli…
…cationUser layout, adding missing fieldSet id in CommandJdo layout
- Loading branch information
1 parent
74c5a0a
commit b463781
Showing
8 changed files
with
199 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
...n/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.fallback.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http://isis.apache.org/applib/layout/links" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <bs3:row> | ||
| <bs3:col span="12" unreferencedActions="true"> | ||
| <cpt:domainObject/> | ||
| <cpt:action id="delete"/> | ||
| <cpt:action id="open"/> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| <bs3:row> | ||
| <bs3:col span="4"> | ||
| <cpt:fieldSet name="Id" id="id" unreferencedProperties="true"> | ||
| <cpt:property id="name"/> | ||
| <cpt:property id="username"/> | ||
| <cpt:property id="encryptedPassword"/> | ||
| </cpt:fieldSet> | ||
| <cpt:fieldSet name="Status" id="status"> | ||
| <cpt:property id="accountType"/> | ||
| <cpt:property id="hasPassword"/> | ||
| <cpt:property id="status"/> | ||
| <cpt:property id="atPath"/> | ||
| </cpt:fieldSet> | ||
| <cpt:fieldSet name="Metadata" id="metadata"> | ||
| <cpt:property id="datanucleusIdLong"/> | ||
| <cpt:property id="datanucleusVersionLong"/> | ||
| <cpt:property id="datanucleusVersionTimestamp"/> | ||
| </cpt:fieldSet> | ||
| </bs3:col> | ||
| <bs3:col span="8"> | ||
| <bs3:row> | ||
| <bs3:col span="12"> | ||
| <bs3:tabGroup> | ||
| <bs3:tab name="Name and Contact Details"> | ||
| <bs3:row> | ||
| <bs3:col span="6"> | ||
| <cpt:fieldSet name="Contact Details" id="contactDetails"> | ||
| <cpt:property id="emailAddress"/> | ||
| <cpt:property id="phoneNumber"/> | ||
| <cpt:property id="faxNumber"/> | ||
| </cpt:fieldSet> | ||
| </bs3:col> | ||
| <bs3:col span="6"> | ||
| <cpt:fieldSet name="Name" id="name"> | ||
| <cpt:property id="familyName"/> | ||
| <cpt:property id="givenName"/> | ||
| <cpt:property id="knownAs"/> | ||
| </cpt:fieldSet> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| <bs3:tab name="Roles"> | ||
| <bs3:row> | ||
| <bs3:col span="12"> | ||
| <cpt:collection id="roles"/> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| <bs3:tab name="Permissions"> | ||
| <bs3:row> | ||
| <bs3:col span="12"> | ||
| <cpt:collection id="permissions"/> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| <bs3:tab name="Other"> | ||
| <bs3:row> | ||
| <bs3:col span="12" unreferencedCollections="true" /> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| </bs3:tabGroup> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:grid> |
72 changes: 0 additions & 72 deletions
72
...o/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
This file was deleted.
Oops, something went wrong.
93 changes: 93 additions & 0 deletions
93
...n/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.layout.fallback.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http://isis.apache.org/applib/layout/links" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <bs3:row> | ||
| <bs3:col span="12" unreferencedActions="true"> | ||
| <cpt:domainObject/> | ||
| <cpt:action id="delete"/> | ||
| <cpt:action id="open"/> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| <bs3:row> | ||
| <bs3:col span="4"> | ||
| <cpt:fieldSet name="Id" id="id" unreferencedProperties="true"> | ||
| <cpt:property id="name"/> | ||
| <cpt:property id="username"/> | ||
| <cpt:property id="encryptedPassword"/> | ||
| </cpt:fieldSet> | ||
| <cpt:fieldSet name="Status" id="status"> | ||
| <cpt:property id="accountType"/> | ||
| <cpt:property id="hasPassword"/> | ||
| <cpt:property id="status"/> | ||
| <cpt:property id="atPath"/> | ||
| </cpt:fieldSet> | ||
| <cpt:fieldSet name="Metadata" id="metadata"> | ||
| <cpt:property id="datanucleusIdLong"/> | ||
| <cpt:property id="datanucleusVersionLong"/> | ||
| <cpt:property id="datanucleusVersionTimestamp"/> | ||
| </cpt:fieldSet> | ||
| </bs3:col> | ||
| <bs3:col span="8"> | ||
| <bs3:row> | ||
| <bs3:col span="12"> | ||
| <bs3:tabGroup> | ||
| <bs3:tab name="Name and Contact Details"> | ||
| <bs3:row> | ||
| <bs3:col span="6"> | ||
| <cpt:fieldSet name="Contact Details" id="contactDetails"> | ||
| <cpt:property id="emailAddress"/> | ||
| <cpt:property id="phoneNumber"/> | ||
| <cpt:property id="faxNumber"/> | ||
| </cpt:fieldSet> | ||
| </bs3:col> | ||
| <bs3:col span="6"> | ||
| <cpt:fieldSet name="Name" id="name"> | ||
| <cpt:property id="familyName"/> | ||
| <cpt:property id="givenName"/> | ||
| <cpt:property id="knownAs"/> | ||
| </cpt:fieldSet> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| <bs3:tab name="Roles"> | ||
| <bs3:row> | ||
| <bs3:col span="12"> | ||
| <cpt:collection id="roles"/> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| <bs3:tab name="Permissions"> | ||
| <bs3:row> | ||
| <bs3:col span="12"> | ||
| <cpt:collection id="permissions"/> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| <bs3:tab name="Other"> | ||
| <bs3:row> | ||
| <bs3:col span="12" unreferencedCollections="true" /> | ||
| </bs3:row> | ||
| </bs3:tab> | ||
| </bs3:tabGroup> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:col> | ||
| </bs3:row> | ||
| </bs3:grid> |
Oops, something went wrong.