extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow style tag in content of main/login messages

Browse Source
This commit is contained in:
Hadi Nategh 2019-03-05 14:08:19 +01:00
parent eb2cee5678
commit 1ec869538d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/templates/default/mainscreen_message.xet
View File

@ -4,13 +4,13 @@
<overlay> <overlay>
<template id ="admin.mainscreen_message.mainscreen" version="18.1"> <template id ="admin.mainscreen_message.mainscreen" version="18.1">
<vbox> <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"/> <textbox id="text_mainscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
</vbox> </vbox>
</template> </template>
<template id ="admin.mainscreen_message.loginscreen" version="18.1"> <template id ="admin.mainscreen_message.loginscreen" version="18.1">
<vbox> <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"/> <textbox id="text_loginscreen" disabled="$cont[html]" rows="25" cols="70" class="et2_fullWidth" multiline="true" height="500"/>
</vbox> </vbox>
</template> </template>

9
api/js/etemplate/et2_widget_htmlarea.js
View File

@ -70,9 +70,15 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([
}, },
statusbar: { statusbar: {
name: "Status bar", 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", type: "boolean",
default: true 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, images_upload_handler: this.options.images_upload_handler,
init_instance_callback : jQuery.proxy(this._instanceIsReady, this), init_instance_callback : jQuery.proxy(this._instanceIsReady, this),
auto_focus: false, auto_focus: false,
valid_children : this.options.valid_children,
plugins: [ plugins: [
"print searchreplace autolink directionality ", "print searchreplace autolink directionality ",
"visualblocks visualchars image link media template ", "visualblocks visualchars image link media template ",