OMG..lots of changes for sake of mobile login / user menu etc.
Feeling a bit sloppy right about now...oh well good enough
This commit is contained in:
Lance Edgar
parent
e3ae427e37
commit
ee0bdc4b74
10 changed files with 335 additions and 183 deletions
|
|
@ -8,3 +8,6 @@
|
|||
% for name, version in packages.iteritems():
|
||||
<h3>${name} ${version}</h3>
|
||||
% endfor
|
||||
|
||||
<br />
|
||||
<p>Please see <a href="https://rattailproject.org/">rattailproject.org</a> for more info.</p>
|
||||
|
|
|
|||
|
|
@ -10,33 +10,31 @@
|
|||
</%def>
|
||||
|
||||
<%def name="logo()">
|
||||
${h.image(request.static_url('tailbone:static/img/home_logo.png'), "Rattail Logo", id='logo')}
|
||||
${h.image(request.static_url('tailbone:static/img/home_logo.png'), "Rattail Logo", id='logo')}
|
||||
</%def>
|
||||
|
||||
<%def name="login_form()">
|
||||
<div class="form">
|
||||
${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'))}
|
||||
|
||||
<div class="buttons">
|
||||
${form.submit('submit', "Login")}
|
||||
<input type="reset" value="Reset" />
|
||||
</div>
|
||||
|
||||
${form.end()}
|
||||
</div>
|
||||
</%def>
|
||||
|
||||
${self.logo()}
|
||||
|
||||
<div class="form">
|
||||
${h.form('')}
|
||||
<input type="hidden" name="referrer" value="${referrer}" />
|
||||
|
||||
% if error:
|
||||
<div class="error">${error}</div>
|
||||
% endif
|
||||
|
||||
<div class="field-wrapper">
|
||||
<label for="username">Username</label>
|
||||
<input type="text" name="username" id="username" value="" />
|
||||
</div>
|
||||
|
||||
<div class="field-wrapper">
|
||||
<label for="password">Password</label>
|
||||
<input type="password" name="password" id="password" value="" />
|
||||
</div>
|
||||
|
||||
<div class="buttons">
|
||||
${h.submit('submit', "Login")}
|
||||
<input type="reset" value="Reset" />
|
||||
</div>
|
||||
|
||||
${h.end_form()}
|
||||
</div>
|
||||
${self.login_form()}
|
||||
|
|
|
|||
|
|
@ -3,40 +3,92 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<title>${self.global_title()} » ${capture(self.title)}</title>
|
||||
<title>${self.global_title()} » ${self.title()}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')}
|
||||
${h.javascript_link('https://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.js')}
|
||||
${h.stylesheet_link('https://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.css')}
|
||||
${h.javascript_link(request.static_url('tailbone:static/js/tailbone.mobile.js'))}
|
||||
${h.stylesheet_link(request.static_url('tailbone:static/css/mobile.css'))}
|
||||
% if not request.rattail_config.production():
|
||||
<style type="text/css">
|
||||
.ui-page-theme-a { background-image: url(${request.static_url('tailbone:static/img/testing.png')}); }
|
||||
</style>
|
||||
% endif
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div data-role="page">
|
||||
|
||||
<div data-role="header">
|
||||
${h.link_to("Home", url('mobile.home'), class_='ui-btn-left')}
|
||||
${h.link_to("About", url('mobile.about'), class_='ui-btn-right')}
|
||||
<h1>${self.global_title()}</h1>
|
||||
</div>
|
||||
|
||||
<div role="main" class="ui-content">
|
||||
% if capture(self.title):
|
||||
<h2>${self.title()}</h2>
|
||||
% endif
|
||||
${self.body()}
|
||||
</div>
|
||||
|
||||
<div data-role="footer">
|
||||
<h4>powered by ${h.link_to("Rattail", url('mobile.about'))}</h4>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
${self.mobile_body()}
|
||||
</html>
|
||||
|
||||
<%def name="global_title()">${"[STAGE] " if not request.rattail_config.production() else ''}Rattail Demo</%def>
|
||||
<%def name="mobile_body()">
|
||||
<body>
|
||||
|
||||
<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 -->
|
||||
|
||||
</body>
|
||||
</%def>
|
||||
|
||||
<%def name="app_title()">Rattail Demo</%def>
|
||||
|
||||
<%def name="global_title()">${"[STAGE] " if not request.rattail_config.production() else ''}${self.app_title()}</%def>
|
||||
|
||||
<%def name="page_url()">${request.current_route_url()}</%def>
|
||||
|
||||
<%def name="page_title()">${self.title()}</%def>
|
||||
|
||||
<%def name="mobile_header()">
|
||||
<div data-role="header">
|
||||
${self.mobile_header_link()}
|
||||
<h1>${self.global_title()}</h1>
|
||||
</div>
|
||||
</%def>
|
||||
|
||||
<%def name="mobile_header_link()">
|
||||
% if request.user:
|
||||
${h.link_to(request.user.get_short_name(), '#usermenu', class_='ui-btn-left ui-btn ui-btn-inline ui-mini ui-corner-all ui-btn-icon-left ui-icon-user')}
|
||||
% elif request.matched_route.name in ('mobile.login', 'mobile.about'):
|
||||
${h.link_to("Home", url('mobile.home'), class_='ui-btn-left ui-btn ui-btn-inline ui-mini ui-corner-all ui-btn-icon-left ui-icon-home')}
|
||||
% else:
|
||||
${h.link_to("Login", url('mobile.login'), class_='ui-btn-left ui-btn ui-btn-inline ui-mini ui-corner-all ui-btn-icon-left ui-icon-user')}
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
<%def name="mobile_usermenu()">
|
||||
<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>
|
||||
<li data-icon="user">${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>
|
||||
</div>
|
||||
</%def>
|
||||
|
||||
<%def name="mobile_page_body()">
|
||||
<div role="main" class="ui-content">
|
||||
% if capture(self.page_title):
|
||||
<h2>${self.page_title()}</h2>
|
||||
% endif
|
||||
|
||||
${self.body()}
|
||||
|
||||
<div class="replacement-header">
|
||||
${self.mobile_header_link()}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</%def>
|
||||
|
||||
<%def name="mobile_footer()">
|
||||
<div data-role="footer">
|
||||
<h4>powered by ${h.link_to("Rattail", url('mobile.about'))}</h4>
|
||||
</div>
|
||||
</%def>
|
||||
|
|
|
|||
20
tailbone/templates/mobile/base_external_toolbars.mako
Normal file
20
tailbone/templates/mobile/base_external_toolbars.mako
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
## -*- coding: utf-8 -*-
|
||||
<%inherit file="tailbone:templates/mobile/base.mako" />
|
||||
|
||||
<%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_page_body()}
|
||||
|
||||
</div><!-- page -->
|
||||
|
||||
${self.mobile_footer()}
|
||||
|
||||
</body>
|
||||
</%def>
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
## -*- coding: utf-8 -*-
|
||||
<%inherit file="/mobile/base.mako" />
|
||||
|
||||
<%def name="title()"></%def>
|
||||
<%def name="title()">Home</%def>
|
||||
|
||||
<%def name="page_title()"></%def>
|
||||
|
||||
<div style="text-align: center;">
|
||||
${h.image(request.static_url('tailbone:static/img/home_logo.png'), "Rattail Logo", width='400')}
|
||||
|
|
|
|||
7
tailbone/templates/mobile/login.mako
Normal file
7
tailbone/templates/mobile/login.mako
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
## -*- coding: utf-8 -*-
|
||||
<%inherit file="/mobile/base.mako" />
|
||||
<%namespace file="/login.mako" import="login_form" />
|
||||
|
||||
<%def name="title()">Login</%def>
|
||||
|
||||
${login_form()}
|
||||
Loading…
Add table
Add a link
Reference in a new issue