From 373abdb33179eb201d8914d1d1cb1628284c9c0d Mon Sep 17 00:00:00 2001
From: siddhu dhangar <siddhudhangar@gmail.com>
Date: Thu, 29 Mar 2018 11:12:03 +0530
Subject: [PATCH 1/5] replaced edit metadata to edit profle in user profile

---
 gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html
index 1c806234f2..026b66d596 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html
@@ -184,7 +184,7 @@
 
               {% endif %}
               <li>
-                  <a href="{% url 'unit_edit' groupid group_object.pk %}" class="fi-pencil"> {% trans "Edit Metadata" %}</a>
+                  <a href="{% url 'unit_edit' groupid group_object.pk %}" class="fi-pencil"> {% if 'Author' in group_object_member_of_names_list %} {% trans "Edit Profile" %} {% else %} {% trans "Edit Metadata" %} {% endif %}</a>
               </li>
               <li> <a data-reveal-id="delete-unit"><i class="fa fa-trash"></i> {% trans "Delete" %}</a> </li>
               <div id="delete-unit" class="reveal-modal tiny text-center" data-reveal>

From 6f4dd7b80d3b96521b219afbafeff3c454048a0f Mon Sep 17 00:00:00 2001
From: siddhu dhangar <siddhudhangar@gmail.com>
Date: Thu, 29 Mar 2018 11:28:47 +0530
Subject: [PATCH 2/5] Home button redirect to welcome page

---
 .../gnowsys_ndf/ndf/templates/ndf/header.html | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
index 18f8243b15..202ec1f950 100755
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
@@ -451,16 +451,19 @@ <h5><small class="fi-torso"> {{each_buddy}}</small></h5>
               <ul class="title-area text-center">
                 <li class="name" title="{% firstof  group_object.altnames group_object.name %}">
                   <h1>
-                    <a href="{% url 'groupchange' group_id %}">
-
-                          {% get_relation_value group_object.pk 'has_profile_pic' as grel_dict %}
-                          {% if not grel_dict.cursor and grel_dict.grel_node %}
-                                    <img src="{{MEDIA_URL}}{{grel_dict.grel_node.if_file.original.relurl}}" />
-                          {% else %}
-                                    <img src="/static/ndf/images/metaStudio-profile.svg" alt="Profile picture for this group."  height="20px" width="20px" >
-                          {% endif %}
+                      {% if group_object.name == "home" %}
+                        <a href="{% url 'landing_page' %}">      
+                      {% else %}
+                        <a href="{% url 'groupchange' group_id %}">      
+                      {% endif %}
+                        {% get_relation_value group_object.pk 'has_profile_pic' as grel_dict %}
+                        {% if not grel_dict.cursor and grel_dict.grel_node %}
+                                  <img src="{{MEDIA_URL}}{{grel_dict.grel_node.if_file.original.relurl}}" />
+                        {% else %}
+                                  <img src="/static/ndf/images/metaStudio-profile.svg" alt="Profile picture for this group."  height="20px" width="20px" >
+                        {% endif %}
 
-                          <span style="color:black!important">{% firstof group_object.altnames|truncatechars:7 group_object.name|truncatechars:7 %}</span>
+                        <span style="color:black!important">{% firstof group_object.altnames|truncatechars:7 group_object.name|truncatechars:7 %}</span>
                     </a>
                   </h1>
                 </li>

From 7a28a20d50a179ba63d2888e99a0decaefa5f105 Mon Sep 17 00:00:00 2001
From: siddhu dhangar <siddhudhangar@gmail.com>
Date: Fri, 30 Mar 2018 11:28:47 +0530
Subject: [PATCH 3/5] search ption move to top header and write note renamed to
 write blog

---
 .../ndf/templates/ndf/activity_player.html    | 29 +++++++++--
 .../gnowsys_ndf/ndf/templates/ndf/header.html | 52 +++++++++++++------
 2 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/activity_player.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/activity_player.html
index 5e07c9ac00..71e45406ec 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/activity_player.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/activity_player.html
@@ -78,12 +78,23 @@
 
         <div class="new_note header_text_block header_text_md_block">
             <a title="Click here to write a Note" {% if user_access_priv == "allow" %} target="_blank" href="{% url 'course_notebook' group_id %}?create=True" {% else %} class="user_not_enrolled" {% endif %}><i class="fa fa-edit header_icon"></i>&nbsp;
-               {% trans "Write Note" %} 
+              {% if "announced_unit" in node.member_of_names_list or "drafts_unit" in node.member_of_names_list%}
+               {% trans "Write Note" %}
+              {% else %}
+                {% trans "Write Blog" %}
+              {% endif %}
+               
             </a>
+              }
         </div>
         <div class="new_note header_text_block  header_text_lg_block">
-            <a {% if prev_lesson_id and lesson_act_prev_id and not resource_prev_id%} href="{% url 'activity_player_detail' group_id prev_lesson_id lesson_act_prev_id %}" title="Go to previous lesson"   {% else %} class = "disabled" title="You are on the first lesson"   {% endif %} ><i class="fa fa-angle-double-left header_icon"></i>&nbsp;
-               {% trans "Previous Lesson" %}  
+        	{% if "announced_unit" in node.member_of_names_list or "drafts_unit" in node.member_of_names_list%}
+	            <a {% if prev_lesson_id and lesson_act_prev_id and not resource_prev_id%} href="{% url 'activity_player_detail' group_id prev_lesson_id lesson_act_prev_id %}" title="Go to previous lesson"   {% else %} class = "disabled" title="You are on the first lesson"   {% endif %} ><i class="fa fa-angle-double-left header_icon"></i>&nbsp;
+           		{% trans "Previous Lesson" %}  
+            {% else %}
+            	<a {% if prev_lesson_id and lesson_act_prev_id and not resource_prev_id%} href="{% url 'activity_player_detail' group_id prev_lesson_id lesson_act_prev_id %}" title="Go to previous section"   {% else %} class = "disabled" title="You are on the first section"   {% endif %} ><i class="fa fa-angle-double-left header_icon"></i>&nbsp;
+                {% trans "Previous Section" %}  
+            {% endif %} 
             </a>
         </div>
 
@@ -105,8 +116,16 @@
         </div>
 
         <div class="new_note header_text_block header_text_lg_block">
-            <a {% if next_lesson_id  and lesson_next_act_id and not resource_next_id %} title="Go to next lesson"  href="{% url 'activity_player_detail' group_id next_lesson_id lesson_next_act_id %}" {% else %} class = "disabled"   title="You are on the last Lesson" {% endif %} >
-               {% trans "Next Lesson" %} <i class="fa fa-angle-double-right header_icon"></i>    
+        	{% if "announced_unit" in node.member_of_names_list or "drafts_unit" in node.member_of_names_list%}
+
+	            <a {% if next_lesson_id  and lesson_next_act_id and not resource_next_id %} title="Go to next lesson"  href="{% url 'activity_player_detail' group_id next_lesson_id lesson_next_act_id %}" {% else %} class = "disabled"   title="You are on the last Lesson" {% endif %} >
+	        	{% trans "Previous Lesson" %} 
+            
+            {% else %}
+                <a {% if next_lesson_id  and lesson_next_act_id and not resource_next_id %} title="Go to next section"  href="{% url 'activity_player_detail' group_id next_lesson_id lesson_next_act_id %}" {% else %} class = "disabled"   title="You are on the last section" {% endif %} >
+                {% trans "Next Section" %}  
+            {% endif %} 
+               <i class="fa fa-angle-double-right header_icon"></i>    
             </a>
         </div>
       </div>
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
index 202ec1f950..db9232c699 100755
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
@@ -129,7 +129,23 @@ <h1><a href="{{site.HOME_PAGE|default_if_none:'/home/'}}">
                   <a title="Click here to view your enrolled Courses" href="{% url 'my_desk' request.user.id %}" {% if title == "my desk" or title == "my performance" %} class="active" {% endif %}> My Desk</a>
               </li>
             {% endif %}
-
+              <li class="has-form">
+                <form {% if groupid %} action="{% url 'results' groupid %}" {% else %} action="" {% endif %}
+                  name="search_form" method="GET" >
+
+                  <div class="row collapse">
+                    <div class="large-11 small-10 columns">
+                      <input type="text" name="search_text" id="search_text" placeholder='{% trans "Search" %} {{group_object.name|truncatechars:15}}' autocomplete="off" required/>
+                    </div>
+                    <div class="large-1 small-2 columns">
+                      <button type="submit" class="tiny button" value="" id="search-submit" class="checked">
+                        <i class="fi-magnifying-glass"></i>
+                      </button>
+                    </div>
+                  </div>
+
+                </form>
+              </li>
         </ul>
         <!-- -END of NROER level one menu -->
       {% comment %}
@@ -532,23 +548,7 @@ <h1>
                       </div>
                     </form>
                   </li> -->
-                  <li class="has-form">
-                    <form {% if groupid %} action="{% url 'results' groupid %}" {% else %} action="" {% endif %}
-                      name="search_form" method="GET" >
-
-                      <div class="row collapse">
-                        <div class="large-11 small-10 columns">
-                          <input type="text" name="search_text" id="search_text" placeholder='{% trans "Search" %} {{group_object.name|truncatechars:15}}' autocomplete="off" required/>
-                        </div>
-                        <div class="large-1 small-2 columns">
-                          <button type="submit" class="tiny button" value="" id="search-submit">
-                            <i class="fi-magnifying-glass"></i>
-                          </button>
-                        </div>
-                      </div>
 
-                    </form>
-                  </li>
 
                   <!-- END of search in the app bar -->
 
@@ -647,3 +647,21 @@ <h1>
 </script>
 
 {% endif %}
+<script>
+  $(document).on("click", "#search-submit", function() {
+    if($("#search-submit").hasClass("checked"))
+    {
+      $("#search_text").show();
+      $("#search-submit").removeClass("checked");
+
+    }
+    else
+    {
+      $("#search_text").hide();
+      $("#search-submit").addClass("checked");
+
+    }
+    
+  });
+
+</script>

From 648102de3d4a4b496f62cdd87f8efb6ac37aeae5 Mon Sep 17 00:00:00 2001
From: siddhu dhangar <siddhudhangar@gmail.com>
Date: Fri, 30 Mar 2018 15:35:42 +0530
Subject: [PATCH 4/5] search box moved to top header

---
 .../gnowsys_ndf/ndf/templates/ndf/header.html | 88 ++++++++++++++++---
 1 file changed, 74 insertions(+), 14 deletions(-)

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
index db9232c699..1e86d31f70 100755
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
@@ -129,13 +129,22 @@ <h1><a href="{{site.HOME_PAGE|default_if_none:'/home/'}}">
                   <a title="Click here to view your enrolled Courses" href="{% url 'my_desk' request.user.id %}" {% if title == "my desk" or title == "my performance" %} class="active" {% endif %}> My Desk</a>
               </li>
             {% endif %}
+              <li class="second-has-form">
+                <div class="large-1 small-2 columns">
+                  <button type="submit" class="tiny button" value="" id="search-submit" class="checked">
+                  <i class="fi-magnifying-glass"></i>
+                  </button>
+                </div>
+
+              </li>  
               <li class="has-form">
-                <form {% if groupid %} action="{% url 'results' groupid %}" {% else %} action="" {% endif %}
+                <form id = "search_form" {% if groupid %} action="{% url 'results' groupid %}" {% else %} action="" {% endif %}
                   name="search_form" method="GET" >
-
+                <!--<form id="search_form"  name="search_form" method="GET" >-->
+                  <!--{{group_object.name|truncatechars:15}}-->
                   <div class="row collapse">
                     <div class="large-11 small-10 columns">
-                      <input type="text" name="search_text" id="search_text" placeholder='{% trans "Search" %} {{group_object.name|truncatechars:15}}' autocomplete="off" required/>
+                      <input type="text" name="search_text" id="search_text" placeholder='{% trans "Search" %} ' autocomplete="off" required />
                     </div>
                     <div class="large-1 small-2 columns">
                       <button type="submit" class="tiny button" value="" id="search-submit" class="checked">
@@ -648,19 +657,70 @@ <h1>
 
 {% endif %}
 <script>
-  $(document).on("click", "#search-submit", function() {
-    if($("#search-submit").hasClass("checked"))
-    {
-      $("#search_text").show();
-      $("#search-submit").removeClass("checked");
+//  $(document).on("click", "#search-submit", function() {
+//
+//    if( $("#search_text").val().length === 0 )
+//    {
+//      if($("#search-submit").hasClass("checked"))
+//      {
+//        $("#search_text").show();
+//        $("#search-submit").removeClass("checked");
+
+//      }
+//     else
+//      {
+//        $("#search_text").hide();
+//      $("#search-submit").addClass("checked");
+//
+ //     }
+//    }
+//    else
+//    {
+ //     $("#search_text").show();
+//      //action="{% url 'results' groupid %}"
+//      $('#search_form').attr('action', "{% url 'results' groupid %}");
+//    }
+ // });
+  //$('#search_form').submit(function (event)
+  $( document ).ready(function() {
+    $("li.has-form").hide();
+    $("li.second-has-form").show();
+    
+  });
 
-    }
-    else
-    {
-      $("#search_text").hide();
-      $("#search-submit").addClass("checked");
 
-    }
+  $(document).on("click", "#search-submit", function() {
+
+    //var action = '';
+    // compute action here...
+
+    $("li.has-form").show();
+    $("li.second-has-form").hide();
+
+//    if( $("#search_text").val().length === 0 )
+//    {
+//      
+//      //$("#search_form").attr('action', action);
+//      if($("#search-submit").hasClass("checked"))
+//      {
+//        $("#search_text").show();
+//        $("#search-submit").removeClass("checked");
+//
+//      }
+//      else
+//      {
+//        $("#search_text").hide();
+ //       $("#search-submit").addClass("checked");
+//
+ //     }
+//    }
+//    else
+//    {
+//      $("li.has-form").show();
+//      $("li.second-has-form").hide();
+     //action="{% url 'results' groupid %}"  
+     //$("#search_form").attr('action', action);
+//    }
     
   });
 

From 5201db1e0f7511ac783ade835b84dc5ecf463115 Mon Sep 17 00:00:00 2001
From: siddhu dhangar <siddhudhangar@gmail.com>
Date: Sat, 31 Mar 2018 11:03:36 +0530
Subject: [PATCH 5/5] added search box on top header

---
 .../gnowsys_ndf/ndf/templates/ndf/header.html | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
index 1e86d31f70..4c641025e9 100755
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/header.html
@@ -132,16 +132,16 @@ <h1><a href="{{site.HOME_PAGE|default_if_none:'/home/'}}">
               <li class="second-has-form">
                 <div class="large-1 small-2 columns">
                   <button type="submit" class="tiny button" value="" id="search-submit" class="checked">
-                  <i class="fi-magnifying-glass"></i>
+                  <i class="fi-magnifying-glass" title="Search"></i>
                   </button>
                 </div>
 
               </li>  
               <li class="has-form">
-                <form id = "search_form" {% if groupid %} action="{% url 'results' groupid %}" {% else %} action="" {% endif %}
+              <!--  <form id = "search_form" {% if groupid %} action="{% url 'results' groupid %}" {% else %} action="" {% endif %}
                   name="search_form" method="GET" >
-                <!--<form id="search_form"  name="search_form" method="GET" >-->
-                  <!--{{group_object.name|truncatechars:15}}-->
+                <!--<form id="search_form"  name="search_form" method="GET" >
+                  {{group_object.name|truncatechars:15}}
                   <div class="row collapse">
                     <div class="large-11 small-10 columns">
                       <input type="text" name="search_text" id="search_text" placeholder='{% trans "Search" %} ' autocomplete="off" required />
@@ -153,7 +153,7 @@ <h1><a href="{{site.HOME_PAGE|default_if_none:'/home/'}}">
                     </div>
                   </div>
 
-                </form>
+                </form>-->
               </li>
         </ul>
         <!-- -END of NROER level one menu -->
@@ -683,19 +683,19 @@ <h1>
  // });
   //$('#search_form').submit(function (event)
   $( document ).ready(function() {
-    $("li.has-form").hide();
     $("li.second-has-form").show();
+    //$("li.has-form").hide();
     
   });
 
 
-  $(document).on("click", "#search-submit", function() {
+  $(document).on("click", "#search-submit1", function() {
 
     //var action = '';
     // compute action here...
-
-    $("li.has-form").show();
     $("li.second-has-form").hide();
+    $("li.has-form").show();
+    
 
 //    if( $("#search_text").val().length === 0 )
 //    {
@@ -723,5 +723,20 @@ <h1>
 //    }
     
   });
+  </script>
+  <script>
+  $(document).on("click", "#search-submit", function() {
+           $("li.second-has-form").hide();
+    
+            //$('li').attr({class: "has-form"});            
+            $('li.has-form').append("<form id = 'search_form' {% if groupid %} action='{% url 'results' groupid %}' {% else %} action='' {% endif %} name='search_form' method=GET></form>");
+            $('#search_form').append('<div class="row collapse"><div class="large-11 small-10 columns"><input type="text" name="search_text" id="search_text" placeholder="{% trans "Search" %}" autocomplete="off" required /></div><div class="large-1 small-2 columns"><button type="submit" class="tiny button" value="" id="search-submit1" class="checked"><i class="fi-magnifying-glass"></i></button></div></div>');
+
+            //$('form').attr({id: "search_form"});
+
+    
 
+ });
 </script>
+
+