mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
Allow style tag in content of main/login messages
This commit is contained in:
parent
eb2cee5678
commit
1ec869538d
@ -4,13 +4,13 @@
|
||||
<overlay>
|
||||
<template id ="admin.mainscreen_message.mainscreen" version="18.1">
|
||||
<vbox>
|
||||
<htmlarea id="html_mainscreen" height="500" width="100%" disabled="!$cont[html]"/>
|
||||
<htmlarea id="html_mainscreen" height="500" width="100%" disabled="!$cont[html]" valid_children="+body[style]"/>
|
||||
<textbox id="text_mainscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
|
||||
</vbox>
|
||||
</template>
|
||||
<template id ="admin.mainscreen_message.loginscreen" version="18.1">
|
||||
<vbox>
|
||||
<htmlarea id="html_loginscreen" height="500" width="100%" disabled="!$cont[html]"/>
|
||||
<htmlarea id="html_loginscreen" height="500" width="100%" disabled="!$cont[html]" valid_children="+body[style]"/>
|
||||
<textbox id="text_loginscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
|
||||
</vbox>
|
||||
</template>
|
||||
|
@ -70,9 +70,15 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([
|
||||
},
|
||||
statusbar: {
|
||||
name: "Status bar",
|
||||
description: "Enable/disable status bar on the bottom of ediotr",
|
||||
description: "Enable/disable status bar on the bottom of editor",
|
||||
type: "boolean",
|
||||
default: true
|
||||
},
|
||||
valid_children: {
|
||||
name: "Valid children",
|
||||
description: "Enables to control what child tag is allowed or not allowed of the present tag. For instance: +body[style], makes style tag allowed inside body",
|
||||
type: "string",
|
||||
default: ""
|
||||
}
|
||||
},
|
||||
|
||||
@ -143,6 +149,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([
|
||||
images_upload_handler: this.options.images_upload_handler,
|
||||
init_instance_callback : jQuery.proxy(this._instanceIsReady, this),
|
||||
auto_focus: false,
|
||||
valid_children : this.options.valid_children,
|
||||
plugins: [
|
||||
"print searchreplace autolink directionality ",
|
||||
"visualblocks visualchars image link media template ",
|
||||
|
Loading…
Reference in New Issue
Block a user