From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 28 Oct 2012 20:52:35 +0000 (+0100)
Subject: Unescape xsrf form HTML.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f55d0127b7f6aaa9c3c34563845fa627ed52065d;p=pbs.git

Unescape xsrf form HTML.
---

diff --git a/data/templates/base.html b/data/templates/base.html
index 1b020634..9876fc0d 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -199,7 +199,7 @@
 		{% if not current_user %}
 			<div class="modal hide fade" id="login">
 				<form id="loginfrm" class="modal-form form-horizontal" method="POST" action="/login">
-					{{ xsrf_form_html() }}
+					{% raw xsrf_form_html() %}
 
 					<div class="modal-header">
 						<a class="close" data-dismiss="modal">&times;</a>
diff --git a/data/templates/build-bugs.html b/data/templates/build-bugs.html
index 6ca40d59..eedb9c57 100644
--- a/data/templates/build-bugs.html
+++ b/data/templates/build-bugs.html
@@ -63,7 +63,7 @@
 
 	<div class="modal hide fade" id="add">
 		<form class="modal-form form-horizontal" method="POST" action="">
-			{{ xsrf_form_html() }}
+			{% raw xsrf_form_html() %}
 			<input type="hidden" name="action" value="add" />
 
 			<div class="modal-header">
@@ -120,7 +120,7 @@
 
 	<div class="modal hide fade" id="rem">
 		<form class="modal-form form-horizontal" method="POST" action="">
-			{{ xsrf_form_html() }}
+			{% raw xsrf_form_html() %}
 			<input type="hidden" name="action" value="remove" />
 
 			<div class="modal-header">
diff --git a/data/templates/build-manage.html b/data/templates/build-manage.html
index 2d1eb875..d456cb5c 100644
--- a/data/templates/build-manage.html
+++ b/data/templates/build-manage.html
@@ -33,7 +33,7 @@
 	<div class="row">
 		<div class="span6 offset3">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<input type="hidden" name="action" value="push" />
 
 				<fieldset>
diff --git a/data/templates/build-priority.html b/data/templates/build-priority.html
index 4f60ee3c..a100b9de 100644
--- a/data/templates/build-priority.html
+++ b/data/templates/build-priority.html
@@ -5,7 +5,7 @@
 {% block body %}
 	<h1>{{ _("Edit build priority") }}: {{ build.name }}</h1>
 	<form method="post" action="">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 		<table class="form form3">
 			<tr>
 				<td class="col1">{{ _("Priority") }}</td>
diff --git a/data/templates/build-state.html b/data/templates/build-state.html
index 6f914c01..707fc685 100644
--- a/data/templates/build-state.html
+++ b/data/templates/build-state.html
@@ -32,7 +32,7 @@
 	{% if current_user and build.has_perm(current_user) %}
 		{% if build.state in ("building", "testing", "stable") %}
 			<form method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<table class="form form2">
 					<tr>
 						<td class="col1" colspan="2">
@@ -65,7 +65,7 @@
 
 		{% if build.state == "broken" %}
 			<form method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<table class="form form2">
 					<tr>
 						<td class="col1" colspan="2">
@@ -86,7 +86,7 @@
 			</form>
 		{% else %}
 			<form method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<table class="form form2">
 					<tr>
 						<td class="col1" colspan="2">
diff --git a/data/templates/builder-edit.html b/data/templates/builder-edit.html
index ca638d44..e48dbdbb 100644
--- a/data/templates/builder-edit.html
+++ b/data/templates/builder-edit.html
@@ -28,7 +28,7 @@
 	<div class="row">
 		<div class="span8">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<fieldset>
 					<div class="control-group">
 						<label class="control-label">{{ _("Hostname") }}</label>
diff --git a/data/templates/builder-new.html b/data/templates/builder-new.html
index 519c3934..04010700 100644
--- a/data/templates/builder-new.html
+++ b/data/templates/builder-new.html
@@ -24,7 +24,7 @@
 	<div class="row">
 		<div class="span6 offset3">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<fieldset>
 					<div class="control-group">
 						<label class="control-label" for="name">{{ _("Hostname") }}</label>
diff --git a/data/templates/builds-watchers-add.html b/data/templates/builds-watchers-add.html
index cc702948..9396840a 100644
--- a/data/templates/builds-watchers-add.html
+++ b/data/templates/builds-watchers-add.html
@@ -48,7 +48,7 @@
 	<div class="row">
 		<div class="span6 offset3">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 
 				<fieldset>
 					{% if current_user.is_admin() %}
diff --git a/data/templates/distro-edit.html b/data/templates/distro-edit.html
index d167d6aa..58f6fd12 100644
--- a/data/templates/distro-edit.html
+++ b/data/templates/distro-edit.html
@@ -6,7 +6,7 @@
 	<h1>{{ _("Edit distribution %s") % distro.name }}</h1>
 
 	<form method="post" action="">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 		<table class="form form3">
 			<tr>
 				<td class="col1">{{ _("Name") }}</td>
diff --git a/data/templates/distro-update-edit.html b/data/templates/distro-update-edit.html
index b3af2028..5e5904a6 100644
--- a/data/templates/distro-update-edit.html
+++ b/data/templates/distro-update-edit.html
@@ -13,7 +13,7 @@
 	</h1>
 
 	<form method="post" action="">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 
 		<table class="form form3">
 			<tr>
diff --git a/data/templates/jobs-abort.html b/data/templates/jobs-abort.html
index 124357e4..d662b040 100644
--- a/data/templates/jobs-abort.html
+++ b/data/templates/jobs-abort.html
@@ -10,7 +10,7 @@
 	</p>
 
 	<form method="post" action="">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 		<table class="form form3">
 			<tr>
 				<td class="col1">{{ _("Build job") }}</td>
diff --git a/data/templates/keys-import.html b/data/templates/keys-import.html
index 6318652d..47eed8b1 100644
--- a/data/templates/keys-import.html
+++ b/data/templates/keys-import.html
@@ -24,7 +24,7 @@
 	<div class="row">
 		<div class="span6 offset3">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<fieldset>
 					<div class="control-group">
 						<label class="control-label" for="data">{{ _("Key") }}</label>
diff --git a/data/templates/login.html b/data/templates/login.html
index 435bc0e3..bd6d9d1f 100644
--- a/data/templates/login.html
+++ b/data/templates/login.html
@@ -15,7 +15,7 @@
 	{% end %}
 
 	<form class="form-horizontal" method="POST" action="">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 
 		<fieldset>
 			<div class="control-group">
diff --git a/data/templates/mirrors-edit.html b/data/templates/mirrors-edit.html
index 56ed2366..e319b5dc 100644
--- a/data/templates/mirrors-edit.html
+++ b/data/templates/mirrors-edit.html
@@ -28,7 +28,7 @@
 	<div class="row">
 		<div class="span6 offset3">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<fieldset>
 					<div class="control-group">
 						<label class="control-label" for="name">{{ _("Hostname") }}</label>
diff --git a/data/templates/mirrors-new.html b/data/templates/mirrors-new.html
index 475b5115..8222f606 100644
--- a/data/templates/mirrors-new.html
+++ b/data/templates/mirrors-new.html
@@ -26,7 +26,7 @@
 	<div class="row">
 		<div class="span6 offset3">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<fieldset>
 					<div class="control-group {% if hostname_missing %}error{% end %}">
 						<label class="control-label" for="name">{{ _("Hostname") }}</label>
diff --git a/data/templates/modules/build-offset.html b/data/templates/modules/build-offset.html
index 493b0972..82c5b46e 100644
--- a/data/templates/modules/build-offset.html
+++ b/data/templates/modules/build-offset.html
@@ -1,5 +1,5 @@
 <form class="form-horizontal" method="POST" action="">
-	{{ xsrf_form_html() }}
+	{% raw xsrf_form_html() %}
 	<fieldset>
 		<div class="control-group">
 			<label class="control-label" for="offset">{{ _("Start time") }}</label>
diff --git a/data/templates/modules/modal-base.html b/data/templates/modules/modal-base.html
index 15de33b0..266fe433 100644
--- a/data/templates/modules/modal-base.html
+++ b/data/templates/modules/modal-base.html
@@ -1,6 +1,6 @@
 <div class="modal hide fade" id="{% block id %}{% end block %}">
 	<form class="modal-form form-horizontal" method="POST" action="{% block form_action %}{% end block %}">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 
 		<div class="modal-header">
 			{% block header %}
diff --git a/data/templates/package-properties.html b/data/templates/package-properties.html
index 3284d8ac..22d53db3 100644
--- a/data/templates/package-properties.html
+++ b/data/templates/package-properties.html
@@ -26,7 +26,7 @@
 	<div class="row">
 		<div class="span8">
 			<form class="form form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 
 				<fieldset>
 					<legend>{{ _("Maintainers") }}</legend>
diff --git a/data/templates/register.html b/data/templates/register.html
index 22a5b13b..1aaa2ba6 100644
--- a/data/templates/register.html
+++ b/data/templates/register.html
@@ -39,7 +39,7 @@
 	<div class="row">
 		<div class="span8">
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 
 				<legend>{{ _("Registration form") }}</legend>
 
diff --git a/data/templates/repository-edit.html b/data/templates/repository-edit.html
index 1774fdd2..33ce65aa 100644
--- a/data/templates/repository-edit.html
+++ b/data/templates/repository-edit.html
@@ -9,7 +9,7 @@
 	</h1>
 
 	<form method="post" action="">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 		<table class="form form3">
 			<tr>
 				<td class="col1">{{ _("Name") }}</td>
diff --git a/data/templates/user-forgot-password.html b/data/templates/user-forgot-password.html
index eb62efb3..2896ea41 100644
--- a/data/templates/user-forgot-password.html
+++ b/data/templates/user-forgot-password.html
@@ -35,7 +35,7 @@
 			<hr>
 
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 
 				<fieldset>
 					<div class="control-group">
diff --git a/data/templates/user-impersonation.html b/data/templates/user-impersonation.html
index 071d1a5b..84d68a1d 100644
--- a/data/templates/user-impersonation.html
+++ b/data/templates/user-impersonation.html
@@ -23,7 +23,7 @@
 			</div>
 
 			<form method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 				<input type="hidden" name="user" value="{{ user.name }}" />
 				<input class="btn btn-danger pull-right" type="submit" value="{{ _("Impersonate %s") % user.realname }}" />
 			</form>
diff --git a/data/templates/user-profile-edit.html b/data/templates/user-profile-edit.html
index 7d9c8167..77e09fe1 100644
--- a/data/templates/user-profile-edit.html
+++ b/data/templates/user-profile-edit.html
@@ -4,7 +4,7 @@
 	<h1>{{ _("Edit user %s") % user.realname }}</h1>
 
 	<form method="post" action="">
-		{{ xsrf_form_html() }}
+		{% raw xsrf_form_html() %}
 		<table class="form form3">
 			<tr>
 				<td class="col1">{{ _("Username") }}:</td>
diff --git a/data/templates/user-profile-passwd.html b/data/templates/user-profile-passwd.html
index c18e9910..8d187d0b 100644
--- a/data/templates/user-profile-passwd.html
+++ b/data/templates/user-profile-passwd.html
@@ -53,7 +53,7 @@
 			{% end %}
 
 			<form class="form-horizontal" method="POST" action="">
-				{{ xsrf_form_html() }}
+				{% raw xsrf_form_html() %}
 
 				<fieldset>
 					{% if user == current_user %}