changeset 1345:e1f9d9b5da57

Fixed block item overwrite in templates. Now block content is overwritten.
author Jaiditya Mathur <jaiditya.mathur@gmail.com>
date Wed, 25 Apr 2012 22:45:35 +0530
parents 59220d491dc3
children 62bfa171319f
files MoinMoin/templates/login.html MoinMoin/templates/lostpass.html MoinMoin/templates/openid_register.html MoinMoin/templates/recoverpass.html MoinMoin/templates/register.html MoinMoin/templates/usersettings.html
diffstat 6 files changed, 33 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/login.html	Tue Apr 24 23:15:56 2012 +0200
+++ b/MoinMoin/templates/login.html	Wed Apr 25 22:45:35 2012 +0530
@@ -1,8 +1,7 @@
 {% extends theme("layout.html") %}
 {% import "forms.html" as forms %}
 
-{% block item %}
-<div id="moin-content">
+{% block content %}
 <div class="moin-form">
 {{ forms.render_errors(form) }}
 
@@ -39,6 +38,5 @@
 {% endif %}
 
 </div>
-</div>
 {% endblock %}
 
--- a/MoinMoin/templates/lostpass.html	Tue Apr 24 23:15:56 2012 +0200
+++ b/MoinMoin/templates/lostpass.html	Wed Apr 25 22:45:35 2012 +0530
@@ -1,7 +1,7 @@
 {% extends theme("layout.html") %}
 {% import "forms.html" as forms %}
 
-{% block item %}
+{% block content %}
 <h1>{{ _("Lost Password") }}</h1>
 <div class="moin-form">
 {{ _("Please note that you only need to fill out one form field.") }}
--- a/MoinMoin/templates/openid_register.html	Tue Apr 24 23:15:56 2012 +0200
+++ b/MoinMoin/templates/openid_register.html	Wed Apr 25 22:45:35 2012 +0530
@@ -1,7 +1,7 @@
 {% extends theme("layout.html") %}
 {% import "forms.html" as forms %}
 
-{% block item %}
+{% block content %}
 <h1>{{ _("Create Account") }}</h1>
 <div class="moin-form">
 {{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
--- a/MoinMoin/templates/recoverpass.html	Tue Apr 24 23:15:56 2012 +0200
+++ b/MoinMoin/templates/recoverpass.html	Wed Apr 25 22:45:35 2012 +0530
@@ -1,7 +1,7 @@
 {% extends theme("layout.html") %}
 {% import "forms.html" as forms %}
 
-{% block item %}
+{% block content %}
 <h1>{{ _("Recover Password") }}</h1>
 {{ gen.form.open(form, method="post", action=url_for('frontend.recoverpass')) }}
   {{ forms.render_errors(form) }}
--- a/MoinMoin/templates/register.html	Tue Apr 24 23:15:56 2012 +0200
+++ b/MoinMoin/templates/register.html	Wed Apr 25 22:45:35 2012 +0530
@@ -1,7 +1,7 @@
 {% extends theme("layout.html") %}
 {% import "forms.html" as forms %}
 
-{% block item %}
+{% block content %}
 <h1>{{ _("Create Account") }}</h1>
 <div class="moin-form">
 {{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
--- a/MoinMoin/templates/usersettings.html	Tue Apr 24 23:15:56 2012 +0200
+++ b/MoinMoin/templates/usersettings.html	Wed Apr 25 22:45:35 2012 +0530
@@ -1,40 +1,38 @@
 {% extends theme("layout.html") %}
 {% import "usersettings_forms.html" as user_forms %}
 
-{% block item %}
-<div id="moin-content">
-    <h1>{{ _("User Settings") }}</h1>
-
-    <div id="moin-usersettings" class="moin-tabs">
-        <h2 class="moin-tab-title"><a href="#personal">{{ _("Personal Settings") }}</a></h2>
-        <div id="personal" class="moin-tab-body moin-form">
-            {{ user_forms.personal(form_objs.personal) }}
-        </div>
-
-        <h2 class="moin-tab-title"><a href="#password">{{ _("Change Password") }}</a></h2>
-        <div id="password" class="moin-tab-body moin-form">
-            {{ user_forms.password(form_objs.password) }}
-        </div>
+{% block content %}
+<h1>{{ _("User Settings") }}</h1>
 
-        <h2 class="moin-tab-title"><a href="#notification">{{ _("Notification Settings") }}</a></h2>
-        <div id="notification" class="moin-tab-body moin-form">
-            {{ user_forms.notification(form_objs.notification) }}
-        </div>
+<div id="moin-usersettings" class="moin-tabs">
+    <h2 class="moin-tab-title"><a href="#personal">{{ _("Personal Settings") }}</a></h2>
+    <div id="personal" class="moin-tab-body moin-form">
+        {{ user_forms.personal(form_objs.personal) }}
+    </div>
 
-        <h2 class="moin-tab-title"><a href="#ui">{{ _("Wiki Appearance Settings") }}</a></h2>
-        <div id="ui" class="moin-tab-body moin-form">
-            {{ user_forms.ui(form_objs.ui) }}
-        </div>
+    <h2 class="moin-tab-title"><a href="#password">{{ _("Change Password") }}</a></h2>
+    <div id="password" class="moin-tab-body moin-form">
+        {{ user_forms.password(form_objs.password) }}
+    </div>
 
-        <h2 class="moin-tab-title"><a href="#navigation">{{ _("Navigation Settings") }}</a></h2>
-        <div id="navigation" class="moin-tab-body moin-form">
-            {{ user_forms.navigation(form_objs.navigation) }}
-        </div>
+    <h2 class="moin-tab-title"><a href="#notification">{{ _("Notification Settings") }}</a></h2>
+    <div id="notification" class="moin-tab-body moin-form">
+        {{ user_forms.notification(form_objs.notification) }}
+    </div>
 
-        <h2 class="moin-tab-title"><a href="#options">{{ _("Options") }}</a></h2>
-        <div id="options" class="moin-tab-body moin-form">
-            {{ user_forms.options(form_objs.options) }}
-        </div>
+    <h2 class="moin-tab-title"><a href="#ui">{{ _("Wiki Appearance Settings") }}</a></h2>
+    <div id="ui" class="moin-tab-body moin-form">
+        {{ user_forms.ui(form_objs.ui) }}
+    </div>
+
+    <h2 class="moin-tab-title"><a href="#navigation">{{ _("Navigation Settings") }}</a></h2>
+    <div id="navigation" class="moin-tab-body moin-form">
+        {{ user_forms.navigation(form_objs.navigation) }}
+    </div>
+
+    <h2 class="moin-tab-title"><a href="#options">{{ _("Options") }}</a></h2>
+    <div id="options" class="moin-tab-body moin-form">
+        {{ user_forms.options(form_objs.options) }}
     </div>
 </div>