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

More mobile view improvements, various

Browse source
This commit is contained in:
Lance Edgar 2016-12-12 15:24:26 -06:00
parent 14ac7aa198
commit 7f14f50ee0
11 changed files with 92 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tailbone/templates/login.mako
View file

@ -18,11 +18,6 @@
${form.begin(**{'data-ajax': 'false'})}
${form.hidden('referrer', value=referrer)}
## this is used by mobile view
% if error:
<div class="error">${error}</div>
% endif
${form.field_div('username', form.text('username'))}
${form.field_div('password', form.password('password'))}

2
tailbone/templates/mobile/about.mako
View file

@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%inherit file="/mobile/base.mako" />
<%def name="title()">About ${project_title}</%def>
<%def name="title()">About ${self.app_title()}</%def>
<h2>${project_title} ${project_version}</h2>

29
tailbone/templates/mobile/base.mako
View file

@ -22,18 +22,20 @@
<%def name="mobile_body()">
<body>
## note that our toolbars are *external* (in jqm-speak) by default
${self.mobile_header()}
<div data-role="page" data-url="${self.page_url()}"${' data-rel="dialog"' if dialog else ''|n}>
${self.mobile_usermenu()}
${self.mobile_header()}
${self.mobile_page_body()}
${self.mobile_footer()}
</div><!-- page -->
${self.mobile_footer()}
</body>
</%def>
@ -67,14 +69,14 @@
<div id="usermenu" data-role="panel" data-display="overlay">
<ul data-role="listview">
<li data-icon="home">${h.link_to("Home", url('mobile.home'))}</li>
% if request.has_perm('datasync.restart'):
<li>${h.link_to("DataSync", url('datasync.mobile'))}</li>
% endif
% if request.is_root:
<li class="root-user" data-icon="forbidden">${h.link_to("Stop being root", url('stop_root'), **{'data-ajax': 'false'})}</li>
% elif request.is_admin:
<li class="root-user" data-icon="forbidden">${h.link_to("Become root", url('become_root'), **{'data-ajax': 'false'})}</li>
% endif
% if request.has_perm('datasync.restart'):
<li>${h.link_to("DataSync", url('datasync.mobile'))}</li>
% endif
<li data-icon="lock">${h.link_to("Logout", url('logout'), **{'data-ajax': 'false'})}</li>
<li data-icon="info">${h.link_to("About {}".format(capture(self.app_title)), url('mobile.about'))}</li>
</ul>
@ -83,6 +85,19 @@
<%def name="mobile_page_body()">
<div role="main" class="ui-content">
% if request.session.peek_flash('error'):
% for error in request.session.pop_flash('error'):
<div class="error">${error}</div>
% endfor
% endif
% if request.session.peek_flash():
% for msg in request.session.pop_flash():
<div class="flash">${msg|n}</div>
% endfor
% endif
% if capture(self.page_title):
<h2>${self.page_title()}</h2>
% endif

8
tailbone/templates/mobile/base_external_toolbars.mako → tailbone/templates/mobile/base_internal_toolbars.mako
View file

@ -4,17 +4,17 @@
<%def name="mobile_body()">
<body>
${self.mobile_header()}
<div data-role="page" data-url="${self.page_url()}"${' data-rel="dialog"' if dialog else ''|n}>
${self.mobile_usermenu()}
${self.mobile_header()}
${self.mobile_page_body()}
${self.mobile_footer()}
</div><!-- page -->
${self.mobile_footer()}
</body>
</%def>

2
tailbone/templates/mobile/datasync.mako
View file

@ -4,5 +4,5 @@
<%def name="title()">DataSync</%def>
${h.form(url('datasync.restart'))}
${h.submit('restart', "Restart DataSync", id='datasync-restart')}
${h.submit('restart', "Restart DataSync Daemon", id='datasync-restart')}
${h.end_form()}