From a7736397a8dc54f1a82f325f8e8519629a104d17 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Sep 2015 16:47:47 +0200
Subject: [PATCH] pass $timeline instead of $document to printTimeline()

---
 views/bootstrap/class.Bootstrap.php    | 20 +++-----------------
 views/bootstrap/class.ViewDocument.php | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 22f145cb1..cd66d678c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2017,8 +2017,7 @@ mayscript>
 	 *
 	 * @param object $document document
 	 */
-	protected function printTimeline($document) { /* {{{ */
-		$timeline = $document->getTimeline();
+	protected function printTimeline($timeline, $height=300) { /* {{{ */
 ?>
 	<script type="text/javascript">
 		var timeline;
@@ -2027,20 +2026,7 @@ mayscript>
 		data = [
 <?php 
 		foreach($timeline as $item) {
-			switch($item['type']) {
-			case 'add_version':
-				$msg = getMLText('timeline_'.$item['type'], array('version'=> $item['params'][0]));
-				break;
-			case 'add_file':
-				$msg = getMLText('timeline_'.$item['type']);
-				break;
-			case 'status_change':
-				$msg = getMLText('timeline_'.$item['type'], array('version'=> $item['params'][0], 'status'=> getOverallStatusText($item['params'][1])));
-				break;
-			default:
-				$msg = '???';
-			}
-			echo "{'start': new Date('".$item['date']."'), 'content': '".$msg."'},";
+			echo "{'start': new Date('".$item['date']."'), 'content': '".$item['msg']."'},";
 		}
 ?>
 			{
@@ -2052,7 +2038,7 @@ mayscript>
 		// specify options
 		var options = {
 			'width':  '100%',
-			'height': '300px',
+			'height': '<?= $height ?>px',
 			'editable': false,   // enable dragging and editing events
 			'style': 'box',
 			'locale': 'de_DE'
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index cb660532e..b1b4c00c6 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1114,7 +1114,24 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 		if($user->isAdmin()) {
 			$this->contentHeading(getMLText("timeline"));
-			$this->printTimeline($document);
+			$timeline = $document->getTimeline();
+			foreach($timeline as &$item) {
+				switch($item['type']) {
+				case 'add_version':
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document'], 'version'=> $item['version']));
+					break;
+				case 'add_file':
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']));
+					break;
+				case 'status_change':
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document'], 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					break;
+				default:
+					$msg = '???';
+				}
+				$item['msg'] = $msg;
+			}
+			$this->printTimeline($timeline);
 		}
 ?>
 		  </div>