Changes for page EditSheet

Summary

• Page properties (2 modified, 0 added, 0 removed)
• Objects (2 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.coelho
	1	+XWiki.superadmin

Content

...	...	@@ -1,38 +1,0 @@
1		-{{include reference="CKEditor.VelocityMacros"/}}
2		-
3		-{{velocity}}
4		-#if ($doc.fullName == 'CKEditor.EditSheet')
5		- This is a sheet for editing the document content using [[CKEditor>>http://ckeditor.com/]].
6		-#else
7		- {{html clean="false"}}
8		- ## Include the auto-save styles.
9		- #set ($discard = $xwiki.ssfx.use('js/xwiki/editors/autosave.css', true))
10		- #if ("$!request.section" != '')
11		- <div class="hidden">
12		- <input type="hidden" name="section" value="$!escapetool.xml($request.section)"/>
13		- </div>
14		- #end
15		- <div class="row">
16		- <div class="cke-editMeta col-xs-12 col-md-7">
17		- ## Add support for editing the page title (which is not available by default in Inline Form edit mode).
18		- #set ($editor = 'wiki')
19		- #template('editmeta.vm')
20		- #set ($editor = 'inline')
21		- </div>
22		- </div>
23		- ## The xwikieditcontent id is needed for the auto-save feature.
24		- <div id="xwikieditcontent" data-autosave="true">
25		- #set ($parameters = {
26		- 'content': $tdoc.content,
27		- 'attributes': {
28		- 'id': 'content',
29		- 'name': 'content',
30		- 'rows': 25,
31		- 'cols': 80
32		- }
33		- })
34		- #ckeditor($parameters)
35		- </div>
36		- {{/html}}
37		-#end
38		-{{/velocity}}

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -54,9 +54,11 @@
54	54	}
55	55
56	56	var uploadDisabled = element.hasAttribute('data-upload-disabled');
	57	+ var startupFocus = element.hasAttribute('data-startup-focus');
57	57
58	58	var config = {
59	59	filebrowserUploadUrl: uploadDisabled ? '' : getUploadURL(sourceDocument, 'filebrowser'),
	61	+ startupFocus,
60	60	height: $(element).height(),
61	61	// Used to resolve and serialize relative references. Also used to make HTTP requests with the right context.
62	62	sourceDocument: sourceDocument,

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -204,8 +204,6 @@
204	204	a.cke_button.cke_button__xwiki-macro-edit > span.cke_button_icon.cke_button__xwiki-macro-edit_icon,
205	205	a.cke_button.cke_button__xwiki-link-open > span.cke_button_icon.cke_button__xwiki-link-open_icon,
206	206	a.cke_button.cke_button__insert > span.cke_button_icon.cke_button__insert_icon {
207		- /* This is needed for XWiki versions older than 7.1M1 where we overwrite the icons path (see above). */
208		- background-image: none !important;
209	209	font-family: 'Glyphicons Halflings';
210	210	position: relative;
211	211	top: 1px;
...	...	@@ -312,7 +312,7 @@
312	312	max-width: 64px;
313	313	vertical-align: text-top;
314	314	}
315		-/* The image still takes some space in IE11 even if there's no source specified. Let's make sure it's hidden.
	313	+/* The image still takes some space in all browsers even if there's no source specified. Let's make sure it's hidden.
316	316	See CKEDITOR-389: Missing space in the suggestions that appear while using the autocomplete function on IE 11 */
317	317	.ckeditor-autocomplete-item-preview-wrapper img[src=""],
318	318	.ckeditor-autocomplete-item-icon-wrapper img[src=""] {
...	...	@@ -448,3 +448,37 @@
448	448	z-index: 9995;
449	449	}
450	450	}
	449	+
	450	+/*
	451	+ * Override the CKEditor reset for the table border color.
	452	+ * The default border color from CKEditor is quite lacking on contrast.
	453	+ */
	454	+.cke_editable.cke_show_borders table.cke_show_border,
	455	+.cke_editable.cke_show_borders table.cke_show_border > tr > th,
	456	+.cke_editable.cke_show_borders table.cke_show_border > tr > td,
	457	+.cke_editable.cke_show_borders table.cke_show_border > thead > tr > th,
	458	+.cke_editable.cke_show_borders table.cke_show_border > thead > tr > td,
	459	+.cke_editable.cke_show_borders table.cke_show_border > tbody > tr > th,
	460	+.cke_editable.cke_show_borders table.cke_show_border > tbody > tr > td,
	461	+.cke_editable.cke_show_borders table.cke_show_border > tfoot > tr > th,
	462	+.cke_editable.cke_show_borders table.cke_show_border > tfoot > tr > td {
	463	+ border-color: @table-border-color;
	464	+ border-style: solid;
	465	+}
	466	+
	467	+/* CKEditor contains a CSS reset. It works with its own style sheets and does not use the ones in XWiki.
	468	+However, we want `.sr-only` from XWiki to still be usable in our CKEditor environment.
	469	+We need to redefine the XWiki styles of this class to have better priority than the CKEditor CSS reset.
	470	+Without this, the elements with this class are still shown which would be different from the behaviour
	471	+of `.sr-only` anywhere else in XWiki (as described in our doc).
	472	+This redefinition allows for a more consistent behaviour of the `.sr-only` class. */
	473	+.cke_reset_all .sr-only {
	474	+ position: absolute;
	475	+ width: 1px;
	476	+ height: 1px;
	477	+ padding: 0;
	478	+ margin: -1px;
	479	+ overflow: hidden;
	480	+ clip: rect(0, 0, 0, 0);
	481	+ border: 0;
	482	+}