[dev] Some diverse patches

Rick Emery rick at emery.homelinux.net
Fri Jan 2 08:55:09 PST 2004


Ordinarily, I would have sent seperate messages for each patch (they don't
relate to each other). However, they're so small with such minor changes, I
just wrapped them into one message.

1. imp_summary.php.diff - If there are no messages to show, make the display
consistent with nag, mnemo, and kronolith (italicized).

2. minisearch.php.diff - Make the title consistent with imp, nag, mnemo, and
kronolith ('-' -> '::').

3. nag_summary.php.diff - If there are no tasks to display, make the message
consistent with imp, kronolith, and mnemo (for the theme I'm using,
class="item" was highlighting the text).

4. metar.php - Uppercase the temperature units here, to make it consistent with
everywhere else.

Thanks

--
Rick Emery

"When once you have tasted flight, you will forever walk the Earth
 with your eyes turned skyward, for there you have been, and there
 you will always long to return"
                                              -- Leonardo Da Vinci
-------------- next part --------------
Index: summary.php
===================================================================
RCS file: /repository/imp/lib/Block/summary.php,v
retrieving revision 1.25
diff -u -r1.25 summary.php
--- summary.php	30 Dec 2003 18:51:58 -0000	1.25
+++ summary.php	2 Jan 2004 16:11:29 -0000
@@ -141,10 +141,12 @@
                 $html .= _("No folders are being checked for new mail.");
             } else {
                 if (!$anyUnseen) {
-                    $html .= _("No folders with unseen messages.");
+                    $html .= sprintf('<i>%s</i>',
+                        _("No folders with unseen messages"));
                 } else {
                     if ($prefs->getValue('nav_popup')) {
-                        $html .= _("No folders with new messages.");
+                        $html .= sprintf('<i>%s</i>',
+                            _("No folders with new messages"));
                     }
                 }
             }
-------------- next part --------------
Index: minisearch.php
===================================================================
RCS file: /repository/turba/lib/Block/minisearch.php,v
retrieving revision 1.8
diff -u -r1.8 minisearch.php
--- minisearch.php	29 Oct 2003 20:55:47 -0000	1.8
+++ minisearch.php	2 Jan 2004 16:08:04 -0000
@@ -20,7 +20,7 @@
     {
         global $registry;
 
-        $html  = Horde::link(Horde::url($registry->getInitialPage(), true), $registry->getParam('name'), 'header') . $registry->getParam('name') . '</a> - ';
+        $html  = Horde::link(Horde::url($registry->getInitialPage(), true), $registry->getParam('name'), 'header') . $registry->getParam('name') . '</a> :: ';
         $html .= Horde::link(Horde::applicationUrl('add.php', true), _("New Contact"), 'smallheader') . Horde::img('add.gif', _("New Contact"), 'hspace="5"', Horde::url($registry->getParam('graphics'), true, -1)) . _("New Contact") . '</a>';
 
         return $html;
-------------- next part --------------
Index: summary.php
===================================================================
RCS file: /repository/nag/lib/Block/summary.php,v
retrieving revision 1.27
diff -u -r1.27 summary.php
--- summary.php	30 Dec 2003 18:51:58 -0000	1.27
+++ summary.php	2 Jan 2004 16:36:41 -0000
@@ -163,9 +163,14 @@
         }
 
         if (empty($html)) {
-            $html = sprintf('<tr><td><i>%s</i></td></tr>', _("No tasks to display"));
+            $html =
+                sprintf('<table border="0" cellpadding="0" cellspacing="1"
+                width="100%%"><tr><td><i>%s</i></td></tr></table>',
+                _("No tasks to display"));
+        } else {
+            $html = '<table border="0" cellpadding="0" cellspacing="1"
+                width="100%" class="item">' . $html . '</table>';
         }
-        $html = '<table border="0" cellpadding="0" cellspacing="1" width="100%" class="item">' . $html . '</table>';
 
         return $html;
     }
-------------- next part --------------
Index: metar.php
===================================================================
RCS file: /repository/horde/lib/Block/metar.php,v
retrieving revision 1.5
diff -u -r1.5 metar.php
--- metar.php	30 Dec 2003 18:39:45 -0000	1.5
+++ metar.php	2 Jan 2004 16:09:12 -0000
@@ -290,25 +290,25 @@
                 if (isset($weather['remark']['6hmaxtemp'])) {
                     $html .= '<br />' . sprintf(_("Max temp last 6 hours: %s %s"),
                         round($weather['remark']['6hmaxtemp']),
-                        $units['temp']);
+                        strtoupper($units['temp']));
                     unset($weather['remark']['6hmaxtemp']);
                 }
                 if (isset($weather['remark']['6hmintemp'])) {
                     $html .= '<br />' . sprintf(_("Min temp last 6 hours: %s %s"),
                         round($weather['remark']['6hmintemp']),
-                        $units['temp']);
+                        strtoupper($units['temp']));
                     unset($weather['remark']['6hmintemp']);
                 }
                 if (isset($weather['remark']['24hmaxtemp'])) {
                     $html .= '<br />' . sprintf(_("Max temp last 24 hours: %s %s"),
                         round($weather['remark']['24hmaxtemp']),
-                        $units['temp']);
+                        strtoupper($units['temp']));
                     unset($weather['remark']['24hmaxtemp']);
                 }
                 if (isset($weather['remark']['24hmintemp'])) {
                     $html .= '<br />' . sprintf(_("Min temp last 24 hours: %s %s"),
                         round($weather['remark']['24hmintemp']),
-                        $units['temp']);
+                        strtoupper($units['temp']));
                     unset($weather['remark']['24hmintemp']);
                 }
                 if (isset($weather['remark']['sensors'])) {


More information about the dev mailing list