Added help support in admin

This commit is contained in:
Antonio de la Rosa 2018-03-08 06:54:56 +01:00
parent dcdfdf11b2
commit 590a10ae0d
7 changed files with 31 additions and 2 deletions

View file

@ -3,10 +3,20 @@
${'*'} \ ${'*'} \
% endif % endif
</%def> </%def>
<%def name="help(help, name)">
% if help:
<i class="fa fa-question-circle tooltip" data-tooltip-content="#tooltip_${name}_content"></i> \
<div class="tooltip_templates" style="display:none;">
<div id="tooltip_${name}_content">
${help}
</div>
</div>
% endif
</%def>
<div class="form"> <div class="form">
% for form in forms.values(): % for form in forms.values():
% if form.type!='hidden': % if form.type!='hidden':
<p><label>${form.label} ${check_required(form.required)}</label>${form.form()|n} <span class="error" id="${form.name}_error">${form.txt_error}</span></p> <p><label>${form.label} ${check_required(form.required)} ${help(form.help, form.name)}</label>${form.form()|n} <span class="error" id="${form.name}_error">${form.txt_error}</span></p>
% else: % else:
${form.form()|n} ${form.form()|n}
% endif % endif

View file

@ -17,6 +17,7 @@ class BaseForm:
self.required=False self.required=False
self.txt_error='' self.txt_error=''
self.name_field_id=self.name+'_form' self.name_field_id=self.name+'_form'
self.help=''
def form(self): def form(self):

View file

@ -21,10 +21,11 @@ class DateForm(BaseForm):
h='' h=''
min='' min=''
s='' s=''
min_time=''
time=format_timedata(self.default_value) time=format_timedata(self.default_value)
if time: if time[0]:
y=int(time[0]) y=int(time[0])
m=int(time[1]) m=int(time[1])
d=int(time[2]) d=int(time[2])

View file

@ -106,6 +106,10 @@ class PhangoField:
self.show_formatted_value=False self.show_formatted_value=False
# Value used for help strings in tooltips in forms
self.help=''
# This method is used for describe the new field in a sql language format. # This method is used for describe the new field in a sql language format.
@ -158,6 +162,7 @@ class PhangoField:
form.required=self.required form.required=self.required
form.label=self.label form.label=self.label
form.field=self form.field=self
form.help=self.help
return form return form
def change_form(self, new_form, parameters): def change_form(self, new_form, parameters):

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -14,8 +14,10 @@ ${make_url('admin/'+module)}\
${add_css_home_local('admin.css', 'admin')} ${add_css_home_local('admin.css', 'admin')}
${add_css_home_local('font-awesome.min.css', 'admin')} ${add_css_home_local('font-awesome.min.css', 'admin')}
${add_css_home_local('responsive-nav.css', 'admin')} ${add_css_home_local('responsive-nav.css', 'admin')}
${add_css_home_local('tooltipster.bundle.min.css', 'admin')}
${add_js_home_local('jquery.min.js', 'admin')} ${add_js_home_local('jquery.min.js', 'admin')}
${add_js_home_local('responsive-nav.min.js', 'admin')} ${add_js_home_local('responsive-nav.min.js', 'admin')}
${add_js_home_local('tooltipster.bundle.min.js', 'admin')}
${HeaderHTML.css_home()|n} ${HeaderHTML.css_home()|n}
${HeaderHTML.js_home()|n} ${HeaderHTML.js_home()|n}
${HeaderHTML.header_home()|n} ${HeaderHTML.header_home()|n}
@ -78,6 +80,13 @@ ${HeaderHTML.header_home()|n}
</div> </div>
<script> <script>
var navigation = responsiveNav(".nav-collapse", {customToggle: "#toggle"}); var navigation = responsiveNav(".nav-collapse", {customToggle: "#toggle"});
$('.tooltip').tooltipster({
animation: 'fade',
delay: 100,
trigger: 'click'
});
</script> </script>
<%block name="jscript_block"> <%block name="jscript_block">
</%block> </%block>