Use Jinja2 inheritance to render user settings pages.

This requires Pillar e55d38261b36756a2850716a453c08c9ee6be9e2 or newer.

src/templates/users/settings/_sidebar.pug

@@ -1,20 +0,0 @@
-#settings-sidebar
-	.settings-header
-		.settings-title Settings
-	.settings-content
-		ul
-			a(class="{% if title == 'profile' %}active{% endif %}",
-				href="{{ url_for('settings.profile') }}")
-				li
-					i.pi-vcard
-					| Profile
-			a(class="{% if title == 'emails' %}active{% endif %}",
-					href="{{ url_for('settings.emails') }}")
-				li
-					i.pi-email
-					| Emails
-			a(class="{% if title == 'billing' %}active{% endif %}",
-					href="{{ url_for('settings.billing') }}")
-				li
-					i.pi-credit-card
-					| Subscription

src/templates/users/settings/billing.pug

@@ -1,20 +1,15 @@
-| {% extends 'layout.html' %}
+| {% extends 'users/settings/page.html' %}
 | {% block head %}
+| {{ super() }}
 style(type='text/css').
 	button#recheck_subscription {
 		margin-top: 1em;
 	}
 | {% endblock %}
-| {% block body %}
-| {% set renew_url = url_for('cloud.renew_subscription') %}
-.container
-	#settings
-		| {% include 'users/settings/_sidebar.html'%}
-		#settings-container
-			.settings-header
-				.settings-title Subscription
 
-			.settings-content
+| {% block settings_page_title %}Subscription{% endblock %}
+| {% block settings_page_content %}
+| {% set renew_url = url_for('cloud.renew_subscription') %}
 | {% if current_user.has_cap('can-renew-subscription') %}
 | {% if current_user.has_cap('subscriber') %}
 h3.subscription-active
@@ -57,6 +52,7 @@ style(type='text/css').
 p
 	button#recheck_subscription.btn.btn-default(onclick="javascript:recheck_subscription(this)") Re-check my subscription
 
+hr
 
 script.
 	function recheck_subscription(button) {

src/templates/users/settings/emails.pug

@@ -1,14 +1,6 @@
-| {% extends 'layout.html' %}
+| {% extends 'users/settings/page.html' %}
-| {% block body %}
+| {% block settings_page_title %}Emails{% endblock %}
-.container
+| {% block settings_page_content %}
-	#settings
-		| {% include 'users/settings/_sidebar.html'%}
-		#settings-container
-			.settings-header
-				.settings-title Emails
-
-			.settings-content
-
 .settings-form
 	form#settings-form(method='POST', action="{{url_for('settings.emails')}}")
 		| {{ form.csrf_token }}
@@ -22,6 +14,4 @@
 			button.btn.btn-default.button-submit(type='submit')
 				i.pi-check
 				| Save Changes
-
-
 | {% endblock %}

src/templates/users/settings/page.pug

@@ -0,0 +1,14 @@
+| {% extends 'users/settings/base.html' %}
+| {% block settings_sidebar_menu %}
+| {{ super() }}
+a(class="{% if title == 'emails' %}active{% endif %}",
+        href="{{ url_for('settings.emails') }}")
+    li
+        i.pi-email
+        | Emails
+a(class="{% if title == 'billing' %}active{% endif %}",
+        href="{{ url_for('settings.billing') }}")
+    li
+        i.pi-credit-card
+        | Subscription
+| {% endblock %}