Populate login from template

Author: Brad Miller

runestone/common/js/bookfuncs.js

@@ -147,11 +147,8 @@ function gotUser(data, status, whatever) {
     } else {
         if (!caughtErr) {
             mess = "username: " + d.nick;
-            eBookConfig.email = d.email;
-            eBookConfig.isLoggedIn = true;
-            eBookConfig.isInstructor = d.isInstructor;
             // If the user is not an instructor then remove the link to the instructors page
-            if (! d.isInstructor) {
+            if (! eBookConfig.isInstructor) {
                 $("#ip_dropdown_link").remove()
             }
             $(document).trigger("runestone:login")

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html

@@ -237,6 +237,8 @@
     eBookConfig.app = eBookConfig.host + '/' + '{{= request.application }}';
     eBookConfig.course = '{{= course_name }}';
     eBookConfig.basecourse = '{{= base_course }}';
+    eBookConfig.isLoggedIn = {{= is_logged_in}};
+    eBookConfig.email = '{{= user_email }}';
     eBookConfig.isInstructor = {{= is_instructor }}
     {% endraw %}
   {% else %}
@@ -250,7 +252,6 @@
   eBookConfig.logLevel = {{loglevel}};
   eBookConfig.loginRequired = {{login_required}};
   eBookConfig.build_info = "{{build_info}}";
-  eBookConfig.isLoggedIn = false;
   eBookConfig.python3 = {{ python3 }};
   eBookConfig.acDefaultLanguage = '{{ default_ac_lang }}' ? '{{ default_ac_lang }}' : 'python'
   eBookConfig.runestone_version = '{{ runestone_version }}';