Skip to content

Major7 fixes #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fpichler wants to merge 62 commits into from
Closed

Major7 fixes #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
db12738
add initCelements.js to albatross
fpichler Mar 10, 2026
b9b8819
replace xwiki.get('...').use
fpichler Mar 10, 2026
7306933
remove unused xwiki-sheets and move xwiki-js-misc to disc
fpichler Mar 10, 2026
253a998
replace object delet and edit icons
fpichler Mar 10, 2026
1e47dc2
velocity syntax in javascript.vm
fpichler Mar 10, 2026
4ffa4f0
drop Panels.SyntaxHelp
fpichler Mar 10, 2026
54e787c
add missing services.css.displayAllCSS()
fpichler Mar 10, 2026
37567d5
move stylesheets.vm after javascript.vm
fpichler Mar 10, 2026
ffacc25
fix path and js loading order
fpichler Mar 10, 2026
9169ac7
remove use of $xwiki.getSkinFile for urls in CSS
cbspichler Mar 10, 2026
50024b4
replace colorThemeInit.vm with defaultColors.css and use CSS variable…
cbspichler Mar 10, 2026
e607956
add missing eof
cbspichler Mar 10, 2026
a32af55
add debugging comment
fpichler Mar 10, 2026
f48c2ff
Merge branch 'major7-fixes' of github.com:celements/celements-web int…
fpichler Mar 10, 2026
0fa939f
correct javascript.vm to load in view
fpichler Mar 10, 2026
d6f1fe0
reduce use of $msg in JS-Files
cbspichler Mar 10, 2026
d3ee7ea
Merge branch 'major7-fixes' of github.com:celements/celements-web int…
cbspichler Mar 10, 2026
8f88dd0
add celements menubar
fpichler Mar 12, 2026
c384ea4
Merge branch 'major7-fixes' of github.com:celements/celements-web int…
fpichler Mar 12, 2026
c2888ad
add celements2.css and admininterface.js
fpichler Mar 12, 2026
807fa0d
add body css class and improve screenlayout.css
fpichler Mar 12, 2026
9843e31
syntax
fpichler Mar 12, 2026
ed2b994
syntax
fpichler Mar 12, 2026
8ea8e72
improve screenlayout.css
fpichler Mar 12, 2026
a25b844
flatten cascating @import for stylesheets
fpichler Mar 12, 2026
2e565e9
move styles.css imports to stylesheets.vm
fpichler Mar 12, 2026
2a0c4a4
reformat minified files
cbspichler Mar 12, 2026
bf44c97
remove velocity from notification.css
cbspichler Mar 12, 2026
6af368a
default hide xwiki-menu
fpichler Mar 12, 2026
c2b0172
Merge branch 'major7-fixes' of github.com:celements/celements-web int…
fpichler Mar 12, 2026
5f78c80
reduce use of $msg further
cbspichler Mar 12, 2026
959805c
undo wrong replacement for $msg
cbspichler Mar 12, 2026
fdf3dc1
replace $msg uses
cbspichler Mar 12, 2026
760512a
replace more $msg uses in JS Files
cbspichler Mar 12, 2026
2e87162
delete unused code
cbspichler Mar 12, 2026
35fdecc
improve celExecOnceAfterMessagesLoaded before end of head
fpichler Mar 12, 2026
15af6a4
use absolute image paths in tablefilterNsort.js
fpichler Mar 12, 2026
8c6c6fb
move translations into local context
cbspichler Mar 12, 2026
5750e79
delete usersandgroups and xwikiexplorer
cbspichler Mar 12, 2026
484de75
Merge branch 'major7-fixes' of github.com:celements/celements-web int…
cbspichler Mar 12, 2026
1fbd6aa
fix mistake
cbspichler Mar 12, 2026
cd2ecc4
delete XWikiWysiwig, procolor and smartclient
cbspichler Mar 12, 2026
40662b7
replace velocity $xwiki in Javascript
cbspichler Mar 12, 2026
5c1b9c7
fix wrong path
cbspichler Mar 12, 2026
25d783c
replace velocity code in js files
fpichler Mar 12, 2026
b2f51ba
rewrite xwiki-misc.js without using prototype
cbspichler Mar 16, 2026
fabf8d2
fix initialisation of translations and celMeta in xwiki.js
cbspichler Mar 16, 2026
ceadc5f
remove font Terminal-Dosis and it's use
cbspichler Mar 16, 2026
8336088
delete imports for deleted files
cbspichler Mar 16, 2026
2345cc8
remove fullScreenEditing
cbspichler Mar 16, 2026
e9bb8d3
remove imports for deleted files
cbspichler Mar 16, 2026
c7a8884
fix imports for google-fonts
cbspichler Mar 16, 2026
fbfa992
remove simpleedittoolbar.vm
cbspichler Mar 16, 2026
abac36e
fix access to messages in xwiki.js
cbspichler Mar 16, 2026
e8ef7b6
fix initializer of xwiki.js
cbspichler Mar 16, 2026
a392c72
remove all uses of XWiki.widgets.Suggest and delete xxxsuggest.js
cbspichler Mar 16, 2026
9adb038
remove jumpToPage
cbspichler Mar 16, 2026
0c1514c
delete mappings for velocity in JS
cbspichler Mar 16, 2026
b6caf0e
delete uses of tags.js, delete tags.css
cbspichler Mar 17, 2026
e1c43f1
Revert "remove font Terminal-Dosis and it's use"
cbspichler Mar 17, 2026
007826f
fix paths to Terminal Dosis files
cbspichler Mar 17, 2026
6e6a929
Merge branch 'dev' into major7-fixes
fpichler Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,24 +235,6 @@
<servlet-name>spring-dispatcher</servlet-name>
<url-pattern>/api/*</url-pattern>
</servlet-mapping>

<!-- We override the mime type definition for javascript, javascript module and css files,
as some containers don't provide it, causing problems for javascript files containg
velocity code, like fullscreenEdit.js -->
<mime-mapping>
<extension>js</extension>
<mime-type>text/javascript</mime-type>
</mime-mapping>

<mime-mapping>
<extension>mjs</extension>
<mime-type>text/javascript</mime-type>
</mime-mapping>

<mime-mapping>
<extension>css</extension>
<mime-type>text/css</mime-type>
</mime-mapping>

<!-- In order to properly work, HTML Components MUST have the proper MIME type starting with XP SP2 -->
<mime-mapping>
Expand Down
273 changes: 119 additions & 154 deletions src/main/webapp/docs/celements2web/Panels/ClassEditorWelcome.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,156 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
<xwikidoc>
<web>Panels</web>
<name>ClassEditorWelcome</name>
<language></language>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<parent>Panels.WebHome</parent>
<creator>XWiki.Admin</creator>
<author>xwiki:XWiki.msladek</author>
<customClass></customClass>
<contentAuthor>xwiki:XWiki.msladek</contentAuthor>
<creationDate>1154086211000</creationDate>
<date>1539796412000</date>
<contentUpdateDate>1539796412000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment>Imported from XAR</comment>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/1.0</syntaxId>
<hidden>false</hidden>
<object>
<class>
<name>Panels.PanelClass</name>
<customClass></customClass>
<customMapping></customMapping>
<defaultViewSheet></defaultViewSheet>
<defaultEditSheet></defaultEditSheet>
<defaultWeb></defaultWeb>
<nameField></nameField>
<validationScript></validationScript>
<category>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
<name>category</name>
<number>5</number>
<prettyName>Category</prettyName>
<relationalStorage>0</relationalStorage>
<separator> </separator>
<separators> ,|</separators>
<size>1</size>
<unmodifiable>0</unmodifiable>
<values>Information|Navigation|Tools|Administration|Other</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</category>
<content>
<disabled>0</disabled>
<editor>Text</editor>
<name>content</name>
<number>4</number>
<prettyName>Content</prettyName>
<rows>25</rows>
<size>60</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</content>
<description>
<disabled>0</disabled>
<editor>Text</editor>
<name>description</name>
<number>3</number>
<prettyName>Description</prettyName>
<rows>5</rows>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</description>
<name>
<disabled>0</disabled>
<name>name</name>
<number>1</number>
<prettyName>Name</prettyName>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</name>
<type>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
<name>type</name>
<number>2</number>
<prettyName>Panel type</prettyName>
<relationalStorage>0</relationalStorage>
<separator> </separator>
<separators> ,|</separators>
<size>1</size>
<unmodifiable>0</unmodifiable>
<values>view|edit</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</type>
</class>
<name>Panels.ClassEditorWelcome</name>
<number>0</number>
<className>Panels.PanelClass</className>
<guid>5f54f197-af72-47c8-879a-c602defc559b</guid>
<property>
<category>Information</category>
</property>
<property>
<content>#largepanelheader($msg.get("classEditorIntro"))
##$xwiki.jsx.use('Panels.ClassSwitcher')##
&lt;p&gt;$msg.get("xe.panels.classedit.youare") &lt;strong&gt;${doc.fullName}&lt;/strong&gt;. $msg.get("xe.panels.classedit.chooseproperty")&lt;/p&gt;
&lt;div&gt;
&lt;form id="changeclass" method="post" action="$doc.getURL("redirect")"&gt;
&lt;div&gt;
&lt;select id="classname" name="xredirect" size="1"&gt;
&lt;option value="-"&gt;Edit another class&lt;/option&gt;
##
## Existing classes are enumerated, grouped by space name.
## The list is already sorted alphabetically
##
#set($prevSpace = "")
#set($optGroupOpen = false)
#foreach ($classname in $xwiki.classList)
#if($!xwiki.hasAccessLevel("edit", $classname))
#set($classdoc = $xwiki.getDocument($classname))
#if($classdoc.space != $prevSpace)
#if($optGroupOpen)
&lt;/optgroup&gt;
#else
#set($optGroupOpen = true)
#end
&lt;optgroup label="$classdoc.space"&gt;
#set($prevSpace = $classdoc.space)
#end
&lt;option value="$classdoc.getURL("edit", "editor=class")"&gt;$classdoc.name&lt;/option&gt;
#end
#end
#if($optGroupOpen)
&lt;/optgroup&gt;
#end
&lt;/select&gt;
&lt;span class="buttonwrapper"&gt;&lt;input class="button" type="submit" value="$msg.get("changeclass")"/&gt;&lt;/span&gt;&lt;/div&gt;
#warning($msg.get('xe.panels.classedit.unsavedchanges'))
&lt;/form&gt;
&lt;/div&gt;
#panelfooter()</content>
</property>
<property>
<description>Class Editor welcome and brief information message.</description>
</property>
<property>
<name>Class Editor Welcome</name>
</property>
<property>
<type>edit</type>
</property>
</object>
<content>#includeForm("Panels.PanelSheet")</content></xwikidoc>
<web>Panels</web>
<name>ClassEditorWelcome</name>
<language></language>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<parent>Panels.WebHome</parent>
<creator>XWiki.Admin</creator>
<author>xwiki:XWiki.msladek</author>
<customClass></customClass>
<contentAuthor>xwiki:XWiki.msladek</contentAuthor>
<creationDate>1154086211000</creationDate>
<date>1539796412000</date>
<contentUpdateDate>1539796412000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment>Imported from XAR</comment>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/1.0</syntaxId>
<hidden>false</hidden>
<object>
<class>
<name>Panels.PanelClass</name>
<customClass></customClass>
<customMapping></customMapping>
<defaultViewSheet></defaultViewSheet>
<defaultEditSheet></defaultEditSheet>
<defaultWeb></defaultWeb>
<nameField></nameField>
<validationScript></validationScript>
<category>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
<name>category</name>
<number>5</number>
<prettyName>Category</prettyName>
<relationalStorage>0</relationalStorage>
<separator> </separator>
<separators> ,|</separators>
<size>1</size>
<unmodifiable>0</unmodifiable>
<values>Information|Navigation|Tools|Administration|Other</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</category>
<content>
<disabled>0</disabled>
<editor>Text</editor>
<name>content</name>
<number>4</number>
<prettyName>Content</prettyName>
<rows>25</rows>
<size>60</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</content>
<description>
<disabled>0</disabled>
<editor>Text</editor>
<name>description</name>
<number>3</number>
<prettyName>Description</prettyName>
<rows>5</rows>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</description>
<name>
<disabled>0</disabled>
<name>name</name>
<number>1</number>
<prettyName>Name</prettyName>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</name>
<type>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
<name>type</name>
<number>2</number>
<prettyName>Panel type</prettyName>
<relationalStorage>0</relationalStorage>
<separator> </separator>
<separators> ,|</separators>
<size>1</size>
<unmodifiable>0</unmodifiable>
<values>view|edit</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</type>
</class>
<name>Panels.ClassEditorWelcome</name>
<number>0</number>
<className>Panels.PanelClass</className>
<guid>5f54f197-af72-47c8-879a-c602defc559b</guid>
<property>
<category>Information</category>
</property>
<property>
<content>#largepanelheader($msg.get("classEditorIntro")) <p>$msg.get("xe.panels.classedit.youare") <strong>
${doc.fullName}</strong>. $msg.get("xe.panels.classedit.chooseproperty")</p> #panelfooter()</content>
</property>
<property>
<description>Class Editor welcome and brief information message.</description>
</property>
<property>
<name>Class Editor Welcome</name>
</property>
<property>
<type>edit</type>
</property>
</object>
<content>#includeForm("Panels.PanelSheet")</content>
</xwikidoc>
Loading