Ronnie has proposed merging lp:~ronnie.vd.c/loco-directory/forms-layout 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/forms-layout/+merge/50483 Restyling of the forms -- https://code.launchpad.net/~ronnie.vd.c/loco-directory/forms-layout/+merge/50483 Your team loco-directory-dev is requested to review the proposed merge of lp:~ronnie.vd.c/loco-directory/forms-layout into lp:loco-directory.
=== modified file 'loco_directory/common/forms.py' --- loco_directory/common/forms.py 2010-11-20 17:25:50 +0000 +++ loco_directory/common/forms.py 2011-02-20 00:06:15 +0000 @@ -1,6 +1,8 @@ from django.template import Context, loader from django import forms from django.utils.translation import ugettext as _ +from django.conf import settings + # Taken from http://djangosnippets.org/snippets/1732/ class RenderableMixin(object): @@ -27,6 +29,7 @@ errors=self.errors, data=self.data, form=self, + MEDIA_URL=settings.MEDIA_URL, ) if getattr(self, 'initial', None): === 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-02-20 00:06:15 +0000 @@ -325,76 +325,99 @@ } .form { - width: 500px; - float:left; + max-width: 500px; + float:left; +} + +.minor-content .form { + max-width: 440px; } .form div{ - padding-top:2px; - padding-bottom:2px; + padding-top:2px; + padding-bottom:2px; } .form div span.help{ - font-size:20px; - color: #DD4814; - cursor:pointer; + font-size: 20px; + color: #DD4814; + cursor: pointer; vertical-align: top; - display:inline; + display: inline; + float: right; + margin-left: 10px; + width: 25px; +} +.form .orange .colorTip { + background-color: #DD4814; + border: 1px solid #DD4814; + color: #FFFFFF; + text-shadow: none; } .form input[type="text"], .form textarea, .form select { padding: 5px; - width: 200px; - margin: 0px 0px 5px 0px; + width: 198px; + margin: 0px 0px 5px 0px; border: 1px solid #ccc; } -.form input[type="text"] { - margin-right: 10px; +.form select { + width: 210px; } .form input[type="checkbox"] { width: 200px; - height:35px; + height: 35px; margin: 0px 0px 5px 0px; } .form div div.field { - float: left; + float: left; + clear: left; padding-top: 5px; } .form div.approved, .form div.approved_date, .form div.expires_date { - height:30px; + height:30px; } .form span.extra { - float: left; + float: left; padding-top: 5px; font-size:0.8em; } -.form div div.field label{ +.form div div.field label { float: left; padding-right: 10px; - width: 170px; + min-width: 170px; font-size: 0.8em; text-align: right; - font-weight:normal; + font-weight:normal; +} + +.form div div.field label { + max-width: 170px; } .form div span.required { - font-size:20px; - color: red; + font-size:20px; + color: #DD4814; margin-left:5px; vertical-align: top; display:inline; } +.form a.add-another { + margin-left:5px; +} + .form textarea { - height: 90px; - width: 270px; + height: 120px; + min-height: 120px; + min-width: 200px; } @@ -423,6 +446,14 @@ padding: 4px 5px; } +.form #id_date_end_0, .form #id_date_end_1, .form #id_date_begin_0, .form #id_date_begin_1 { + width: 88px; +} + +.form #id_date_end_0, .form #id_date_begin_0 { + margin-right: 10px; +} + .attendee-cell { padding-top:10px; } === added file 'loco_directory/media/img/question.png' Binary files loco_directory/media/img/question.png 1970-01-01 00:00:00 +0000 and loco_directory/media/img/question.png 2011-02-20 00:06:15 +0000 differ === modified file 'loco_directory/templates/form.html' --- loco_directory/templates/form.html 2010-10-21 15:45:21 +0000 +++ loco_directory/templates/form.html 2011-02-20 00:06:15 +0000 @@ -3,7 +3,7 @@ <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 %} + {% if field.help_text %}<span class="help" rel="help" title="{{ field.help_text }} {% if field.field.required %}({% trans "Required" %}){% endif %}"><img src="{{ MEDIA_URL }}img/question.png" /></span>{% endif %} {{ field.errors }} </div> {% endfor %}
_______________________________________________ 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
