Update raw templates for Jinja2

Author: runestonetest

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

@@ -1,7 +1,7 @@
 {% extends "basic/layout.html" %}
 
 {% if dynamic_pages == 'True' %}
-  {% set appname = '{{ =request.application }}' %}
+  {% set appname = '{{ request.application }}' %}
 {% endif %}
 
 
@@ -41,7 +41,7 @@
         <a class="navbar-brand" href="{{ pathto(master_doc) }}" aria-label="index-page">
           {% if dynamic_pages == 'True' %}
             {% raw %}
-            {{ =course_name }}
+            {{ course_name }}
             {% endraw %}
           {% else %}
           {% if course_title -%}{{ course_title|e }}{%- else -%}{{ course_id|e }}{%- endif -%}
@@ -234,18 +234,18 @@
     {% raw %}
     eBookConfig.useRunestoneServices = true;
     eBookConfig.host = '';
-    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 }};
-    eBookConfig.username = '{{= user_id}}';
-    eBookConfig.readings = {{= readings}};
-    eBookConfig.activities = {{= XML(activity_info) }}
-    eBookConfig.downloadsEnabled = {{=downloads_enabled}};
-    eBookConfig.allow_pairs = {{=allow_pairs}}
-    eBookConfig.enableCompareMe = {{=enable_compare_me }};
+    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 }};
+    eBookConfig.username = '{{ user_id}}';
+    eBookConfig.readings = {{ readings}};
+    eBookConfig.activities = {{ activity_info }}
+    eBookConfig.downloadsEnabled = {{downloads_enabled}};
+    eBookConfig.allow_pairs = {{allow_pairs}}
+    eBookConfig.enableCompareMe = {{enable_compare_me}};
     {% endraw %}
   {% else %}
     eBookConfig.useRunestoneServices = {% if use_services == 'true' -%}true{%- else -%}false{%- endif -%};
@@ -274,9 +274,9 @@
 <!-- Ad Serving Headers Only serve ads to Anonymous Users -->
 {% if dynamic_pages == 'True' %}
     {% raw %}
-        {{ if response.serve_ad and settings.adsenseid: }}
-         <script data-ad-client="{{=settings.adsenseid}}" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-        {{ pass }}
+        {% if settings.serve_ad and settings.adsenseid %}
+         <script data-ad-client="{{settings.adsenseid}}" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+        {% endif %}
     {% endraw %}
 {% endif %}
 
@@ -299,16 +299,16 @@
 <!-- Ad Serving for Runestone Campaign -->
 {% if dynamic_pages == 'True' %}
     {% raw %}
-        {{ if settings.num_banners > 0 and settings.show_rs_banner: }}
+        {% if settings.num_banners > 0 and settings.show_rs_banner %}
          <div style="width: 100%;">
-            <a href="/runestone/default/donate?banner={{=banner_num}}">
+            <a href="/runestone/default/donate?banner={{banner_num}}">
             <img class="runestone-banner"
-                 src="/runestone/static/images/RunestoneBanner{{=banner_num}}.png"
+                 src="/runestone/static/images/RunestoneBanner{{banner_num}}.png"
                  alt="Please Support Runestone"
                  style="display: block; width: 728px; margin-left: auto; margin-right: auto; margin-top: 10px;">
             </a>
          </div>
-        {{ pass }}
+        {% endif %}
     {% endraw %}
 {% endif %}
 
@@ -359,10 +359,10 @@
 
 {% if dynamic_pages == 'True' %}
   {% raw %}
-    {{ if request.application == 'runestone':}}
+    {% if request.application == 'runestone' %}
       <script type="text/javascript">
         var _gaq = _gaq || [];
-        _gaq.push(['_setAccount', '{{ =settings.google_ga }}']);
+        _gaq.push(['_setAccount', '{{ settings.google_ga }}']);
         _gaq.push(['_trackPageview']);
 
         (function() {
@@ -371,7 +371,7 @@
           var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
         })();
       </script>
-    {{ pass }}
+    {% endif %}
   {% endraw %}
 
   {% if minimal_outside_links != 'True' %}

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

@@ -1,14 +1,19 @@
-<script>
-</script>
+<script></script>
 <li class="dropdown globaltoc-container">
-  <a href="{{ pathto(master_doc) }}"
-     class="dropdown-toggle"
-     data-toggle="dropdown" aria-label="{{master_doc}}">This Chapter<b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc">
-      {% raw %}
-      {{ for row in subchapter_list: }}
-        <li class=toctree-l1><a class="reference internal" href="{{= row['subchap_uri']}}">{{= row['title']}}</a></li>
-      {{ pass }}
-      {% endraw %}
-  </ul>
+    <a
+        href="{{ pathto(master_doc) }}"
+        class="dropdown-toggle"
+        data-toggle="dropdown"
+        aria-label="{{master_doc}}"
+        >This Chapter<b class="caret"></b
+    ></a>
+    <ul class="dropdown-menu globaltoc">
+        {% raw %} {% for row in subchapter_list %}
+        <li class="toctree-l1">
+            <a class="reference internal" href="{{ row['subchap_uri']}}"
+                >{{ row['title']}}</a
+            >
+        </li>
+        {% endfor %} {% endraw %}
+    </ul>
 </li>