diff --git a/planner-0.14.3-htmlimprovements.patch b/planner-0.14.3-htmlimprovements.patch
new file mode 100644
index 0000000..e9028f2
--- /dev/null
+++ b/planner-0.14.3-htmlimprovements.patch
@@ -0,0 +1,512 @@
+diff -uN data/stylesheets/html1_css_ie7.xsl data/stylesheets/html1_css_ie7.xsl
+--- data/stylesheets/html1_css_ie7.xsl 1970-01-01 01:00:00.000000000 +0100
++++ data/stylesheets/html1_css_ie7.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -0,0 +1,13 @@
++
++ ]>
++
++
++
++.gantt-chart {
++ padding-bottom: 0px;
++}
++
++
++
+diff -uN data/stylesheets/html1_css_ie.xsl data/stylesheets/html1_css_ie.xsl
+--- data/stylesheets/html1_css_ie.xsl 2007-11-14 22:22:24.000000000 +0000
++++ data/stylesheets/html1_css_ie.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -9,6 +9,37 @@
+ * (see http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug)
+ */
+
++.gantt-resources {
++ overflow: hidden;
++}
++
++
++.tasklist, .resourcelist {
++ overflow-x: auto;
++ overflow-y: hidden;
++ padding-bottom: 1em;
++}
++
++
++.gantt-tasklist, .gantt-chart {
++ overflow-x: scroll;
++ overflow-y: hidden;
++}
++
++
++.gantt-chart {
++ padding-bottom: 1px;
++}
++
++
++
++.tasklist-table, .resourcelist-table {
++ width: 99.8%;
++}
++
+ /*
+ div.gantt-empty-begin, div.gantt-empty-end, div.gantt-complete-done, div.gantt-complete-notdone, div.gantt-summary {
+ height: 1.75em;
+diff -uN data/stylesheets/html1_css.xsl data/stylesheets/html1_css.xsl
+--- data/stylesheets/html1_css.xsl 2007-11-14 22:22:24.000000000 +0000
++++ data/stylesheets/html1_css.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -17,13 +17,13 @@
+ * Fonts
+ */
+ html,body,table {
+- font-family: Bitstream Vera Sans, helvetica, Arial, sans-serif;
++ font-family: "Bitstream Vera Sans", helvetica, Arial, sans-serif;
+ font-size: 12px;
+ white-space: nowrap;
+ }
+
+ tr,td,th,table,font,span,div,h1,h2,h3 {
+- font-family: Bitstream Vera Sans, helvetica, Arial, sans-serif;
++ font-family: "Bitstream Vera Sans", helvetica, Arial, sans-serif;
+ }
+
+ h1 {
+@@ -56,6 +56,8 @@
+ * Footer
+ */
+ .footer {
++ float: left;
++ width: 100%;
+ margin-top: 50px;
+ padding-top: 2px;
+ border-style: dotted;
+@@ -78,19 +80,40 @@
+
+
+ /*
+- * Tables
++ * Layout
+ */
+-.scroll-div {
+- overflow: auto;
++
++.gantt, .gantt-tasklist, .gantt-chart, .tasklist, .resourcelist {
++ float: left;
++}
++
++.gantt-tasklist, .gantt-chart, .tasklist-table, .resourcelist-table {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #aaa;
+ }
+
+-.no-scroll-div {
+- border-style: solid;
+- border-color: #aaa;
++.gantt-tasklist, .gantt-chart, .tasklist, .resourcelist {
++ overflow: auto;
++}
++
++.gantt, .tasklist, .resourcelist {
++ clear: both;
++ width: 100%;
++}
++
++.gantt-tasklist {
+ border-width: 1px 0px 1px 1px;
++ width: 30%;
++}
++
++.gantt-chart {
++ border-color: #aaa #aaa #aaa #fff;
++ width: 69.5%;
++}
++
++.tasklist, .resourcelist {
++ clear: left;
+ }
+
+ table {
+@@ -135,7 +158,11 @@
+ margin-right: 6px;
+ }
+
+-span.note {
++th.note {
++ min-width: 20em;
++}
++
++td.note {
+ white-space: normal;
+ }
+
+@@ -174,16 +201,19 @@
+ margin-left: 0;
+ }
+
+-span.gantt-milestone {
+- font-size: 0.8em;
++div.gantt-milestone {
++ float: left;
++ font-size: 0.9em;
+ color: #000000;
+ position: relative;
+ margin-left: 0;
+ margin-right: 0;
+ }
+
+-span.gantt-resources {
++div.gantt-resources {
++ float: left;
+ margin-left: 0.5em;
++ white-space: nowrap;
+ }
+
+ th.gantt-1day-header {
+@@ -191,32 +221,33 @@
+ }
+
+ th.gantt-2day-header {
+- width: 38px;
++ width: 39px;
+ }
+
+ th.gantt-3day-header {
+- width: 57px;
++ width: 59px;
+ }
+
+ th.gantt-4day-header {
+- width: 76px;
++ width: 79px;
+ }
+
+ th.gantt-5day-header {
+- width: 95px;
++ width: 99px;
+ }
+
+ th.gantt-6day-header {
+- width: 114px;
++ width: 119px;
+ }
+
+-th.gantt-week-header {
+- width: 133px;
++th.gantt-week-header, .gantt-resources {
++ width: 139px;
+ }
+
+ th.gantt-day-header {
+ margin: 0;
+- padding: 0;
++ padding-top: 1px;
++ padding-bottom: 1px;
+ width: 19px;
+ }
+
+diff -uN data/stylesheets/html1_gantt.xsl data/stylesheets/html1_gantt.xsl
+--- data/stylesheets/html1_gantt.xsl 2008-03-15 14:41:24.000000000 +0000
++++ data/stylesheets/html1_gantt.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -76,9 +76,12 @@
+
+
+
++
+
+
+-
++
++
+
+
+
+@@ -87,11 +90,7 @@
+
+
+
+-
+-
+-
+-
+- |
+-
+-
+- |
+-
+-
++
+
+
+
+diff -uN data/stylesheets/html1_milestones.xsl data/stylesheets/html1_milestones.xsl
+--- data/stylesheets/html1_milestones.xsl 1970-01-01 01:00:00.000000000 +0100
++++ data/stylesheets/html1_milestones.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -0,0 +1,59 @@
++
++ ]>
++
++
++
++
++
++
++
++
++ Milestone |
++ Date |
++ Notes |
++
++
++
++
++
++
++
++
++
++
++
++
++ |
++
++
++
++
++
++
++ |
++
++
++ |
++
++
++
++
++
++
++
++
+\ No newline at end of file
+diff -uN data/stylesheets/html1_resources.xsl data/stylesheets/html1_resources.xsl
+--- data/stylesheets/html1_resources.xsl 2007-11-14 22:22:24.000000000 +0000
++++ data/stylesheets/html1_resources.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -23,9 +23,10 @@
+
+
++
+
+
+-
+
+
+
+@@ -104,7 +106,7 @@
+
+
+
+-
++ |
+
+
+
+diff -uN data/stylesheets/html1_tasks.xsl data/stylesheets/html1_tasks.xsl
+--- data/stylesheets/html1_tasks.xsl 2008-01-13 14:02:13.000000000 +0000
++++ data/stylesheets/html1_tasks.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -42,9 +42,11 @@
+
+
+
++
++
+
+
+-
+
+
+diff -uN data/stylesheets/Makefile.am data/stylesheets/Makefile.am
+--- data/stylesheets/Makefile.am 2008-02-02 00:42:29.000000000 +0000
++++ data/stylesheets/Makefile.am 2008-10-13 12:59:21.000000000 +0100
+@@ -4,6 +4,7 @@
+ planner2html.xsl \
+ html1_css.xsl \
+ html1_css_ie.xsl \
++ html1_css_ie7.xsl \
+ html1_gantt.xsl \
+ html1_resources.xsl \
+ html1_tasks.xsl \
+diff -uN data/stylesheets/planner2html.xsl data/stylesheets/planner2html.xsl
+--- data/stylesheets/planner2html.xsl 2008-04-05 00:13:54.000000000 +0100
++++ data/stylesheets/planner2html.xsl 2008-10-13 12:59:21.000000000 +0100
+@@ -34,6 +34,7 @@
+
+
+
++
+
+
+
+@@ -147,10 +148,15 @@
+
+
+
+- [if lte IE 6]><style type="text/css">
++ [if IE]><style type="text/css">
+
+ </style><![endif]
+
++
++ [if gte IE 7]><style type="text/css">
++
++ </style><![endif]
++
+
+
+
diff --git a/planner.spec b/planner.spec
index e5ebed7..abe2eeb 100644
--- a/planner.spec
+++ b/planner.spec
@@ -1,7 +1,7 @@
Summary: A graphical project management tool
Name: planner
Version: 0.14.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: Applications/Productivity
URL: http://live.gnome.org/Planner
@@ -25,6 +25,7 @@ Obsoletes: libmrproject-devel <= 0.10.3
Patch0: planner-0.12-desktop-fix.patch
Patch1: planner-0.13-enableeds.patch
Patch2: planner-0.13-gannt-bar-height.patch
+Patch3: planner-0.14.3-htmlimprovements.patch
%description
Planner is a visual project management application which allows users to
@@ -57,6 +58,7 @@ This package provides a plugin to integration planner and evolution.
%patch0 -p1 -b .desktop-fix
%patch1 -p1 -b .enableeds
%patch2 -p1 -b .ganttheight
+%patch3 -p0 -b .htmlimprovements
%build
aclocal
@@ -152,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*
%changelog
+* Mon Oct 13 2008 Caolán McNamara - 0.14.3-5
+- Resolves: rhbz#466615 back-port html improvements
+
* Tue Sep 16 2008 Caolán McNamara - 0.14.3-4
- remove some .la files
|