syncing with upstream

helix/templates/array_summary.html.jinja

@@ -2,7 +2,7 @@
 {% set title = "Helix Calculator" %}
 {% block contents %}
     <script>
-        {%if context['corners']%}
+        {%if context['corners'] and 'ff_cpp' is active_feature %}
             var corners_data = {{ context['corners']|tojson}};
             if (corners_data){
                 console.log("Corners data :");
@@ -20,12 +20,12 @@
         <i class="icon-spin6 animate-spin"></i>
     </div>
 
-    {% if 'SFID' in session %}
+    {% if 'sf_session' in session %}
         <ul id="sf_msg_container" class="msg-container" style="display:none;">
         </ul>
 
         <div id="sf-spinner-panel" class="spinner-panel">
-            <p>Loading DXF file from Sales Force. Please wait, this may take a while.</p>
+            <p>Loading DXF file from Salesforce. Please wait, this may take a while.</p>
             <i class="icon-spin6 animate-spin"></i>
         </div>
     {% endif %}