diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index fe36d1f4b7..8e896ea7c0 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -341,7 +341,7 @@
-
+
@@ -395,7 +395,7 @@
-
+
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 557f314e99..77044c0dcf 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -241,7 +241,7 @@
-
+
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 1a0e47b13c..ef9eeb2fb0 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1270,9 +1270,6 @@ div.calendar {
background-color: rgba(255, 221, 115, 0.1);
margin-bottom: 1em;
}
-#calendar-edit #calendar-edit_calendar-edit-history {
- max-width: 800px;
-}
#calendar-edit #calendar-edit_calendar-edit-history tbody {
display: table-row-group;
width: 100%;
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 02c481664f..55fb283884 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -682,7 +682,6 @@ div.calendar { position: relative; }
/*// Historie*/
#calendar-edit_calendar-edit-history{
- max-width: 800px;
tbody{
display: table-row-group;
width: 100%;
diff --git a/etemplate/js/et2_widget_historylog.js b/etemplate/js/et2_widget_historylog.js
index bba8fafe49..518a1f1854 100644
--- a/etemplate/js/et2_widget_historylog.js
+++ b/etemplate/js/et2_widget_historylog.js
@@ -31,7 +31,7 @@
*
* @augments et2_valueWidget
*/
-var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],
+var et2_historylog = et2_valueWidget.extend([et2_IDataProvider,et2_IResizeable],
{
createNamespace: true,
attributes: {
@@ -480,5 +480,19 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],
}
return columnName == 'note' || columnName == 'description' || (value && (value.length > 50 || value.match(/\n/g)));
},
+
+ resize: function (_height)
+ {
+ if (typeof this.options != 'undefined' && _height
+ && typeof this.options.resize_ratio != 'undefined')
+ {
+ // apply the ratio
+ _height = (this.options.resize_ratio != '')? _height * this.options.resize_ratio: _height;
+ if (_height != 0)
+ {
+ this.div.height(this.div.height() + _height);
+ }
+ }
+ }
});
et2_register_widget(et2_historylog, ['historylog']);
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index dca999951a..c27a416738 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -83,7 +83,7 @@
-
+
@@ -214,7 +214,7 @@
-
+
diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet
index e19fce2c20..7c96ec41d0 100644
--- a/timesheet/templates/default/edit.xet
+++ b/timesheet/templates/default/edit.xet
@@ -83,9 +83,7 @@
-
-
-
+