Merge pull request #6 from RunestoneInteractive/master

Grabbing latest updates from Main Runestone repo

Author: riknos314

runestone/activecode/js/activecode.js

@@ -1012,6 +1012,7 @@ function loadEditor(data, status, whatever) {
 }
 
 function disableAcOpt() {
+    console.log("setup buttons for logged out");
     $jqTheme('button.ac_opt').each(function (index, value) {
         value.className = value.className + ' disabled';
         $jqTheme(value).attr('onclick', 'return false;');
@@ -1252,3 +1253,4 @@ function injectCodeCoach(div_id) {
 $(document).ready(createEditors);
 $(document).ready(createScratchActivecode);
 $(document).ready(styleUnittestResults);
+$(document).bind("runestone:logout",disableAcOpt);

runestone/common/js/bookfuncs.js

@@ -87,7 +87,7 @@ function gotUser(data, status, whatever) {
             if (confirm("Error: " + err.toString() + "Please report this error!  Click OK to continue without logging in.  Cancel to retry.")) {
                 caughtErr = true;
                 mess = "Not logged in";
-                disableAcOpt();
+                $(document).trigger("runestone:logout")
                 $('li.loginout').html('<a href="' + eBookConfig.app + '/default/user/login">Login</a>')
             } else {
                 window.location.href = eBookConfig.app + '/default/user/login?_next=' + window.location.href
@@ -99,16 +99,15 @@ function gotUser(data, status, whatever) {
             window.location.href = eBookConfig.app + '/default/user/login?_next=' + window.location.href
         } else {
             mess = "Not logged in";
-            disableAcOpt();
+            $(document).trigger("runestone:logout")
             $('li.loginout').html('<a href="' + eBookConfig.app + '/default/user/login">Login</a>')
         }
     } else {
         if (!caughtErr) {
             mess = d.email;
             eBookConfig.isLoggedIn = true;
             eBookConfig.cohortId = d.cohortId;
-            addNavbarLoginLink(); // will change navbar login link to say 'Log Out'
-            enableUserHighlights();
+            $(document).trigger("runestone:login")
             timedRefresh();
         }
     }
@@ -152,43 +151,43 @@ function isLoggedIn() {
     return false;
 }
 
-function addUserToFooter() {
-    // test to see if online before doing this.
-    var x = "user ";
+function handleLoginLogout() {
     if (shouldLogin()) {
         jQuery.get(eBookConfig.ajaxURL + 'getuser', null, gotUser)
     } else {
-        $(".footer").html(x + 'not logged in');
-        disableAcOpt();
-        logBookEvent({'event': 'page', 'act': 'view', 'div_id': window.location.pathname})
+        $(document).trigger("runestone:logout")
     }
 }
 
-function addNavbarLoginLink() {
-    if (isLoggedIn()) {
-        if (eBookConfig.cohortId == null || eBookConfig.cohortId == "") {
-            $('#joinGroupLink').show();
-            $('#groupScheduleLink').hide();
-            $('#newChapterLink').hide();
-            $('#manageGroupLink').hide();
-        } else {
-            $('#joinGroupLink').hide();
-            $('#groupScheduleLink').show();
-            $('#newChapterLink').show();
-            $('#manageGroupLink').show();
-        }
-        $('#profilelink').show();
-        $('#passwordlink').show();
-        $('#registerlink').hide();
-        $('li.loginout').html('<a href="' + eBookConfig.app + '/default/user/logout">Log Out</a>')
+function setupNavbarLoggedIn() {
+    if (eBookConfig.cohortId == null || eBookConfig.cohortId == "") {
+        $('#joinGroupLink').show();
+        $('#groupScheduleLink').hide();
+        $('#newChapterLink').hide();
+        $('#manageGroupLink').hide();
     } else {
-        $('#registerlink').show();
-        $('#profilelink').hide();
-        $('#passwordlink').hide();
-        $('li.loginout').html('<a href="' + eBookConfig.app + '/default/user/login">Login</a>')
+        $('#joinGroupLink').hide();
+        $('#groupScheduleLink').show();
+        $('#newChapterLink').show();
+        $('#manageGroupLink').show();
     }
+    $('#profilelink').show();
+    $('#passwordlink').show();
+    $('#registerlink').hide();
+    $('li.loginout').html('<a href="' + eBookConfig.app + '/default/user/logout">Log Out</a>')
 }
-
+$(document).bind("runestone:login", setupNavbarLoggedIn);
+
+function setupNavbarLoggedOut() {
+    console.log("setup navbar for logged out");
+    $('#registerlink').show();
+    $('#profilelink').hide();
+    $('#passwordlink').hide();
+    $('li.loginout').html('<a href="' + eBookConfig.app + '/default/user/login">Login</a>')
+    $(".footer").html('user not logged in');
+    logBookEvent({'event': 'page', 'act': 'view', 'div_id': window.location.pathname})
+}
+$(document).bind("runestone:logout",setupNavbarLoggedOut);
 
 function getNumUsers() {
     if (eBookConfig.useRunestoneServices) {
@@ -256,8 +255,7 @@ function addDelay(directive, action, delay) {
 
 
 // initialize stuff
-$(document).ready(addUserToFooter);
-$(document).ready(addNavbarLoginLink);
+$(document).ready(handleLoginLogout);
 $(document).ready(getNumUsers);
 $(document).ready(getOnlineUsers);
 

runestone/common/js/user-highlights.js

@@ -299,6 +299,8 @@ function enableUserHighlights() {
     // in-progress or completed sections.
     decorateTableOfContents();  //todo: use document.ready to call
 }
+// call enable user highlights after login
+$(document).bind("runestone:login",enableUserHighlights);
 
 function findHighlightClass(classList) {
     var className;

runestone/datafile/__init__.py

@@ -23,7 +23,6 @@
 
 def setup(app):
     app.add_directive('datafile',DataFile)
-    app.add_javascript('bookfuncs.js')
     app.add_javascript('skulpt.min.js')
     app.add_javascript('skulpt-stdlib.js')
     app.add_javascript('datafile.js')