Add full date and time as "title" (mouseover) text for dates shown on the message...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14398 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 330eec1f265a0192cc6bec47482a6f84a0d856ab..9628707abcb21cb3598ac6d5baab487ea2a83c52 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -381,6 +381,8 @@ Version 1.5.2 - SVN
   - Added option to use blank spacer instead of security image ("This
     image has been removed for security reasons.") for replacing
     unsafe images.
   - Added option to use blank spacer instead of security image ("This
     image has been removed for security reasons.") for replacing
     unsafe images.

+  - Full date and time is used as "title" (mouseover) text for dates
+    shown on the message list screen

 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/date.php b/functions/date.php
index 63f79b92687682b3aa577675a04cfb7c2a206147..e61b7337270a2f502cee0557a6e63b8824bfa026 100644 (file)
--- a/functions/date.php
+++ b/functions/date.php
@@ -334,10 +334,17 @@ function getLongDateString( $stamp, $fallback = '' ) {
  * of the form: "14:23" or "Jun 14, 2003" depending
  * on whether the stamp is "today" or not.
  *
  * of the form: "14:23" or "Jun 14, 2003" depending
  * on whether the stamp is "today" or not.
  *

- * @param int stamp the timestamp
+ * @param int $stamp The timestamp
+ * @param boolean $return_full_date_and_time When TRUE,
+ *                                           ignore all
+ *                                           user settings
+ *                                           and use full
+ *                                           date and time
+ *                                           (OPTIONAL;
+ *                                           default FALSE)

  * @return string the date string
  */
  * @return string the date string
  */

-function getDateString( $stamp ) {
+function getDateString( $stamp, $return_full_date_and_time=FALSE ) {

 
     global $invert_time, $hour_format, $show_full_date, $custom_date_format;
 
 
     global $invert_time, $hour_format, $show_full_date, $custom_date_format;
 


@@ -366,7 +373,14 @@ function getDateString( $stamp ) {
     $nextmid = $midnight + 86400;
 
     $custom_date_format = trim($custom_date_format);
     $nextmid = $midnight + 86400;
 
     $custom_date_format = trim($custom_date_format);

-    if (!empty($custom_date_format)) {
+
+    if ($return_full_date_and_time) {
+        if ( $hour_format == SMPREF_TIME_12HR ) {
+            $date_format = _("D, M j, Y g:i a");
+        } else {
+            $date_format = _("D, M j, Y H:i");
+        }
+    } else if (!empty($custom_date_format)) {

         $date_format = $custom_date_format;
     } else if ($show_full_date == 1 || $nextmid < $stamp) {
         $date_format = _("M j, Y");
         $date_format = $custom_date_format;
     } else if ($show_full_date == 1 || $nextmid < $stamp) {
         $date_format = _("M j, Y");

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 0ebe484bb0ef99422f3ab83df5afa18f24c9539a..41a277a9c91cbbe016da22236cbd1bb2609aed10 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -618,7 +618,9 @@ function prepareMessageList(&$aMailbox, $aProps) {
                     break;
                 case SQM_COL_DATE:
                 case SQM_COL_INT_DATE:
                     break;
                 case SQM_COL_DATE:
                 case SQM_COL_INT_DATE:

-                    $value = getDateString(getTimeStamp(explode(' ',trim($value))));
+                    $value = getTimeStamp(explode(' ',trim($value)));
+                    $title = getDateString($value, TRUE);
+                    $value = getDateString($value);

                     break;
                 case SQM_COL_FLAGS:
                     $aFlagColumn = array('seen' => false,
                     break;
                 case SQM_COL_FLAGS:
                     $aFlagColumn = array('seen' => false,

diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl
index 8d9548c30d2b999de9c3cf9aa746f6573a60e4f7..b09079bc116b8998d156e5b613d1b67983422c1d 100644 (file)
--- a/templates/default/message_list.tpl
+++ b/templates/default/message_list.tpl
@@ -514,8 +514,9 @@ if ($non_clicked_class != 'even' && $non_clicked_class != 'odd'
             break;
           case SQM_COL_INT_DATE:
           case SQM_COL_DATE:
             break;
           case SQM_COL_INT_DATE:
           case SQM_COL_DATE:

-            $sText = "    <td class=\"col_date\" $javascript_auto_click>"
-                   . $value. "</td>\n";
+            $sText = "    <td class=\"col_date\" $javascript_auto_click";
+            if ($title) {$sText .= " title=\"$title\"";}
+            $sText .= ">" . $value. "</td>\n";

             echo $sText;
             break;
           default:
             echo $sText;
             break;
           default: