Merge branch 'bookfuncs-reorg'

Author: bnmnetp

runestone/__main__.py

@@ -20,12 +20,20 @@ def init():
     while ' ' in conf_dict['project_name']:
         conf_dict['project_name'] = click.prompt("Project name: (one word, NO SPACES)")
     conf_dict['build_dir'] = click.prompt("Path to build dir ", default="./build")
-    conf_dict['login_req'] = click.prompt("Require login  ", default="false")
-    conf_dict['master_url'] = click.prompt("URL for ajax server ", default="http://127.0.0.1:8000")
+    conf_dict['use_services'] = click.prompt("Use Runestone Web Services ", type=click.Choice(['true', 'false']), default="false")
     conf_dict['author'] = click.prompt("Your Name ", default=getpass.getuser())
     conf_dict['project_title'] = click.prompt("Title for this project ", default="Runestone Default")
-    conf_dict['logging'] = click.prompt("Log student actions? ", type=bool, default=True)
-    conf_dict['log_level'] = 10 if conf_dict['logging'] else 0
+    conf_dict['python3'] = click.prompt("Use Simple Python3 Semantics ", default="false")
+    if conf_dict['use_services'] == "true":
+        conf_dict['login_req'] = click.prompt("Require login  ", default="false")
+        conf_dict['master_url'] = click.prompt("URL for ajax server ", default="http://127.0.0.1:8000")
+        conf_dict['logging'] = click.prompt("Log student actions? ", type=bool, default=True)
+        conf_dict['log_level'] = 10 if conf_dict['logging'] else 0
+    else:
+        conf_dict['login_req'] = "false"
+        conf_dict['master_url'] = "http://127.0.0.1:8000"
+        conf_dict['logging'] = False
+        conf_dict['log_level'] = 0
 
     shutil.copytree(os.path.join(template_base_dir,'_sources'),'_sources')
     shutil.copytree(os.path.join(template_base_dir,'_static'),'_static')

runestone/common/js/bookfuncs.js

@@ -138,7 +138,7 @@ function timedRefresh() {
 function shouldLogin() {
     var sli = true;
 
-    if (window.location.href.indexOf('file://') > -1) {
+    if (window.location.href.indexOf('file://') > -1 || (! eBookConfig.useRunestoneServices) ) {
         sli = false;
     }
 
@@ -154,6 +154,7 @@ function isLoggedIn() {
 
 function addUserToFooter() {
     // test to see if online before doing this.
+    var x = "user ";
     if (shouldLogin()) {
         jQuery.get(eBookConfig.ajaxURL + 'getuser', null, gotUser)
     } else {
@@ -190,11 +191,15 @@ function addNavbarLoginLink() {
 
 
 function getNumUsers() {
-    $.getJSON(eBookConfig.ajaxURL + 'getnumusers', setNumUsers)
+    if (eBookConfig.useRunestoneServices) {
+        $.getJSON(eBookConfig.ajaxURL + 'getnumusers', setNumUsers)
+    }
 }
 
 function getOnlineUsers() {
-    $.getJSON(eBookConfig.ajaxURL + 'getnumonline', setOnlineUsers)
+    if (eBookConfig.useRunestoneServices) {
+        $.getJSON(eBookConfig.ajaxURL + 'getnumonline', setOnlineUsers)
+    }
 }
 
 function setOnlineUsers(data) {

runestone/common/project_template/_static/activecodethumb.png

@@ -216,9 +216,11 @@
   eBookConfig.ajaxURL = eBookConfig.app+'/ajax/';
   eBookConfig.course = '{{course_id}}';
   eBookConfig.logLevel = {{loglevel}};
-  eBookConfig.loginRequired = {{login_required}}
+  eBookConfig.loginRequired = {{login_required}};
   eBookConfig.build_info = "{{build_info}}";
   eBookConfig.isLoggedIn = false;
+  eBookConfig.useRunestoneServices = {{ use_services }};
+  eBookConfig.python3 = {{ python3 }};
 </script>
 
 <div id="fb-root"></div>

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

@@ -25,7 +25,10 @@ options(
                        'login_required':'%(login_req)s',
                        'appname':master_app,
                        'loglevel': %(log_level)d,
-                       'course_url':master_url }
+                       'course_url':master_url,
+                       'use_services': '%(use_services)s',
+                       'python3': '%(python3)s'
+                        }
     )
 )
 

runestone/common/project_template/pavement.tmpl

@@ -6,7 +6,7 @@
 setup(
     name='runestone',
     description='Sphinx extensions for writing interactive documents.',
-    version='2.0a4',
+    version='2.0a5',
     author = 'Brad Miller',
     author_email = '[email protected]',
     packages= find_packages(),
@@ -17,7 +17,7 @@
     package_data = { '' : ['js/*.js', 'css/*.css', '*.txt']},
     license='GPL',
     url = 'https://github.com/RunestoneInteractive/RunestoneTools',
-    download_url = 'https://github.com/RunestoneInteractive/RunestoneTools/tarball/2.0a4',
+    download_url = 'https://github.com/RunestoneInteractive/RunestoneTools/tarball/2.0a5',
     keywords = ['runestone', 'sphinx', 'ebook'], # arbitrary keywords
     classifiers=('Development Status :: 5 - Production/Stable',
                    'Environment :: Console',