rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Refactor all Buefy form submit buttons, per Chrome behavior

Browse source 
ugh, what a pain.  and turns out i'd previously ran into this same issue for
jQuery, per commit e945ebe325
This commit is contained in:
Lance Edgar 2019-06-25 20:32:49 -05:00
parent 43a210cac4
commit a4b27115ac
17 changed files with 517 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tailbone/forms/core.py
View file

@ -758,6 +758,9 @@ class Form(object):
context.setdefault('form_kwargs', {}) context.setdefault('form_kwargs', {})
# TODO: deprecate / remove the latter option here # TODO: deprecate / remove the latter option here
if self.auto_disable_save or self.auto_disable: if self.auto_disable_save or self.auto_disable:
if self.use_buefy:
context['form_kwargs']['@submit'] = 'submit{}'.format(self.component_studly)
else:
context['form_kwargs']['class_'] = 'autodisable' context['form_kwargs']['class_'] = 'autodisable'
if self.focus_spec: if self.focus_spec:
context['form_kwargs']['data-focus'] = self.focus_spec context['form_kwargs']['data-focus'] = self.focus_spec

28
tailbone/static/js/tailbone.buefy.oncebutton.js
View file

@ -1,21 +1,19 @@
const OnceButton = { const OnceButton = {
template: [ template: `
'<b-button', <b-button :type="type"
':type="type"', :native-type="nativeType"
':native-type="nativeType"', :tag="tag"
':tag="tag"', :href="href"
':href="href"', :title="title"
':title="title"', :disabled="buttonDisabled"
':disabled="buttonDisabled"', @click="clicked"
'@click="clicked"', icon-pack="fas"
'icon-pack="fas"', :icon-left="iconLeft">
':icon-left="iconLeft"', {{ buttonText }}
'>', </b-button>
'{{ buttonText }}', `,
'</b-button>'
].join(' '),
props: { props: {
type: String, type: String,

170
tailbone/templates/appsettings.mako
View file

@ -33,8 +33,12 @@
% endif % endif
</%def> </%def>
<div class="form">
${h.form(form.action_url, id=dform.formid, method='post', class_='autodisable')} % if use_buefy:
<script type="text/x-template" id="app-settings-template">
<div class="form">
${h.form(form.action_url, id=dform.formid, method='post', **{'@submit': 'submitForm'})}
${h.csrf_token(request)} ${h.csrf_token(request)}
% if dform.error: % if dform.error:
@ -50,75 +54,11 @@
</div> </div>
% endif % endif
% if use_buefy:
<div id="app-settings-app">
<app-settings :groups="groups" :showing-group="showingGroup"></app-settings>
</div>
% else:
## not buefy
<div class="group-picker">
<div class="field-wrapper">
<label for="settings-group">Showing Group</label>
<div class="field select">
${h.select('settings-group', current_group, group_options, **{'auto-enhance': 'true'})}
</div>
</div>
</div>
% for group in groups:
<div class="panel" data-groupname="${group}">
<h2>${group}</h2>
<div class="panel-body">
% for setting in settings:
% if setting.group == group:
<% field = dform[setting.node_name] %>
<div class="field-wrapper ${field.name} ${'with-error' if field.error else ''}">
% if field.error:
<div class="field-error">
% for msg in field.error.messages():
<span class="error-msg">${msg}</span>
% endfor
</div>
% endif
<div class="field-row">
<label for="${field.oid}">${form.get_label(field.name)}</label>
<div class="field">
${field.serialize()|n}
</div>
</div>
% if form.has_helptext(field.name):
<span class="instructions">${form.render_helptext(field.name)}</span>
% endif
</div>
% endif
% endfor
</div><!-- panel-body -->
</div><! -- panel -->
% endfor
<div class="buttons">
${h.submit('save', getattr(form, 'submit_label', getattr(form, 'save_label', "Submit")), class_='button is-primary')}
${h.link_to("Cancel", form.cancel_url, class_='cancel button{}'.format(' autodisable' if form.auto_disable_cancel else ''))}
</div>
## end of legacy (not buefy)
% endif
${h.end_form()}
</div>
% if use_buefy:
<script type="text/x-template" id="app-settings-template">
<div class="app-wrapper"> <div class="app-wrapper">
<div class="field-wrapper"> <div class="field-wrapper">
<label for="settings-group">Showing Group</label> <label for="settings-group">Showing Group</label>
<b-select @input="showGroup" <b-select name="settings-group"
name="settings-group"
v-model="showingGroup"> v-model="showingGroup">
<option value="">(All)</option> <option value="">(All)</option>
<option v-for="group in groups" <option v-for="group in groups"
@ -184,18 +124,26 @@
</div><!-- card --> </div><!-- card -->
<div class="buttons"> <div class="buttons">
<once-button type="is-primary" <b-button type="is-primary"
native-type="submit" native-type="submit"
text="${getattr(form, 'submit_label', getattr(form, 'save_label', "Submit"))}"> :disabled="formSubmitting">
</once-button> {{ formButtonText }}
</b-button>
<once-button tag="a" href="${form.cancel_url}" <once-button tag="a" href="${form.cancel_url}"
text="Cancel"> text="Cancel">
</once-button> </once-button>
</div> </div>
</div><!-- app-wrapper --> </div><!-- app-wrapper -->
${h.end_form()}
</div>
</script> </script>
<div id="app-settings-app">
<app-settings :groups="groups" :showing-group="showingGroup"></app-settings>
</div>
<script type="text/javascript"> <script type="text/javascript">
Vue.component('app-settings', { Vue.component('app-settings', {
@ -204,10 +152,16 @@
groups: Array, groups: Array,
showingGroup: String showingGroup: String
}, },
data() {
return {
formSubmitting: false,
formButtonText: ${json.dumps(getattr(form, 'submit_label', getattr(form, 'save_label', "Submit")))|n},
}
},
methods: { methods: {
showGroup(group) { submitForm() {
console.log("SHOWING GROUP") this.formSubmitting = true
console.log(group) this.formButtonText = "Working, please wait..."
} }
} }
}) })
@ -223,4 +177,74 @@
}) })
</script> </script>
% else:
## legacy / not buefy
<div class="form">
${h.form(form.action_url, id=dform.formid, method='post', class_='autodisable')}
${h.csrf_token(request)}
% if dform.error:
<div class="error-messages">
<div class="ui-state-error ui-corner-all">
<span style="float: left; margin-right: .3em;" class="ui-icon ui-icon-alert"></span>
Please see errors below.
</div>
<div class="ui-state-error ui-corner-all">
<span style="float: left; margin-right: .3em;" class="ui-icon ui-icon-alert"></span>
${dform.error}
</div>
</div>
% endif
<div class="group-picker">
<div class="field-wrapper">
<label for="settings-group">Showing Group</label>
<div class="field select">
${h.select('settings-group', current_group, group_options, **{'auto-enhance': 'true'})}
</div>
</div>
</div>
% for group in groups:
<div class="panel" data-groupname="${group}">
<h2>${group}</h2>
<div class="panel-body">
% for setting in settings:
% if setting.group == group:
<% field = dform[setting.node_name] %>
<div class="field-wrapper ${field.name} ${'with-error' if field.error else ''}">
% if field.error:
<div class="field-error">
% for msg in field.error.messages():
<span class="error-msg">${msg}</span>
% endfor
</div>
% endif
<div class="field-row">
<label for="${field.oid}">${form.get_label(field.name)}</label>
<div class="field">
${field.serialize()|n}
</div>
</div>
% if form.has_helptext(field.name):
<span class="instructions">${form.render_helptext(field.name)}</span>
% endif
</div>
% endif
% endfor
</div><!-- panel-body -->
</div><! -- panel -->
% endfor
<div class="buttons">
${h.submit('save', getattr(form, 'submit_label', getattr(form, 'save_label', "Submit")), class_='button is-primary')}
${h.link_to("Cancel", form.cancel_url, class_='cancel button{}'.format(' autodisable' if form.auto_disable_cancel else ''))}
</div>
${h.end_form()}
</div>
% endif % endif

39
tailbone/templates/batch/view.mako
View file

@ -75,16 +75,27 @@
</%def> </%def>
<%def name="execute_submit_button()"> <%def name="execute_submit_button()">
<once-button type="is-primary" <b-button type="is-primary"
% if master.has_execution_options(batch):
@click="executeBatch"
% else:
native-type="submit" native-type="submit"
% endif
% if not execute_enabled: % if not execute_enabled:
disabled disabled
% elif not master.has_execution_options(batch):
:disabled="executeFormSubmitting"
% endif % endif
% if why_not_execute: % if why_not_execute:
title="${why_not_execute}" title="${why_not_execute}"
% endif % endif
text="${execute_title}"> >
</once-button> % if master.has_execution_options(batch):
${execute_title}
% else:
{{ executeFormButtonText }}
% endif
</b-button>
</%def> </%def>
<%def name="object_helpers()"> <%def name="object_helpers()">
@ -131,8 +142,7 @@
<p>Batch has not yet been executed.</p> <p>Batch has not yet been executed.</p>
% if use_buefy: % if use_buefy:
% if master.has_execution_options(batch): % if master.has_execution_options(batch):
## TODO: this doesn't work yet <p>TODO: must implement execution with options</p>
${self.execute_submit_button()}
% else: % else:
<execute-form></execute-form> <execute-form></execute-form>
% endif % endif
@ -180,19 +190,26 @@
<%def name="render_this_page_buefy()"> <%def name="render_this_page_buefy()">
% if use_buefy and master.handler.executable(batch) and request.has_perm('{}.execute'.format(permission_prefix)): % if use_buefy and master.handler.executable(batch) and request.has_perm('{}.execute'.format(permission_prefix)):
## TODO: stop using |n filter ## TODO: stop using |n filter
${execute_form.render_deform(buttons=capture(execute_submit_button))|n} ${execute_form.render_deform(buttons=capture(execute_submit_button), form_kwargs={'@submit': 'submitExecuteForm'})|n}
% endif % endif
${parent.render_this_page_buefy()} ${parent.render_this_page_buefy()}
</%def> </%def>
<%def name="declare_page_vars()"> <%def name="modify_this_page()">
${parent.declare_page_vars()} ${parent.modify_this_page()}
% if not batch.executed and request.has_perm('{}.execute'.format(permission_prefix)): % if not batch.executed and request.has_perm('{}.execute'.format(permission_prefix)):
<script type="text/javascript"> <script type="text/javascript">
let ${execute_form.component_studly} = { ${execute_form.component_studly}Data.executeFormButtonText = "${execute_title}"
template: '#${execute_form.component}-template', ${execute_form.component_studly}Data.executeFormSubmitting = false
methods: {}
${execute_form.component_studly}.methods.executeBatch = function() {
alert("TODO: implement options dialog for batch execution")
}
${execute_form.component_studly}.methods.submitExecuteForm = function() {
this.executeFormSubmitting = true
this.executeFormButtonText = "Executing, please wait..."
} }
</script> </script>

52
tailbone/templates/datasync/changes/index.mako
View file

@ -5,12 +5,17 @@
${parent.grid_tools()} ${parent.grid_tools()}
% if request.has_perm('datasync.restart'): % if request.has_perm('datasync.restart'):
${h.form(url('datasync.restart'), name='restart-datasync', class_='autodisable control')} % if use_buefy:
${h.form(url('datasync.restart'), name='restart-datasync', class_='control', **{'@submit': 'submitRestartDatasyncForm'})}
% else:
${h.form(url('datasync.restart'), name='restart-datasync', class_='autodisable')}
% endif
${h.csrf_token(request)} ${h.csrf_token(request)}
% if use_buefy: % if use_buefy:
<once-button native-type="submit" <b-button native-type="submit"
text="Restart DataSync"> :disabled="restartDatasyncFormSubmitting">
</once-button> {{ restartDatasyncFormButtonText }}
</b-button>
% else: % else:
${h.submit('submit', "Restart DataSync", data_working_label="Restarting DataSync", class_='button')} ${h.submit('submit', "Restart DataSync", data_working_label="Restarting DataSync", class_='button')}
% endif % endif
@ -18,12 +23,49 @@
% endif % endif
% if allow_filemon_restart and request.has_perm('filemon.restart'): % if allow_filemon_restart and request.has_perm('filemon.restart'):
${h.form(url('filemon.restart'), name='restart-filemon', class_='autodisable control')} % if use_buefy:
${h.form(url('filemon.restart'), name='restart-filemon', class_='control', **{'@submit': 'submitRestartFilemonForm'})}
% else:
${h.form(url('filemon.restart'), name='restart-filemon', class_='autodisable')}
% endif
${h.csrf_token(request)} ${h.csrf_token(request)}
% if use_buefy:
<b-button native-type="submit"
:disabled="restartFilemonFormSubmitting">
{{ restartFilemonFormButtonText }}
</b-button>
% else:
${h.submit('submit', "Restart FileMon", data_working_label="Restarting FileMon", class_='button')} ${h.submit('submit', "Restart FileMon", data_working_label="Restarting FileMon", class_='button')}
% endif
${h.end_form()} ${h.end_form()}
% endif % endif
</%def> </%def>
<%def name="modify_tailbone_grid()">
${parent.modify_tailbone_grid()}
<script type="text/javascript">
% if request.has_perm('datasync.restart'):
TailboneGridData.restartDatasyncFormSubmitting = false
TailboneGridData.restartDatasyncFormButtonText = "Restart Datasync"
TailboneGrid.methods.submitRestartDatasyncForm = function() {
this.restartDatasyncFormSubmitting = true
this.restartDatasyncFormButtonText = "Restarting Datasync..."
}
% endif
% if allow_filemon_restart and request.has_perm('filemon.restart'):
TailboneGridData.restartFilemonFormSubmitting = false
TailboneGridData.restartFilemonFormButtonText = "Restart Filemon"
TailboneGrid.methods.submitRestartFilemonForm = function() {
this.restartFilemonFormSubmitting = true
this.restartFilemonFormButtonText = "Restarting Filemon..."
}
% endif
</script>
</%def>
${parent.body()} ${parent.body()}

26
tailbone/templates/form.mako
View file

@ -15,9 +15,7 @@
</div> </div>
</%def> </%def>
<%def name="render_this_page()"> <%def name="page_content()">
<div style="display: flex; justify-content: space-between;">
<div class="form-wrapper"> <div class="form-wrapper">
% if use_buefy: % if use_buefy:
${self.render_buefy_form()} ${self.render_buefy_form()}
@ -25,6 +23,14 @@
${self.render_form()} ${self.render_form()}
% endif % endif
</div> </div>
</%def>
<%def name="render_this_page()">
<div style="display: flex; justify-content: space-between;">
<div class="this-page-content">
${self.page_content()}
</div>
<div style="display: flex; align-items: flex-start;"> <div style="display: flex; align-items: flex-start;">
<div class="object-helpers"> <div class="object-helpers">
@ -46,20 +52,6 @@
${parent.render_this_page_buefy()} ${parent.render_this_page_buefy()}
</%def> </%def>
<%def name="declare_page_vars()">
${parent.declare_page_vars()}
% if form is not Undefined:
<script type="text/javascript">
let ${form.component_studly} = {
template: '#${form.component}-template',
methods: {}
}
</script>
% endif
</%def>
<%def name="finalize_page_components()"> <%def name="finalize_page_components()">
${parent.finalize_page_components()} ${parent.finalize_page_components()}
% if form is not Undefined: % if form is not Undefined:

27
tailbone/templates/forms/deform_buefy.mako
View file

@ -44,10 +44,11 @@
<div class="buttons"> <div class="buttons">
## TODO: deprecate / remove the latter option here ## TODO: deprecate / remove the latter option here
% if form.auto_disable_save or form.auto_disable: % if form.auto_disable_save or form.auto_disable:
<once-button type="is-primary" <b-button type="is-primary"
native-type="submit" native-type="submit"
text="${getattr(form, 'submit_label', getattr(form, 'save_label', "Submit"))}"> :disabled="${form.component_studly}Submitting">
</once-button> {{ ${form.component_studly}ButtonText }}
</b-button>
% else: % else:
<b-button type="is-primary" <b-button type="is-primary"
native-type="submit"> native-type="submit">
@ -83,6 +84,20 @@
<script type="text/javascript"> <script type="text/javascript">
let ${form.component_studly} = {
template: '#${form.component}-template',
methods: {
## TODO: deprecate / remove the latter option here
% if form.auto_disable_save or form.auto_disable:
submit${form.component_studly}() {
this.${form.component_studly}Submitting = true
this.${form.component_studly}ButtonText = "Working, please wait..."
}
% endif
}
}
let ${form.component_studly}Data = { let ${form.component_studly}Data = {
## TODO: ugh, this seems pretty hacky. need to declare some data models ## TODO: ugh, this seems pretty hacky. need to declare some data models
@ -95,6 +110,12 @@
% endif % endif
% endfor % endfor
% endif % endif
## TODO: deprecate / remove the latter option here
% if form.auto_disable_save or form.auto_disable:
${form.component_studly}Submitting: false,
${form.component_studly}ButtonText: ${json.dumps(getattr(form, 'submit_label', getattr(form, 'save_label', "Submit")))|n},
% endif
} }
</script> </script>

28
tailbone/templates/master/clone.mako
View file

@ -27,7 +27,11 @@
% endif % endif
<br /> <br />
${h.form(request.current_route_url(), class_=None if use_buefy else 'autodisable')} % if use_buefy:
${h.form(request.current_route_url(), **{'@submit': 'submitForm'})}
% else:
${h.form(request.current_route_url(), class_='autodisable')}
% endif
${h.csrf_token(request)} ${h.csrf_token(request)}
${h.hidden('clone', value='clone')} ${h.hidden('clone', value='clone')}
<div class="buttons"> <div class="buttons">
@ -35,10 +39,11 @@
<once-button tag="a" href="${form.cancel_url}" <once-button tag="a" href="${form.cancel_url}"
text="Whoops, nevermind..."> text="Whoops, nevermind...">
</once-button> </once-button>
<once-button type="is-primary" <b-button type="is-primary"
native-type="submit" native-type="submit"
text="Yes, please clone away"> :disabled="formSubmitting">
</once-button> {{ submitButtonText }}
</b-button>
% else: % else:
${h.link_to("Whoops, nevermind...", form.cancel_url, class_='button autodisable')} ${h.link_to("Whoops, nevermind...", form.cancel_url, class_='button autodisable')}
${h.submit('submit', "Yes, please clone away")} ${h.submit('submit', "Yes, please clone away")}
@ -47,5 +52,20 @@
${h.end_form()} ${h.end_form()}
</%def> </%def>
<%def name="modify_this_page()">
${parent.modify_this_page()}
<script type="text/javascript">
TailboneFormData.formSubmitting = false
TailboneFormData.submitButtonText = "Yes, please clone away"
TailboneForm.methods.submitForm = function() {
this.formSubmitting = true
this.submitButtonText = "Working, please wait..."
}
</script>
</%def>
${parent.body()} ${parent.body()}

28
tailbone/templates/master/delete.mako
View file

@ -44,17 +44,22 @@
% endif % endif
<br /> <br />
${h.form(request.current_route_url(), class_=None if use_buefy else 'autodisable')} % if use_buefy:
${h.form(request.current_route_url(), **{'@submit': 'submitForm'})}
% else:
${h.form(request.current_route_url(), class_='autodisable')}
% endif
${h.csrf_token(request)} ${h.csrf_token(request)}
<div class="buttons"> <div class="buttons">
% if use_buefy: % if use_buefy:
<once-button tag="a" href="${form.cancel_url}" <once-button tag="a" href="${form.cancel_url}"
text="Whoops, nevermind..."> text="Whoops, nevermind...">
</once-button> </once-button>
<once-button type="is-primary is-danger" <b-button type="is-primary is-danger"
native-type="submit" native-type="submit"
text="Yes, please DELETE this data forever!"> :disabled="formSubmitting">
</once-button> {{ formButtonText }}
</b-button>
% else: % else:
<a class="button" href="${form.cancel_url}">Whoops, nevermind...</a> <a class="button" href="${form.cancel_url}">Whoops, nevermind...</a>
${h.submit('submit', "Yes, please DELETE this data forever!", class_='button is-primary')} ${h.submit('submit', "Yes, please DELETE this data forever!", class_='button is-primary')}
@ -63,5 +68,20 @@
${h.end_form()} ${h.end_form()}
</%def> </%def>
<%def name="modify_this_page()">
${parent.modify_this_page()}
<script type="text/javascript">
TailboneFormData.formSubmitting = false
TailboneFormData.formButtonText = "Yes, please DELETE this data forever!"
TailboneForm.methods.submitForm = function() {
this.formSubmitting = true
this.formButtonText = "Working, please wait..."
}
</script>
</%def>
${parent.body()} ${parent.body()}

2
tailbone/templates/master/edit.mako
View file

@ -5,6 +5,7 @@
<%def name="extra_javascript()"> <%def name="extra_javascript()">
${parent.extra_javascript()} ${parent.extra_javascript()}
% if not use_buefy:
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
@ -18,6 +19,7 @@
}); });
</script> </script>
% endif
</%def> </%def>
<%def name="context_menu_items()"> <%def name="context_menu_items()">

31
tailbone/templates/master/index.mako
View file

@ -14,9 +14,7 @@
<%def name="extra_javascript()"> <%def name="extra_javascript()">
${parent.extra_javascript()} ${parent.extra_javascript()}
% if use_buefy: % if not use_buefy:
${h.javascript_link(request.static_url('tailbone:static/js/tailbone.buefy.grid.js') + '?ver={}'.format(tailbone.__version__))}
% else:
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
@ -148,18 +146,23 @@
## merge 2 objects ## merge 2 objects
% if master.mergeable and request.has_perm('{}.merge'.format(permission_prefix)): % if master.mergeable and request.has_perm('{}.merge'.format(permission_prefix)):
${h.form(url('{}.merge'.format(route_prefix)), name='merge-things', class_='control')} % if use_buefy:
${h.form(url('{}.merge'.format(route_prefix)), **{'@submit': 'submitMergeForm'})}
% else:
${h.form(url('{}.merge'.format(route_prefix)), name='merge-things')}
% endif
${h.csrf_token(request)} ${h.csrf_token(request)}
% if use_buefy: % if use_buefy:
<input type="hidden" <input type="hidden"
name="uuids" name="uuids"
:value="checkedRowUUIDs()" /> :value="checkedRowUUIDs()" />
<once-button type="is-primary" <b-button type="is-primary"
native-type="submit" native-type="submit"
icon-pack="fas"
icon-left="object-ungroup" icon-left="object-ungroup"
:disabled="checkedRows.length != 2" :disabled="mergeFormSubmitting || checkedRows.length != 2">
text="Merge 2 ${model_title_plural}"> {{ mergeFormButtonText }}
</once-button> </b-button>
% else: % else:
${h.hidden('uuids')} ${h.hidden('uuids')}
<button type="submit" class="button">Merge 2 ${model_title_plural}</button> <button type="submit" class="button">Merge 2 ${model_title_plural}</button>
@ -213,7 +216,17 @@
</%def> </%def>
<%def name="modify_tailbone_grid()"> <%def name="modify_tailbone_grid()">
## NOTE: if you override this, must use <script> tags <script type="text/javascript">
% if master.mergeable and request.has_perm('{}.merge'.format(permission_prefix)):
TailboneGridData.mergeFormButtonText = "Merge 2 ${model_title_plural}"
TailboneGridData.mergeFormSubmitting = false
TailboneGrid.methods.submitMergeForm = function() {
this.mergeFormSubmitting = true
this.mergeFormButtonText = "Working, please wait..."
}
% endif
</script>
</%def> </%def>
<%def name="make_tailbone_grid_app()"> <%def name="make_tailbone_grid_app()">

142
tailbone/templates/master/merge.mako
View file

@ -1,5 +1,5 @@
## -*- coding: utf-8 -*- ## -*- coding: utf-8 -*-
<%inherit file="/base.mako" /> <%inherit file="/page.mako" />
<%def name="title()">Merge 2 ${model_title_plural}</%def> <%def name="title()">Merge 2 ${model_title_plural}</%def>
@ -91,62 +91,7 @@
<li>${h.link_to("Back to {}".format(model_title_plural), url(route_prefix))}</li> <li>${h.link_to("Back to {}".format(model_title_plural), url(route_prefix))}</li>
</%def> </%def>
<%def name="page_content()">
% if use_buefy:
<script type="text/x-template" id="merge-buttons-template">
<div class="level" style="margin-top: 2em;">
<div class="level-left">
<div class="level-item">
<a class="button" href="${index_url}">Whoops, nevermind</a>
</div>
<div class="level-item">
${h.form(request.current_route_url())}
${h.csrf_token(request)}
${h.hidden('uuids', value='{},{}'.format(object_to_keep.uuid, object_to_remove.uuid))}
<once-button native-type="submit"
text="Swap which ${model_title} is kept/removed"
working="Swapping">
</once-button>
${h.end_form()}
</div>
<div class="level-item">
${h.form(request.current_route_url())}
${h.csrf_token(request)}
${h.hidden('uuids', value='{},{}'.format(object_to_remove.uuid, object_to_keep.uuid))}
${h.hidden('commit-merge', value='yes')}
<once-button native-type="submit"
type="is-primary"
text="Yes, perform this merge"
working="Merging">
</once-button>
${h.end_form()}
</div>
</div>
</div>
</script>
<script type="text/javascript">
const MergeButtons = {
template: '#merge-buttons-template'
}
Vue.component('merge-buttons', MergeButtons)
</script>
## end of buefy
% endif
<ul id="context-menu">
${self.context_menu_items()}
</ul>
<p> <p>
You are about to <strong>merge</strong> two ${model_title} records, You are about to <strong>merge</strong> two ${model_title} records,
@ -193,16 +138,7 @@
</table> </table>
% if use_buefy: % if use_buefy:
<div id="merge-buttons-app">
<merge-buttons></merge-buttons> <merge-buttons></merge-buttons>
</div>
<script type="text/javascript">
new Vue({
el: '#merge-buttons-app'
})
</script>
% else: % else:
## no buefy; do legacy stuff ## no buefy; do legacy stuff
@ -216,3 +152,77 @@ ${h.csrf_token(request)}
</div> </div>
${h.end_form()} ${h.end_form()}
% endif % endif
</%def>
% if use_buefy:
<script type="text/x-template" id="merge-buttons-template">
<div class="level" style="margin-top: 2em;">
<div class="level-left">
<div class="level-item">
<a class="button" href="${index_url}">Whoops, nevermind</a>
</div>
<div class="level-item">
${h.form(request.current_route_url(), **{'@submit': 'submitSwapForm'})}
${h.csrf_token(request)}
${h.hidden('uuids', value='{},{}'.format(object_to_keep.uuid, object_to_remove.uuid))}
<b-button native-type="submit"
:disabled="swapFormSubmitting">
{{ swapFormButtonText }}
</b-button>
${h.end_form()}
</div>
<div class="level-item">
% if use_buefy:
${h.form(request.current_route_url(), **{'@submit': 'submitMergeForm'})}
% else:
${h.form(request.current_route_url())}
% endif
${h.csrf_token(request)}
${h.hidden('uuids', value='{},{}'.format(object_to_remove.uuid, object_to_keep.uuid))}
${h.hidden('commit-merge', value='yes')}
<b-button type="is-primary"
native-type="submit"
:disabled="mergeFormSubmitting">
{{ mergeFormButtonText }}
</b-button>
${h.end_form()}
</div>
</div>
</div>
</script>
<script type="text/javascript">
const MergeButtons = {
template: '#merge-buttons-template',
data() {
return {
swapFormButtonText: "Swap which ${model_title} is kept/removed",
swapFormSubmitting: false,
mergeFormButtonText: "Yes, perform this merge",
mergeFormSubmitting: false,
}
},
methods: {
submitSwapForm() {
this.swapFormSubmitting = true
this.swapFormButtonText = "Swapping, please wait..."
},
submitMergeForm() {
this.mergeFormSubmitting = true
this.mergeFormButtonText = "Merging, please wait..."
},
}
}
Vue.component('merge-buttons', MergeButtons)
</script>
% endif
${parent.body()}

4
tailbone/templates/page.mako
View file

@ -43,6 +43,8 @@
methods: {} methods: {}
} }
let ThisPageData = {}
</script> </script>
</%def> </%def>
@ -56,6 +58,8 @@
${self.finalize_page_components()} ${self.finalize_page_components()}
<script type="text/javascript"> <script type="text/javascript">
ThisPage.data = function() { return ThisPageData }
Vue.component('this-page', ThisPage) Vue.component('this-page', ThisPage)
new Vue({ new Vue({

22
tailbone/templates/principal/find_by_perm.mako
View file

@ -82,7 +82,7 @@ ${h.end_form()}
<script type="text/x-template" id="find-principals-template"> <script type="text/x-template" id="find-principals-template">
<div class="app-wrapper"> <div class="app-wrapper">
${h.form(request.current_route_url())} ${h.form(request.current_route_url(), **{'@submit': 'submitForm'})}
${h.csrf_token(request)} ${h.csrf_token(request)}
<div class="field-wrapper"> <div class="field-wrapper">
@ -116,10 +116,11 @@ ${h.end_form()}
</div> </div>
<div class="buttons"> <div class="buttons">
<once-button type="is-primary" <b-button type="is-primary"
native-type="submit" native-type="submit"
text="Find ${model_title_plural}"> :disabled="formSubmitting">
</once-button> {{ formButtonText }}
</b-button>
</div> </div>
${h.end_form()} ${h.end_form()}
@ -148,12 +149,14 @@ ${h.end_form()}
groupPermissions: ${json.dumps(buefy_perms.get(selected_group, {}).get('permissions', []))|n}, groupPermissions: ${json.dumps(buefy_perms.get(selected_group, {}).get('permissions', []))|n},
selectedGroup: ${json.dumps(selected_group)|n}, selectedGroup: ${json.dumps(selected_group)|n},
% if selected_permission: % if selected_permission:
selectedPermission: ${json.dumps(selected_permission)|n} selectedPermission: ${json.dumps(selected_permission)|n},
% elif selected_group in buefy_perms: % elif selected_group in buefy_perms:
selectedPermission: ${json.dumps(buefy_perms[selected_group]['permissions'][0]['permkey'])|n} selectedPermission: ${json.dumps(buefy_perms[selected_group]['permissions'][0]['permkey'])|n},
% else: % else:
selectedPermission: null selectedPermission: null,
% endif % endif
formButtonText: "Find ${model_title_plural}",
formSubmitting: false,
} }
}, },
methods: { methods: {
@ -163,6 +166,11 @@ ${h.end_form()}
// re-populate Permission dropdown, auto-select first option // re-populate Permission dropdown, auto-select first option
this.groupPermissions = this.permissionGroups[groupkey].permissions this.groupPermissions = this.permissionGroups[groupkey].permissions
this.selectedPermission = this.groupPermissions[0].permkey this.selectedPermission = this.groupPermissions[0].permkey
},
submitForm() {
this.formSubmitting = true
this.formButtonText = "Working, please wait..."
} }
} }
}) })

71
tailbone/templates/settings/email/view.mako
View file

@ -21,13 +21,32 @@
% endif % endif
</%def> </%def>
${parent.body()} <%def name="render_form()">
${parent.render_form()}
% if not use_buefy:
${h.form(url('email.preview'), name='send-email-preview', class_='autodisable')}
${h.csrf_token(request)}
${h.hidden('email_key', value=instance['key'])}
${h.link_to("Preview HTML", '{}?key={}&type=html'.format(url('email.preview'), instance['key']), id='preview-html', class_='button', target='_blank')}
${h.link_to("Preview TXT", '{}?key={}&type=txt'.format(url('email.preview'), instance['key']), id='preview-txt', class_='button', target='_blank')}
or
${h.text('recipient', value=request.user.email_address or '')}
${h.submit('send_{}'.format(instance['key']), value="Send Preview Email")}
${h.end_form()}
% endif
</%def>
<%def name="render_buefy_form()">
${parent.render_buefy_form()}
<email-preview-tools></email-preview-tools>
</%def>
% if use_buefy: % if use_buefy:
<script type="text/x-template" id="email-preview-tools-template"> <script type="text/x-template" id="email-preview-tools-template">
${h.form(url('email.preview'))} ${h.form(url('email.preview'), **{'@submit': 'submitPreviewForm'})}
${h.csrf_token(request)} ${h.csrf_token(request)}
${h.hidden('email_key', value=instance['key'])} ${h.hidden('email_key', value=instance['key'])}
@ -76,10 +95,11 @@ ${parent.body()}
</div> </div>
<div class="control"> <div class="control">
<once-button type="is-primary" <b-button type="is-primary"
native-type="submit" native-type="submit"
text="Send Preview Email"> :disabled="previewFormSubmitting">
</once-button> {{ previewFormButtonText }}
</b-button>
</div> </div>
</div><!-- field --> </div><!-- field -->
@ -90,36 +110,25 @@ ${parent.body()}
<script type="text/javascript"> <script type="text/javascript">
const EmailPreviewTools = { const EmailPreviewTools = {
template: '#email-preview-tools-template' template: '#email-preview-tools-template',
data() {
return {
previewFormButtonText: "Send Preview Email",
previewFormSubmitting: false,
}
},
methods: {
submitPreviewForm() {
this.previewFormSubmitting = true
this.previewFormButtonText = "Working, please wait..."
}
}
} }
Vue.component('email-preview-tools', EmailPreviewTools) Vue.component('email-preview-tools', EmailPreviewTools)
</script> </script>
<div id="email-preview-tools-app">
<email-preview-tools></email-preview-tools>
</div>
<script type="text/javascript">
new Vue({
el: '#email-preview-tools-app'
})
</script>
% else:
## not buefy; do traditional thing
${h.form(url('email.preview'), name='send-email-preview', class_='autodisable')}
${h.csrf_token(request)}
${h.hidden('email_key', value=instance['key'])}
${h.link_to("Preview HTML", '{}?key={}&type=html'.format(url('email.preview'), instance['key']), id='preview-html', class_='button', target='_blank')}
${h.link_to("Preview TXT", '{}?key={}&type=txt'.format(url('email.preview'), instance['key']), id='preview-txt', class_='button', target='_blank')}
or
${h.text('recipient', value=request.user.email_address or '')}
${h.submit('send_{}'.format(instance['key']), value="Send Preview Email")}
${h.end_form()}
% endif % endif
${parent.body()}

1
tailbone/templates/tempmon/probes/graph.mako
View file

@ -147,6 +147,7 @@
</%def> </%def>
<%def name="modify_this_page()"> <%def name="modify_this_page()">
${parent.modify_this_page()}
<script type="text/javascript"> <script type="text/javascript">
ThisPage.data = function() { return { ThisPage.data = function() { return {

22
tailbone/templates/upgrades/view.mako
View file

@ -42,13 +42,18 @@
% if not instance.executed and instance.status_code == enum.UPGRADE_STATUS_PENDING and request.has_perm('{}.execute'.format(permission_prefix)): % if not instance.executed and instance.status_code == enum.UPGRADE_STATUS_PENDING and request.has_perm('{}.execute'.format(permission_prefix)):
<div class="buttons"> <div class="buttons">
% if instance.enabled and not instance.executing: % if instance.enabled and not instance.executing:
% if use_buefy:
${h.form(url('{}.execute'.format(route_prefix), uuid=instance.uuid), **{'@submit': 'submitForm'})}
% else:
${h.form(url('{}.execute'.format(route_prefix), uuid=instance.uuid), class_='autodisable')} ${h.form(url('{}.execute'.format(route_prefix), uuid=instance.uuid), class_='autodisable')}
% endif
${h.csrf_token(request)} ${h.csrf_token(request)}
% if use_buefy: % if use_buefy:
<once-button type="is-primary" <b-button type="is-primary"
native-type="submit" native-type="submit"
text="Execute this upgrade"> :disabled="formSubmitting">
</once-button> {{ formButtonText }}
</b-button>
% else: % else:
${h.submit('execute', "Execute this upgrade", class_='button is-primary')} ${h.submit('execute', "Execute this upgrade", class_='button is-primary')}
% endif % endif
@ -62,11 +67,20 @@
% endif % endif
</%def> </%def>
<%def name="modify_tailbone_form()"> <%def name="modify_this_page()">
${parent.modify_this_page()}
<script type="text/javascript"> <script type="text/javascript">
TailboneFormData.showingPackages = 'diffs' TailboneFormData.showingPackages = 'diffs'
TailboneFormData.formButtonText = "Execute this upgrade"
TailboneFormData.formSubmitting = false
TailboneForm.methods.submitForm = function() {
this.formSubmitting = true
this.formButtonText = "Working, please wait..."
}
</script> </script>
</%def> </%def>