You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2017/09/18 16:20:18 UTC
allura git commit: Adds extra content block for masthead,
Adds optional textbox placeholders
Repository: allura
Updated Branches:
refs/heads/kt/login_page_extras [created] b3d267a0a
Adds extra content block for masthead, Adds optional textbox placeholders
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b3d267a0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b3d267a0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b3d267a0
Branch: refs/heads/kt/login_page_extras
Commit: b3d267a0ad90855e9dfef778f42ded79e358b947
Parents: aaf959a
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Mon Sep 18 16:20:05 2017 +0000
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Mon Sep 18 16:20:05 2017 +0000
----------------------------------------------------------------------
Allura/allura/lib/plugin.py | 3 +++
Allura/allura/lib/widgets/auth_widgets.py | 6 +++++-
Allura/allura/templates/jinja_master/master.html | 3 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/b3d267a0/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 5dc5623..aafe236 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -1392,6 +1392,9 @@ class ThemeProvider(object):
max_age=timedelta(days=365))
return note
+ def use_input_placeholders(self):
+ return False
+
class LocalProjectRegistrationProvider(ProjectRegistrationProvider):
pass
http://git-wip-us.apache.org/repos/asf/allura/blob/b3d267a0/Allura/allura/lib/widgets/auth_widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/auth_widgets.py b/Allura/allura/lib/widgets/auth_widgets.py
index e25c029..58a3dc5 100644
--- a/Allura/allura/lib/widgets/auth_widgets.py
+++ b/Allura/allura/lib/widgets/auth_widgets.py
@@ -39,8 +39,12 @@ class LoginForm(ForgeForm):
fields = [
ew.TextField(name=g.antispam.enc('username'), label='Username', attrs={
'autofocus': 'autofocus',
+ 'placeholder': 'Username' if plugin.ThemeProvider.get().use_input_placeholders else ''
+
+ }),
+ ew.PasswordField(name=g.antispam.enc('password'), label='Password', attrs={
+ 'placeholder': 'Password' if plugin.ThemeProvider.get().use_input_placeholders else ''
}),
- ew.PasswordField(name=g.antispam.enc('password'), label='Password'),
ew.Checkbox(
name=g.antispam.enc('rememberme'),
label='Remember Me',
http://git-wip-us.apache.org/repos/asf/allura/blob/b3d267a0/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 16ed516..c9e185a 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -87,7 +87,8 @@
{{ theme_macros.header(g.login_url, '/auth/logout') }}
{{ theme_macros.site_notification() }}
{% set flash = tg.flash_obj.render('flash', use_js=False) %}
-<section id="page-body" class="{{ g.document_class(neighborhood) }}">
+{% block masthead %}{% endblock %}
+<section id="page-body" class="{{ g.document_class(neighborhood) }} {% block page_body_classes %}{% endblock %}">
<div id="nav_menu_holder">
{% if c.project and c.project.is_nbhd_project %}
{% set neighborhood=c.project.neighborhood %}