Merge pull request #28 from f5devcentral/prettify

Prettify

Author: kreynoldsf5

labapp/app/app.py

@@ -130,7 +130,7 @@ def cache_control(response):
 def ensure_cookie():
     """Ensure that the cookie is present, otherwise redirect to the cookie page."""
     if not request.path.startswith('/static'):
-        if (request.path not in ['/', '/cookie']) and (data_cookie not in request.cookies):
+        if (request.path not in ['/', '/cookie', '/_ce_status']) and (data_cookie not in request.cookies):
             return redirect('/cookie')
 
 @app.route('/')
@@ -204,9 +204,11 @@ def path():
 def header():
     """manipulation page"""
     ns = get_eph_ns()
+    site = get_site()
     return render_template('manipulation.html',
         title="MCN Practical: Manipulation",
-        ns=ns
+        ns=ns, 
+        site=site
     )
 
 @app.route('/portability')

labapp/app/templates/manipulation.html

@@ -128,7 +128,7 @@ <h3><strong>Test Criteria</strong></h3>
     ...
     "request_headers": {
         "x-mcn-namespace": "wiggly-yellowtail",
-        "x-mcn-src-site": "cluster-xxxxxxxx",
+        "x-mcn-src-site": "{{ site or 'cluster-xxxxxxxxx' }}",
     },
     ...
 }

labapp/app/templates/portability.html

@@ -83,7 +83,7 @@ <h2><strong>Exercise 2: Find a Friend</strong></h2>
 <p>
     Do you have a friend working on the lab?
     Have they updated their advertise policy to use the virtual site?
-    Find thier <strong>ephemeral namespace</strong> (or use the one provided in the form).
+    Find their <strong>ephemeral namespace</strong> (or use the one provided in the form).
 </p>
 
 <div>
@@ -100,7 +100,7 @@ <h2><strong>Exercise 2: Find a Friend</strong></h2>
 <h3><strong>Test Criteria</strong></h3>
 
 <div class="alert alert-secondary" role="alert">
-    <strong>Use this ephemeral NS if a friend is unavailable.</strong>
+    <strong>Use the example ephemeral NS if a friend is unavailable.</strong>
 </div>
 
 <pre class="hljs language-http rounded"><code>