From 32596fb0e03c77ec0b3594fb0796e0802752ef5a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 25 Feb 2015 16:30:49 +0000
Subject: [PATCH] Implement widget historylog resize handler and fix historylog
 template in all apps

---
 addressbook/templates/default/edit.xet |  4 ++--
 calendar/templates/default/edit.xet    |  2 +-
 calendar/templates/pixelegg/app.css    |  3 ---
 calendar/templates/pixelegg/app.less   |  1 -
 etemplate/js/et2_widget_historylog.js  | 16 +++++++++++++++-
 infolog/templates/default/edit.xet     |  4 ++--
 timesheet/templates/default/edit.xet   |  4 +---
 7 files changed, 21 insertions(+), 13 deletions(-)

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 @@
 		</box>
 	</template>
 	<template id="addressbook.edit.history" template="" lang="" group="0" version="1.9.001">
-		<historylog id="history" width="100%" overflow="hidden"/>
+		<historylog id="history" width="100%"/>
 	</template>
 	<template id="addressbook.edit" template="" lang="" group="0" version="1.9.004" class="addressbook_edit">
 		<template id="addressbook.editname"/>
@@ -395,7 +395,7 @@
 					<description/>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%" tab_height="200">
+					<tabbox id="tabs" span="all" width="100%" tab_height="250">
 						<tabs>
 							<tab id="general" label="Organisation"/>
 							<tab id="home" label="Private" statustext="Home address, Birthday, ..."/>
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 @@
 		</grid>
 	</template>
 	<template id="calendar.edit.history" template="" lang="" group="0" version="1.7.002">
-		<historylog id="history" options="history_status" width="100%" overflow="hidden"/>
+		<historylog id="history" options="history_status" width="100%" />
 	</template>
 	<template id="calendar.delete_series" template="" lang="" group="0" version="1.7.003">
 		<vbox>
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 @@
 		</grid>
 	</template>
 	<template id="infolog.edit.history" template="" lang="" group="0" version="1.3.002">
-		<historylog id="history" width="100%" overflow="hidden"/>
+		<historylog id="history" width="100%"/>
 	</template>
 	<template id="infolog.edit.details" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -214,7 +214,7 @@
 					<description/>
 				</row>
 				<row>
-					<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="246px">
+					<tabbox id="tabs" class="et2_nowrap" span="all" width="100%" tab_height="250px">
 						<tabs>
 							<tab id="description" label="Description" statustext="longer textual description"/>
 							<tab id="details" label="Details" statustext="Location, priority , ..."/>
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 @@
 		</box>
 	</template>
 	<template id="timesheet.edit.history" template="" lang="" group="0" version="1.7.001">
-		<box width="100%" overflow="auto">
-			<historylog id="history"/>
-		</box>
+		<historylog id="history"/>
 	</template>
 	<template id="timesheet.edit" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">