From e3b0d10bf8c5a8c266152f7446e591ea8f07e832 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 7 Nov 2019 21:05:11 +0100
Subject: [PATCH] hide tabs for edit pages

---
 lam/lib/adminHeader.inc                  |  9 +++------
 lam/lib/lists.inc                        |  1 +
 lam/lib/modules.inc                      | 11 +++++++++--
 lam/templates/tree/treeViewContainer.php |  3 ++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lam/lib/adminHeader.inc b/lam/lib/adminHeader.inc
index 85d258e0..f1fee687 100644
--- a/lam/lib/adminHeader.inc
+++ b/lam/lib/adminHeader.inc
@@ -193,16 +193,12 @@ jQuery(document).ready(function() {
 });
 </script>
 
-<div class="ui-tabs ui-corner-all ui-widget ui-widget-content">
-<ul class="ui-tabs-nav ui-corner-all ui-helper-reset ui-helper-clearfix ui-widget-header">
-	<?php
-		printTypeTabs($headerPrefix);
-	?>
-</ul>
 
 <?php
 
 function printTypeTabs($headerPrefix) {
+	echo '<div class="ui-tabs ui-corner-all ui-widget ui-widget-content">';
+	echo '<ul class="ui-tabs-nav ui-corner-all ui-helper-reset ui-helper-clearfix ui-widget-header">';
 	$typeManager = new \LAM\TYPES\TypeManager();
 	$types = $typeManager->getConfiguredTypes();
 	foreach ($types as $type) {
@@ -217,5 +213,6 @@ function printTypeTabs($headerPrefix) {
 		echo $link;
 		echo "</li>\n";
 	}
+	echo '</ul>';
 }
 
diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index eb27dd40..8f170a5b 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -912,6 +912,7 @@ class lamList {
 	 */
 	private function printHeader() {
 		include 'adminHeader.inc';
+		\LAM\HEADER\printTypeTabs('../..');
 		$this->printHeaderContent();
 	}
 
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 6aadc869..ec20ffdd 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -1314,6 +1314,7 @@ class accountContainer {
 				 . getSecurityTokenName() . '\',\'' . getSecurityTokenValue() . '\');');
 			$leftButtonGroup->addElement($passwordButton);
 		}
+		// delete button
 		if (!$this->isNewAccount) {
 			$leftButtonGroup->addElement(new htmlSpacer('15px', null));
 			$deleteButton = new htmlButton('accountContainerDelete', _('Delete'));
@@ -1321,7 +1322,13 @@ class accountContainer {
 			$deleteButton->setCSSClasses(array('fullwidth-mobile-only'));
 			$leftButtonGroup->addElement($deleteButton);
 		}
-		$row->add($leftButtonGroup, 12, 7);
+		// back to list button
+		$leftButtonGroup->addElement(new htmlSpacer('15px', null));
+		$backToListButton = new htmlButton('accountContainerBackToList', $this->type->getBaseType()->LABEL_BACK_TO_ACCOUNT_LIST);
+		$backToListButton->setIconClass('backButton');
+		$backToListButton->setCSSClasses(array('fullwidth-mobile-only'));
+		$leftButtonGroup->addElement($backToListButton);
+		$row->add($leftButtonGroup, 12, 9);
 
 		$rightGroup = new htmlGroup();
 		// profile selection
@@ -1340,7 +1347,7 @@ class accountContainer {
 			$rightGroup->addElement(new htmlSpacer('1px', null));
 			$rightGroup->addElement(new htmlHelpLink('401'));
 		}
-		$row->add($rightGroup, 12, 5, 5, 'text-right');
+		$row->add($rightGroup, 12, 3, 3, 'text-right');
 
 		parseHtml(null, $row, array(), false, $tabindex, $this->type->getScope());
 	}
diff --git a/lam/templates/tree/treeViewContainer.php b/lam/templates/tree/treeViewContainer.php
index 5c6a95e9..17ea39f7 100644
--- a/lam/templates/tree/treeViewContainer.php
+++ b/lam/templates/tree/treeViewContainer.php
@@ -2,7 +2,7 @@
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2010 - 2018  Roland Gruber
+  Copyright (C) 2010 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ enforceUserIsLoggedIn();
 setlanguage();
 
 include __DIR__ . '/../../lib/adminHeader.inc';
+\LAM\HEADER\printTypeTabs('../..');
 
 ?>
 <div id="tabcontent" class="ui-tabs-panel ui-widget-content ui-corner-bottom">