Modifications pour le document EditSheet

Résumé

• Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)
• Objets (1 modifications, 0 ajouts, 0 suppressions)
  • XWiki.StyleSheetExtension[0]

Détails

Propriétés de la Page

Contenu

...	...	@@ -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.StyleSheetExtension[0]

Code

...	...	@@ -211,6 +211,8 @@
211	211	a.cke_button.cke_button__xwiki-macro-edit > span.cke_button_icon.cke_button__xwiki-macro-edit_icon,
212	212	a.cke_button.cke_button__xwiki-link-open > span.cke_button_icon.cke_button__xwiki-link-open_icon,
213	213	a.cke_button.cke_button__insert > span.cke_button_icon.cke_button__insert_icon {
	214	+ /* This is needed for XWiki versions older than 7.1M1 where we overwrite the icons path (see above). */
	215	+ background-image: none !important;
214	214	font-family: 'Glyphicons Halflings';
215	215	position: relative;
216	216	top: 1px;
...	...	@@ -317,7 +317,7 @@
317	317	max-width: 64px;
318	318	vertical-align: text-top;
319	319	}
320		-/* The image still takes some space in all browsers even if there's no source specified. Let's make sure it's hidden.
	322	+/* The image still takes some space in IE11 even if there's no source specified. Let's make sure it's hidden.
321	321	See CKEDITOR-389: Missing space in the suggestions that appear while using the autocomplete function on IE 11 */
322	322	.ckeditor-autocomplete-item-preview-wrapper img[src=""],
323	323	.ckeditor-autocomplete-item-icon-wrapper img[src=""] {
...	...	@@ -370,15 +370,26 @@
370	370	}
371	371
372	372	.cke_contents > textarea.cke_source.cke_editable_inline {
	375	+ border: 1px solid transparent;
	376	+ border-radius: 0;
373	373	box-shadow: none;
	378	+ margin-top: -1px;
	379	+ margin-left: -1px;
	380	+
	381	+ .form-control-focus();
374	374	}
375	375
	384	+.cke_contents.fake {
	385	+ /* We need this to have the box shadow visible when the source area is focused. */
	386	+ overflow: visible;
	387	+}
	388	+
376	376	#xwikicontent + .cke_contents > textarea.cke_source.cke_editable_inline {
377	377	/* Don't take the padding and the margin into account when computing the 100% width. */
378	378	box-sizing: content-box;
379	379	/* Make sure the Source area has the same width as the WYSIWYG area. */
380		- margin-left: -@grid-gutter-width / 2;
381		- margin-right: -@grid-gutter-width / 2;
	393	+ margin-left: -@grid-gutter-width / 2 - 1px;
	394	+ margin-right: -@grid-gutter-width / 2 - 1px;
382	382	}
383	383
384	384	/**