From 0f98640ba3bd4fc8101f9e2ef9f88ee006bcddb4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 10:00:55 +0200
Subject: [PATCH] make login form smaller and put it into a div

---
 views/bootstrap/class.Login.php         |  7 +++++--
 views/bootstrap4/styles/application.css | 13 +++++++++++--
 views/bootstrap4/styles/styles.css      |  4 ----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index 90e4cb4c1..834403f23 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -97,6 +97,7 @@ $(document).ready( function() {
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
 		$this->contentStart();
+		echo "<div id=\"login_wrapper\">\n";
 		$this->pageNavigation(getMLText("sign_in"));
 		if($msg)
 			$this->errorMsg(htmlspecialchars($msg));
@@ -114,7 +115,7 @@ $(document).ready( function() {
 				'type'=>'text',
 				'id'=>'login',
 				'name'=>'login',
-				'placeholder'=>'login',
+				'placeholder'=>getMLText('user_login'),
 				'autocomplete'=>'on',
 				'required'=>true
 			)
@@ -126,6 +127,7 @@ $(document).ready( function() {
 				'type'=>'password',
 				'id'=>'pwd',
 				'name'=>'pwd',
+				'placeholder'=>getMLText('password'),
 				'autocomplete'=>'off',
 				'required'=>true
 			)
@@ -154,8 +156,8 @@ $(document).ready( function() {
 				$html
 			);
 		}
-		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_login'));
+		$this->contentContainerEnd();
 ?>
 </form>
 <?php
@@ -169,6 +171,7 @@ $(document).ready( function() {
 			print implode(' | ', $tmpfoot);
 			print "</p>\n";
 		}
+		echo "</div>\n";
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 732abbef8..2ce7692c9 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -1,9 +1,18 @@
 body { /* Add top padding for full-width layout */
-	padding-top: 4.0rem;
+	padding-top: 3.7rem;
+}
+#login_wrapper {
+	margin: auto auto;
+	width: 360px;
+}
+@media (max-width: 575px) { 
+	#login_wrapper {
+		width: 100%;
+	}
 }
 
 a.navbar-brand img {
-	height: 2.3rem;
+	height: 2.0rem;
 }
 
 .dropdown-submenu {
diff --git a/views/bootstrap4/styles/styles.css b/views/bootstrap4/styles/styles.css
index d160ce347..95133c727 100644
--- a/views/bootstrap4/styles/styles.css
+++ b/views/bootstrap4/styles/styles.css
@@ -1,7 +1,3 @@
-.navbar-brand img {
-	height: 2.3rem;
-}
-
 ul.jqtree-tree ul.jqtree_common {
 	margin-left: 22px;
 }