Merge branch 'feature-3716/Messaging_inbox_outbox_user'

This commit is contained in:
Paolo
2020-03-02 16:13:04 +01:00
4 changed files with 8 additions and 12 deletions
@@ -62,7 +62,7 @@
</div>
<br>
<div class="row">
<div class="col-lg-10">
<div class="col-lg-9">
<label>
<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
@@ -74,7 +74,7 @@
</textarea>
</div>
<div class="col-lg-2">
<div class="col-lg-3">
<div class="form-group">
<label>
@@ -89,7 +89,7 @@
array(
'name' => 'variables[]',
'id' => 'variables',
'size' => 14,
'size' => 27,
'multiple' => true
)
);
+2 -2
View File
@@ -11,7 +11,7 @@
$align = "valign-top";
}
?>
<div class="div-cell width-150px <?php echo $align; ?>">
<div class="div-cell <?php echo $align; ?>">
<label
for="<?php echo ${HTMLWidget::HTML_ARG_NAME}[HTMLWidget::HTML_ID]; ?>"
<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::REQUIRED); ?>
@@ -22,7 +22,7 @@
<?php
}
?>
<div class="div-cell width-150px">
<div class="div-cell">
<select
<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::HTML_ID); ?>
<?php HTMLWidget::printAttribute(${HTMLWidget::HTML_ARG_NAME}, HTMLWidget::HTML_NAME); ?>
+1
View File
@@ -1,5 +1,6 @@
.div-table {
display: table;
width: 100%;
}
.div-row {
+2 -7
View File
@@ -46,10 +46,7 @@ $(document).ready(function ()
{
tinymce.init({
selector: "#bodyTextArea",
plugins: "autoresize",
autoresize_min_height: 150,
autoresize_max_height: 600,
autoresize_bottom_margin: 10
plugins: "autoresize"
});
tinymce.init({
@@ -58,9 +55,7 @@ $(document).ready(function ()
menubar: false,
toolbar: false,
statusbar: false,
readonly: 1,
autoresize_min_height: 150,
autoresize_bottom_margin: 10
readonly: 1
});
if ($("#variables"))