From bb0aa09b4e80feb84fa203b251f97b0f391931dd Mon Sep 17 00:00:00 2001
From: pateljannat <pateljannat2308@gmail.com>
Date: Mon, 31 May 2021 13:39:31 +0530
Subject: [PATCH] fix: messages and url

---
 community/hooks.py                            |  2 +-
 community/www/batch/home.html                 | 22 ++++++++++++-------
 .../{become-a-member/index.html => join.html} | 11 +++++-----
 .../{become-a-member/index.py => join.py}     |  0
 4 files changed, 21 insertions(+), 14 deletions(-)
 rename community/www/batch/{become-a-member/index.html => join.html} (86%)
 rename community/www/batch/{become-a-member/index.py => join.py} (100%)

diff --git a/community/hooks.py b/community/hooks.py
index e507aefa..e6916c0b 100644
--- a/community/hooks.py
+++ b/community/hooks.py
@@ -144,7 +144,7 @@ primary_rules = [
     {"from_route": "/courses/<course>/<batch>/discuss", "to_route": "batch/discuss"},
     {"from_route": "/courses/<course>/<batch>/about", "to_route": "batch/about"},
     {"from_route": "/courses/<course>/<batch>/progress", "to_route": "batch/progress"},
-    {"from_route": "/become-a-member/<batch>", "to_route": "batch/become-a-member"}
+    {"from_route": "/courses/<course>/<batch>/join", "to_route": "batch/join"}
 ]
 
 # Any frappe default URL is blocked by profile-rules, add it here to unblock it
diff --git a/community/www/batch/home.html b/community/www/batch/home.html
index 839df68c..09743e50 100644
--- a/community/www/batch/home.html
+++ b/community/www/batch/home.html
@@ -1,23 +1,18 @@
 {% extends "templates/base.html" %}
-{% block title %}Batch{% endblock %}
+{% block title %} Batch {% endblock %}
+
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
-
 <link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{% set invite_link = frappe.utils.get_url() + "/become-a-member/" + batch.name %}
+{% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/" + batch.name + "/join" %}
 <div class="container mt-5">
   {{ widgets.BatchTabs(course=course, batch=batch) }}
   <div>
     <h1 class="mt-5">{{ batch.title }}</h1>
-    <div class="col pull-right w-25">
-      <button class="btn btn-primary  mr-5" id="invite-link" data-link="{{ invite_link }}">Get Batch Invitation
-        Link</button>
-      <small id="copy-message" class="text-muted pull-right" style="display: none;">Copied to Clipboard.</small>
-    </div>
   </div>
   <div class="course-details">
     {{ widgets.CourseOutline(course=course, batch=batch, show_link=True) }}
@@ -26,10 +21,21 @@
     <h2>Batch Schedule</h2>
     {{ widgets.RenderBatch(course=course, batch=batch) }}
   </div>
+
   {% if batch.description %}
   <h2>Batch Details</h2>
   {{ frappe.utils.md_to_html(batch.description) }}
   {% endif %}
+
+  {% if course.is_mentor(frappe.session.user) %}
+  <div class="">
+    <h2> Invite Members </h2>
+    <a href="" class="anchor_style mr-5" id="invite-link" data-link="{{ invite_link }}">Get Batch Invitation
+      Link</a>
+    <small id="copy-message" class="text-muted pull-right" style="display: none;">Copied to Clipboard.</small>
+  </div>
+  {% endif %}
+
 </div>
 
 <script>
diff --git a/community/www/batch/become-a-member/index.html b/community/www/batch/join.html
similarity index 86%
rename from community/www/batch/become-a-member/index.html
rename to community/www/batch/join.html
index 5f0f418d..0bcb73e9 100644
--- a/community/www/batch/become-a-member/index.html
+++ b/community/www/batch/join.html
@@ -1,7 +1,8 @@
 % extends "templates/base.html" %}
-{% block title %}Become a member{% endblock %}
+{% block title %}Join a Course{% endblock %}
+
 {% block head_include %}
-<meta name="description" content="Become a member" />
+<meta name="description" content="Join a Course"/>
 <meta name="keywords" content="" />
 {% endblock %}
 
@@ -12,9 +13,9 @@
   <div class='page-card-head'>
     <span class='indicator blue password-box'>Login Required</span>
   </div>
-  <div class=''>Please log in to confirm your membership.</div>
+  <div class=''>Please log in to confirm to join the course {{ batch.course_title }}.</div>
   <a type="submit" id="login" class="btn btn-primary w-100"
-    href="/login?redirect-to=/become-a-member/{{ batch.name }}">{{_("Login")}}</a>
+    href="/login?redirect-to=/courses/{{ batch.course }}/{{ batch.name }}/join">{{_("Login")}}</a>
 </div>
 
 {% elif already_a_member %}
@@ -23,7 +24,7 @@
   <div class='page-card-head'>
     <span class='indicator blue password-box'>Already a member</span>
   </div>
-  <div class=''>You are already a member of the batch {{ batch.title }}.
+  <div class=''>You are already a member of the batch {{ batch.title }} for the course {{ batch.course_title }}.
   </div>
   <a type="submit" id="batch-home" class="btn btn-primary w-100" href="/courses/{{batch.course}}/{{batch.name}}/home">{{_("Go to Batch Home")}}</a>
 </div>
diff --git a/community/www/batch/become-a-member/index.py b/community/www/batch/join.py
similarity index 100%
rename from community/www/batch/become-a-member/index.py
rename to community/www/batch/join.py