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 %}

helix/templates/download.html.jinja

@@ -5,14 +5,14 @@
         {% if context['sfdc_export_error'] %}
             <div class="summary_warning" style="margin-top: 20px;">{{ context['sfdc_export_error'] }}</div>
         {% else %}
-            <div class="msg-container">Documents exported to Sales Force succesffully.</div>
+            <div class="msg-container">Documents exported to Salesforce successfully.</div>
         {% endif %}
 
         <ul class="msg-container">
             {% if context['sfdc_export_urls']['dxfUrl'] %}
                 <li><a href="{{ context['sfdc_export_urls']['dxfUrl'] }}">DXF file</a> (uploaded on Helix)</li>
             {% else %}
-                <li><a href="{{ context['sfdc_export_urls']['dxfUrlFromSF'] }}">DXF file</a> (uploaded on Sales Force)</li>
+                <li><a href="{{ context['sfdc_export_urls']['dxfUrlFromSF'] }}">DXF file</a> (uploaded on Salesforce)</li>
             {% endif %}
             <li><a href="{{ context['sfdc_export_urls']['documentationUrl'] }}">Documentation file</a></li>
             <li><a href="{{ context['sfdc_export_urls']['bomCsvUrl'] }}">BOM CSV file</a></li>
@@ -40,7 +40,7 @@
             </a>
         </div>
 
-        {% if 'SFID' in session %}
+        {% if 'sf_session' in session %}
         <div class="download">
             <a href="/export-sfdc">
                 <button>Export documents to Salesforce</button>

helix/templates/ebom_form.html.jinja

@@ -15,8 +15,7 @@
             <div>Inverter Brand</div>
         </div>
         <form name="inverter_brand_form" action="" method="post" enctype="multipart/form-data">
-            <div id="inverter_brand_form"
-                 class="form_section ebom_form">
+            <div id="inverter_brand_form" class="form_section ebom_form">
                 {{ inverter_brand_form.csrf_token }}
                 {% for field in inverter_brand_form.group('hidden') %}
                     {{ field }}

helix/templates/layout.html.jinja

@@ -59,7 +59,23 @@
             {% endif %}
         {% endfor %}
     </div>
+
+    {% with messages = get_flashed_messages() %}
+      {% if messages %}
+        <br>
+        <div class="summary_warning">
+        {% for message in messages %}
+          <div>{{ message }}</div>
+        {% endfor %}
+        </div>
+      {% endif %}
+    {% endwith %}
+
     {% block contents %}{% endblock %}
+
+    {% if 'sf_session' in session %}
+        <small><i>Salesforce project</i> (<a href="/sales_force_logout">Log out</a>)</small>
+    {% endif %}
 </div>
 
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>

helix/templates/site_summary.html.jinja

@@ -87,7 +87,4 @@
 
     {% endif %}
     {% include "navigation_buttons.html.jinja" %}
-    {% if 'SFID' in session %}
-        <small><i>Sales Force project</i> (<a href="/sales_force_logout">Logout</a>)</small>
-    {% endif %}
 {% endblock %}