Skip to content
Snippets Groups Projects
Commit 76bcaa25 authored by gnaegi's avatar gnaegi
Browse files

OO-507 remove warning style of info message and adding style selector in info message admin form

parent 71cfca61
No related branches found
No related tags found
No related merge requests found
......@@ -95,7 +95,9 @@ public class InfoMsgForm extends FormBasicController {
//allow script tags...
richTextConfig.setQuotedConfigValue(RichTextConfiguration.INVALID_ELEMENTS, RichTextConfiguration.INVALID_ELEMENTS_FORM_FULL_VALUE_UNSAVE_WITH_SCRIPT);
richTextConfig.setQuotedConfigValue(RichTextConfiguration.EXTENDED_VALID_ELEMENTS, "script[src,type,defer]");
// add style buttons to make alert style available
richTextConfig.setContentCSSFromTheme(getWindowControl().getWindowBackOffice().getWindow().getGuiTheme());
richTextConfig.setQuotedConfigValue(RichTextConfiguration.THEME_ADVANCED_BUTTONS1_ADD, RichTextConfiguration.SEPARATOR_BUTTON + "," + RichTextConfiguration.STYLESELECT_BUTTON);
FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttonGroupLayout", getTranslator());
formLayout.add(buttonGroupLayout);
......
......@@ -7,13 +7,11 @@
<fieldset>
<legend>$r.translate("infomsg.title")</legend>
#if ($infomsg)
<div class="b_border_box">
$infomsg
</div>
#else
<i>$r.translate("infomsg.nomsg")</i>
<i>$r.translate("infomsg.nomsg")</i>
<br /><br />
#end
<br /><br />
$r.render("infomsgEdit") $r.render("infomsgClear")
</fieldset>
......@@ -22,13 +20,11 @@ $r.render("infomsgEdit") $r.render("infomsgClear")
<fieldset>
<legend>$r.translate("infomsg.title.cluster")</legend>
#if ($infoMsgCluster)
<div class="b_border_box">
$infoMsgCluster
</div>
#else
<i>$r.translate("infomsg.nomsg")</i>
<i>$r.translate("infomsg.nomsg")</i>
<br /><br />
#end
<br /><br />
$r.render("infomsgEditCluster") $r.render("infomsgClearCluster")
</fieldset>
#end
......@@ -37,13 +33,14 @@ $r.render("infomsgEdit") $r.render("infomsgClear")
<fieldset>
<legend>$r.translate("maintenancemsg.title")</legend>
#if ($maintenanceMsgAllNodes)
<div class="b_border_box">
<div id="b_msg_sticky_preview">
$maintenanceMsgAllNodes
</div>
#else
<i>$r.translate("maintenancemsg.nomsg")</i>
<i>$r.translate("maintenancemsg.nomsg")</i>
<br />
#end
<br /><br />
<br />
$r.render("maintenancemsgEdit") $r.render("maintenancemsgClear")
</fieldset>
......@@ -52,13 +49,14 @@ $r.render("maintenancemsgEdit") $r.render("maintenancemsgClear")
<fieldset>
<legend>$r.translate("maintenancemsg.title.cluster")</legend>
#if ($maintenanceMsgThisNodeOnly)
<div class="b_border_box">
<div id="b_msg_sticky_preview">
$maintenanceMsgThisNodeOnly
</div>
#else
<i>$r.translate("maintenancemsg.nomsg")</i>
<i>$r.translate("maintenancemsg.nomsg")</i>
<br />
#end
<br /><br />
<br />
$r.render("maintenancemsgEditCluster") $r.render("maintenancemsgClearCluster")
</fieldset>
#end
\ No newline at end of file
......@@ -154,7 +154,7 @@ div.b_msg_dialog {
}
/* sticky info (admins can create stick-messages that will show for all users) */
#b_msg_sticky {
#b_msg_sticky, #b_msg_sticky_preview {
clear:both; padding: 10px 10px 10px 50px;
min-height: 32px;
background: #FFB651 url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
......@@ -191,17 +191,13 @@ div.b_msg_error_winicon { background: url(../openolat/images/icon_error_32.png)
.b_msg_title { font-weight: bold; }
}
/* "info-message" on login screen */
/* "info-message" on login screen. As of 9.0 release the styling of the info message is done in HTML editor in the admin tab */
.o_infomessage_wrapper {
border: 1px solid #ccc;
background:#FAFAFA;
margin-bottom:20px;
margin: 20px 0 20px 0;
.o_infomessage{
padding: 10px 10px 10px 50px;
text-align: left;
min-height:40px;
background: url(../openolat/images/icon_warning_32.png) no-repeat 10px 10px;
.o_infomessage_inner {
}
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment