X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Fmessage_list.tpl;h=21fbc18d01cef5b7609caa8b5a14cfe95a63e683;hp=62808fffde4b0b25656fc760635ca90678404676;hb=ad648d4c60bc23ce7fad4c8ff38fdd8c54db3603;hpb=d7f26e6e38aeb92fa01ee24b0b5c5e0346139fc7 diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl index 62808fff..21fbc18d 100644 --- a/templates/default/message_list.tpl +++ b/templates/default/message_list.tpl @@ -13,6 +13,7 @@ */ /** add required includes */ +include_once(SM_PATH . 'templates/util_global.php'); include_once(SM_PATH . 'templates/util_message_list.php'); /* retrieve the template vars */ @@ -77,26 +78,20 @@ 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 . '/'; -} + * All icon functionality is now handled through $icon_theme_path. + * $icon_theme_path will contain the path to the user-selected theme. If it is + * NULL, the user and/or admin have turned off icons. +*/ // set this to an empty string to turn off extra // highlighting of checked rows // //$clickedColor = ''; $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; - + ?>
-
+ +
@@ -126,17 +121,17 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; if (count($aFormElements)) { ?> -
- @@ -230,9 +230,9 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; switch ($iCol) { case SQM_COL_CHECK: if ($javascript_on) { - echo ''."\n"; + echo ''."\n"; } else { - $link = $baseurl . "&startMessage=$pageOffset&&checkall="; + $link = $baseurl . "&startMessage=$pageOffset&checkall="; if (sqgetGlobalVar('checkall',$checkall,SQ_GET)) { $link .= ($checkall) ? '0' : '1'; } else { @@ -245,27 +245,15 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; case SQM_COL_DATE: echo _("Date")."\n"; break; case SQM_COL_SUBJ: echo _("Subject")."\n"; break; case SQM_COL_FLAGS: - if ($bIcons) { - echo '!'."\n"; - } else { - echo ' '."\n"; - } - break; + echo getIcon($icon_theme_path, 'msg_new.png', ' ', _("Message Flags")) . "\n"; + break; case SQM_COL_SIZE: echo _("Size")."\n"; break; case SQM_COL_PRIO: - if ($bIcons) { - echo '!'."\n"; - } else { - echo '!'."\n"; - } - break; + echo getIcon($icon_theme_path, 'prio_high.png', '!', _("Priority")) . "\n"; + break; case SQM_COL_ATTACHMENT: - if ($bIcons) { - echo '+'."\n"; - } else { - echo '+'."\n"; - } - break; + echo getIcon($icon_theme_path, 'attach.png', '+', _("Attachment")) . "\n"; + break; case SQM_COL_INT_DATE: echo _("Received")."\n"; break; case SQM_COL_TO: echo _("To")."\n"; break; case SQM_COL_CC: echo _("Cc")."\n"; break; @@ -275,20 +263,22 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; // add the sort buttons if (isset($aSortSupported[$iCol])) { if ($sort == $aSortSupported[$iCol][0]) { - $newsort = $aSortSupported[$iCol][1]; - $img = 'up_pointer.png'; + $newsort = $aSortSupported[$iCol][1]; + $img = 'up_pointer.png'; + $text_icon = '⇧'; // U+21E7 UPWARDS WHITE ARROW } else if ($sort == $aSortSupported[$iCol][1]) { - $newsort = 0; - $img = 'down_pointer.png'; + $newsort = 0; + $img = 'down_pointer.png'; + $text_icon = '⇩'; // U+21E9 DOWNWARDS WHITE ARROW } else { - $newsort = $aSortSupported[$iCol][0]; - $img = 'sort_none.png'; + $newsort = $aSortSupported[$iCol][0]; + $img = 'sort_none.png'; + $text_icon = '◻'; // U+25FB WHITE MEDIUM SQUARE } /* Now that we have everything figured out, show the actual button. */ - echo " "; - echo 'sort'."\n"; + echo " " . + getIcon($icon_theme_path, $img, $text_icon, _("Click here to change the sorting of the message list")) . "\n" . + ''; } ?> @@ -336,12 +326,8 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; */ if (isset($aColumns[SQM_COL_FLAGS])) { $aFlags = $aColumns[SQM_COL_FLAGS]['value']; - if ($bIcons) { + $sFlags = getFlagIcon($aFlags, $icon_theme_path); - $sFlags = getFlagIcon($aFlags, $sImageLocation); - } else { - $sFlags = getFlagText($aFlags); - } /* add the flag string to the value index */ $aColumns[SQM_COL_FLAGS]['value'] = $sFlags; } @@ -349,25 +335,7 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; * Check the priority column */ if (isset($aColumns[SQM_COL_PRIO])) { - /* FIX ME, we should use separate templates for icons */ - if ($bIcons) { - $sValue = ' ' ; break; - case 5: $sValue .= 'prio_low.png" border="0" height="10" width="5" alt="" /> ' ; break; - default: $sValue .= 'transparent.png" border="0" width="5" alt="" /> ' ; break; - } - } else { - $sValue = ''; - switch ($aColumns[SQM_COL_PRIO]['value']) { - case 1: - case 2: $sValue .= '!'; break; - // use downwards arrow for low priority emails - case 5: $sValue .= '↓'; break; - default: break; - } - } + $sValue = getPriorityIcon($aColumns[SQM_COL_PRIO]['value'], $icon_theme_path); $aColumns[SQM_COL_PRIO]['value'] = $sValue; } @@ -375,15 +343,7 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16]; * Check the attachment column */ if (isset($aColumns[SQM_COL_ATTACHMENT])) { - /* FIX ME, we should use separate templates for icons */ - if ($bIcons) { - $sValue = '' - : 'transparent.png" border="0" width="6" alt="" />'; - } else { - $sValue = ($aColumns[SQM_COL_ATTACHMENT]['value']) ? '+' : ''; - } + $sValue = getAttachmentIcon($aColumns[SQM_COL_ATTACHMENT]['value'], $icon_theme_path); $aColumns[SQM_COL_ATTACHMENT]['value'] = $sValue; } @@ -441,7 +401,7 @@ if ($class != 'even' && $class != 'odd') // flag style mumbo jumbo $sPre = $sEnd = ''; if (isset($aColumns[SQM_COL_FLAGS])) { - if (!in_array('seen',$aFlags)) { + if (!in_array('seen',$aFlags) || !$aFlags['seen']) { $sPre = ''; $sEnd = ''; } if (in_array('deleted',$aFlags) && $aFlags['deleted']) { @@ -481,9 +441,15 @@ if ($class != 'even' && $class != 'odd') switch ($iCol) { case SQM_COL_CHECK: - echo ' + if ($javascript_on) { + echo ''; + $checked = ($checkall) ? " checked=checked " : " "; + echo ""; + } break; case SQM_COL_SUBJ: $indent = $aCol['indent'];
+ $value) { switch ($value[1]) { case 'submit': - if ($key != 'moveButton' && $key != 'delete' && $key != 'undeleteButton') { // add move in a different table cell + if ($key != 'moveButton' && $key != 'copyButton' && $key != 'delete' && $key != 'undeleteButton') { // add move in a different table cell ?>   -   +   -   +   + + + + ' ?> - " id="" value="" />' ?> + " id="" value="" />