From 86b97c757399c478d376a29ec88b5d4ae76a259b Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Mon, 26 Jan 2015 11:37:14 +0000
Subject: [PATCH] Summary: Facelift IPR add comment page - Legacy-Id: 8915
---
ietf/ipr/forms.py | 2 +-
ietf/templates/ipr/add_comment.html | 36 ++++++++++++++---------------
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/ietf/ipr/forms.py b/ietf/ipr/forms.py
index 1a8b6177d..de628c0d8 100644
--- a/ietf/ipr/forms.py
+++ b/ietf/ipr/forms.py
@@ -46,8 +46,8 @@ class MessageModelChoiceField(forms.ModelChoiceField):
# Forms
# ----------------------------------------------------------------
class AddCommentForm(forms.Form):
- private = forms.BooleanField(required=False,help_text="If this box is checked the comment will not appear in the disclosure's public history view.")
comment = forms.CharField(required=True, widget=forms.Textarea)
+ private = forms.BooleanField(label="Private comment", required=False,help_text="If this box is checked the comment will not appear in the disclosure's public history view.")
class AddEmailForm(forms.Form):
direction = forms.ChoiceField(choices=(("incoming", "Incoming"), ("outgoing", "Outgoing")),
diff --git a/ietf/templates/ipr/add_comment.html b/ietf/templates/ipr/add_comment.html
index 490edbd7c..df7f37d2a 100644
--- a/ietf/templates/ipr/add_comment.html
+++ b/ietf/templates/ipr/add_comment.html
@@ -1,26 +1,24 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}Add comment on {{ ipr.title }}{% endblock %}
-{% block pagehead %}
-<link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
-{% endblock %}
-
{% block content %}
-<h1>Add comment on {{ ipr }}</h1>
+ <h1>Add comment<br><small>{{ ipr }}</small></h1>
-<p>The comment will be added to the history trail.</p>
+ <p>The comment will be added to the history trail of the disclosure.</p>
-<form class="add-comment" action="" method="post">{% csrf_token %}
- <table>
- {{ form.as_table }}
- <tr>
- <td></td>
- <td class="actions">
- <a href="{% url "ipr_history" id=ipr.id %}">Back</a>
- <input type="submit" value="Add comment"/>
- </td>
- </tr>
- </table>
-</form>
+ {% bootstrap_messages %}
+
+ <form class="add-comment" method="post">
+ {% csrf_token %}
+
+ {% bootstrap_form form %}
+
+ {% buttons %}
+ <button type="submit" class="btn btn-primary">Add Comment</button>
+ <a class="btn btn-default pull-right" href="{% url "ipr_history" id=ipr.id %}">Back</a>
+ {% endbuttons %}
+ </form>
{% endblock %}