From 439dced1150056d56afecdae60e310777e9c350e Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Oct 13 2008 12:08:34 +0000
Subject: Resolves: rhbz#466615 back-port html improvements


---

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 @@
++<?xml version="1.0" encoding="ISO-8859-1"?>
++<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
++<xsl:stylesheet version="1.0"
++              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                  xmlns="http://www.w3.org/1999/xhtml">
++<xsl:comment>
++
++.gantt-chart {
++  padding-bottom: 0px;
++}
++
++</xsl:comment>
++</xsl:stylesheet>
+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;
++}
++
++<!-- to prevent overlapping part of the content with the horizontal scrollbar
++     and to turn off the vertical scrollbar -->
++.tasklist, .resourcelist {
++  overflow-x: auto;
++  overflow-y: hidden;
++  padding-bottom: 1em;
++}
++
++<!-- the padding in the above fix is visible (and ugly) in the gantt, so there
++     it's nicer to just have a disabled scrollbar -->
++.gantt-tasklist, .gantt-chart {
++  overflow-x: scroll;
++  overflow-y: hidden;
++}
++
++<!-- fix a misalignment with the gantt-tasklist -->
++.gantt-chart {
++  padding-bottom: 1px;
++}
++
++
++<!-- to prevent IE from showing scrollbars because the border of the table does
++     not fit within the container -->
++.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 @@
+ </xsl:template>
+ 
+ <xsl:template name="gantt">
++  <div class="gantt">
+   <h2><a name="gantt"><xsl:value-of select="I18N:gettext('Gantt Chart')"/></a></h2>
+  
+-  <xsl:variable name="tmpdays" select="ceiling($projlength div 86400)"/>
++  <!-- add 7 days to make room for at least part of the resource names of tasks
++       that end close to the end of the project -->
++  <xsl:variable name="tmpdays" select="ceiling($projlength div 86400) + 7"/>
+ 
+   <xsl:variable name="days">
+     <xsl:choose>
+@@ -87,11 +90,7 @@
+     </xsl:choose>
+   </xsl:variable>
+ 
+-  <table cellspacing="0" cellpadding="0" border="0">
+-  <tr>
+-  <td>
+-
+-  <div class="no-scroll-div">
++  <div class="gantt-tasklist">
+   <table cellspacing="0" cellpadding="0" border="1">
+     <tr class="header" align="left">
+       <th><span><xsl:value-of select="I18N:gettext('WBS')"/></span></th>
+@@ -186,10 +185,7 @@
+   </table>
+   </div>
+ 
+-  </td>
+-  <td>
+-
+-  <div class="scroll-div" style="border-color: #aaa #aaa #aaa #fff;">
++  <div class="gantt-chart">
+   <table cellspacing="0" cellpadding="0" border="1" style="table-layout: fixed;">
+     <tr class="header" align="left">
+       <xsl:call-template name="create-week-row">
+@@ -255,8 +251,8 @@
+                   
+               <xsl:choose>
+                 <xsl:when test="@type = 'milestone'">
+-                  <span class="gantt-milestone">&#9670;</span>
+-                  <span class="gantt-resources">
++                  <div class="gantt-milestone">&#9670;</div>
++                  <div class="gantt-resources">
+                     <xsl:variable name="task-id" select="@id"/>
+                     <xsl:for-each select="/project/allocations/allocation[@task-id=$task-id]">
+                       <xsl:sort data-type="number" select="@resource-id" order="descending"/>
+@@ -275,11 +271,11 @@
+                         <xsl:text>, </xsl:text>
+                       </xsl:if>
+                     </xsl:for-each>
+-                  </span>
++                  </div>
+                 </xsl:when>
+                 <xsl:otherwise>
+                   <div class="gantt-empty-end"></div>
+-                  <span class="gantt-resources">
++                  <div class="gantt-resources">
+                     <xsl:variable name="task-id" select="@id"/>
+                     <xsl:for-each select="/project/allocations/allocation[@task-id=$task-id]">
+                       <xsl:sort data-type="number" select="@resource-id" order="descending"/>
+@@ -298,7 +294,7 @@
+                         <xsl:text>, </xsl:text>
+                       </xsl:if>
+                     </xsl:for-each>
+-                  </span>
++                  </div>
+                 </xsl:otherwise>
+               </xsl:choose>
+ 
+@@ -309,11 +305,7 @@
+     </xsl:for-each>
+   </table>
+   </div>
+-
+-
+-  </td>
+-  </tr>
+-  </table>
++  </div>
+ 
+ 
+ </xsl:template>
+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 @@
++<?xml version="1.0"?>
++<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
++<xsl:stylesheet version="1.0"
++              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                  xmlns="http://www.w3.org/1999/xhtml"
++             xmlns:date="http://exslt.org/dates-and-times">
++
++<!--**************************************************************************
++    *
++    * html1_milestones.xsl: Display milestones
++    *
++    * Copyright (c)2003 Daniel Lundin
++    * Copyright (c)2003 CodeFactory AB
++    *
++    *-->
++
++<xsl:template name="milestones">
++  <h2><a name="milestones">Project Milestones</a></h2>
++  <table class="milestones" cellspacing="1" cellpadding="2" border="1">
++    <tr class="milestones-hdr">
++      <th align="left" class="milestones-hdr">Milestone</th>
++      <th align="left" class="milestones-hdr">Date</th>
++      <th align="left" class="milestones-hdr">Notes</th>
++    </tr>
++    <xsl:for-each select="//task[@type='milestone']">
++      <xsl:sort data-type="number" 
++        select="date:seconds (date:add (concat (substring (@start, 1, 4),'-',
++                substring (@start, 5, 2),'-',
++                substring (@start, 7, 2)), 
++                date:duration (substring (@end, 10))))"
++        order="descending"/>
++      <xsl:variable name="mid" select="@id"/>
++      <xsl:variable name="mdate">
++        <xsl:call-template name="mrproj-parse-date">
++          <xsl:with-param name="thedate" select="@start"/>
++        </xsl:call-template>
++      </xsl:variable>
++      <tr>
++        <td class="milestones-name" align="left" valign="middle">
++          <xsl:value-of select="@name"/>
++        </td>
++        <td class="milestones-date" align="left" valign="middle">
++          <xsl:value-of select="date:day-in-month ($mdate)"/> 
++          <xsl:text> </xsl:text>
++          <xsl:value-of select="date:month-abbreviation ($mdate)"/>
++          <xsl:text> </xsl:text>
++          <xsl:value-of select="date:year ($mdate)"/>
++        </td>
++        <td class="milestones-note" align="left" valign="top">
++          <xsl:value-of select="@note"/>
++        </td>
++      </tr>
++    </xsl:for-each>
++  </table>
++</xsl:template>
++
++
++
++</xsl:stylesheet>
+\ 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 @@
+   <xsl:variable name="hasnotes"
+     select="boolean (count(//resource[@note!='']))"/>
+   
++  <div class="resourcelist">
+   <h2><a name="resources"><xsl:value-of select="I18N:gettext('Resources')"/></a></h2>
+ 
+-  <div class="scroll-div">
++  <div class="resourcelist-table">
+   <table cellspacing="0" cellpadding="0" border="1" width="100%">
+     <tr class="header" align="left">
+       <th><span><xsl:value-of select="I18N:gettext('Name')"/></span></th>
+@@ -35,7 +36,7 @@
+       <th><span><xsl:value-of select="I18N:gettext('Email')"/></span></th>
+       <th><span><xsl:value-of select="I18N:gettext('Cost')"/></span></th>
+       <xsl:if test="$hasnotes">
+-        <th><span>Notes</span></th>
++        <th class="note"><span>Notes</span></th>
+       </xsl:if>
+     </tr>
+ 
+@@ -50,6 +51,7 @@
+     </xsl:for-each>
+   </table>
+   </div>
++  </div>
+ </xsl:template>
+ 
+ 
+@@ -104,7 +106,7 @@
+            </span>
+          </td>
+          <xsl:if test="$hasnotes">
+-           <td>
++           <td class="note">
+              <span>
+                <xsl:value-of select="@note"/>
+              </span>
+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 @@
+ <xsl:template match="tasks">
+   <xsl:variable name="hasproperties" select="boolean (count(//task/properties/property[@value!='']))"/>
+   <xsl:variable name="hasnotes" select="boolean (count(//task[@note!='']))"/>
++
++  <div class="tasklist">
+   <h2><a name="tasks"><xsl:value-of select="I18N:gettext('Tasks')"/></a></h2>
+ 
+-  <div class="scroll-div">
++  <div class="tasklist-table">
+   <table cellspacing="0" cellpadding="0" border="1">
+     <tr class="header" align="left">
+       <th><span><xsl:value-of select="I18N:gettext('WBS')"/></span></th>
+@@ -56,7 +58,7 @@
+       <th><span><xsl:value-of select="I18N:gettext('Complete')"/></span></th>
+       <th><span><xsl:value-of select="I18N:gettext('Cost')"/></span></th>
+       <xsl:if test="$hasnotes">
+-        <th><span>Notes</span></th>
++        <th class="note"><span>Notes</span></th>
+       </xsl:if>
+     </tr>
+     <xsl:for-each select="//task">
+@@ -152,10 +154,10 @@
+                 </span>
+               </td>
+               <xsl:if test="$hasnotes">
+-                <td>
+-                  <span class="note">
++                <td class="note">
++                  <span>
+                     <xsl:value-of select="@note"/>
+-          </span>
++                  </span>
+                 </td>
+               </xsl:if>
+             </tr>
+@@ -217,8 +219,8 @@
+                 </span>
+               </td>
+               <xsl:if test="$hasnotes">
+-                <td>
+-                  <span class="note">
++                <td class="note">
++                  <span>
+                     <xsl:value-of select="@note"/>
+                   </span>
+                 </td>
+@@ -295,8 +297,8 @@
+                 </span>
+               </td>
+               <xsl:if test="$hasnotes">
+-                <td>
+-                  <span class="note">
++                <td class="note">
++                  <span>
+                     <xsl:value-of select="@note"/>
+                   </span>
+                 </td>
+@@ -307,5 +309,6 @@
+     </xsl:for-each>
+   </table>
+   </div>
++  </div>
+ </xsl:template>
+ </xsl:stylesheet>
+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 @@
+ <!-- CSS file to be included in XHTML output -->
+ <xsl:variable name="css-stylesheet-local" select="'html1_css.xsl'"/>
+ <xsl:variable name="css-stylesheet-local-ie" select="'html1_css_ie.xsl'"/>
++<xsl:variable name="css-stylesheet-local-ie7" select="'html1_css_ie7.xsl'"/>
+ 
+ 
+ <!-- Current date/time at UTC/GMT -->
+@@ -147,10 +148,15 @@
+       <xsl:value-of select="document($css-stylesheet-local)"/>
+     </style>
+       <xsl:comment>
+-        <xsl:text>[if lte IE 6]&gt;&lt;style type="text/css"&gt;</xsl:text>
++        <xsl:text>[if IE]&gt;&lt;style type="text/css"&gt;</xsl:text>
+         <xsl:value-of select="document($css-stylesheet-local-ie)"/>
+         <xsl:text>&lt;/style&gt;&lt;![endif]</xsl:text>
+       </xsl:comment>
++      <xsl:comment>
++        <xsl:text>[if gte IE 7]&gt;&lt;style type="text/css"&gt;</xsl:text>
++        <xsl:value-of select="document($css-stylesheet-local-ie7)"/>
++        <xsl:text>&lt;/style&gt;&lt;![endif]</xsl:text>
++      </xsl:comment>
+   </head>
+ </xsl:template>
+ 
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 <caolanm@redhat.com> - 0.14.3-5
+- Resolves: rhbz#466615 back-port html improvements
+
 * Tue Sep 16 2008 Caolán McNamara <caolanm@redhat.com> - 0.14.3-4
 - remove some .la files