From 42cf1e9d054427d19d0adc3be86cf5f4385b7321 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 1 May 2021 13:19:47 +0200
Subject: [PATCH] use identical layout on all remove pages

---
 views/bootstrap/class.RemoveDocument.php | 6 +-----
 views/bootstrap/class.RemoveFolder.php   | 6 +-----
 views/bootstrap/class.RemoveVersion.php  | 4 +---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index 57cb0f816..a3e43fa49 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -43,19 +43,15 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Theme_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_document"));
-		$this->contentContainerStart('warning');
 
+		$this->warningMsg(getMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName()))));
 ?>
 <form action="../op/op.RemoveDocument.php" name="form1" method="post">
 <input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
 <?php echo createHiddenFieldWithKey('removedocument'); ?>
-<p>
-<?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
-</p>
 <p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.RemoveFolder.php b/views/bootstrap/class.RemoveFolder.php
index c91b9f9c2..713462875 100644
--- a/views/bootstrap/class.RemoveFolder.php
+++ b/views/bootstrap/class.RemoveFolder.php
@@ -41,19 +41,15 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Theme_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
 		$this->contentHeading(getMLText("rm_folder"));
-		$this->contentContainerStart();
+		$this->warningMsg(getMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName()))));
 ?>
 <form action="../op/op.RemoveFolder.php" method="post" name="form1">
 	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
 	<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
   <?php echo createHiddenFieldWithKey('removefolder'); ?>
-	<p>
-	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
-	</p>
 	<p><button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.RemoveVersion.php b/views/bootstrap/class.RemoveVersion.php
index 6c6f8690a..40e9869e7 100644
--- a/views/bootstrap/class.RemoveVersion.php
+++ b/views/bootstrap/class.RemoveVersion.php
@@ -43,17 +43,15 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Theme_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_version"));
-		$this->contentContainerStart();
+		$this->warningMsg(getMLText("confirm_rm_version", array ("documentname" => htmlspecialchars($document->getName()), "version" => $version->getVersion())));
 ?>
 <form action="../op/op.RemoveVersion.php" name="form1" method="post">
 	<?php echo createHiddenFieldWithKey('removeversion'); ?>
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="version" value="<?php echo $version->getVersion()?>">
-	<p><?php printMLText("confirm_rm_version", array ("documentname" => htmlspecialchars($document->getName()), "version" => $version->getVersion()));?></p>
   <p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_version");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */