Ronnie has proposed merging lp:~ronnie.vd.c/loco-directory/form-base-styling
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~ronnie.vd.c/loco-directory/form-base-styling/+merge/53174
Added Forms Styling conform the web development guidelines - works with code
from:
lp:~ronnie.vd.c/ubuntu-website/django-forms
--
https://code.launchpad.net/~ronnie.vd.c/loco-directory/form-base-styling/+merge/53174
Your team loco-directory-dev is requested to review the proposed merge of
lp:~ronnie.vd.c/loco-directory/form-base-styling into lp:loco-directory.
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2011-02-19 14:00:14 +0000
+++ loco_directory/media/css/newstyle.css 2011-03-13 15:41:54 +0000
@@ -23,12 +23,12 @@
th.form-item-label {
vertical-align: top;
}
-
+/*
label {
font-weight: bold;
white-space: nowrap;
}
-
+*/
.minor-content.venue-map {
min-height: 350px;
margin-top: 60px;
@@ -209,6 +209,7 @@
/* UI Errors ( To yell at the user when they don't fill out a form ) */
+/*
ul.errorlist {
margin: 0px;
padding: 0px;
@@ -222,6 +223,7 @@
margin: 0px 0px 3px;
padding: 4px 5px;
}
+*/
/* Flickr Feed for Global Event */
@@ -324,6 +326,22 @@
padding: 5px 0px 3px;
}
+#site_search_form {
+ width: auto;
+}
+#site_search_form input#id_q {
+ width: 200px;
+ margin: 0;
+}
+
+/* TODO: date_begin and date_end should have class .small */
+#id_date_begin_0, #id_date_begin_1, #id_date_end_0, #id_date_end_1 {
+ width: 134px;
+}
+#id_date_begin_0:focus, #id_date_begin_1:focus, #id_date_end_0:focus, #id_date_end_1:focus {
+ width: 132px;
+}
+/*
.form {
width: 500px;
float:left;
@@ -422,7 +440,7 @@
margin: 0px 130px 3px;
padding: 4px 5px;
}
-
+*/
.attendee-cell {
padding-top:10px;
}
=== modified file 'loco_directory/templates/events/global_event_delete_confirm.html'
--- loco_directory/templates/events/global_event_delete_confirm.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/global_event_delete_confirm.html 2011-03-13 15:41:54 +0000
@@ -9,10 +9,13 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Delete global Event" %}</h2>
-{% blocktrans with global_event_object.name as eventname %}Do you really want to delete the Global Event: {{eventname}}?{% endblocktrans %}
-<form action="." method="post">
- <p><input type="submit" value="Submit" /> <a href="{{global_event_object.get_absolute_url}}">{% trans "Cancel" %}</a></p>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Delete global Event" %}</legend>
+ <label>{% blocktrans with global_event_object.name as eventname %}Do you really want to delete the Global Event: {{eventname}}?{% endblocktrans %}</label>
+ </fieldset>
+ <input type="submit" value="Submit" />
+ <a href="{{global_event_object.get_absolute_url}}">{% trans "Cancel" %}</a>
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/events/global_event_new.html'
--- loco_directory/templates/events/global_event_new.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/global_event_new.html 2011-03-13 15:41:54 +0000
@@ -19,16 +19,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Add new Global Event" %}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Add new Global Event" %}</legend>
{{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/events/global_event_update.html'
--- loco_directory/templates/events/global_event_update.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/global_event_update.html 2011-03-13 15:41:54 +0000
@@ -17,16 +17,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Update Global Event" %}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Update Global Event" %}</legend>
+ {{ form.as_template }}
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/events/team_event_comment_new.html'
--- loco_directory/templates/events/team_event_comment_new.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/team_event_comment_new.html 2011-03-13 15:41:54 +0000
@@ -16,17 +16,15 @@
{% endblock %}
{% block content %}
-<article class="main-content leading">
-<h2>{% trans "Team Event Comment" %}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
+<article class="main-content">
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Team Event Comment" %}</legend>
+ {{ form.as_template }}
+ </fieldset>
{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
<input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ </form>
</article>
{% include "events/team_event_detail.inc.html" %}
=== modified file 'loco_directory/templates/events/team_event_delete_confirm.html'
--- loco_directory/templates/events/team_event_delete_confirm.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/team_event_delete_confirm.html 2011-03-13 15:41:54 +0000
@@ -9,10 +9,13 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Delete Team Event" %}</h2>
-{% blocktrans with team_event_object.name as eventname %}Do you really want to delete the Team Event: {{eventname}}?{% endblocktrans %}
-<form action="." method="post">
- <p><input type="submit" value="Submit" /> <a href="{{team_event_object.get_absolute_url}}">{% trans "Cancel" %}</a></p>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Delete Team Event" %}</legend>
+ <label>{% blocktrans with team_event_object.name as eventname %}Do you really want to delete the Team Event: {{eventname}}?{% endblocktrans %}</label>
+ </fieldset>
+ <input type="submit" value="{% trans 'Delete' %}" />
+ <a href="{{team_event_object.get_absolute_url}}">{% trans "Cancel" %}</a>
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/events/team_event_new.html'
--- loco_directory/templates/events/team_event_new.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/team_event_new.html 2011-03-13 15:41:54 +0000
@@ -25,16 +25,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Add new Team Event for " %}{{ team_object.name}}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Add new Team Event for " %}{{ team_object.name}}<span class="supporting">{% trans 'is required' %}</span></legend>
+ {{ form.as_template }}
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/events/team_event_register.html'
--- loco_directory/templates/events/team_event_register.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/team_event_register.html 2011-03-13 15:41:54 +0000
@@ -9,21 +9,17 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Register for event " %}</h2>
-
-{% if is_past_event %}
-<p><strong>{% trans "This event has finished!" %}</strong> {% trans "Feel free to change your registration status to reflect whether you actually attended; we're just making sure you know you're not signing up for an upcoming event :)" %}</p>
-{% endif %}
-
-<form action="." method="post">
- <div class="form">
- {{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Register for event " %}</legend>
+ {% if is_past_event %}
+ <p><strong>{% trans "This event has finished!" %}</strong> {% trans "Feel free to change your registration status to reflect whether you actually attended; we're just making sure you know you're not signing up for an upcoming event :)" %}</p>
+ {% endif %}
+ {{ form.as_template }}
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/events/team_event_update.html'
--- loco_directory/templates/events/team_event_update.html 2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/team_event_update.html 2011-03-13 15:41:54 +0000
@@ -17,16 +17,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Update Team Event" %}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Update Team Event" %}</legend>
+ {{ form.as_template }}
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== removed file 'loco_directory/templates/form.html'
--- loco_directory/templates/form.html 2010-10-21 15:45:21 +0000
+++ loco_directory/templates/form.html 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-{% load i18n %}
-{% for field in form.visible_fields %}
- <div>
- {% if field.field.label %}<div class="field"><label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}{% endif %} :</label></div>{% endif %}
- {{ field }}{% if field.field.required %}<span class="required">*</span>{% endif %}
- {% if field.help_text %}<span class="help" rel="help" title="{{ field.help_text }} {% if field.field.required %}({% trans "Required" %}){% endif %}">?</span>{% endif %}
- {{ field.errors }}
- </div>
-{% endfor %}
-{% for field in form.hidden_fields %}
- <div class="hidden">{{ field }}</div>
-{% endfor %}
=== modified file 'loco_directory/templates/meetings/agenda_item_delete_confirm.html'
--- loco_directory/templates/meetings/agenda_item_delete_confirm.html 2011-01-23 15:20:31 +0000
+++ loco_directory/templates/meetings/agenda_item_delete_confirm.html 2011-03-13 15:41:54 +0000
@@ -14,30 +14,28 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Delete Agenda Item" %}</h2>
-
-{% if agenda_item_object.children.all %}
-<p>
-Deleting this Agenda Item will also delete the following Agenda Items:
-</p>
-{% recurse item.children.all with agenda_item_object.children.all as item %}
- <ol class="agenda-list">
- {% loop %}
- <li class="agenda-item">
- <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{item.title}}" href="{% url agenda-item-update team_meeting_object.id item.id %}">{{ item.title }}</a>
- - <a class="agenda-sig" target="launchpaduser" href="https://launchpad.net/~{{ item.owner.user.username}}">{{ item.owner.realname }}</a>
- @ {{ item.created_date|date:"D, d N Y H:i T" }}
- </li>
- {% child %}
- {% endloop %}
- </ol>
-{% endrecurse %}
-{% endif %}
-
-<p>{% blocktrans with agenda_item_object.title as itemname %}Do you really want to delete the Agenda Item: {{itemname}}?{% endblocktrans %}</p>
-
-<form action="." method="post">
- <p><input type="submit" value="Submit" /> <a href="{{team_meeting_object.get_absolute_url}}">{% trans "Cancel" %}</a></p>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Delete Agenda Item" %}</legend>
+ {% if agenda_item_object.children.all %}
+ <p>{% trans 'Deleting this Agenda Item will also delete the following Agenda Items:' %}</p>
+ {% recurse item.children.all with agenda_item_object.children.all as item %}
+ <ol class="agenda-list">
+ {% loop %}
+ <li class="agenda-item">
+ <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{item.title}}" href="{% url agenda-item-update team_meeting_object.id item.id %}">{{ item.title }}</a>
+ - <a class="agenda-sig" target="launchpaduser" href="https://launchpad.net/~{{ item.owner.user.username}}">{{ item.owner.realname }}</a>
+ @ {{ item.created_date|date:"D, d N Y H:i T" }}
+ </li>
+ {% child %}
+ {% endloop %}
+ </ol>
+ {% endrecurse %}
+ {% endif %}
+ <p>{% blocktrans with agenda_item_object.title as itemname %}Do you really want to delete the Agenda Item: {{itemname}}?{% endblocktrans %}</p>
+ </fieldset>
+ <input type="submit" value="{% trans 'Delete' %}" />
+ <a href="{{team_meeting_object.get_absolute_url}}">{% trans "Cancel" %}</a>
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/meetings/agenda_item_new.html'
--- loco_directory/templates/meetings/agenda_item_new.html 2011-01-22 16:05:24 +0000
+++ loco_directory/templates/meetings/agenda_item_new.html 2011-03-13 15:41:54 +0000
@@ -21,16 +21,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name}}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name}}</legend>
+ {{ form.as_template }}
+ </fieldset>
{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
<input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
--- loco_directory/templates/meetings/agenda_item_update.html 2011-01-23 02:17:54 +0000
+++ loco_directory/templates/meetings/agenda_item_update.html 2011-03-13 15:41:54 +0000
@@ -22,16 +22,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Update Agenda Item" %}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Update Agenda Item" %}</legend>
+ {{ form.as_template }}
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/meetings/team_meeting_delete_confirm.html'
--- loco_directory/templates/meetings/team_meeting_delete_confirm.html 2010-12-02 07:56:46 +0000
+++ loco_directory/templates/meetings/team_meeting_delete_confirm.html 2011-03-13 15:41:54 +0000
@@ -9,10 +9,13 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Delete Team Meeting" %}</h2>
-{% blocktrans with team_meeting_object.name as meetingname %}Do you really want to delete the Team Meeting: {{meetingname}}?{% endblocktrans %}
-<form action="." method="post">
- <p><input type="submit" value="Submit" /> <a href="{{team_meeting_object.get_absolute_url}}">{% trans "Cancel" %}</a></p>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Delete Team Meeting" %}</legend>
+ <label>{% blocktrans with team_meeting_object.name as meetingname %}Do you really want to delete the Team Meeting: {{meetingname}}?{% endblocktrans %}</label>
+ </fieldset>
+ <input type="submit" value="Submit" />
+ <a href="{{team_meeting_object.get_absolute_url}}">{% trans "Cancel" %}</a>
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/meetings/team_meeting_new.html'
--- loco_directory/templates/meetings/team_meeting_new.html 2010-12-02 07:56:46 +0000
+++ loco_directory/templates/meetings/team_meeting_new.html 2011-03-13 15:41:54 +0000
@@ -17,16 +17,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</legend>
+ {{ form.as_template }}
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/meetings/team_meeting_update.html'
--- loco_directory/templates/meetings/team_meeting_update.html 2010-12-02 07:56:46 +0000
+++ loco_directory/templates/meetings/team_meeting_update.html 2011-03-13 15:41:54 +0000
@@ -17,16 +17,14 @@
{% block content %}
<article class="main-content">
-<h2>{% trans "Update Team Meeting" %}</h2>
-<form action="." method="post">
- <div class="form" style="width:auto;">
- {{ form.as_template }}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
- </div>
- </div>
-</form>
+ <form action="." method="post">
+ <fieldset>
+ <legend>{% trans "Update Team Meeting" %}</legend>
+ {{ form.as_template }}
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
+ </form>
</article>
{% endblock %}
=== modified file 'loco_directory/templates/teams/team_update.html'
--- loco_directory/templates/teams/team_update.html 2011-01-10 00:53:42 +0000
+++ loco_directory/templates/teams/team_update.html 2011-03-13 15:41:54 +0000
@@ -30,9 +30,12 @@
{% endif %}
<form action="{{ request.path_info }}" method="POST">
- <p>{% trans "Update the information below:" %}</p>
- <div class="form">
- {{ form.as_template }}
+ <fieldset>
+ <legend>{% trans "Update the information below" %}</legend>
+ {{ form.as_template }}
+ </fieldset>
+ <fieldset>
+ <legend>{% trans "Static information" %}</legend>
<div class="approved">
<div class="field"><label for="approved">Approved :</label></div>
<span class="extra">{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span>
@@ -47,11 +50,9 @@
<span class="extra">{{ team.expires_date }}</span>
</div>
{% endif %}
- <div>
- {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
- <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" />
- </div>
- </div>
+ </fieldset>
+ {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+ <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" />
</form>
</article>
=== modified file 'loco_directory/templates/venues/venue_update.html'
--- loco_directory/templates/venues/venue_update.html 2011-02-17 16:23:06 +0000
+++ loco_directory/templates/venues/venue_update.html 2011-03-13 15:41:54 +0000
@@ -24,15 +24,13 @@
{% block content %}
<article class="minor-content">
- <h2>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</h2>
- <form action="." method="post">
- <div class="form">
+ <form action="." method="post" style="width:auto;">
+ <fieldset>
+ <legend>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</legend>
{{ form.as_template }}
- <div>
+ </fieldset>
{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
<input type="submit" name="submit" value="Submit" class="submit-button" />
- </div>
- </div>
</form>
</article>
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
