Changes for page EditSheet

Summary

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

Details

Page properties

Content

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

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -204,6 +204,8 @@
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;
207	207	font-family: 'Glyphicons Halflings';
208	208	position: relative;
209	209	top: 1px;
...	...	@@ -310,7 +310,7 @@
310	310	max-width: 64px;
311	311	vertical-align: text-top;
312	312	}
313		-/* The image still takes some space in all browsers even if there's no source specified. Let's make sure it's hidden.
	315	+/* The image still takes some space in IE11 even if there's no source specified. Let's make sure it's hidden.
314	314	See CKEDITOR-389: Missing space in the suggestions that appear while using the autocomplete function on IE 11 */
315	315	.ckeditor-autocomplete-item-preview-wrapper img[src=""],
316	316	.ckeditor-autocomplete-item-icon-wrapper img[src=""] {
...	...	@@ -446,20 +446,3 @@
446	446	z-index: 9995;
447	447	}
448	448	}
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		-}