changeset 2943:39d57a15fdef

merge basic and modernized login.html; fix html validation errors, partial fix #471
author RogerHaase <haaserd@gmail.com>
date Wed, 06 May 2015 13:38:38 -0700
parents d3f05a117edb
children afe523052a7f
files MoinMoin/templates/login.html MoinMoin/themes/basic/templates/login.html
diffstat 2 files changed, 1 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/login.html	Wed May 06 07:14:05 2015 -0700
+++ b/MoinMoin/templates/login.html	Wed May 06 13:38:38 2015 -0700
@@ -29,7 +29,7 @@
                 <dl>
                     {{ forms.render(form['openid']) }}
                 </dl>
-                {{ forms.render(form['submit']) }}
+                {{ forms.render(form['submit'], id='openid_login_submit') }}
                 {{ forms.render_submit(form) }}
             {{ gen.form.close() }}
         {% endif %}
--- a/MoinMoin/themes/basic/templates/login.html	Wed May 06 07:14:05 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-{% extends theme("layout.html") %}
-{% import "forms.html" as forms %}
-
-{% block content %}
-    <h2>{{ _('Moin Login') }}</h2>
-    <div class="row">
-        <div class="col-md-4">
-            {{ forms.render_errors(form) }}
-
-            {% if 'username' in login_inputs or 'password' in login_inputs %}
-                {{ gen.form.open(form, method="post", action=url_for('frontend.login', next=request.args.get('next'))) }}
-
-                    {% if 'username' in login_inputs %}
-                        <div class="form-group">
-                            {{ gen.label(form['username']) }}
-                            {{ gen.input(form['username'], type="text", class="form-control") }}
-                        </div>
-                    {% endif %}
-                    {% if 'password' in login_inputs %}
-                        <div class="form-group">
-                            {{ gen.label(form['password']) }}
-                            {{ gen.input(form['password'], type="password", class="form-control") }}
-                        </div>
-                    {% endif %}
-
-                    {{ forms.render(form['submit']) }}
-
-                    <div class="form-group">
-                        {{ forms.render_submit(form, class='btn btn-primary') }}
-                    </div>
-                {{ gen.form.close() }}
-            {% endif %}
-
-            {% if 'openid' in login_inputs %}
-                <h2>{{ _('OpenID Login') }}</h2>
-
-                {{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
-
-                    {{ forms.render(form['openid']) }}
-
-                    {{ forms.render(form['submit']) }}
-                    <div class="form-group">
-                        {{ forms.render_submit(form, class='btn btn-primary') }}
-                    </div>
-                {{ gen.form.close() }}
-            {% endif %}
-
-        </div>
-    </div>
-{% endblock %}