Skip to content

Commit

Permalink
Content corrections for 15 update.
Browse files Browse the repository at this point in the history 
Fixed demo content categories.
  • Loading branch information
@aKandzior
aKandzior committed Apr 21, 2023
1 parent cff54ce commit 588d114
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 88 deletions.
108 changes: 28 additions & 80 deletions alkacon.mercury.template.democontents/resources/manifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,37 @@
<nicename><![CDATA[Mercury template: Default demo content]]></nicename>
<group>Mercury template</group>
<class/>
<import-script><![CDATA[writeProperty '/' 'Title' 'Demo Site'
writeProperty '/' 'Description' 'The OpenCms demo, brought to you by Alkacon Software.'
writeProperty '/' 'NavText' 'Overview'
writeProperty '/' 'template' '/system/modules/alkacon.mercury.template/templates/mercury.jsp'
writeProperty '/' 'mercury.theme' '/system/modules/alkacon.mercury.theme/css/theme-standard.min.css'
writeProperty '/' 'mercury.title.prefix' 'OpenCms |'
writeProperty '/' 'mercury.privacy.policy' '/.content/privacy-policy.xml'

createUser 'Author' 'password' 'Sample author user'
addUserToGroup 'Author' 'Users'
addUserToRole 'Author' 'ELEMENT_AUTHOR'

createUser 'Editor' 'password' 'Sample editor user'
addUserToGroup 'Editor' 'Users'
addUserToRole 'Editor' 'EDITOR'

createUser 'Gallator' 'password' 'Sample user who can edit categories and galleries'
addUserToGroup 'Gallator' 'Users'
addUserToRole 'Gallator' 'CATEGORY_EDITOR'
addUserToRole 'Gallator' 'GALLERY_EDITOR'

createUser 'Demo' 'password' 'Sample user with workplace access permissions'
addUserToGroup 'Demo' 'Users'
addUserToRole 'Demo' 'WORKPLACE_USER'

createUser 'Templator' 'password' 'Sample user with template development permissions'
addUserToGroup 'Templator' 'Users'
<import-script><![CDATA[writeProperty '/' 'Title' 'Demo Site'
writeProperty '/' 'Description' 'The OpenCms demo, brought to you by Alkacon Software.'
writeProperty '/' 'NavText' 'Overview'
writeProperty '/' 'template' '/system/modules/alkacon.mercury.template/templates/mercury.jsp'
writeProperty '/' 'mercury.theme' '/system/modules/alkacon.mercury.theme/css/theme-standard.min.css'
writeProperty '/' 'mercury.title.prefix' 'OpenCms |'
writeProperty '/' 'mercury.privacy.policy' '/.content/privacy-policy.xml'
createUser 'Author' 'password' 'Sample author user'
addUserToGroup 'Author' 'Users'
addUserToRole 'Author' 'ELEMENT_AUTHOR'
createUser 'Editor' 'password' 'Sample editor user'
addUserToGroup 'Editor' 'Users'
addUserToRole 'Editor' 'EDITOR'
createUser 'Gallator' 'password' 'Sample user who can edit categories and galleries'
addUserToGroup 'Gallator' 'Users'
addUserToRole 'Gallator' 'CATEGORY_EDITOR'
addUserToRole 'Gallator' 'GALLERY_EDITOR'
createUser 'Demo' 'password' 'Sample user with workplace access permissions'
addUserToGroup 'Demo' 'Users'
addUserToRole 'Demo' 'WORKPLACE_USER'
createUser 'Templator' 'password' 'Sample user with template development permissions'
addUserToGroup 'Templator' 'Users'
addUserToRole 'Templator' 'DEVELOPER']]></import-script>
<import-site>/sites/default</import-site>
<export-mode name="reduced"/>
<description><![CDATA[The OpenCms Mercury template "default" demo contents.
<description><![CDATA[The OpenCms Mercury template "default" demo contents.
This module also creates a set of demo users during the import.]]></description>
<version>15.0.0</version>
<autoincrement>true</autoincrement>
Expand Down Expand Up @@ -1574,10 +1574,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -1618,10 +1614,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -1666,10 +1658,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -1702,10 +1690,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -1817,10 +1801,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -1861,10 +1841,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -3296,10 +3272,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/machines/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -3336,10 +3308,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/location/europe/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -3376,10 +3344,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/people/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -3416,10 +3380,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/location/europe/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -12152,10 +12112,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -12188,10 +12144,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down Expand Up @@ -12224,10 +12176,6 @@ This module also creates a set of demo users during the import.]]></description>
<path>/.categories/topic/opencms/</path>
<type>CATEGORY</type>
</relation>
<relation>
<path>/system/categories/</path>
<type>CATEGORY</type>
</relation>
</relations>
<accesscontrol/>
</file>
Expand Down
15 changes: 7 additions & 8 deletions alkacon.mercury.template.democontents/resources/release/.content/section-m/cs_00015.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<target><![CDATA[https://github.com/alkacon/opencms-core/pull/753]]></target>
</link>
<link name="link2" internal="false" type="A">
<target><![CDATA[https://github.com/alkacon/opencms-core/pull/766]]></target>
<target><![CDATA[https://github.com/alkacon/opencms-core/pull/756]]></target>
</link>
<link name="link3" internal="false" type="A">
<target><![CDATA[https://github.com/alkacon/opencms-core/issues/751]]></target>
Expand Down Expand Up @@ -42,9 +42,8 @@
<ul>
<li>Restrict write access to sitemap .config file to a configured role</li>
<li>Added configurable sitemap attribute editor for all content managers</li>
<li>In the "Add content" dialog, content types that are not supported in the current page can now be hidden instead of</li>
<li>shown disabled</li>
<li>Lauchpad app "Person data search" reveals personal user data stored in the VFS</li>
<li>In the "Add content" dialog, content types that are not supported in the current page can now be hidden instead of shown disabled</li>
<li>Launchpad app "Person data search" reveals personal user data stored in the VFS</li>
<li>Improved native WebDAV support for macOS</li>
<li>Lists now allow to add new elements without existing elements</li>
<li>Optimize gallery dialog now features a context menu that allows to rename, replace or delete images</li>
Expand All @@ -71,7 +70,7 @@
<li>CmsShell: Added "reindexResources" command</li>
<li>Pull request #752 improved error handling during XML validation (<a class="external" href="%(link0)">github</a>)</li>
<li>Pull request #753 added WYSIWYG editor option 'link_default_protocol' which is passed to TinyMCE (<a class="external" href="%(link1)">github</a>)</li>
<li>Pull request #766 added option for showing full groups names to multi-group selector widge (<a class="external" href="%(link2)">github</a>)</li>
<li>Pull request #756 added option for showing full groups names to multi-group selector widge (<a class="external" href="%(link2)">github</a>)</li>
<li>Updated multiple dependency libs that contained security vulnerabilities</li>
</ul>
<h2>Issues fixed in OpenCms 15</h2>
Expand All @@ -81,19 +80,19 @@
<li>XML: Schema macros not always resolved as expected</li>
<li>Form editor: Disabled select default is not displayed correctly</li>
<li>Form editor: Calendar widget did interpret two-digit year numbers literally</li>
<li>Form editor: Category widget did not work correctly when category paths where substrings of the subsite path</li>
<li>Form editor: Category widget did not work correctly when category paths were substrings of the subsite path</li>
<li>Page editor: Edit points mess up the page layout with Bootstrap "row-cols"</li>
<li>Page editor: Z-Index for "disabled" overlay is too low</li>
<li>Page editor: Pointer events for edit point do "bubble"</li>
<li>Page editor: Attachment container elements could get removed when editing their settings</li>
<li>Page editor: Editing copied model groups simultaneously lead to issues</li>
<li>Page editor: For long notification messages the scroll bar did not work</li>
<li>Sitemap editor: "Switch Site" dialog in did not work anymore</li>
<li>Sitemap editor: "Switch Site" dialog did not work anymore</li>
<li>Element settings: Help icon after formatter selection did not show description</li>
<li>Workplace: GWT context menu has wrong position after the first click</li>
<li>Workplace: HTML tags sometimes shown in "title" attribute for editor components</li>
<li>Workplace: Removing site selection by clicking on "x" did not work in gallery view</li>
<li>JSP API: UGC did not work if scripts where loaded with "defer"</li>
<li>JSP API: UGC did not work if scripts were loaded with "defer"</li>
<li>JSP API: "cms:link" detailPage parameter did not work as expected</li>
<li>JSP API: &lt;x:transform&gt; tag in JSPs erroneously deleted attributes</li>
<li>Fixed issue where dots '.' in the detail page title leads to bad detail page URLs</li>
Expand Down

0 comments on commit 588d114

Please sign in to comment.