syncing with upstream

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>