Wiki source code of Page Editing
Version 282.1 by Marius Dumitru Florea on 2020/06/29
Hide last authors
| author | version | line-number | content |
|---|---|---|---|
 |
186.1 | 1 | {{box cssClass="floatinginfobox" title="**Contents**"}} |
| 2 | {{toc/}} | ||
| 3 | {{/box}} | ||
 |
33.1 | 4 | |
 |
276.1 | 5 | All XWiki pages are editable provided you are logged in and / or you have [[edit right>>Documentation.UserGuide.Features.RightsManagement]]. To edit a page, you can: |
 |
15.1 | 6 | |
| |
276.1 | 7 | * either use the **{{velocity}}$services.icon.render('pencil'){{/velocity}} Edit** button, usually located on the top right corner of the page (but its position may vary depending on the skin your wiki is using); for the [[Flamingo skin>>extensions:Extension.Flamingo Skin]] it looks like this:((( |
 |
131.1 | 8 | {{image reference="EditSimpleModeFlamingo.png"/}} |
| |
276.1 | 9 | ))) |
| |
281.2 | 10 | * or use the **section** edit link, located on the right of some of the page headings (those that are generated with plain wiki syntax and that are not nested within the page content); headings that are generated with [[Velocity script>>extensions:Extension.Velocity Macro]] or the [[HTML macro>>extensions:Extension.HTML Macro]] or that are inside a table cell, for instance, don't have the edit link. See the [[Section Configuration page in the Admin Guide>>Documentation.AdminGuide.Configuration.WebHome||anchor="HSectionEditing"]] for configuration options.((( |
| |
279.1 | 11 | {{image reference="sectionEditLink.png"/}} |
| 12 | ))) | ||
| |
40.1 | 13 | |
| |
276.1 | 14 | If you can't find the Edit button nor the section edit links then it probably means you don't have the right to edit the current page. |
| 15 | |||
 |
45.1 | 16 | = Simple and Advanced editing modes = |
| |
1.73 | 17 | |
| |
162.3 | 18 | Since XWiki is an [[application wiki>>platform:Main.SecondGenerationWiki]], not all users will need to use the same features. This is why XWiki comes with a Simple and an Advanced editing mode. Users can easily choose which editing mode they prefer on their profile (available at the top right of the page when you are logged in). This way, standard users do not have to choose between editing modes they may not be familiar with. By default new users are given the Simple editing mode but they can switch to the Advanced mode as described below. |
| |
1.73 | 19 | |
| |
43.3 | 20 | == Simple Mode == |
| |
1.73 | 21 | |
| |
269.1 | 22 | Clicking on the "Edit" button has the following behavior for a simple user: |
| |
1.73 | 23 | |
| |
269.1 | 24 | * if the current page is displayed by a sheet (e.g. if the page has an object attached that has a sheet associated) then the page will be edited in [[Inline form>>#HFormeditingmode28akainlinemode29]] edit mode |
| 25 | * if the current page has no sheet (i.e. it's a plain wiki page) then: | ||
| |
270.1 | 26 | ** if the prefered content editor is the WYSIWYG editor and the syntax of the current page supports WYSIWYG editing then the page will be [[edited in-place>>#HIn-placeediting]] ({{info}}since 12.3{{/info}}) or in [[WYSIWYG edit mode>>#HWYSIWYGeditingmode]] (before 12.3) |
| |
269.1 | 27 | ** othewise, the page will be edited in [[Wiki edit mode>>#HWikieditingmode]] |
| |
1.73 | 28 | |
| |
43.3 | 29 | == Advanced Mode == |
| |
1.73 | 30 | |
| |
131.1 | 31 | Experienced XWiki users will want to use all the editing choices (particularly those who want to use XWiki programming features). They can choose to switch to advanced mode on their user profile page (see image below). Following this, clicking on the arrow in the "Edit" button on any page will display the full editing menu, letting the user choose which mode he wants to use ("Wiki", "Inline form", "Objects"...). |
| |
1.73 | 32 | |
 |
181.1 | 33 | {{image reference="AdvancedEditMode.png"/}} |
| |
131.1 | 34 | Once you have switched to advanced mode, the "Edit" menu will look like this on mouse click: |
| |
204.1 | 35 | |
| |
218.2 | 36 | {{image reference="EditAdvancedMode.png"/}} |
| |
93.1 | 37 | |
| |
162.3 | 38 | * [[Form Editing Mode>>platform:Features.PageEditing#HFormeditingmode28akainlinemode29]] |
| 39 | * [[Object Editing Mode>>platform:Features.PageEditing#HObjectseditingmode]] | ||
| 40 | * [[Class Editing Mode>>platform:Features.PageEditing#HClasseseditingmode]] | ||
| |
223.2 | 41 | * [[Access Rights Editing Mode>>platform:Features.PageEditing#HAccessRightseditingmode]]. Note that this menu entry will only appear for Terminal pages. For Nested Pages, you'll be able to access rights by clicking on the "Administer Page" entry in the "More Actions" menu (3 vertical dots menu). |
| |
1.73 | 42 | |
| |
162.3 | 43 | In addition, advanced users have the ability to [[create Terminal pages>>platform:Features.DocumentLifecycle||anchor="HByusingtheAddPageaction"]] (i.e. pages that can't have children). |
| |
143.1 | 44 | |
| |
43.3 | 45 | = Common edit actions = |
 |
16.1 | 46 | |
| |
43.4 | 47 | All edit modes have some or all of the elements in the following image : |
| |
16.1 | 48 | |
| |
149.1 | 49 | {{image reference="autosave.png"/}} |
| |
16.1 | 50 | |
 |
108.2 | 51 | {{info}} |
| 52 | A wiki document's version is composed of two numbers. Saving a major change will increase the first component and reset the second to "1", while a minor edit will just increase the second component. | ||
| 53 | {{/info}} | ||
| 54 | |||
| |
42.1 | 55 | The **minor edit** checkbox is meant to mark the fact that superficial changes were made to the document. Such changes may include, but are not restricted to: spelling error corrections, text rearrangements, formatting. It is the editor's responsibility to distinguish between major and minor changes. |
| |
16.1 | 56 | |
| 57 | By default, minor edits do not appear in the "What's New" page and in the document history. The option "Show minor edits" will list all the versions, including minor ones. | ||
| 58 | |||
| |
131.1 | 59 | The **Version summary** field allows entering a short description of the changes made to the document in the version that is being saved. It is displayed in the history page and it is meant to increase comprehensibility of the content's evolution. |
| |
16.1 | 60 | |
| |
31.1 | 61 | The **Cancel** button causes the changes to be discarded and forwards to the document view mode. |
| |
16.1 | 62 | |
| |
31.1 | 63 | The **Preview** button shows the document as it would look with the current changes saved, but does not actually change the document. From the preview mode, the user will be able to cancel the changes, return to edit mode or save the changes. This button is not available in all edit modes. |
| |
16.1 | 64 | |
| |
31.1 | 65 | The **Save & Continue** button submits the current changes and returns to the current edit mode. |
| |
16.1 | 66 | |
| |
31.1 | 67 | The **Save & View** button submits the current changes and returns to the document view mode. |
| |
16.1 | 68 | |
| |
142.1 | 69 | == Autosave == |
| 70 | |||
| 71 | The Autosave feature automatically saves the document you're working on as a minor version at a given interval. Just check the Autosave checkbox next to the action buttons, at the bottom of the editing area. You can optionally change the autosave interval by entering the desired number of minutes in the input following the checkbox. | ||
| 72 | |||
| 73 | {{warning}} | ||
| |
145.1 | 74 | Note that this feature is still not fully mature since it creates a new revision of the document every N seconds (where N is the time interval you specify). This means a document may have a lot of revisions which will potentially hamper performances and history readability. In the future one idea is to [[implement the notion of pseudo versions>>https://jira.xwiki.org/browse/XWIKI-500]]. |
| |
142.1 | 75 | {{/warning}} |
| 76 | |||
| |
269.1 | 77 | = In-place editing = |
| 78 | |||
| |
272.1 | 79 | In-place editing ({{info}}since 12.3{{/info}}) allows you to edit the title and the content of a wiki page while remaining in view mode. The advantage is that it loads faster and that you don't loose the context. Moreover, the in-place section editing provides a quick way to edit a section of a page's content without having to scroll the page. |
| |
269.1 | 80 | |
| |
272.1 | 81 | {{image reference="inPlaceEdit.png"/}} |
| 82 | |||
| |
274.1 | 83 | You can translate the page in the current language, if the translation is missing and multilingual is on, by using the Translate button. All the following changes will be saved to the new translation. |
| 84 | |||
| |
275.1 | 85 | {{image reference="editInPlace-translate.png"/}} |
| |
274.1 | 86 | |
| |
282.1 | 87 | Although enabled by default, this editing mode can be disabled by administrators from ##xwiki.properties## ({{info}}since 12.5{{/info}}). |
| 88 | |||
| |
43.3 | 89 | = Wiki editing mode = |
| |
1.73 | 90 | |
| |
162.3 | 91 | This is a mode you should be familiar with if you're already a wiki user. In this mode you can enter text using a simple [[Wiki Syntax>>platform:Main.XWikiSyntax]]. Note that the [[Help Application>>extensions:Extension.Help Application]] provides help on the syntax when editing a page. |
| |
1.73 | 92 | |
| |
131.1 | 93 | This is how the wiki edit mode looks like with the Flamingo skin: |
| |
1.73 | 94 | |
| |
106.2 | 95 | {{image reference="WikiEditing.png"/}} |
| |
1.73 | 96 | |
| |
43.3 | 97 | == Choosing a Syntax == |
| |
18.1 | 98 | |
| |
162.3 | 99 | You have the option to choose what syntax you want to use for writing the content of the page (see the [[XWiki Syntax Guide>>platform:Main.XWikiSyntax]] for more details and the [[Rendering wiki>>rendering:Main.WebHome]] for a full list of available syntaxes). To choose the syntax to use for the current page, go in wiki edit mode and in the Information Panel select the syntax to use. |
| |
18.1 | 100 | |
| |
133.2 | 101 | {{info}} |
| |
268.3 | 102 | By default only the latest XWiki syntax is enabled, but you can [[configure other syntaxes>>extensions:Extension.Rendering Administration Application]] from the "Global Administration > Editing > Syntaxes", as shown in the screenshot below. |
| |
133.2 | 103 | {{/info}} |
| 104 | |||
| |
133.3 | 105 | For example using the Flamingo Skin: |
| 106 | |||
| 107 | {{image reference="Syntax2.png"/}} | ||
| 108 | |||
| |
114.1 | 109 | == Converting between Syntaxes == |
| |
19.3 | 110 | |
| |
114.1 | 111 | If you already have content for the page in a given Syntax and you try to change the Syntax to another one then XWiki will propose to convert your content to the new Syntax if it knows how to perform that conversion (converting to XWiki Syntax 2.0+ will always prompt for a conversion). The quality of the conversion will usually be good but may depend on the quality of the original Syntax; for example converting from XWiki Syntax 1.0 to XWiki Syntax 2.0+ may not generate perfect result and you'll need to review manually the result. |
| 112 | |||
| |
43.3 | 113 | = WYSIWYG editing mode = |
| |
1.73 | 114 | |
| |
42.1 | 115 | This mode is ideal for first time users or people who do not want to use the Wiki Syntax. It's a mode similar to the one used by your favorite word processor in which you see how what you type is rendered. There's a toolbar available to add special effects to your text, add images, insert links, add macros, etc. |
| |
35.2 | 116 | |
| |
106.2 | 117 | {{image reference="wysiwyg.png"/}} |
| |
1.73 | 118 | |
| |
162.1 | 119 | Read the [[documentation for using the WYSIWYG editor>>extensions:Extension.CKEditor Integration.WebHome]] for more details. |
| |
19.7 | 120 | |
| |
102.2 | 121 | = Setting the page parent = |
| |
101.2 | 122 | |
| |
132.1 | 123 | {{info}} |
| |
223.3 | 124 | Starting with XWiki 7.2, the concept of setting the page parent has been deprecated in favor of the [[Nested Pages feature>>Documentation.UserGuide.Features.ContentOrganization.WebHome]]. The location of a page is no longer controlled by the "parent" field. In order to change a page's location you now need to Rename or Move it to another location. |
| |
102.2 | 125 | |
| |
132.1 | 126 | For example a page "CEO" inside a page "Boarding" inside a page "Management" inside a page "Staff" you would have the following Breadcrumb: |
| 127 | |||
| 128 | {{image reference="referencebreadcrumb.png"/}} | ||
| 129 | {{/info}} | ||
| 130 | |||
| 131 | {{info}}XWiki < 7.2{{/info}} In order to have an organized structure of your page, when you create a new page in a space, its parent will be automatically set to be the WebHome page of the space in which you create the page. | ||
| 132 | |||
| |
102.2 | 133 | If you want to change the parent of the page, you have to edit the page with wiki or wysiwyg editors. |
| 134 | |||
| |
106.2 | 135 | {{image reference="documentParent.png"/}} |
| |
102.2 | 136 | |
| 137 | Click on the small pencil above the page title in order to edit the page parent. | ||
| 138 | |||
| |
106.2 | 139 | {{image reference="documentParentCollapsed.png"/}} |
| |
102.2 | 140 | |
| |
102.3 | 141 | {{info}} |
| |
103.3 | 142 | If the page has no parent set, the breadcrumbs feature will not show the path to navigate from the Main.WebHome to the page. These pages are called orphan pages. |
| |
102.3 | 143 | {{/info}} |
| 144 | |||
| |
106.2 | 145 | {{image reference="documentParentNoParent.png"/}} |
| |
102.3 | 146 | |
| |
186.1 | 147 | {{image reference="pageNoBreadcrumb.png"/}} |
| |
102.3 | 148 | |
| |
103.4 | 149 | {{warning}} |
| 150 | Please note that when you copy a page, its parent field will not be updated accordingly to the new space the copy is in. You will have to do that manually. | ||
| 151 | {{/warning}} | ||
| 152 | |||
| |
147.4 | 153 | = Hiding Pages = |
| |
146.1 | 154 | |
| |
268.2 | 155 | It's possible to hide (or unhide) pages. When a page is hidden, it'll still be visible if you navigate explicitly to it but it'll disappear from Search, Page Index, Navigation Trees, etc. However the hidden page will still be visible to users who've [[configured their user profile to show Hidden Pages>>extensions:Extension.User Profile Application#HEditPreferences]]. By default users don't see hidden pages. Also note that the SuperAdmin user always sees hidden pages ({{info}}Since 12.2{{/info}}). |
| |
146.1 | 156 | |
| |
147.2 | 157 | To hide a page, edit it in Wiki or WYSIWYG edit mode and set the flag as shown below: |
| 158 | |||
| |
149.1 | 159 | {{image reference="hiding.png"/}} |
| |
146.1 | 160 | |
| |
147.3 | 161 | {{info}} |
| |
161.2 | 162 | When you're a "Simple" user, you only have a single Edit button available and when clicked that takes you to the default edit mode. If the page you're editing is configured to use the "Form" editor then you won't see the side panel as on the screenshot above. Thus you'll need to [[switch to being an "Advanced" user and Edit in Wiki or WYSIWYG mode>>#HAdvancedMode]]. |
| 163 | {{/info}} | ||
| 164 | |||
| 165 | {{info}} | ||
| |
147.3 | 166 | Hiding is not replacing permissions which is what you'll use if you want to make pages not visible to some user or group. |
| 167 | {{/info}} | ||
| 168 | |||
| |
43.3 | 169 | = Form editing mode (aka inline mode) = |
| |
1.73 | 170 | |
| |
36.1 | 171 | Inline mode, or Form mode, is a special feature of XWiki, that allows administrators to define patterns of structured information (like a blog entry, or a standard tax form). Pages containing such structured information can be edited and re-edited as simple HTML Forms, which have (almost) the same structure as the displayed page. Thus, when clicking the edit button, it seems that the page content can be edited in-place, or inline and the form view is automatically displayed. |
| |
28.1 | 172 | |
| |
36.1 | 173 | Technically the inline mode is triggered automatically differently whether the page is written in XWiki Syntax 1.0 or 2.0, using the following algorithm: |
| |
70.3 | 174 | |
| |
36.1 | 175 | * XWiki Syntax 1.0: If the page contains a call to ###includeForm()## |
| |
246.2 | 176 | * XWiki Syntax 2.0: If the page has an associated sheet (see the [[Developer documentation for the Sheet Module>>extensions:Extension.Sheet Module]]) |
| |
1.73 | 177 | |
| |
162.3 | 178 | Note that it is beyond the scope of this simple guide to explain the programming technique supporting this feature. Please check the [[Developer's Guide>>platform:DevGuide.WebHome]] to find out more about programming with Objects/Classes and Forms. |
| |
1.73 | 179 | |
| |
43.3 | 180 | = Objects editing mode = |
| |
1.73 | 181 | |
| |
162.3 | 182 | In XWiki it's possible to attach Objects to pages. Objects are simple sets of properties with values that add additional information about a page. For example a security right can be added to a page to control its rights, a blog object is attached to a page representing a blog entry, etc. Again, it's beyond this simple guide to explain this programming technique. Please check the [[Developer's Guide>>platform:DevGuide.WebHome]] to know more about programming with Objects/Classes. |
| |
1.73 | 183 | |
| |
110.2 | 184 | {{image reference="ObjectEditor.png"/}} |
| |
93.4 | 185 | |
| |
43.3 | 186 | = Classes editing mode = |
| |
1.73 | 187 | |
| |
162.3 | 188 | We've seen that some pages can have Objects attached to them. Some pages can also be Object definitions, a.k.a Classes. The Classes editing mode calls the class editor on the current page, allowing to edit the Classes attached to the document. Again, it's beyond this simple guide to explain this programming technique. Please check the [[Developer's Guide>>platform:DevGuide.WebHome]] to find out more about programming with Objects/Classes. |
| |
1.73 | 189 | |
| |
110.2 | 190 | {{image reference="ClassEditor.png"/}} |
| 191 | |||
| |
108.3 | 192 | = Access Rights editing mode = |
| |
1.73 | 193 | |
| |
162.3 | 194 | This mode allows you to control the access rights for the page you're viewing (you need to have the required access rights to modify a page's rights). See the [[Rights Management>>platform:Features.RightsManagement]] topic for more information. |
| |
1.75 | 195 | |
| |
43.3 | 196 | = Full Screen Mode = |
| |
1.75 | 197 | |
| |
150.1 | 198 | A full-screen mode is available in XWiki. When editing a page either in Wiki or WYSIWYG mode, clicking on the button at the top right of the edit box will send the editor in full-screen mode. You can then edit your page as usual and click on the button to return to the usual interface when you are finished. |
| |
1.75 | 199 | |
| |
31.1 | 200 | //The button you need to click to go in full-screen mode// |
| |
106.2 | 201 | {{image reference="FullScreenButton.png"/}} |
| |
1.77 | 202 | |
| |
45.1 | 203 | //Editing while in full-screen mode// |
| |
106.2 | 204 | {{image reference="FullScreen.png"/}} |
| |
95.1 | 205 | |
| 206 | = Title Behavior = | ||
| 207 | |||
| 208 | Pages have both names and titles. The page name is used in the URL to the page while the title is used to display a user-friendly short description of the page. The title is used for example as the top level headings when viewing a page. | ||
| 209 | |||
| 210 | Page titles can be set while editing documents in Wiki or WYSIWYG modes. | ||
| 211 | |||
| |
162.3 | 212 | Titles are not mandatory by default but it's possible to [[configure XWiki to make titles mandatory>>platform:AdminGuide.Configuration#HTitlebehavior]]. |
| |
95.1 | 213 | |
| |
144.1 | 214 | The title's content is parsed using Velocity so you're also allowed to put Velocity content in there in addition to plain text (this is for example useful when wanting to internationalize titles). Note that you're not allowed to use any wiki markup. |
| |
95.1 | 215 | |
| |
144.1 | 216 | When a page has no title set then XWiki will use the page name as its title. |
| 217 | |||
| 218 | {{info}} | ||
| |
162.4 | 219 | It's also possible to [[configure XWiki to extract the topmost heading>>platform:AdminGuide.Configuration#HTitlebehavior]] from the document's content. For example if you have a level 1 heading, it'll be used as the page title. If you don't have a level 1 heading but have a level 2 heading then the level 2 heading will be used as the page title. The heading level depth XWiki used for titles is controlled in [[XWiki's title configuration>>platform:AdminGuide.Configuration#HTitlebehavior]]. Since you're allowed to use any wiki syntax in headings, if a page doesn't have a title set (and titles are not mandatory) then any wiki markup in the topmost headings will get rendered when displaying the extracted title for that page. |
| |
144.1 | 220 | |
| 221 | However this is a backward compatibility option and we do not recommend that you use it. The reason we deprecated this behavior that allowed styling the titles is because it leads to all sorts of issues: | ||
| |
163.1 | 222 | |
| |
144.1 | 223 | * The title is used in several places including the browser's title or in LiveTable results and since those places forces to display the title in plain text, this means you'd see wiki markup or HTML displayed as is |
| 224 | * When the heading is generated through a script, if that script gets executed outside of the page's rendering context, it can lead to side effects and the page title displayed in LiveTable or other places can be completely wrong | ||
| 225 | {{/info}} | ||
| |
163.1 | 226 | |
| 227 | = Locking = | ||
| 228 | |||
 |
262.2 | 229 | By default, when you edit a page, a lock is put on the page (the duration [[can be configured>>Documentation.AdminGuide.Configuration.WebHome#HLockDuration]]), till you either Save (any kind of Save), Cancel the edition or close the browser window. |
| |
163.1 | 230 | |
| |
262.2 | 231 | If you keep the page open in the browser without doing any Save action, the lock will be active by default for 30 minutes (see [[lock duration>>Documentation.AdminGuide.Configuration.WebHome#HLockDuration]] configuration). |
| |
164.2 | 232 | |
| 233 | Anyone trying to edit a page that is locked will see the following warning message allowing you to know that the page is locked and also to force the lock. | ||
| 234 | |||
| |
163.1 | 235 | {{image reference="lock.png"/}} |
| 236 | |||
| |
164.3 | 237 | If you force the lock then the last user who saves will overwrite the content with his version of the page. |
| |
224.1 | 238 | |
 |
247.1 | 239 | = Edit conflict = |
| 240 | |||
| |
260.1 | 241 | Starting with {{info}}XWiki 11.2RC1{{/info}} we detect during the edition of a document if a conflict might happen when saving the page. If this warning occurs, this means someone edited and saved the document while you were working on it. |
| |
247.1 | 242 | |
| |
260.1 | 243 | Starting with {{info}}XWiki 11.3.1 and XWiki 11.4RC1{{/info}} you have two main choices: |
| |
247.1 | 244 | |
| |
253.1 | 245 | * force save the page: in that case you will override saved while you were editing the page; they are not really lost though since they might be retrieved in the previous version of the page. |
| 246 | * reload the editor: in that case your changes **will be lost** and the editor will be reloaded with the last version saved. | ||
| |
252.1 | 247 | |
| |
251.1 | 248 | We display the diff between the version you're trying to save and the last version that has been saved, so you can copy some changes made and reapply them if you like. |
| 249 | Note that you can also simply cancel the save and go back to the editor to make changes before trying again to save. | ||
| |
253.1 | 250 | You can click on the arrow of each action to have a quick description of what it actually means. |
| |
249.2 | 251 | |
| |
253.1 | 252 | {{gallery}} |
| 253 | image:edit-conflict-reload.png | ||
| 254 | image:edit-conflict-force-save.png | ||
| 255 | {{/gallery}} | ||
| |
251.1 | 256 | |
| |
261.1 | 257 | |
| |
260.1 | 258 | We improve with {{info}}XWiki 11.5RC1{{/info}} the support of conflict edition by implementing a merge on save mechanism. This means that in case of conflict edition (two users saving the same document at the same time), instead of always displaying a window to the user asking what to do, we first try to perform a merge of both document. If the changes concerned two very different parts of the document (two different sections, an edit performed on an object against an edit of the content, etc) the user won't notice that a merge has been performed. |
| 259 | |||
| 260 | Now, some conflicts might still occur if both users tried to edit the same part of the document. In that case, a new window is displayed asking the user what to do. | ||
| 261 | The user will now have three different choices: | ||
| 262 | |||
| 263 | * Merge the document and fix conflict with his/her own changes: this means that as much as possible, we try to merge the changes. Only for the part that are conflicting, we only kept the changes from the last user. This is the recommended choice. | ||
| 264 | * Force save the document: this means no merge at all will be performed. Only the changes performed by the last user will be saved. It basically discards the changes made by the previous user. | ||
| 265 | * Reload the editor: this choice might be taken very carefully as it might cause a loss of data. It means that the current changes performed on the document will be completely lost and the editor will be reloaded with the last changes. | ||
| 266 | |||
| 267 | The conflict window now display the changes that will be performed for each choices. Be careful with the parts in red since it shows what part of the document will be lost during the operation. Note that it's also possible to select two specific versions of the document to perform a comparison before making a choice. | ||
| 268 | |||
| 269 | {{gallery}} | ||
| 270 | image:merge-conflict-modal-usage-v2.gif | ||
| 271 | {{/gallery}} | ||
| 272 | |||
| |
263.1 | 273 | {{info}} |
| 274 | Starting with {{code}}XWiki 11.3.2 and XWiki 11.6RC1{{/code}} the whole feature can be disabled from the xwiki.properties file by setting {{code}}edit.conflictChecking.enabled = false{{/code}}. | ||
| 275 | {{/info}} | ||
| 276 | |||
| |
264.1 | 277 | Starting with {{code}}XWiki 11.8RC1{{/code}} the conflict edition window allows one more choice: to fix each conflict individually. |
| 278 | This new choice is marked as advanced since it's not something easy to handle. | ||
| 279 | |||
| 280 | {{gallery}} | ||
| 281 | image:custom_conflict_resolution.png | ||
| 282 | image:custom_conflict_fix.gif | ||
| 283 | {{/gallery}} | ||
| 284 | |||
| 285 | When choosing the new option, the UI is updated to display the changes between the latest version saved and the current version the user is trying to save. At each place a conflict occurred, the changes display an orange bar and a blue area is reserved for the conflict resolution. | ||
| 286 | This blue area displays some text, and a select with several choices. The displayed text in the blue area is what will be used for fixing the conflict, you can see the text changing for each choice. | ||
| 287 | |||
| 288 | The conflict choices are the following: | ||
| 289 | |||
| 290 | * current version (default): the conflict is fixed by getting the current changes | ||
| 291 | * before your changes: the conflict is fixed by getting what was there before you starting to edit. Both latest version saved and your current changes would be lost for this conflict, | ||
| 292 | * latest version saved: the change made on the latest version saved (the one you are conflicting with) are taken to fix the conflict | ||
| 293 | * custom version: with this option, a text area is displayed to allow you to enter any new value to fix the conflict. Multiple lines can be entered. | ||
| 294 | |||
| 295 | If the choice text displays something in red, it is because no content is actually available for the chosen version to fix the conflict: usually it means the content in conflict will be removed with the choice made. | ||
| 296 | |||
| |
226.1 | 297 | = Extension page protection = |
| 298 | |||
| |
229.1 | 299 | Since 10.3, extension pages are protected against editing ([[unless explicitly indicated otherwise in the extension>>http://extensions.xwiki.org/xwiki/bin/view/Extension/XAR%20Module%20Specifications#Hpackage.xml]]) to avoid mistake a user could make while still allowing advanced users to force it if really required. |
| |
226.1 | 300 | |
| 301 | {{image reference="editprotection.png"/}} | ||
| 302 | |||
| |
224.1 | 303 | = Default Language = |
| 304 | |||
| 305 | If you've set up your wiki to be multingual, then when editing a page using the wiki editor, you'll be able to set the default language for the current page as in: | ||
| 306 | |||
| 307 | {{image reference="defaultLanguage.png"/}} |
