X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault%2Fmessage_list.tpl;h=85b4646a43161a5a33a5f8584625d0da02a15794;hb=47ccfad452e8d345542d09e59112cac317cffed8;hp=faf6e6e063d97bd31095d095810981fbb77d8ce1;hpb=4f5e5e94e42b80c6c0d753539b543c386f7bea78;p=squirrelmail.git diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl index faf6e6e0..85b4646a 100644 --- a/templates/default/message_list.tpl +++ b/templates/default/message_list.tpl @@ -3,15 +3,16 @@ /** * message_list.tpl * - * Copyright (c) 1999-2004 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * Template for viewing a messages list * + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail + * @subpackage templates */ +/** add required includes */ include_once(SM_PATH . 'templates/util_message_list.php'); /* retrieve the template vars */ @@ -33,13 +34,13 @@ if ($pageOffset < $end_msg) { if (!($sort & SQSORT_THREAD) && $enablesort) { - $aSortSupported = array(SQM_COL_SUBJ => array(SQSORT_SUBJ_ASC , SQSORT_SUBJ_DESC), - SQM_COL_DATE => array(SQSORT_DATE_ASC , SQSORT_DATE_DESC), - SQM_COL_INT_DATE => array(SQSORT_INT_DATE_ASC, SQSORT_INT_DATE_DESC), - SQM_COL_FROM => array(SQSORT_FROM_ASC , SQSORT_FROM_DESC), - SQM_COL_TO => array(SQSORT_TO_ASC , SQSORT_TO_DESC), - SQM_COL_CC => array(SQSORT_CC_ASC , SQSORT_CC_DESC), - SQM_COL_SIZE => array(SQSORT_SIZE_ASC , SQSORT_SIZE_DESC)); + $aSortSupported = array(SQM_COL_SUBJ => array(SQSORT_SUBJ_ASC , SQSORT_SUBJ_DESC), + SQM_COL_DATE => array(SQSORT_DATE_DESC , SQSORT_DATE_ASC), + SQM_COL_INT_DATE => array(SQSORT_INT_DATE_DESC, SQSORT_INT_DATE_ASC), + SQM_COL_FROM => array(SQSORT_FROM_ASC , SQSORT_FROM_DESC), + SQM_COL_TO => array(SQSORT_TO_ASC , SQSORT_TO_DESC), + SQM_COL_CC => array(SQSORT_CC_ASC , SQSORT_CC_DESC), + SQM_COL_SIZE => array(SQSORT_SIZE_ASC , SQSORT_SIZE_DESC)); } else { $aSortSupported = array(); } @@ -75,22 +76,30 @@ if (!($javascript_on && $fancy_index_highlite)) { } } +/** + * Check usage of images for attachments, flags and priority + */ +$bIcons = ($use_icons && $icon_theme) ? true : false; + +/** + * Location of icon images + */ +if ($bIcons) { + $sImageLocation = SM_PATH . 'images/themes/' . $icon_theme . '/'; +} + // set this to an empty string to turn off extra // highlighting of checked rows // //$clickedColor = ''; -if (!empty($color[16])) - $clickedColor = $color[16]; -else - $clickedColor = $color[2]; - +$clickedColor = (empty($color[16])) ? $color[2] : $color[16]; ?>
- +
@@ -196,7 +231,7 @@ else foreach($aOrder as $iCol) { ?> - "; + $sText = " \n"; echo $sText; break; case SQM_COL_INT_DATE: case SQM_COL_DATE: - $sText = " \n"; echo $sText; break; default: - $sText = "
@@ -129,16 +138,18 @@ else foreach ($aFormElements as $key => $value) { switch ($value[1]) { case 'submit': - if ($key != 'moveButton') { // add move in a different table cell + if ($key != 'moveButton' && $key != 'delete' && $key != 'undeleteButton') { // add move in a different table cell ?> -   +     \n"; @@ -153,19 +164,43 @@ else + +  +?> + + -
+ +   + +   + +   + + + +   - + +
+ '; + } else { + echo ' '; + } + break; case SQM_COL_SIZE: echo _("Size"); break; - case SQM_COL_PRIO: echo '!'; break; - case SQM_COL_ATTACHMENT: echo '+'; break; + case SQM_COL_PRIO: + if ($bIcons) { + echo '!'; + } else { + echo '!'; + } + break; + case SQM_COL_ATTACHMENT: + if ($bIcons) { + echo '+'; + } else { + echo '+'; + } + break; case SQM_COL_INT_DATE: echo _("Received"); break; case SQM_COL_TO: echo _("To"); break; case SQM_COL_CC: echo _("Cc"); break; @@ -269,9 +322,10 @@ else // //$clickedColor = ''; $clickedColor = (!empty($color[16])) ? $color[16] : $color[2]; - } - if ($javascript_on) { -// $checkbox_javascript = ' onClick="this.checked = !this.checked;"'; + + $checkbox_javascript = ' onclick="this.checked = !this.checked;"'; + } else { + $checkbox_javascript = ''; } foreach ($aMessages as $iUid => $aMsg) { echo $sLine; @@ -283,18 +337,6 @@ else $aColumns = $aMsg['columns']; - /** - * Check usage of images for attachments, flags and priority - * Aaaaaaaaaah fix me. DO NOT USE the string "None" if you mean FALSE, no icon theme - */ - $bIcons = ($use_icons && $icon_theme) ? true : false; - - /** - * Location of icon images - */ - if ($bIcons) { - $sImageLocation = SM_PATH . 'images/themes/' . $icon_theme . '/'; - } /** * Check the flags and set a class var. @@ -328,7 +370,8 @@ else switch ($aColumns[SQM_COL_PRIO]['value']) { case 1: case 2: $sValue .= "!"; break; - case 5: $sValue .= "?"; break; + // use downwards arrow for low priority emails + case 5: $sValue .= "↓"; break; default: break; } } @@ -390,16 +433,18 @@ else '; $sEnd = ''; - } - if (in_array('deleted',$aFlags) && $aFlags['deleted']) { - $sPre = "" . $sPre; - $sEnd .= ''; - } else { - if (in_array('flagged',$aFlags) && $aFlags['flagged']) { - $sPre = "" . $sPre; + if (isset($aColumns[SQM_COL_FLAGS])) { + if (!in_array('seen',$aFlags)) { + $sPre = ''; $sEnd = ''; + } + if (in_array('deleted',$aFlags) && $aFlags['deleted']) { + $sPre = "" . $sPre; $sEnd .= ''; + } else { + if (in_array('flagged',$aFlags) && $aFlags['flagged']) { + $sPre = "" . $sPre; + $sEnd .= ''; + } } } /** @@ -407,18 +452,21 @@ else * we have to do some php coding to display the columns in the right order */ foreach ($aOrder as $iCol) { - if (in_array($index_order_part, $show_label_columns)) { - $sLabelStart = '' ?> + echo '' ?> " id="" value="" /> "; $sText .= "$value"; + $sText = " "; $sText .= $value. "
- +