Merge pull request #137 from colaraz/develop

Release candidate
colaraz · Dec 13, 2021 · 292a87d · 292a87d
2 parents 6f5fb89 + 82b4902
commit 292a87d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 30 deletions.
diff --git a/colaraz/cms/templates/base.html b/colaraz/cms/templates/base.html
@@ -21,6 +21,7 @@
 from openedx.core.djangolib.markup import HTML
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.release import RELEASE_LINE
+from django.contrib.auth.models import User
 %>
 
 <%page expression_filter="h"/>
@@ -270,7 +271,11 @@
         var colarazCheckSessionKey = "${getattr(settings, 'COLARAZ_CHECK_SESSION', {}).get('COLARAZ_CHECK_SESSION_KEY')}";
         var edXLogoutUrl = "${reverse('logout')}";
         % if user.is_authenticated:
-            var currentUserEmail = "${user.email}";
+          % if user.id != request.session['_auth_user_id']:
+              var currentUserEmail = "${User.objects.get(id=request.session['_auth_user_id']).email}";
+          % else:
+              var currentUserEmail = "${user.email}";
+          % endif     
         % endif
 
       </script>

diff --git a/colaraz/cms/templates/export.html b/colaraz/cms/templates/export.html
@@ -11,7 +11,6 @@
 <%namespace name='static' file='static_content.html'/>
 
 <%!
-  from django.core.urlresolvers import reverse
   from django.utils.translation import ugettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import (
@@ -40,20 +39,14 @@
 <%block name="content">
 <div class="wrapper-mast wrapper">
   <header class="mast has-subtitle">
-    <%
-      index_url = reverse('course_handler', kwargs={'course_key_string': unicode(context_course.id)})
-    %>
     <h1 class="page-header">
-      <small class="subtitle">
-        ${_("Tools")} -
-        %if library:
-          ${_("Library Export")}
-        %else:
-          ${_("Course Export")}
-        %endif
-      </small>
-      <span class="sr">&gt; </span>
-      <a href="${index_url}"><span class="text">${context_course.display_name_with_default}</span></a>
+      <small class="subtitle">${_("Tools")}</small>
+        <span class="sr">&gt; </span>
+      %if library:
+        ${_("Library Export")}
+      %else:
+        ${_("Course Export")}
+      %endif
     </h1>
   </header>
 </div>

diff --git a/colaraz/cms/templates/import.html b/colaraz/cms/templates/import.html
@@ -10,7 +10,6 @@
 </%def>
 <%namespace name='static' file='static_content.html'/>
 <%!
-  from django.core.urlresolvers import reverse
   from django.utils.translation import ugettext as _
   from openedx.core.djangolib.js_utils import (
       dump_js_escaped_json, js_escaped_string
@@ -29,20 +28,14 @@
 <%block name="content">
 <div class="wrapper-mast wrapper">
   <header class="mast has-subtitle">
-    <%
-      index_url = reverse('course_handler', kwargs={'course_key_string': unicode(context_course.id)})
-    %>
     <h1 class="page-header">
-      <small class="subtitle">
-        ${_("Tools")} -
+      <small class="subtitle">${_("Tools")}</small>
+      <span class="sr">&gt; </span>
         %if library:
             ${_("Library Import")}
         %else:
             ${_("Course Import")}
         %endif
-      </small>
-      <span class="sr">&gt; </span>
-      <a href="${index_url}"><span class="text">${context_course.display_name_with_default}</span></a>
     </h1>
   </header>
 </div>

diff --git a/colaraz/cms/templates/manage_users_lib.html b/colaraz/cms/templates/manage_users_lib.html
@@ -23,9 +23,8 @@
 <div class="wrapper-mast wrapper">
   <header class="mast has-actions has-subtitle">
     <h1 class="page-header">
-      <small class="subtitle">${_("Settings")} - ${_("User Access")}</small>
-      <span class="sr">&gt; </span>
-      <span class="text">${context_course.display_name_with_default}</span>
+      <small class="subtitle">${_("Settings")}</small>
+      <span class="sr">&gt; </span>${_("User Access")}
     </h1>
 
     <nav class="nav-actions" aria-label="${_('Page Actions')}">

diff --git a/colaraz/lms/templates/main.html b/colaraz/lms/templates/main.html
@@ -30,6 +30,7 @@
     from openedx.core.release import RELEASE_LINE
     from pipeline_mako import render_require_js_path_overrides
     from student.models import CourseEnrollment
+    from django.contrib.auth.models import User
 %>
 
 <%
@@ -318,7 +319,6 @@
 </head>
 
 <body class="${static.dir_rtl()} <%block name='bodyclass'/> lang_${LANGUAGE_CODE}" data-nav-menu-url="${marketing_link('NAV_MENU')}" data-zendesk-widget-url="${marketing_link('ZENDESK-WIDGET')}">
-
     <%static:optional_include_mako file="body-initial.html" is_theming_enabled="True" />
 <div id="page-prompt"></div>
 
@@ -357,7 +357,6 @@
               <%include file="${static.get_template_path('registration/account_activation_sidebar_notice.html')}" />
             </div>
           %endif
-
           <div class="side-widget side-profile">
             <div class="side-profile-row">
               <div class="avatar">
@@ -478,7 +477,11 @@ <h2 class="account-status-title sr">${_("Account Status Info")}: </h2>
         var colarazCheckSessionKey = "${getattr(settings, 'COLARAZ_CHECK_SESSION', {}).get('COLARAZ_CHECK_SESSION_KEY')}";
         var edXLogoutUrl = "${reverse('logout')}";
         % if user.is_authenticated:
-            var currentUserEmail = "${user.email}";
+          % if user.id != request.session['_auth_user_id']:
+              var currentUserEmail = "${User.objects.get(id=request.session['_auth_user_id']).email}";
+          % else:
+              var currentUserEmail = "${user.email}";
+          % endif     
         % endif
 
         // Colaraz Discussion Forum API variables