From f2ec50e8e4edc32a45ebeb09e6a9d9d7e4df868d Mon Sep 17 00:00:00 2001
From: css911 <chetanshinde2001@gmail.com>
Date: Mar 06 2019 10:04:51 +0000
Subject: [PATCH 1/3] This commit fixes issue #146 in this issue are highlighting only the current page which is been viewed in the sidebar. For this we made changes in template/base.html file which check whether the set url is equal to the request.path


---

diff --git a/templates/base.html b/templates/base.html
index df27945..9023faf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,15 +28,15 @@
             <ul class="nav nav-stacked">
                 <li><a>Packets sent: <b>{{ packets_sent }}</b></a></li>
                 {% url 'messaging:send' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Send some happiness!</a></li>
+                 <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}Send some happiness!{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
                 {% url 'messaging:start' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">What are Happiness Packets?</a></li>
+                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}What are Happiness Packets?{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
                 {% url 'messaging:inspiration' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Get inspired</a></li>
+                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}Get inspired{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
                 {% url 'messaging:faq' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">FAQ</a></li>
+                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}FAQ{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
                 {% url 'messaging:archive' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Happiness Archive</a></li>
+                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}Happiness Archive{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
             </ul>
             {% if user.is_authenticated %}
                 <form id="logout" action="{% url 'oidc_logout' %}" method="post">

From 4e6eddc1f9f197e179e4362aead9837098fab457 Mon Sep 17 00:00:00 2001
From: css911 <chetanshinde2001@gmail.com>
Date: Mar 06 2019 13:15:49 +0000
Subject: [PATCH 2/3] In this commit we are able to change the background of the text which is currently been viewed


---

diff --git a/assets/css/custom.css b/assets/css/custom.css
index d955781..462c2fd 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -252,3 +252,18 @@ blockquote {
 .socio-buttons a {
     padding: 0.9rem;
 }
+
+#aaa{
+color: blue; 
+font-weight: bold;
+
+}
+
+li.inactive {
+    background: white;
+    border-bottom-left-radius: 25px;
+    margin-right: auto;
+    border-top-right-radius: 25px;
+}
+
+
diff --git a/templates/base.html b/templates/base.html
index 9023faf..633a429 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,16 +28,15 @@
             <ul class="nav nav-stacked">
                 <li><a>Packets sent: <b>{{ packets_sent }}</b></a></li>
                 {% url 'messaging:send' as url %}
-                 <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}Send some happiness!{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
+                 <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>Send some happiness!</a></li>
                 {% url 'messaging:start' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}What are Happiness Packets?{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
+		<li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>What are Happiness Packets?</a></li>	                
                 {% url 'messaging:inspiration' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}Get inspired{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
+                <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>Get inspired</a></li>
                 {% url 'messaging:faq' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}FAQ{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
+                <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>FAQ</a></li>
                 {% url 'messaging:archive' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">{% ifequal request.path url %}<b><u>{% endifequal %}Happiness Archive{% ifequal request.path url %}</b></u>{% endifequal %}</a></li>
-            </ul>
+                <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>Happiness Archive</a></li>
             {% if user.is_authenticated %}
                 <form id="logout" action="{% url 'oidc_logout' %}" method="post">
                     {% csrf_token %}

From dc3400e7754ac71f0815272b5d241d73acdbf18b Mon Sep 17 00:00:00 2001
From: css911 <chetanshinde2001@gmail.com>
Date: Mar 06 2019 18:13:10 +0000
Subject: [PATCH 3/3] This commit reverts the changes made to the file previously


---

diff --git a/assets/css/custom.css b/assets/css/custom.css
index 462c2fd..92943ee 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -253,17 +253,4 @@ blockquote {
     padding: 0.9rem;
 }
 
-#aaa{
-color: blue; 
-font-weight: bold;
-
-}
-
-li.inactive {
-    background: white;
-    border-bottom-left-radius: 25px;
-    margin-right: auto;
-    border-top-right-radius: 25px;
-}
-
 
diff --git a/templates/base.html b/templates/base.html
index 633a429..020139e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,15 +28,15 @@
             <ul class="nav nav-stacked">
                 <li><a>Packets sent: <b>{{ packets_sent }}</b></a></li>
                 {% url 'messaging:send' as url %}
-                 <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>Send some happiness!</a></li>
+                 <li role="presentation" {% ifequal request.path url%}class="active"{% endif %}><a href="{{ url }}">Send some happiness!</a></li>
                 {% url 'messaging:start' as url %}
-		<li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>What are Happiness Packets?</a></li>	                
+		<li role="presentation" {% ifequal request.path url%}class="active"{% endif %}><a href="{{ url }}" >What are Happiness Packets?</a></li>	                
                 {% url 'messaging:inspiration' as url %}
-                <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>Get inspired</a></li>
+                <li role="presentation" {% ifequal request.path url%}class="active"{% endif %}><a href="{{ url }}" >Get inspired</a></li>
                 {% url 'messaging:faq' as url %}
-                <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>FAQ</a></li>
+                <li role="presentation" {% ifequal request.path url%}class="active"{% endif %}><a href="{{ url }}" >FAQ</a></li>
                 {% url 'messaging:archive' as url %}
-                <li role="presentation" {% ifequal request.path url%}class="inactive"{%else%} class = "active"{% endif %}><a href="{{ url }}" {% ifequal request.path url %} id ="aaa"{% endifequal %}>Happiness Archive</a></li>
+                <li role="presentation" {% ifequal request.path url%}class="active"{% endif %}><a href="{{ url }}" >Happiness Archive</a></li>
             {% if user.is_authenticated %}
                 <form id="logout" action="{% url 'oidc_logout' %}" method="post">
                     {% csrf_token %}