diff --git a/tailbone/templates/themes/waterpark/base.mako b/tailbone/templates/themes/waterpark/base.mako
index 520e18ce..774479ba 100644
--- a/tailbone/templates/themes/waterpark/base.mako
+++ b/tailbone/templates/themes/waterpark/base.mako
@@ -164,12 +164,7 @@
/>
- % if request.has_perm('common.feedback'):
-
-
- % endif
+ ${parent.render_feedback_button()}
%def>
<%def name="render_crud_header_buttons()">
@@ -262,174 +257,133 @@
/>
%def>
-<%def name="render_vue_templates()">
- ${parent.render_vue_templates()}
+<%def name="render_vue_template_feedback()">
+
-
+%def>
- showFeedback() {
- this.referrer = location.href
- this.showDialog = true
- this.$nextTick(function() {
- this.$refs.textarea.focus()
- })
- },
+<%def name="render_vue_script_feedback()">
+ ${parent.render_vue_script_feedback()}
+
- % endif
+ // TODO: deprecate / remove these
+ const FeedbackForm = WuttaFeedbackForm
+ const FeedbackFormData = WuttaFeedbackFormData
+
+
+%def>
+
+<%def name="render_vue_templates()">
+ ${parent.render_vue_templates()}
+ ${page_help.render_template()}
+ ${page_help.declare_vars()}
%def>
<%def name="modify_vue_vars()">
@@ -528,21 +482,6 @@
% endif
- ##############################
- ## feedback
- ##############################
-
- % if request.has_perm('common.feedback'):
-
- WholePageData.feedbackMessage = ""
-
- % if request.user:
- FeedbackFormData.userUUID = ${json.dumps(request.user.uuid)|n}
- FeedbackFormData.userName = ${json.dumps(str(request.user))|n}
- % endif
-
- % endif
-
##############################
## edit fields help
##############################
@@ -562,10 +501,4 @@
${h.javascript_link(request.static_url('tailbone:static/js/tailbone.buefy.timepicker.js') + f'?ver={tailbone.__version__}')}
${make_grid_filter_components()}
${page_help.make_component()}
- % if request.has_perm('common.feedback'):
-
- % endif
%def>