Merge lp:~daker/loco-team-portal/fix.forms into lp:loco-team-portal
- fix.forms
- Merge into 0.2
Proposed by
Adnane Belmadiaf
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Adnane Belmadiaf | ||||
Approved revision: | 613 | ||||
Merged at revision: | 613 | ||||
Proposed branch: | lp:~daker/loco-team-portal/fix.forms | ||||
Merge into: | lp:loco-team-portal | ||||
Diff against target: |
994 lines (+437/-308) 14 files modified
loco_directory/events/forms.py (+4/-18) loco_directory/events/models.py (+0/-1) loco_directory/events/widgets.py (+90/-0) loco_directory/media/css/styles.css (+208/-109) loco_directory/media/js/events-ui.js (+1/-5) loco_directory/meetings/forms.py (+4/-9) loco_directory/templates/events/global_event_new.html (+13/-22) loco_directory/templates/events/global_event_update.html (+13/-20) loco_directory/templates/events/team_event_new.html (+19/-26) loco_directory/templates/events/team_event_update.html (+13/-20) loco_directory/templates/form.html (+18/-0) loco_directory/templates/meetings/team_meeting_new.html (+11/-18) loco_directory/templates/meetings/team_meeting_update.html (+11/-18) loco_directory/templates/teams/team_update.html (+32/-42) |
||||
To merge this branch: | bzr merge lp:~daker/loco-team-portal/fix.forms | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
LoCo Team Portal Developers | Pending | ||
Review via email: mp+148917@code.launchpad.net |
Commit message
Fixed the forms style
Description of the change
To post a comment you must log in.
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote : | # |
- 613. By Adnane Belmadiaf
-
Merged trunk
Fixed #797992
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'loco_directory/events/forms.py' | |||
2 | --- loco_directory/events/forms.py 2013-02-16 00:29:22 +0000 | |||
3 | +++ loco_directory/events/forms.py 2013-02-18 21:30:29 +0000 | |||
4 | @@ -8,6 +8,7 @@ | |||
5 | 8 | from venues.models import Venue | 8 | from venues.models import Venue |
6 | 9 | from common.forms import RenderableMixin | 9 | from common.forms import RenderableMixin |
7 | 10 | from userprofiles.models import UserProfile | 10 | from userprofiles.models import UserProfile |
8 | 11 | from .widgets import DateTimeWidget | ||
9 | 11 | 12 | ||
10 | 12 | import itertools | 13 | import itertools |
11 | 13 | 14 | ||
12 | @@ -43,23 +44,17 @@ | |||
13 | 43 | 44 | ||
14 | 44 | class Media: | 45 | class Media: |
15 | 45 | css = {'all': ( | 46 | css = {'all': ( |
19 | 46 | settings.MEDIA_URL + 'jquery-ui/css/css/smoothness/jquery-ui.css', | 47 | settings.MEDIA_URL + 'jquery-ui/css/smoothness/jquery-ui.css', |
17 | 47 | settings.MEDIA_URL + 'jquery-ui-timepicker/css/ui-lightness/ui.timepickr.css', | ||
18 | 48 | settings.MEDIA_URL + 'css/colortip-1.0-jquery.css', | ||
20 | 49 | )} | 48 | )} |
21 | 50 | js = ( | 49 | js = ( |
22 | 51 | settings.MEDIA_URL + 'jquery/jquery.js', | ||
23 | 52 | settings.MEDIA_URL + 'jquery-ui/jquery-ui.js', | 50 | settings.MEDIA_URL + 'jquery-ui/jquery-ui.js', |
24 | 53 | settings.MEDIA_URL + 'jquery-ui-timepicker/js/jquery.timepickr.min.js', | ||
25 | 54 | settings.MEDIA_URL + 'jquery-ui-timepicker/js/ui.timepickr.min.js', | ||
26 | 55 | settings.MEDIA_URL + 'js/colortip-1.0-jquery.js', | ||
27 | 56 | settings.MEDIA_URL + 'js/events-ui.js', | 51 | settings.MEDIA_URL + 'js/events-ui.js', |
28 | 57 | ) | 52 | ) |
29 | 58 | 53 | ||
30 | 59 | def __init__(self, *args, **kargs): | 54 | def __init__(self, *args, **kargs): |
31 | 60 | super(BaseEventForm, self).__init__(*args, **kargs) | 55 | super(BaseEventForm, self).__init__(*args, **kargs) |
34 | 61 | self.fields['date_begin'].widget = forms.SplitDateTimeWidget() | 56 | self.fields['date_begin'].widget = DateTimeWidget() |
35 | 62 | self.fields['date_end'].widget = forms.SplitDateTimeWidget() | 57 | self.fields['date_end'].widget = DateTimeWidget() |
36 | 63 | 58 | ||
37 | 64 | def clean(self): | 59 | def clean(self): |
38 | 65 | begin = self.cleaned_data.get('date_begin') | 60 | begin = self.cleaned_data.get('date_begin') |
39 | @@ -184,12 +179,3 @@ | |||
40 | 184 | class Meta: | 179 | class Meta: |
41 | 185 | model = TeamEventComment | 180 | model = TeamEventComment |
42 | 186 | exclude = ('team_event', 'date_created', 'commenter_profile') | 181 | exclude = ('team_event', 'date_created', 'commenter_profile') |
43 | 187 | |||
44 | 188 | class Media: | ||
45 | 189 | css = {'all': ( | ||
46 | 190 | settings.MEDIA_URL + 'css/colortip-1.0-jquery.css', | ||
47 | 191 | )} | ||
48 | 192 | js = ( | ||
49 | 193 | settings.MEDIA_URL + 'jquery/jquery.js', | ||
50 | 194 | settings.MEDIA_URL + 'js/colortip-1.0-jquery.js', | ||
51 | 195 | ) | ||
52 | 196 | 182 | ||
53 | === modified file 'loco_directory/events/models.py' | |||
54 | --- loco_directory/events/models.py 2013-02-16 00:29:22 +0000 | |||
55 | +++ loco_directory/events/models.py 2013-02-18 21:30:29 +0000 | |||
56 | @@ -93,7 +93,6 @@ | |||
57 | 93 | venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True) | 93 | venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True) |
58 | 94 | channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True) | 94 | channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True) |
59 | 95 | registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True) | 95 | registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True) |
60 | 96 | template = 'events/team_event_li.inc.html' | ||
61 | 97 | 96 | ||
62 | 98 | objects = TeamEventManager() | 97 | objects = TeamEventManager() |
63 | 99 | 98 | ||
64 | 100 | 99 | ||
65 | === added file 'loco_directory/events/widgets.py' | |||
66 | --- loco_directory/events/widgets.py 1970-01-01 00:00:00 +0000 | |||
67 | +++ loco_directory/events/widgets.py 2013-02-18 21:30:29 +0000 | |||
68 | @@ -0,0 +1,90 @@ | |||
69 | 1 | # -*- coding: utf-8 -*- | ||
70 | 2 | from datetime import time | ||
71 | 3 | from time import strptime, strftime | ||
72 | 4 | |||
73 | 5 | from django import forms | ||
74 | 6 | from django.utils.translation import ugettext as _ | ||
75 | 7 | |||
76 | 8 | |||
77 | 9 | class DateWidget(forms.DateInput): | ||
78 | 10 | """A more-friendly date widget with a pop-up calendar. | ||
79 | 11 | """ | ||
80 | 12 | def __init__(self, attrs=None): | ||
81 | 13 | self.date_class = 'datepicker' | ||
82 | 14 | if not attrs: | ||
83 | 15 | attrs = {} | ||
84 | 16 | if 'date_class' in attrs: | ||
85 | 17 | self.date_class = attrs.pop('date_class') | ||
86 | 18 | if 'class' not in attrs: | ||
87 | 19 | attrs['class'] = 'date' | ||
88 | 20 | |||
89 | 21 | super(DateWidget, self).__init__(attrs=attrs) | ||
90 | 22 | |||
91 | 23 | def render(self, name, value, attrs=None): | ||
92 | 24 | return '<span class="%s">%s</span>' % (self.date_class, super(DateWidget, self).render(name, value, attrs)) | ||
93 | 25 | |||
94 | 26 | |||
95 | 27 | class TimeWidget(forms.MultiWidget): | ||
96 | 28 | """A more-friendly time widget. | ||
97 | 29 | """ | ||
98 | 30 | def __init__(self, attrs=None): | ||
99 | 31 | self.time_class = 'timepicker' | ||
100 | 32 | if not attrs: | ||
101 | 33 | attrs = {} | ||
102 | 34 | if 'time_class' in attrs: | ||
103 | 35 | self.time_class = attrs.pop('time_class') | ||
104 | 36 | if 'class' not in attrs: | ||
105 | 37 | attrs['class'] = 'time' | ||
106 | 38 | |||
107 | 39 | widgets = ( | ||
108 | 40 | forms.Select(attrs=attrs, choices=[(i + 1, "%02d" % (i + 1)) for i in range(0, 12)]), | ||
109 | 41 | forms.Select(attrs=attrs, choices=[(i, "%02d" % i) for i in range(00, 60, 15)]), | ||
110 | 42 | forms.Select(attrs=attrs, choices=[('AM', _('AM')), ('PM', _('PM'))]) | ||
111 | 43 | ) | ||
112 | 44 | |||
113 | 45 | super(TimeWidget, self).__init__(widgets, attrs) | ||
114 | 46 | |||
115 | 47 | def decompress(self, value): | ||
116 | 48 | if isinstance(value, time): | ||
117 | 49 | hour = int(value.strftime("%I")) | ||
118 | 50 | minute = int(value.strftime("%M")) | ||
119 | 51 | meridian = value.strftime("%p") | ||
120 | 52 | return (hour, minute, meridian) | ||
121 | 53 | return (None, None, None) | ||
122 | 54 | |||
123 | 55 | def value_from_datadict(self, data, files, name): | ||
124 | 56 | value = super(TimeWidget, self).value_from_datadict(data, files, name) | ||
125 | 57 | t = strptime("%02d:%02d %s" % (int(value[0]), int(value[1]), value[2]), "%I:%M %p") | ||
126 | 58 | return strftime("%H:%M:%S", t) | ||
127 | 59 | |||
128 | 60 | def format_output(self, rendered_widgets): | ||
129 | 61 | return '<span class="%s">%s%s%s</span>' % ( | ||
130 | 62 | self.time_class, | ||
131 | 63 | rendered_widgets[0], rendered_widgets[1], rendered_widgets[2] | ||
132 | 64 | ) | ||
133 | 65 | |||
134 | 66 | |||
135 | 67 | class DateTimeWidget(forms.SplitDateTimeWidget): | ||
136 | 68 | """A more-friendly date/time widget. | ||
137 | 69 | |||
138 | 70 | Inspired by: | ||
139 | 71 | |||
140 | 72 | http://copiesofcopies.org/webl/2010/04/26/a-better-datetime-widget-for-django/ | ||
141 | 73 | """ | ||
142 | 74 | def __init__(self, attrs=None, date_format=None, time_format=None): | ||
143 | 75 | super(DateTimeWidget, self).__init__(attrs, date_format, time_format) | ||
144 | 76 | self.widgets = ( | ||
145 | 77 | DateWidget(attrs=attrs), | ||
146 | 78 | TimeWidget(attrs=attrs), | ||
147 | 79 | ) | ||
148 | 80 | |||
149 | 81 | def decompress(self, value): | ||
150 | 82 | if value: | ||
151 | 83 | d = strftime("%Y-%m-%d", value.timetuple()) | ||
152 | 84 | t = strftime("%I:%M %p", value.timetuple()) | ||
153 | 85 | return (d, t) | ||
154 | 86 | else: | ||
155 | 87 | return (None, None) | ||
156 | 88 | |||
157 | 89 | def format_output(self, rendered_widgets): | ||
158 | 90 | return '%s%s' % (rendered_widgets[0], rendered_widgets[1]) | ||
159 | 0 | 91 | ||
160 | === modified file 'loco_directory/media/css/styles.css' | |||
161 | --- loco_directory/media/css/styles.css 2013-02-16 18:50:41 +0000 | |||
162 | +++ loco_directory/media/css/styles.css 2013-02-18 21:30:29 +0000 | |||
163 | @@ -352,113 +352,133 @@ | |||
164 | 352 | margin: 0; | 352 | margin: 0; |
165 | 353 | } | 353 | } |
166 | 354 | 354 | ||
274 | 355 | /* TODO: date_begin and date_end should have class .small */ | 355 | #id_date_begin_0, #id_date_begin_1, |
275 | 356 | #id_date_begin_0, #id_date_begin_1, #id_date_end_0, #id_date_end_1 { | 356 | #id_date_end_0, #id_date_end_1, |
276 | 357 | width: 134px; | 357 | #id_date_begin_1_0, #id_date_begin_1_1, #id_date_begin_1_2, |
277 | 358 | } | 358 | #id_date_end_1_0, #id_date_end_1_1, #id_date_end_1_2 { |
278 | 359 | #id_date_begin_0:focus, #id_date_begin_1:focus, #id_date_end_0:focus, #id_date_end_1:focus { | 359 | width: 100px; |
279 | 360 | width: 132px; | 360 | display: inline; |
280 | 361 | } | 361 | } |
281 | 362 | /* | 362 | |
282 | 363 | .form { | 363 | #id_date_begin_1_0, #id_date_begin_1_1, #id_date_begin_1_2, |
283 | 364 | width: 500px; | 364 | #id_date_end_1_0, #id_date_end_1_1, #id_date_end_1_2 { |
284 | 365 | float:left; | 365 | width: 60px; |
285 | 366 | } | 366 | } |
286 | 367 | 367 | ||
287 | 368 | .form div{ | 368 | #id_name, #id_announce, #id_registration { |
288 | 369 | padding-top:2px; | 369 | width: 350px; |
289 | 370 | padding-bottom:2px; | 370 | } |
290 | 371 | } | 371 | |
291 | 372 | 372 | form.form { | |
292 | 373 | .form div span.help{ | 373 | margin-bottom: 10px; |
293 | 374 | font-size:20px; | 374 | } |
294 | 375 | color: #DD4814; | 375 | |
295 | 376 | cursor:pointer; | 376 | form.form div{ |
296 | 377 | vertical-align: top; | 377 | margin-top: 10px; |
297 | 378 | display:inline; | 378 | margin-bottom: 10px; |
298 | 379 | 379 | } | |
299 | 380 | } | 380 | |
300 | 381 | 381 | form.form div ul.errorlist + input, | |
301 | 382 | .form input[type="text"], .form textarea, .form select { | 382 | form.form div ul.errorlist + select, |
302 | 383 | padding: 5px; | 383 | form.form div ul.errorlist + textarea { |
303 | 384 | width: 200px; | 384 | background-color: #fff6f6; |
304 | 385 | margin: 0px 0px 5px 0px; | 385 | border-color: #eec3c7; |
305 | 386 | border: 1px solid #ccc; | 386 | } |
306 | 387 | } | 387 | |
307 | 388 | 388 | form.form div label{ | |
308 | 389 | .form input[type="text"] { | 389 | font-size: 14px; |
309 | 390 | margin-right: 10px; | 390 | margin-bottom: 5px; |
310 | 391 | } | 391 | cursor:default; |
311 | 392 | 392 | } | |
312 | 393 | .form input[type="checkbox"] { | 393 | |
313 | 394 | width: 200px; | 394 | form.form div span.h{ |
314 | 395 | height:35px; | 395 | color: #a1a1a1; |
315 | 396 | margin: 0px 0px 5px 0px; | 396 | font-size: 12px; |
316 | 397 | } | 397 | font-style: italic; |
317 | 398 | 398 | display: block; | |
318 | 399 | .form div div.field { | 399 | margin-bottom: 15px; |
319 | 400 | float: left; | 400 | } |
320 | 401 | padding-top: 5px; | 401 | |
321 | 402 | } | 402 | form.form input[type="text"], form.form textarea, form.form select { |
322 | 403 | 403 | height: auto; | |
323 | 404 | .form div.approved, .form div.approved_date, .form div.expires_date { | 404 | box-sizing: border-box; |
324 | 405 | height:30px; | 405 | -moz-box-sizing: border-box; |
325 | 406 | } | 406 | border: 1px solid #ddd; |
326 | 407 | 407 | padding: 8px; | |
327 | 408 | .form span.extra { | 408 | border-radius: 3px; |
328 | 409 | float: left; | 409 | -moz-border-radius: 3px; |
329 | 410 | padding-top: 5px; | 410 | -webkit-border-radius: 3px; |
330 | 411 | font-size:0.8em; | 411 | font-size: 13px; |
331 | 412 | } | 412 | margin-right: 10px; |
332 | 413 | 413 | } | |
333 | 414 | .form div div.field label{ | 414 | |
334 | 415 | float: left; | 415 | form.form input[type="text"] { |
335 | 416 | padding-right: 10px; | 416 | margin-right: 10px; |
336 | 417 | width: 170px; | 417 | } |
337 | 418 | font-size: 0.8em; | 418 | |
338 | 419 | text-align: right; | 419 | form.form input[type="checkbox"] { |
339 | 420 | font-weight:normal; | 420 | margin: 0px 0px 5px 0px; |
340 | 421 | } | 421 | } |
341 | 422 | 422 | ||
342 | 423 | .form div span.required { | 423 | form.form div span.required { |
343 | 424 | font-size:20px; | 424 | font-size:20px; |
344 | 425 | color: red; | 425 | color: #b94a5c; |
345 | 426 | margin-left:5px; | 426 | margin-left: 5px; |
346 | 427 | vertical-align: top; | 427 | vertical-align: top; |
347 | 428 | display:inline; | 428 | display: inline; |
348 | 429 | } | 429 | } |
349 | 430 | 430 | ||
350 | 431 | .form textarea { | 431 | form.form textarea { |
351 | 432 | height: 90px; | 432 | height: 180px; |
352 | 433 | width: 270px; | 433 | width: 520px!important; |
353 | 434 | } | 434 | max-width: 500px!important; |
354 | 435 | 435 | min-width: auto!important; | |
355 | 436 | 436 | } | |
356 | 437 | .form select:focus, .form textarea:focus, .form input:focus { | 437 | |
357 | 438 | border: 1px solid #900; | 438 | form.form select:focus, form.form textarea:focus, form.form input:focus { |
358 | 439 | } | 439 | border: 1px solid #900; |
359 | 440 | 440 | } | |
360 | 441 | .form input.submit-button { | 441 | |
361 | 442 | padding-left: 20px; | 442 | form.form input.btn { |
362 | 443 | padding-right: 20px; | 443 | background: transparent url(../images/bg_btn.png) repeat-x top left; |
363 | 444 | float: right; | 444 | -webkit-border-radius: 4px; |
364 | 445 | margin-right: 50px; | 445 | -moz-border-radius: 4px; |
365 | 446 | } | 446 | border-radius: 4px; |
366 | 447 | 447 | font-size: 13px; | |
367 | 448 | .form ul.errorlist { | 448 | font-weight: bold; |
368 | 449 | margin: 0px; | 449 | text-align: center; |
369 | 450 | padding: 0px; | 450 | white-space: nowrap; |
370 | 451 | } | 451 | margin: 0; |
371 | 452 | 452 | outline: 0; | |
372 | 453 | .form .errorlist li { | 453 | padding: 7px 25px; |
373 | 454 | color: red; | 454 | color: white; |
374 | 455 | font-weight: bold; | 455 | text-shadow: 0 1px rgba(0, 0, 0, 0.1); |
375 | 456 | display: block; | 456 | position: relative; |
376 | 457 | font-size: 0.8em; | 457 | display: inline-block; |
377 | 458 | margin: 0px 130px 3px; | 458 | text-transform: uppercase; |
378 | 459 | padding: 4px 5px; | 459 | } |
379 | 460 | } | 460 | |
380 | 461 | */ | 461 | form.form input.btn:active { |
381 | 462 | -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3); | ||
382 | 463 | -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.3); | ||
383 | 464 | box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3); | ||
384 | 465 | } | ||
385 | 466 | |||
386 | 467 | form.form ul.errorlist { | ||
387 | 468 | margin: 0px; | ||
388 | 469 | padding: 0px; | ||
389 | 470 | color: #b94a5c; | ||
390 | 471 | display: block; | ||
391 | 472 | } | ||
392 | 473 | |||
393 | 474 | form.form ul.errorlist li { | ||
394 | 475 | font-weight: bold; | ||
395 | 476 | display: block; | ||
396 | 477 | font-size: 0.9em; | ||
397 | 478 | margin: 0; | ||
398 | 479 | padding: 0; | ||
399 | 480 | background: transparent; | ||
400 | 481 | } | ||
401 | 462 | 482 | ||
402 | 463 | h3.attendees-title { | 483 | h3.attendees-title { |
403 | 464 | display: inline-block; | 484 | display: inline-block; |
404 | @@ -473,6 +493,11 @@ | |||
405 | 473 | text-transform: uppercase; | 493 | text-transform: uppercase; |
406 | 474 | margin-top: 10px; | 494 | margin-top: 10px; |
407 | 475 | } | 495 | } |
408 | 496 | |||
409 | 497 | form fieldset { | ||
410 | 498 | padding: 15px 20px 15px 20px !important; | ||
411 | 499 | } | ||
412 | 500 | |||
413 | 476 | ul.attendees { | 501 | ul.attendees { |
414 | 477 | margin: 0; | 502 | margin: 0; |
415 | 478 | padding: 0; | 503 | padding: 0; |
416 | @@ -487,7 +512,7 @@ | |||
417 | 487 | } | 512 | } |
418 | 488 | 513 | ||
419 | 489 | .attendee-mugshot { | 514 | .attendee-mugshot { |
421 | 490 | cursor: pointer; | 515 | cursor: pointer; |
422 | 491 | float: left; | 516 | float: left; |
423 | 492 | height: 32px; | 517 | height: 32px; |
424 | 493 | margin-right: 10px; | 518 | margin-right: 10px; |
425 | @@ -1600,6 +1625,80 @@ | |||
426 | 1600 | font-size: 0.8em; | 1625 | font-size: 0.8em; |
427 | 1601 | } | 1626 | } |
428 | 1602 | 1627 | ||
429 | 1628 | |||
430 | 1629 | /* CALENDAR STYLES */ | ||
431 | 1630 | .ui-datepicker-calendar thead{ | ||
432 | 1631 | display:none; | ||
433 | 1632 | } | ||
434 | 1633 | |||
435 | 1634 | #ui-datepicker-div{ | ||
436 | 1635 | font-size:13px; | ||
437 | 1636 | line-height:1.8em; | ||
438 | 1637 | z-index:10000 !important; | ||
439 | 1638 | border:5px solid #455868; | ||
440 | 1639 | -webkit-border-radius: 4px; | ||
441 | 1640 | -moz-border-radius: 4px; | ||
442 | 1641 | border-radius: 4px; | ||
443 | 1642 | margin-top:6px; | ||
444 | 1643 | margin-left:-60px; | ||
445 | 1644 | padding-bottom:10px; | ||
446 | 1645 | } | ||
447 | 1646 | |||
448 | 1647 | .ui-datepicker{ | ||
449 | 1648 | padding:0 !important; | ||
450 | 1649 | padding-bottom: 3px !important; | ||
451 | 1650 | width:auto !important; | ||
452 | 1651 | } | ||
453 | 1652 | |||
454 | 1653 | .ui-datepicker table{ | ||
455 | 1654 | margin:0 !important; | ||
456 | 1655 | width:auto !important; | ||
457 | 1656 | } | ||
458 | 1657 | |||
459 | 1658 | .ui-datepicker td{ | ||
460 | 1659 | padding:0 !important; | ||
461 | 1660 | border:1px solid #ECECEC !important; | ||
462 | 1661 | width:29px; | ||
463 | 1662 | height:29px; | ||
464 | 1663 | } | ||
465 | 1664 | |||
466 | 1665 | .ui-datepicker td a { | ||
467 | 1666 | text-align: center!important; | ||
468 | 1667 | } | ||
469 | 1668 | |||
470 | 1669 | .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default{ | ||
471 | 1670 | border: 0 none !important; | ||
472 | 1671 | background:none !important; | ||
473 | 1672 | } | ||
474 | 1673 | |||
475 | 1674 | .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, | ||
476 | 1675 | .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus{ | ||
477 | 1676 | border: 0 none !important; | ||
478 | 1677 | background: #909DA7 !important; | ||
479 | 1678 | color:#FFFFFF !important; | ||
480 | 1679 | } | ||
481 | 1680 | |||
482 | 1681 | .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{ | ||
483 | 1682 | color:#FFFFFF !important; | ||
484 | 1683 | background: #909DA7 !important; | ||
485 | 1684 | } | ||
486 | 1685 | |||
487 | 1686 | .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight{ | ||
488 | 1687 | border: 0 none !important; | ||
489 | 1688 | } | ||
490 | 1689 | |||
491 | 1690 | .ui-datepicker-prev.ui-state-hover, .ui-datepicker-next.ui-state-hover { | ||
492 | 1691 | background:none !important; | ||
493 | 1692 | } | ||
494 | 1693 | |||
495 | 1694 | .ui-widget-header { | ||
496 | 1695 | background: #dd4814 !important; | ||
497 | 1696 | -moz-border-radius: 0 !important; | ||
498 | 1697 | -webkit-border-radius: 0 !important; | ||
499 | 1698 | border-radius: 0 !important; | ||
500 | 1699 | color: #fff !important; | ||
501 | 1700 | } | ||
502 | 1701 | |||
503 | 1603 | #lc { | 1702 | #lc { |
504 | 1604 | padding: 15px; | 1703 | padding: 15px; |
505 | 1605 | border-top: 1px solid #E6E6E6; | 1704 | border-top: 1px solid #E6E6E6; |
506 | @@ -1616,4 +1715,4 @@ | |||
507 | 1616 | 1715 | ||
508 | 1617 | #lc ul li:last-child { | 1716 | #lc ul li:last-child { |
509 | 1618 | margin-bottom: 0; | 1717 | margin-bottom: 0; |
510 | 1619 | } | ||
511 | 1620 | \ No newline at end of file | 1718 | \ No newline at end of file |
512 | 1719 | } | ||
513 | 1621 | 1720 | ||
514 | === modified file 'loco_directory/media/js/events-ui.js' | |||
515 | --- loco_directory/media/js/events-ui.js 2012-03-22 21:57:48 +0000 | |||
516 | +++ loco_directory/media/js/events-ui.js 2013-02-18 21:30:29 +0000 | |||
517 | @@ -6,12 +6,8 @@ | |||
518 | 6 | }); | 6 | }); |
519 | 7 | 7 | ||
520 | 8 | $("#id_date_begin_0").datepicker({altField: "#id_date_end_0", altFormat: "yy-mm-dd"}); | 8 | $("#id_date_begin_0").datepicker({altField: "#id_date_end_0", altFormat: "yy-mm-dd"}); |
521 | 9 | $('#id_date_begin_1').timepickr({ trigger: 'focus', convention: 24 }); | ||
522 | 10 | 9 | ||
523 | 11 | $("#id_date_end_0").datepicker(); | 10 | $("#id_date_end_0").datepicker(); |
524 | 12 | $('#id_date_end_1').timepickr({ trigger: 'focus', convention: 24 }); | ||
525 | 13 | |||
526 | 14 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
527 | 15 | 11 | ||
528 | 16 | $('#id_filtering').datepicker( { | 12 | $('#id_filtering').datepicker( { |
529 | 17 | changeYear: true, | 13 | changeYear: true, |
530 | @@ -19,7 +15,7 @@ | |||
531 | 19 | showButtonPanel: true, | 15 | showButtonPanel: true, |
532 | 20 | dateFormat: 'yy-m', | 16 | dateFormat: 'yy-m', |
533 | 21 | onClose: function(dateText, inst) { | 17 | onClose: function(dateText, inst) { |
535 | 22 | 18 | ||
536 | 23 | var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val(); | 19 | var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val(); |
537 | 24 | var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val(); | 20 | var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val(); |
538 | 25 | $(this).datepicker('setDate', new Date(year, month, 1)); | 21 | $(this).datepicker('setDate', new Date(year, month, 1)); |
539 | 26 | 22 | ||
540 | === modified file 'loco_directory/meetings/forms.py' | |||
541 | --- loco_directory/meetings/forms.py 2013-02-05 23:23:30 +0000 | |||
542 | +++ loco_directory/meetings/forms.py 2013-02-18 21:30:29 +0000 | |||
543 | @@ -6,6 +6,7 @@ | |||
544 | 6 | from models import BaseMeeting, TeamMeeting, AgendaItem | 6 | from models import BaseMeeting, TeamMeeting, AgendaItem |
545 | 7 | from common.forms import RenderableMixin | 7 | from common.forms import RenderableMixin |
546 | 8 | from userprofiles.models import UserProfile | 8 | from userprofiles.models import UserProfile |
547 | 9 | from events.widgets import DateTimeWidget | ||
548 | 9 | 10 | ||
549 | 10 | import urllib | 11 | import urllib |
550 | 11 | 12 | ||
551 | @@ -32,23 +33,17 @@ | |||
552 | 32 | 33 | ||
553 | 33 | class Media: | 34 | class Media: |
554 | 34 | css = {'all': ( | 35 | css = {'all': ( |
558 | 35 | settings.MEDIA_URL + 'jquery-ui/css/css/smoothness/jquery-ui.css', | 36 | settings.MEDIA_URL + 'jquery-ui/css/smoothness/jquery-ui.css', |
556 | 36 | settings.MEDIA_URL + 'jquery-ui-timepicker/css/ui-lightness/ui.timepickr.css', | ||
557 | 37 | settings.MEDIA_URL + 'css/colortip-1.0-jquery.css', | ||
559 | 38 | )} | 37 | )} |
560 | 39 | js = ( | 38 | js = ( |
561 | 40 | settings.MEDIA_URL + 'jquery/jquery.js', | ||
562 | 41 | settings.MEDIA_URL + 'jquery-ui/jquery-ui.js', | 39 | settings.MEDIA_URL + 'jquery-ui/jquery-ui.js', |
563 | 42 | settings.MEDIA_URL + 'jquery-ui-timepicker/js/jquery.timepickr.min.js', | ||
564 | 43 | settings.MEDIA_URL + 'jquery-ui-timepicker/js/ui.timepickr.min.js', | ||
565 | 44 | settings.MEDIA_URL + 'js/events-ui.js', | 40 | settings.MEDIA_URL + 'js/events-ui.js', |
566 | 45 | settings.MEDIA_URL + 'js/colortip-1.0-jquery.js', | ||
567 | 46 | ) | 41 | ) |
568 | 47 | 42 | ||
569 | 48 | def __init__(self, *args, **kargs): | 43 | def __init__(self, *args, **kargs): |
570 | 49 | super(BaseMeetingForm, self).__init__(*args, **kargs) | 44 | super(BaseMeetingForm, self).__init__(*args, **kargs) |
573 | 50 | self.fields['date_begin'].widget = forms.SplitDateTimeWidget() | 45 | self.fields['date_begin'].widget = DateTimeWidget() |
574 | 51 | self.fields['date_end'].widget = forms.SplitDateTimeWidget() | 46 | self.fields['date_end'].widget = DateTimeWidget() |
575 | 52 | 47 | ||
576 | 53 | def clean(self): | 48 | def clean(self): |
577 | 54 | begin = self.cleaned_data.get('date_begin') | 49 | begin = self.cleaned_data.get('date_begin') |
578 | 55 | 50 | ||
579 | === modified file 'loco_directory/templates/events/global_event_new.html' | |||
580 | --- loco_directory/templates/events/global_event_new.html 2012-12-26 17:23:50 +0000 | |||
581 | +++ loco_directory/templates/events/global_event_new.html 2013-02-18 21:30:29 +0000 | |||
582 | @@ -4,31 +4,22 @@ | |||
583 | 4 | {% block page_name %}{% trans "New Global Event" %}{% endblock %} | 4 | {% block page_name %}{% trans "New Global Event" %}{% endblock %} |
584 | 5 | 5 | ||
585 | 6 | {% block extrahead %}{{ block.super }} | 6 | {% block extrahead %}{{ block.super }} |
597 | 7 | {{form.media}} | 7 | {{ form.media }} |
587 | 8 | <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script> | ||
588 | 9 | <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/> | ||
589 | 10 | {% endblock %} | ||
590 | 11 | |||
591 | 12 | {% block extrafooter %} | ||
592 | 13 | <script type="text/javascript"><!-- | ||
593 | 14 | $(document).ready(function(){ | ||
594 | 15 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
595 | 16 | }); | ||
596 | 17 | --></script> | ||
598 | 18 | {% endblock %} | 8 | {% endblock %} |
599 | 19 | 9 | ||
600 | 20 | {% block content %} | 10 | {% block content %} |
601 | 21 | <div class="row"> | 11 | <div class="row"> |
612 | 22 | <section class="span-9"> | 12 | <section class="span-9"> |
613 | 23 | <form action="." method="post">{% csrf_token %} | 13 | <div class="box_content"> |
614 | 24 | <fieldset> | 14 | <div class="pagelet"> |
615 | 25 | <h3>{% trans "Add new Global Event" %}</h3> | 15 | <form action="." method="post" class="form">{% csrf_token %} |
616 | 26 | {{ form.as_template }} | 16 | <h2>{% trans "Add new Global Event" %}</h2> |
617 | 27 | </fieldset> | 17 | {{ form.as_template }} |
618 | 28 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 18 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
619 | 29 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 19 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" /> |
620 | 30 | </form> | 20 | </form> |
621 | 31 | </section> | 21 | </div> |
622 | 22 | </div> | ||
623 | 23 | </section> | ||
624 | 32 | </div> | 24 | </div> |
625 | 33 | |||
626 | 34 | {% endblock %} | 25 | {% endblock %} |
627 | 35 | 26 | ||
628 | === modified file 'loco_directory/templates/events/global_event_update.html' | |||
629 | --- loco_directory/templates/events/global_event_update.html 2012-12-26 17:23:50 +0000 | |||
630 | +++ loco_directory/templates/events/global_event_update.html 2013-02-18 21:30:29 +0000 | |||
631 | @@ -4,29 +4,22 @@ | |||
632 | 4 | {% block page_name %}{% trans "Update Global Event" %}{% endblock %} | 4 | {% block page_name %}{% trans "Update Global Event" %}{% endblock %} |
633 | 5 | 5 | ||
634 | 6 | {% block extrahead %}{{ block.super }} | 6 | {% block extrahead %}{{ block.super }} |
644 | 7 | {{form.media}} | 7 | {{ form.media }} |
636 | 8 | {% endblock %} | ||
637 | 9 | |||
638 | 10 | {% block extrafooter %} | ||
639 | 11 | <script type="text/javascript"><!-- | ||
640 | 12 | $(document).ready(function(){ | ||
641 | 13 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
642 | 14 | }); | ||
643 | 15 | --></script> | ||
645 | 16 | {% endblock %} | 8 | {% endblock %} |
646 | 17 | 9 | ||
647 | 18 | {% block content %} | 10 | {% block content %} |
648 | 19 | <div class="row"> | 11 | <div class="row"> |
659 | 20 | <section class="span-9"> | 12 | <section class="span-9"> |
660 | 21 | <form action="." method="post">{% csrf_token %} | 13 | <div class="box_content"> |
661 | 22 | <fieldset> | 14 | <div class="pagelet"> |
662 | 23 | <h3>{% trans "Update Global Event" %}</h3> | 15 | <form action="." method="post" class="form">{% csrf_token %} |
663 | 24 | {{ form.as_template }} | 16 | <h2>{% trans "Update Global Event" %}</h2> |
664 | 25 | </fieldset> | 17 | {{ form.as_template }} |
665 | 26 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 18 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
666 | 27 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 19 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" /> |
667 | 28 | </form> | 20 | </form> |
668 | 29 | </section> | 21 | </div> |
669 | 22 | </div> | ||
670 | 23 | </section> | ||
671 | 30 | </div> | 24 | </div> |
672 | 31 | |||
673 | 32 | {% endblock %} | 25 | {% endblock %} |
674 | 33 | 26 | ||
675 | === modified file 'loco_directory/templates/events/team_event_new.html' | |||
676 | --- loco_directory/templates/events/team_event_new.html 2012-12-26 17:23:50 +0000 | |||
677 | +++ loco_directory/templates/events/team_event_new.html 2013-02-18 21:30:29 +0000 | |||
678 | @@ -4,37 +4,30 @@ | |||
679 | 4 | {% block page_name %}{% trans "New Team Event" %}{% endblock %} | 4 | {% block page_name %}{% trans "New Team Event" %}{% endblock %} |
680 | 5 | 5 | ||
681 | 6 | {% block extrahead %}{{ block.super }} | 6 | {% block extrahead %}{{ block.super }} |
683 | 7 | {{form.media}} | 7 | {{ form.media }} |
684 | 8 | {% if global_event %} | 8 | {% if global_event %} |
690 | 9 | <script> | 9 | <script type="text/javascript"> |
691 | 10 | $.datepicker.setDefaults({ | 10 | $.datepicker.setDefaults({ |
692 | 11 | minDate: new Date({{global_event.date_begin.year}}, {{global_event.date_begin.month}}-1, {{global_event.date_begin.day}} ), | 11 | minDate: new Date({{ global_event.date_begin.year }}, {{ global_event.date_begin.month }}-1, {{ global_event.date_begin.day }} ), |
693 | 12 | maxDate: new Date({{global_event.date_end.year}}, {{global_event.date_end.month}}-1, {{global_event.date_end.day}} ) | 12 | maxDate: new Date({{ global_event.date_end.year }}, {{ global_event.date_end.month }}-1, {{ global_event.date_end.day }} ) |
694 | 13 | }); | 13 | }); |
695 | 14 | </script> | 14 | </script> |
696 | 15 | {% endif %} | 15 | {% endif %} |
697 | 16 | {% endblock %} | 16 | {% endblock %} |
698 | 17 | 17 | ||
699 | 18 | {% block extrafooter %} | ||
700 | 19 | <script type="text/javascript"><!-- | ||
701 | 20 | $(document).ready(function(){ | ||
702 | 21 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
703 | 22 | }); | ||
704 | 23 | --></script> | ||
705 | 24 | {% endblock %} | ||
706 | 25 | |||
707 | 26 | {% block content %} | 18 | {% block content %} |
708 | 27 | <div class="row"> | 19 | <div class="row"> |
719 | 28 | <section class="span-9"> | 20 | <section class="span-9"> |
720 | 29 | <form action="." method="post">{% csrf_token %} | 21 | <div class="box_content"> |
721 | 30 | <fieldset> | 22 | <div class="pagelet"> |
722 | 31 | <h3>{% trans "Add new Team Event for " %}{{ team_object.name}}<span class="supporting">{% trans 'is required' %}</span></h3> | 23 | <form action="." method="post" class="form">{% csrf_token %} |
723 | 32 | {{ form.as_template }} | 24 | <h2>{% trans "Add new Team Event for " %}{{ team_object.name}}</h2> |
724 | 33 | </fieldset> | 25 | {{ form.as_template }} |
725 | 34 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 26 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
726 | 35 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 27 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" /> |
727 | 36 | </form> | 28 | </form> |
728 | 37 | </section> | 29 | </div> |
729 | 30 | </div> | ||
730 | 31 | </section> | ||
731 | 38 | </div> | 32 | </div> |
734 | 39 | 33 | {% endblock %} | |
733 | 40 | {% endblock %} | ||
735 | 41 | \ No newline at end of file | 34 | \ No newline at end of file |
736 | 42 | 35 | ||
737 | === modified file 'loco_directory/templates/events/team_event_update.html' | |||
738 | --- loco_directory/templates/events/team_event_update.html 2012-12-26 17:23:50 +0000 | |||
739 | +++ loco_directory/templates/events/team_event_update.html 2013-02-18 21:30:29 +0000 | |||
740 | @@ -4,29 +4,22 @@ | |||
741 | 4 | {% block page_name %}{% trans "Update Team Event" %}{% endblock %} | 4 | {% block page_name %}{% trans "Update Team Event" %}{% endblock %} |
742 | 5 | 5 | ||
743 | 6 | {% block extrahead %}{{ block.super }} | 6 | {% block extrahead %}{{ block.super }} |
753 | 7 | {{form.media}} | 7 | {{ form.media }} |
745 | 8 | {% endblock %} | ||
746 | 9 | |||
747 | 10 | {% block extrafooter %} | ||
748 | 11 | <script type="text/javascript"><!-- | ||
749 | 12 | $(document).ready(function(){ | ||
750 | 13 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
751 | 14 | }); | ||
752 | 15 | --></script> | ||
754 | 16 | {% endblock %} | 8 | {% endblock %} |
755 | 17 | 9 | ||
756 | 18 | {% block content %} | 10 | {% block content %} |
757 | 19 | <div class="row"> | 11 | <div class="row"> |
768 | 20 | <section class="span-9"> | 12 | <section class="span-9"> |
769 | 21 | <form action="." method="post">{% csrf_token %} | 13 | <div class="box_content"> |
770 | 22 | <fieldset> | 14 | <div class="pagelet"> |
771 | 23 | <h3>{% trans "Update Team Event" %}</h3> | 15 | <form action="." method="post" class="form">{% csrf_token %} |
772 | 24 | {{ form.as_template }} | 16 | <h2>{% trans "Update Team Event" %}</h2> |
773 | 25 | </fieldset> | 17 | {{ form.as_template }} |
774 | 26 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 18 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
775 | 27 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 19 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" /> |
776 | 28 | </form> | 20 | </form> |
777 | 29 | </section> | 21 | </div> |
778 | 22 | </div> | ||
779 | 23 | </section> | ||
780 | 30 | </div> | 24 | </div> |
781 | 31 | |||
782 | 32 | {% endblock %} | 25 | {% endblock %} |
783 | 33 | 26 | ||
784 | === added file 'loco_directory/templates/form.html' | |||
785 | --- loco_directory/templates/form.html 1970-01-01 00:00:00 +0000 | |||
786 | +++ loco_directory/templates/form.html 2013-02-18 21:30:29 +0000 | |||
787 | @@ -0,0 +1,18 @@ | |||
788 | 1 | {% load i18n %} | ||
789 | 2 | {% for field in form.visible_fields %} | ||
790 | 3 | <div> | ||
791 | 4 | {% if field.field.label %}<label for="id_{{ field.name }}"{% if field.field.required %} class="required"{% endif %}>{{ field.label }}</label>{% endif %} | ||
792 | 5 | {% if field.errors %} | ||
793 | 6 | <ul class="errorlist"> | ||
794 | 7 | {% for error in field.errors %} | ||
795 | 8 | <li class="error">{{ error }}</li> | ||
796 | 9 | {% endfor %} | ||
797 | 10 | </ul> | ||
798 | 11 | {% endif %} | ||
799 | 12 | {{ field }} | ||
800 | 13 | {% if field.help_text %}<span class="h">{{ field.help_text }}</span>{% endif %} | ||
801 | 14 | </div> | ||
802 | 15 | {% endfor %} | ||
803 | 16 | {% for field in form.hidden_fields %} | ||
804 | 17 | <div class="hidden">{{ field }}</div> | ||
805 | 18 | {% endfor %} | ||
806 | 0 | 19 | ||
807 | === modified file 'loco_directory/templates/meetings/team_meeting_new.html' | |||
808 | --- loco_directory/templates/meetings/team_meeting_new.html 2012-12-26 17:23:50 +0000 | |||
809 | +++ loco_directory/templates/meetings/team_meeting_new.html 2013-02-18 21:30:29 +0000 | |||
810 | @@ -4,29 +4,22 @@ | |||
811 | 4 | {% block page_name %}{% trans "New Team Meeting" %}{% endblock %} | 4 | {% block page_name %}{% trans "New Team Meeting" %}{% endblock %} |
812 | 5 | 5 | ||
813 | 6 | {% block extrahead %}{{ block.super }} | 6 | {% block extrahead %}{{ block.super }} |
823 | 7 | {{form.media}} | 7 | {{ form.media }} |
815 | 8 | {% endblock %} | ||
816 | 9 | |||
817 | 10 | {% block extrafooter %} | ||
818 | 11 | <script type="text/javascript"><!-- | ||
819 | 12 | $(document).ready(function(){ | ||
820 | 13 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
821 | 14 | }); | ||
822 | 15 | --></script> | ||
824 | 16 | {% endblock %} | 8 | {% endblock %} |
825 | 17 | 9 | ||
826 | 18 | {% block content %} | 10 | {% block content %} |
827 | 19 | <div class="row"> | 11 | <div class="row"> |
828 | 20 | <section class="span-9"> | 12 | <section class="span-9"> |
837 | 21 | <form action="." method="post">{% csrf_token %} | 13 | <div class="box_content"> |
838 | 22 | <fieldset> | 14 | <div class="pagelet"> |
839 | 23 | <h3>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</h3> | 15 | <form action="." method="post" class="form">{% csrf_token %} |
840 | 24 | {{ form.as_template }} | 16 | <h2>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</h2> |
841 | 25 | </fieldset> | 17 | {{ form.as_template }} |
842 | 26 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 18 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
843 | 27 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 19 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" /> |
844 | 28 | </form> | 20 | </form> |
845 | 21 | </div> | ||
846 | 22 | </div> | ||
847 | 29 | </section> | 23 | </section> |
848 | 30 | </div> | 24 | </div> |
849 | 31 | |||
850 | 32 | {% endblock %} | 25 | {% endblock %} |
851 | 33 | 26 | ||
852 | === modified file 'loco_directory/templates/meetings/team_meeting_update.html' | |||
853 | --- loco_directory/templates/meetings/team_meeting_update.html 2012-12-26 17:23:50 +0000 | |||
854 | +++ loco_directory/templates/meetings/team_meeting_update.html 2013-02-18 21:30:29 +0000 | |||
855 | @@ -4,29 +4,22 @@ | |||
856 | 4 | {% block page_name %}{% trans "Update Team Meeting" %}{% endblock %} | 4 | {% block page_name %}{% trans "Update Team Meeting" %}{% endblock %} |
857 | 5 | 5 | ||
858 | 6 | {% block extrahead %}{{ block.super }} | 6 | {% block extrahead %}{{ block.super }} |
868 | 7 | {{form.media}} | 7 | {{ form.media }} |
860 | 8 | {% endblock %} | ||
861 | 9 | |||
862 | 10 | {% block extrafooter %} | ||
863 | 11 | <script type="text/javascript"><!-- | ||
864 | 12 | $(document).ready(function(){ | ||
865 | 13 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
866 | 14 | }); | ||
867 | 15 | --></script> | ||
869 | 16 | {% endblock %} | 8 | {% endblock %} |
870 | 17 | 9 | ||
871 | 18 | {% block content %} | 10 | {% block content %} |
872 | 19 | <div class="row"> | 11 | <div class="row"> |
873 | 20 | <section class="span-9"> | 12 | <section class="span-9"> |
882 | 21 | <form action="." method="post">{% csrf_token %} | 13 | <div class="box_content"> |
883 | 22 | <fieldset> | 14 | <div class="pagelet"> |
884 | 23 | <h3>{% trans "Update Team Meeting" %}</h3> | 15 | <form action="." method="post" class="form">{% csrf_token %} |
885 | 24 | {{ form.as_template }} | 16 | <h2>{% trans "Update Team Meeting" %}</h2> |
886 | 25 | </fieldset> | 17 | {{ form.as_template }} |
887 | 26 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 18 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
888 | 27 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 19 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" /> |
889 | 28 | </form> | 20 | </form> |
890 | 21 | </div> | ||
891 | 22 | </div> | ||
892 | 29 | </section> | 23 | </section> |
893 | 30 | </div> | 24 | </div> |
894 | 31 | |||
895 | 32 | {% endblock %} | 25 | {% endblock %} |
896 | 33 | 26 | ||
897 | === modified file 'loco_directory/templates/teams/team_update.html' | |||
898 | --- loco_directory/templates/teams/team_update.html 2012-12-26 17:23:50 +0000 | |||
899 | +++ loco_directory/templates/teams/team_update.html 2013-02-18 21:30:29 +0000 | |||
900 | @@ -1,62 +1,52 @@ | |||
901 | 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
902 | 2 | {% load i18n %} | 2 | {% load i18n %} |
903 | 3 | 3 | ||
905 | 4 | {% block page_name %}{% blocktrans with team.name as teamname %}Update {{teamname}}{% endblocktrans %}{% endblock %} | 4 | {% block page_name %}{% blocktrans with team.name as teamname %}Update {{ teamname }}{% endblocktrans %}{% endblock %} |
906 | 5 | 5 | ||
908 | 6 | {% block extrahead %}{{block.super}} | 6 | {% block extrahead %}{{ block.super }} |
909 | 7 | {{ form.media }} | 7 | {{ form.media }} |
910 | 8 | {% endblock %} | 8 | {% endblock %} |
911 | 9 | 9 | ||
912 | 10 | {% block extrafooter %} | ||
913 | 11 | <script type="text/javascript"><!-- | ||
914 | 12 | $(document).ready(function(){ | ||
915 | 13 | $('span[rel*=help]').colorTip({color:'orange'}); | ||
916 | 14 | }); | ||
917 | 15 | --></script> | ||
918 | 16 | {% endblock %} | ||
919 | 17 | |||
920 | 18 | {% block sub_nav_links %} | 10 | {% block sub_nav_links %} |
923 | 19 | <li><a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a></li> | 11 | <li><a class="sub-nav-item" href="/teams/">{% trans "Back to Teams List" %}</a></li> |
924 | 20 | <li><a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a></li> | 12 | <li><a class="sub-nav-item" href="/teams/{{ team.lp_name }}/">{% trans "Back to Team Details" %}</a></li> |
925 | 21 | {% endblock %} | 13 | {% endblock %} |
926 | 22 | 14 | ||
927 | 23 | {% block content %} | 15 | {% block content %} |
928 | 24 | |||
929 | 25 | <div class="row"> | 16 | <div class="row"> |
932 | 26 | <section class="span-9"> | 17 | <section class="span-9"> |
931 | 27 | <article id="form"> | ||
933 | 28 | {% if form.errors %} | 18 | {% if form.errors %} |
934 | 29 | <p style="color: red;"> | 19 | <p style="color: red;"> |
935 | 30 | {% trans "Please correct the error" %}{{ form.errors|pluralize }} below. | 20 | {% trans "Please correct the error" %}{{ form.errors|pluralize }} below. |
936 | 31 | </p> | 21 | </p> |
937 | 32 | {% endif %} | 22 | {% endif %} |
964 | 33 | 23 | <div class="box_content"> | |
965 | 34 | <form action="{{ request.path_info }}" method="POST">{% csrf_token %} | 24 | <div class="pagelet"> |
966 | 35 | <fieldset> | 25 | <form action="." method="post" class="form">{% csrf_token %} |
967 | 36 | <h3>{% trans "Update the information below" %}</h3> | 26 | <h2>{% trans "Update the information below" %}</h2> |
968 | 37 | {{ form.as_template }} | 27 | {{ form.as_template }} |
969 | 38 | </fieldset> | 28 | <fieldset> |
970 | 39 | <fieldset> | 29 | <h3>{% trans "Static information" %}</h3> |
971 | 40 | <h3>{% trans "Static information" %}</h3> | 30 | <div class="approved"> |
972 | 41 | <div class="approved"> | 31 | <span>Approved :</span> |
973 | 42 | <div class="field"><label for="approved">Approved :</label></div> | 32 | <span>{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span> |
974 | 43 | <span class="extra">{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span> | 33 | </div> |
975 | 44 | </div> | 34 | {% if team.approved %} |
976 | 45 | {% if team.approved %} | 35 | <div class="approved_date"> |
977 | 46 | <div class="approved_date"> | 36 | <span>Date Approved :</span> |
978 | 47 | <div class="field"><label for="approved_date">Date Approved :</label></div> | 37 | <span>{{ team.approved_date }}</span> |
979 | 48 | <span class="extra">{{ team.approved_date }}</span> | 38 | </div> |
980 | 49 | </div> | 39 | <div class="expires_date"> |
981 | 50 | <div class="expires_date"> | 40 | <span>Reapproval Date :</span> |
982 | 51 | <div class="field"><label for="expires_date">Reapproval Date :</label></div> | 41 | <span>{{ team.expires_date }}</span> |
983 | 52 | <span class="extra">{{ team.expires_date }}</span> | 42 | </div> |
984 | 53 | </div> | 43 | {% endif %} |
985 | 54 | {% endif %} | 44 | </fieldset> |
986 | 55 | </fieldset> | 45 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
987 | 56 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 46 | <input type="submit" name="submit" value="{% trans "Update" %}" class="btn" /> |
988 | 57 | <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" /> | 47 | </form> |
989 | 58 | </form> | 48 | </div> |
990 | 49 | </div> | ||
991 | 59 | </section> | 50 | </section> |
992 | 60 | </div> | 51 | </div> |
993 | 61 | |||
994 | 62 | {% endblock %} | 52 | {% endblock %} |
Attempt to merge into lp:loco-team-portal failed due to conflicts:
text conflict in loco_directory/ media/css/ styles. css