From d0f3ec8abc88abcbaef142fdcca22599f832cdc4 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Wed, 31 Jan 2024 11:53:49 +0530
Subject: [PATCH] [UPDT] SETTINGS: General settings order

---
 base/templates/announcement/expiry_day.html |  7 ++++++-
 templates/settings.html                     | 18 ++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/base/templates/announcement/expiry_day.html b/base/templates/announcement/expiry_day.html
index 1b37e0de7..66a104655 100644
--- a/base/templates/announcement/expiry_day.html
+++ b/base/templates/announcement/expiry_day.html
@@ -5,15 +5,20 @@
   <div class="oh-inner-sidebar-content__header mt-4">
     <h2 class="oh-inner-sidebar-content__title">{% trans "Announcement Expire" %}</h2>
   </div>
-   {{form}}
+  <div>
+    <input type="number" name="days" value="{{form.instance.days}}" class="oh-input w-25" placeholder="Days" id="id_days">
   {% if perms.payroll.change_payrollsettings %}
     <button
+      style="display: inline;margin-left: 10px;"
       type="submit"
       class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
     >
       {% trans "Save Changes" %}
     </button>
   {% endif %}
+  </div>
+
   <div class="oh-inner-sidebar-content__footer"></div>
+
 </form>
 
diff --git a/templates/settings.html b/templates/settings.html
index a0fca29b8..b4a333104 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -43,6 +43,14 @@
 					id="mobileMenu"
 				>
 					<ul class="oh-inner-sidebar__items">
+						<li class="oh-inner-sidebar__item">
+							<a
+								id="currency"
+								href="{% url 'general-settings' %}"
+								class="oh-inner-sidebar__link oh-dropdown__link"
+								>{% trans "General Settings" %}</a
+							>
+						</li>
 						{% if perms.base.view_department %}
 						<li class="oh-inner-sidebar__item">
 							<a
@@ -213,16 +221,6 @@
 								>{% trans "Disciplinary Action Type" %}</a
 							>
 						</li>
-						{% if perms.base.add_announcement %}
-						<li class="oh-inner-sidebar__item">
-							<a
-								id="currency"
-								href="{% url 'general-settings' %}"
-								class="oh-inner-sidebar__link oh-dropdown__link"
-								>{% trans "General Settings" %}</a
-							>
-						</li>
-						{% endif %}
 						{% if perms.base.view_company %}
 
 						<li class="oh-inner-sidebar__item">