From 88df1cee829961207209d79e66f837ea5c65305d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 09:53:14 +0200
Subject: [PATCH] move printProtocol() into class.Bootstrap.php

---
 views/bootstrap/class.Bootstrap.php    | 101 +++++++++++++++++++++++++
 views/bootstrap/class.ViewDocument.php | 101 -------------------------
 2 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index bf3f7a83f..cdd0df352 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1998,5 +1998,106 @@ mayscript>
 	function show(){ /* {{{ */
 		parent::show();
 	} /* }}} */
+
+	/**
+	 * Output a protocol
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printProtocol($latestContent, $type="") { /* {{{ */
+		$dms = $this->params['dms'];
+?>
+		<legend><?php printMLText($type.'_log'); ?></legend>
+		<table class="table condensed">
+			<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>, <?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
+<?php
+		switch($type) {
+		case "review":
+			$statusList = $latestContent->getReviewStatus(10);
+			break;
+		case "approval":
+			$statusList = $latestContent->getApprovalStatus(10);
+			break;
+		case "revision":
+			$statusList = $latestContent->getRevisionStatus(10);
+			break;
+		case "receipt":
+			$statusList = $latestContent->getReceiptStatus(1);
+			break;
+		default:
+			$statusList = array();
+		}
+		foreach($statusList as $rec) {
+			echo "<tr>";
+			echo "<td>";
+			switch ($rec["type"]) {
+				case 0: // individual.
+					$required = $dms->getUser($rec["required"]);
+					if (!is_object($required)) {
+						$reqName = getMLText("unknown_user")." '".$rec["required"]."'";
+					} else {
+						$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+					}
+					break;
+				case 1: // Approver is a group.
+					$required = $dms->getGroup($rec["required"]);
+					if (!is_object($required)) {
+						$reqName = getMLText("unknown_group")." '".$rec["required"]."'";
+					}
+					else {
+						$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+					}
+					break;
+			}
+			echo $reqName;
+			echo "</td>";
+			echo "<td>";
+			echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
+			$updateuser = $dms->getUser($rec["userID"]);
+			if(!is_object($required))
+				echo getMLText("unknown_user");
+			else
+				echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");
+			echo "</i>";
+			if($rec['comment'])
+				echo "<br />".htmlspecialchars($rec['comment']);
+			switch($type) {
+			case "review":
+				if($rec['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				break;
+			case "approval":
+				if($rec['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				break;
+			}
+			echo "</td>";
+			echo "<td>";
+			switch($type) {
+			case "review":
+				echo getReviewStatusText($rec["status"]);
+				break;
+			case "approval":
+				echo getApprovalStatusText($rec["status"]);
+				break;
+			case "revision":
+				echo getRevisionStatusText($rec["status"]);
+				break;
+			case "receipt":
+				echo getReceiptStatusText($rec["status"]);
+				break;
+			default:
+			}
+			echo "</td>";
+			echo "</tr>";
+		}
+?>
+				</table>
+<?php
+	} /* }}} */
 }
 ?>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 95c1ae2c2..db4991ae7 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -110,107 +110,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 	
 	} /* }}} */
 
-	/**
-	 * Output a protocol
-	 *
-	 * @param object $attribute attribute
-	 */
-	protected function printProtocol($latestContent, $type="") { /* {{{ */
-		$dms = $this->params['dms'];
-?>
-		<legend><?php printMLText($type.'_log'); ?></legend>
-		<table class="table condensed">
-			<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>, <?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
-<?php
-		switch($type) {
-		case "review":
-			$statusList = $latestContent->getReviewStatus(10);
-			break;
-		case "approval":
-			$statusList = $latestContent->getApprovalStatus(10);
-			break;
-		case "revision":
-			$statusList = $latestContent->getRevisionStatus(10);
-			break;
-		case "receipt":
-			$statusList = $latestContent->getReceiptStatus(1);
-			break;
-		default:
-			$statusList = array();
-		}
-		foreach($statusList as $rec) {
-			echo "<tr>";
-			echo "<td>";
-			switch ($rec["type"]) {
-				case 0: // individual.
-					$required = $dms->getUser($rec["required"]);
-					if (!is_object($required)) {
-						$reqName = getMLText("unknown_user")." '".$rec["required"]."'";
-					} else {
-						$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
-					}
-					break;
-				case 1: // Approver is a group.
-					$required = $dms->getGroup($rec["required"]);
-					if (!is_object($required)) {
-						$reqName = getMLText("unknown_group")." '".$rec["required"]."'";
-					}
-					else {
-						$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-					}
-					break;
-			}
-			echo $reqName;
-			echo "</td>";
-			echo "<td>";
-			echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
-			$updateuser = $dms->getUser($rec["userID"]);
-			if(!is_object($required))
-				echo getMLText("unknown_user");
-			else
-				echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");
-			echo "</i>";
-			if($rec['comment'])
-				echo "<br />".htmlspecialchars($rec['comment']);
-			switch($type) {
-			case "review":
-				if($rec['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-				}
-				break;
-			case "approval":
-				if($rec['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-				}
-				break;
-			}
-			echo "</td>";
-			echo "<td>";
-			switch($type) {
-			case "review":
-				echo getReviewStatusText($rec["status"]);
-				break;
-			case "approval":
-				echo getApprovalStatusText($rec["status"]);
-				break;
-			case "revision":
-				echo getRevisionStatusText($rec["status"]);
-				break;
-			case "receipt":
-				echo getReceiptStatusText($rec["status"]);
-				break;
-			default:
-			}
-			echo "</td>";
-			echo "</tr>";
-		}
-?>
-				</table>
-<?php
-	} /* }}} */
-
 	function show() { /* {{{ */
 		parent::show();
 		$dms = $this->params['dms'];