[dev] XHMTL Compliant Jonah.php

[Joe Wilson]

Index: jonah/lib/Jonah.php
===================================================================
RCS file: /usr/local/cvs/horde/jonah/lib/Jonah.php,v
retrieving revision 1.48
diff -r1.48 Jonah.php
97d96
<         $radar = $weather->getRadar($location);
98a98,99
> 	$html .= '<tr><td class="text">';
>         $radar = $weather->getRadar($location);
100c101
<             $html .= ' (' . Horde::link($radar, _("Radar"), 'header', '', "window.open('" .
---
>             $html .= '<b>(' . Horde::link($radar, _("Radar"), '', '', "window.open('" .
102,103c103,104
<                                         "status=no, resizable=yes, location=no, scrollbars=yes, width=660, height=500'); " .
<                                         'return false;') . _("Radar") . '</a>)';
---
>                                         "status=no, resizable=yes, location=no, scrollbars=yes, width=800, height=600'); " .
>                                         'return false;') . _("Radar") . '</a></b>)';
105c106,113
<         $html = '<tr><td class="text">';
---
>         $satellite = $weather->getSatellite($location);
>         if ($satellite) {
>             $html .= '(<b>' . Horde::link($satellite, _("Satellite"), '', '', "window.open('" .
>                                         $satellite . "', '_blank', 'toolbar=no, menubar=no, " .
>                                         "status=no, resizable=yes, location=no, scrollbars=yes, width=800, height=600'); " .
>                                         'return false;') . _("Satellite") . '</a></b>)';
>         }
>         $html .= '</td></tr><tr><td class="text" align="center">';
247c255
<             $html .= '<b>' . $weather->conditions['city'];
---
>             $html .= '<b><font size="+1">' . $weather->conditions['city'];
251c259
<             $html .= $sep . $weather->conditions['country'] . '</b>';
---
>             $html .= $sep . $weather->conditions['country'] . '</font></b>';
253c261
<             $html .= $sep . $weather->conditions['state'] . '</b>';
---
>             $html .= $sep . $weather->conditions['state'] . '</font></b>';
256c264
<             $html = sprintf(_("%s at %s"), $html, strftime("%X", strtotime($weather->conditions['date'])));
---
>             $html = sprintf(_("%s as of %s"), $html, strftime("%X", strtotime($weather->conditions['date'])));
258c266
<         $html .= ' <br/>';
---
>         $html .= '</td></tr>';
260c268,270
<             $html .= sprintf(_("The temperature is <b>%s</b>, "),
---
> 	    $html .= '<tr><td align="center" class="text"><style> <!-- td.underline {border-bottom-style: solid;border-bottom-width: 1px;border-bottom-color: #DDDDDD;}--></style>';
> 	    $html .= '<table border="0" cellpadding="5" cellspacing="0"><tr><td rowspan="2" valign="center"><center>';
>             $html .= sprintf(_("<font size=\"+1\"><b>%s</b></font>"),
266c276
<             $html .= sprintf(_("humidity is at %s"), $weather->conditions['humidity'] . '% ');
---
>             $html .= sprintf(_("<td class=\"underline\" align=\"left\"><b>Humidity</b> %s</td>"), $weather->conditions['humidity'] . '% ');
269c279
<             $html .= _("and there is no wind measured. ");
---
>             $html .= _("<td class=\"underline\" align=\"left\"><b>Wind</b> Calm </td>");
272c282
<                 $html .= sprintf(_("and the wind is %s at %s. "),
---
>                 $html .= sprintf(_("<td class=\"underline\" align=\"left\"><b>Wind</b> %s at %s </td>"),
278c288
<                 $html .= sprintf(_("and the wind is %s. "), $weather->conditions['windDir']);
---
>                 $html .= sprintf(_("<td class=\"underline\" align=\"left\"><b>Wind</b> %s</td>"), $weather->conditions['windDir']);
282c292
<             $html .= sprintf(_("It feels like %s. "),
---
>             $html .= sprintf(_("<td class=\"underline\" align=\"left\"><b>Real Feel</b> %s</td>"),
288c298
<             $html .= sprintf(_("Barometer shows %s. "),
---
>             $html .= sprintf(_("</tr><tr><td align=\"left\"><b>Barometer</b> %s</td>"),
295c305
<             $visibility = sprintf(_("Visibility is %s"),
---
>             $visibility = sprintf(_("<b>Visibility</b> %s"),
302c312
<         $html .= $visibility;
---
>         $html .= "<td align=\"left\">$visibility</td>";
305c315
<                 $uv = sprintf(_("minimal %s"), $weather->conditions['uv']);
---
>                 $uv = sprintf(_("Minimal (%s)"), $weather->conditions['uv']);
307c317
<                 $uv = sprintf(_("low %s"), $weather->conditions['uv']);
---
>                 $uv = sprintf(_("Low (%s)"), $weather->conditions['uv']);
309c319
<                 $uv = sprintf(_("moderate %s"), $weather->conditions['uv']);
---
>                 $uv = sprintf(_("Moderate (%s)"), $weather->conditions['uv']);
311c321
<                 $uv = sprintf(_("high %s. Use sunscreen"), $weather->conditions['uv']);
---
>                 $uv = sprintf(_("High (%s)"), $weather->conditions['uv']);
313c323
<                 $uv = sprintf(_("very high %s. Stay indoors"), $weather->conditions['uv']);
---
>                 $uv = sprintf(_("Very High (%s)"), $weather->conditions['uv']);
315c325
<             $html .= sprintf(empty($visibility) ? _("The UV index is a %s. ") : _(" and the UV index is a %s. "), $uv);
---
>             $html .= sprintf(empty($visibility) ? _("<td><b>UV index</b> %s </td>") : _("<td align=\"left\"><b>UV Index</b> %s </td>"), $uv);
317c327
<             $html .= '. ';
---
>             $html .= ' ';
318a329
> 	$html .= '</tr></table></td></tr><tr><td class="text">';