1.1 --- a/conf/apache/imip-agent.conf Wed Jan 28 17:22:40 2015 +0100
1.2 +++ b/conf/apache/imip-agent.conf Wed Jan 28 18:45:19 2015 +0100
1.3 @@ -1,4 +1,5 @@
1.4 Alias /freebusy /var/www/imip-agent/static/
1.5 +Alias /imip-manager/styles.css /var/www/imip-agent/styles.css
1.6 ScriptAlias /imip-manager /var/www/imip-agent/imip_manager.py
1.7
1.8 <Location "/imip-manager">
3.1 --- a/imip_manager.py Wed Jan 28 17:22:40 2015 +0100
3.2 +++ b/imip_manager.py Wed Jan 28 18:45:19 2015 +0100
3.3 @@ -264,7 +264,7 @@
3.4 # Presentation methods.
3.5
3.6 def new_page(self, title):
3.7 - self.page.init(title=title, charset=self.encoding)
3.8 + self.page.init(title=title, charset=self.encoding, css="styles.css")
3.9
3.10 def status(self, code, message):
3.11 self.header("Status", "%s %s" % (code, message))
3.12 @@ -650,24 +650,24 @@
3.13 partitioned_group_types.append(group_type)
3.14 partitioned_group_sources.append(group_source)
3.15
3.16 - page.table(border=1, cellspacing=0, cellpadding=5)
3.17 - self.show_calendar_participant_headings(partitioned_group_sources, group_columns)
3.18 + page.table(cellspacing=5, cellpadding=5, id="calendar")
3.19 + self.show_calendar_participant_headings(partitioned_group_types, partitioned_group_sources, group_columns)
3.20 self.show_calendar_days(days, partitioned_groups, partitioned_group_types, group_columns)
3.21 page.table.close()
3.22
3.23 - def show_calendar_participant_headings(self, group_sources, group_columns):
3.24 + def show_calendar_participant_headings(self, group_types, group_sources, group_columns):
3.25
3.26 """
3.27 Show headings for the participants and other scheduling contributors,
3.28 - defined by 'group_sources' and 'group_columns'.
3.29 + defined by 'group_types', 'group_sources' and 'group_columns'.
3.30 """
3.31
3.32 page = self.page
3.33
3.34 - page.colgroup(span=1) # for datetime information
3.35 + page.colgroup(span=1, id="columns-timeslot")
3.36
3.37 - for columns in group_columns:
3.38 - page.colgroup(span=columns)
3.39 + for group_type, columns in zip(group_types, group_columns):
3.40 + page.colgroup(span=columns, id="columns-%s" % group_type)
3.41
3.42 page.thead()
3.43 page.tr()
3.44 @@ -743,8 +743,7 @@
3.45 active = slots and slots.get(point)
3.46
3.47 if not active:
3.48 - page.td(class_="empty", colspan=columns)
3.49 - page.td.close()
3.50 + page.td("", class_="empty", colspan=columns)
3.51 continue
3.52
3.53 slots = slots.items()
3.54 @@ -790,16 +789,14 @@
3.55
3.56 page.td.close()
3.57 else:
3.58 - page.td(class_="empty")
3.59 - page.td.close()
3.60 + page.td("", class_="empty")
3.61
3.62 # Pad with empty columns.
3.63
3.64 i = columns - len(active)
3.65 while i > 0:
3.66 i -= 1
3.67 - page.td(class_="empty")
3.68 - page.td.close()
3.69 + page.td("", class_="empty")
3.70
3.71 page.tr.close()
3.72
4.1 --- a/tools/install.sh Wed Jan 28 17:22:40 2015 +0100
4.2 +++ b/tools/install.sh Wed Jan 28 18:45:19 2015 +0100
4.3 @@ -21,3 +21,4 @@
4.4 fi
4.5
4.6 cp imip_manager.py "$WEB_INSTALL_DIR"
4.7 +cp htdocs/styles.css "$WEB_INSTALL_DIR"