From 626e0d854cefa772778fbcf0a71a246edcc588f0 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 6 Aug 2020 13:20:49 +0200
Subject: [PATCH] Fix subDn form style

---
 src/css/default/base.css                 |  3 +--
 src/css/light-blue.css                   | 11 ++++++++++-
 src/includes/class/class.LSsession.php   |  4 ++--
 src/templates/default/base_connected.tpl |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/css/default/base.css b/src/css/default/base.css
index bebe582c..bdbbb784 100644
--- a/src/css/default/base.css
+++ b/src/css/default/base.css
@@ -90,11 +90,10 @@ a img {
  */
 #LSsession_topDn {
   height:                   1.5em;
-  width:                    150px;
+  width:                    166px;
 }
 
 #LSsession_topDn_form {
-  width:                    150px;
   margin:                   5px;
   color:                    #fff;
 }
diff --git a/src/css/light-blue.css b/src/css/light-blue.css
index cffc7d3f..3e35110e 100644
--- a/src/css/light-blue.css
+++ b/src/css/light-blue.css
@@ -37,6 +37,12 @@
 	vertical-align: baseline;
 }
 
+#LSsession_topDn_form {
+  margin: 0;
+	color: var(--dark-color);
+	font-weight: bold;
+}
+
 /* ---- Menu ---- */
 ul.menu {
 	padding: 0;
@@ -255,7 +261,7 @@ tr.LSobject-list-bis, .LSform input[type=text], .LSform input[type=password], .L
 	background-color:	var(--light-color);
 }
 
-.LSform select, select#LSview_search_predefinedFilter {
+#LSsession_topDn, .LSform select, select#LSview_search_predefinedFilter {
 	appearance: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
@@ -263,6 +269,9 @@ tr.LSobject-list-bis, .LSform input[type=text], .LSform input[type=password], .L
 	border: 1px solid var(--medium-color);
 }
 
+#LSsession_topDn {
+	background: white url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 5px center/8px 10px;
+}
 
 /* ---- Dark ---- */
 li.LSform_layout_current, .LSform input[type=submit], input[type='submit'].LSview_search, ul.LSaccessRightsMatrixView_tabs li.LSaccessRightsMatrixView_active_tab {
diff --git a/src/includes/class/class.LSsession.php b/src/includes/class/class.LSsession.php
index 7b4cc3c0..bf34a46c 100644
--- a/src/includes/class/class.LSsession.php
+++ b/src/includes/class/class.LSsession.php
@@ -1563,8 +1563,8 @@ class LSsession {
     $listTopDn = self :: getSubDnLdapServer();
     if (is_array($listTopDn)) {
       asort($listTopDn);
-      LStemplate :: assign('label_level',self :: getSubDnLabel());
-      LStemplate :: assign('_refresh',_('Refresh'));
+      LStemplate :: assign('LSsession_subDn_level',self :: getSubDnLabel());
+      LStemplate :: assign('LSsession_subDn_refresh',_('Refresh'));
       $LSsession_topDn_index = array();
       $LSsession_topDn_name = array();
       foreach($listTopDn as $index => $name) {
diff --git a/src/templates/default/base_connected.tpl b/src/templates/default/base_connected.tpl
index 95d89ca7..e1d9298a 100644
--- a/src/templates/default/base_connected.tpl
+++ b/src/templates/default/base_connected.tpl
@@ -8,8 +8,8 @@
 
       {if isset($LSsession_subDn) && $LSsession_subDn!=""}
         <form action="" method='post' id='LSsession_topDn_form'>
-          <label>{$label_level|escape:"htmlall"}
-            <a href="?LSsession_refresh"><img src='{img name='refresh'}' alt='{$_refresh|escape:"htmlall"}' title='{$_refresh|escape:"htmlall"}' /></a>
+          <label>{$LSsession_subDn_level|escape:"htmlall"}
+            <a href="?LSsession_refresh"><img src='{img name='refresh'}' alt='{$LSsession_subDn_refresh|escape:"htmlall"}' title='{$LSsession_subDn_refresh|escape:"htmlall"}' /></a>
             <select name='LSsession_topDn' id='LSsession_topDn'>
               {html_options values=$LSsession_subDn_indexes output=$LSsession_subDn_names selected=$LSsession_subDn}
             </select>