Skip to content

update celements2web on-disk pages to 7.0#547

Open
fpichler wants to merge 2 commits into
devfrom
update-celements2web-7x-onDisk
Open

update celements2web on-disk pages to 7.0#547
fpichler wants to merge 2 commits into
devfrom
update-celements2web-7x-onDisk

Conversation

@fpichler

@fpichler fpichler commented Jul 5, 2026

Copy link
Copy Markdown
Member

Summary

Updates the on-disk celements2web pages under celements-webapp/src/main/webapp/docs/celements2web/ to the release version 7.0 from the Maven repository (https://maven.celements.ch/releases/celements-apps/celements2web-7.0.xar).

Changes

  • Replaced the contents of the celements2web/ directory with the extracted pages from the 7.0.xar release package.
  • Updated existing templates and configurations in spaces:
    • Celements2/
    • CelementsContextMenu/
    • PageTypes/
    • Panels/
    • SimpleLayout/
    • Templates/
    • XApp/
    • XWiki/
  • Added new spaces, templates, and administration pages:
    • BlogTemplates/
    • CalTemplates/
    • TableHeader/
    • TableRow/
    • UserAdmin/
    • UserAdminEdit/
    • UserAdminForm/
    • UserAdminSearch/
    • package.xml (package metadata file)

@fpichler fpichler requested review from cbspichler and msladek July 5, 2026 03:16
@fpichler fpichler changed the title update celements2web on disk to 7.0 xar update celements2web on-disk pages to 7.0 Jul 5, 2026

@cbspichler cbspichler left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we started adding xml-files to disk I had to separate all the files into the projects they belong to: Blog in celements-blog/blog-web, UserAdmin in celements-features/celements-user-manager-web, etc.

You have now added all those pages again to celements-webapp. Either delete the old ones in the different projects or move the current ones where they belong. Maybe also find a way to document the decision for the future.

@cbspichler cbspichler assigned fpichler and unassigned cbspichler Jul 6, 2026
@msladek

msladek commented Jul 6, 2026

Copy link
Copy Markdown
Member

I think we should instead separate the XApp xar bundles into one per web-module, so we can consistently export them from db to disk.

@msladek msladek removed their assignment Jul 6, 2026
@fpichler fpichler requested a review from cbspichler July 6, 2026 23:24
@fpichler fpichler assigned msladek and cbspichler and unassigned fpichler Jul 6, 2026

@cbspichler cbspichler left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are still a few new files (mostly Templates and Pagetypes). They really seem to be new, I couldn't find them on disk. I commented one that might belong somewhere else. Please check them for:

  • correct project?
  • still needed? (Might we have deleted them on disk?)

I found quite a few files that look newer on disk as well. So, there might have been mistakes happening with deploying Celements 7 and the xml-files we edited.

$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/accordion/accordion.js'))##
$xwiki.jsfx.use('js/scriptaculous/scriptaculous.js')
$xwiki.jsfx.use('js/xwiki/accordion/accordion.js')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change looks weird. Isn't the deleted code supposed to be newer?

$xwiki.jsfx.use("js/xwiki/accordion/accordion.js")
$xwiki.jsfx.use("js/xwiki/panelwizard/Drag.js")
$xwiki.jsfx.use("js/xwiki/panelwizard/ieemu.js")
$xwiki.jsfx.use("js/xwiki/panelwizard/toolTip.js")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here: deleted code should be newer?

$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/accordion/accordion.js'))##
$xwiki.jsfx.use("js/scriptaculous/scriptaculous.js")
$xwiki.jsfx.use("js/xwiki/accordion/accordion.js")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and again

$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/accordion/accordion.js'))##
$xwiki.jsfx.use("js/scriptaculous/scriptaculous.js")
$xwiki.jsfx.use("js/xwiki/accordion/accordion.js")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and again

## Deprecated !!! please use the following parseTemplate line instead!
## #parse("celTemplates/ObjectEdit.vm")
$services.deprecated.logVelocityScript('celements2web:Templates.ObjectEdit.vm')
$celementsweb.logDeprecatedVelocityScript('celements2web:Templates.ObjectEdit.vm')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and again: deleted code is newer

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this belong to celements-web? Or rather usermanager-web?

@cbspichler cbspichler assigned fpichler and unassigned cbspichler Jul 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants