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

Clean up falafel theme, move some parts to root template path

Browse source
This commit is contained in:
Lance Edgar 2019-05-07 21:10:48 -05:00
parent 6ef217c546
commit 3cb803ffe3
4 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tailbone/templates/themes/falafel/base.mako
View file

@ -1,6 +1,6 @@
## -*- coding: utf-8; -*-
<%namespace file="/grids/nav.mako" import="grid_index_nav" />
<%namespace file="/feedback_dialog.mako" import="feedback_dialog" />
<%namespace file="/feedback_dialog_buefy.mako" import="feedback_dialog" />
<%namespace name="base_meta" file="/base_meta.mako" />
<!DOCTYPE html>
<html lang="en">
@ -274,8 +274,6 @@
## FontAwesome 5.3.1
<script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
## ${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.loadmask.min.js'))}
## ${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.ui.timepicker.js'))}
<script type="text/javascript">
var session_timeout = ${request.get_session_timeout() or 'null'};
var logout_url = '${request.route_url('logout')}';
@ -296,35 +294,18 @@
});
});
</script>
## ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.js') + '?ver={}'.format(tailbone.__version__))}
## ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.feedback.js') + '?ver={}'.format(tailbone.__version__))}
## ${h.javascript_link(request.static_url('tailbone:static/js/jquery.ui.tailbone.js') + '?ver={}'.format(tailbone.__version__))}
</%def>
<%def name="jquery()">
## jQuery 1.12.4
${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')}
## jQuery 1.11.4
## ${h.javascript_link('https://code.jquery.com/ui/{}/jquery-ui.min.js'.format(request.rattail_config.get('tailbone', 'jquery_ui.version', default='1.11.4')))}
</%def>
<%def name="extra_javascript()"></%def>
<%def name="core_styles()">
## Bulma 0.7.4
${h.stylesheet_link('https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css')}
## Buefy 0.7.4
${h.stylesheet_link('https://unpkg.com/buefy@0.7.4/dist/buefy.min.css')}
## ${self.jquery_theme()}
## ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.loadmask.css'))}
## ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.timepicker.css'))}
## ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.tailbone.css') + '?ver={}'.format(tailbone.__version__))}
${self.buefy_styles()}
${h.stylesheet_link(request.static_url('tailbone:static/themes/bobcat/css/base.css') + '?ver={}'.format(tailbone.__version__))}
${h.stylesheet_link(request.static_url('tailbone:static/themes/falafel/css/layout.css') + '?ver={}'.format(tailbone.__version__))}
@ -336,8 +317,9 @@
${h.stylesheet_link(request.static_url('tailbone:static/css/diffs.css') + '?ver={}'.format(tailbone.__version__))}
</%def>
<%def name="jquery_theme()">
${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/dark-hive/jquery-ui.css')}
<%def name="buefy_styles()">
## Buefy 0.7.4
${h.stylesheet_link('https://unpkg.com/buefy@0.7.4/dist/buefy.min.css')}
</%def>
<%def name="extra_styles()"></%def>

69
tailbone/templates/themes/falafel/feedback_dialog.mako
View file

@ -1,69 +0,0 @@
## -*- coding: utf-8; -*-
<%def name="feedback_dialog()">
<div id="feedback-template" style="display: none;">
${h.form(url('feedback'))}
${h.csrf_token(request)}
${h.hidden('user', value=request.user.uuid if request.user else None)}
<div class="modal-card feedback-dialog">
<header class="modal-card-head">
<p class="modal-card-title">User Feedback</p>
</header>
<section class="modal-card-body">
<p>
Questions, suggestions, comments, complaints, etc.
<span class="red">regarding this website</span> are
welcome and may be submitted below.
</p>
<b-field label="User Name">
% if request.user:
<b-input
value="${six.text_type(request.user)}"
disabled="true">
</b-input>
% else:
<b-input
name="user_name">
</b-input>
% endif
</b-field>
% if request.user:
<b-input
name="user_name"
type="hidden"
value="${six.text_type(request.user)}">
</b-input>
% endif
<b-field label="Referring URL">
<b-input
:value="referrer"
disabled="true">
</b-input>
</b-field>
<b-input
name="referrer"
type="hidden"
:value="referrer">
</b-input>
<b-field label="Message">
<b-input
name="message"
type="textarea">
</b-input>
</b-field>
</section>
<footer class="modal-card-foot">
<button type="button" class="button" @click="$parent.close()">Cancel</button>
<button type="button" class="button is-primary" @click="sendFeedback()">Send</button>
</footer>
</div>
${h.end_form()}
</div>
</%def>

57
tailbone/templates/themes/falafel/grids/filters.mako
View file

@ -1,57 +0,0 @@
## -*- coding: utf-8; -*-
<form action="${form.action_url}" method="GET" v-on:submit.prevent="applyFilters()">
<grid-filter v-for="key in filtersSequence"
:key="key"
:filter="filters[key]"
ref="gridFilters">
</grid-filter>
<b-field grouped>
<b-button type="is-primary"
native-type="submit"
icon-pack="fas"
icon-left="check"
class="control">
Apply Filters
</b-button>
<b-select @input="addFilter"
placeholder="Add Filter"
v-model="selectedFilter">
<option v-for="key in filtersSequence"
:key="key"
:value="key"
:disabled="filters[key].visible">
{{ filters[key].label }}
</option>
</b-select>
<b-button @click="resetView()"
icon-pack="fas"
icon-left="home"
class="control">
Default View
</b-button>
<b-button @click="clearFilters()"
icon-pack="fas"
icon-left="trash"
class="control">
No Filters
</b-button>
% if allow_save_defaults and request.user:
<b-button @click="saveDefaults()"
icon-pack="fas"
icon-left="save"
class="control">
Save Defaults
</b-button>
% endif
</b-field>
</form>