*/
/** add required includes */
+include_once(SM_PATH . 'templates/util_global.php');
include_once(SM_PATH . 'templates/util_message_list.php');
/* retrieve the template vars */
}
/**
- * 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];
-
+
?>
<div id="message_list">
-<form id="<?php echo $form_id;?>" name="<?php echo $form_name;?>" method="post" action="<?php echo $php_self;?>">
+<form id="<?php echo $form_name;?>" name="<?php echo $form_name;?>" method="post" action="<?php echo $php_self;?>">
<table class="table_empty" cellspacing="0">
<tr>
<td>
if (count($aFormElements)) {
?>
<!-- start message list form control -->
- <tr class="message_list_controls" cellspacing="0">
+ <tr class="message_list_controls">
<td>
<table class="table_empty" cellspacing="0">
<tr>
- <td class="message_control_buttons" cellspacing="0">
+ <td class="message_control_buttons">
<?php
foreach ($aFormElements as $key => $value) {
<?php
/*
* As an FYI, Firefox on Windows seems to have an issue w/ putting wierd breaks while
- * rendering this table if we use THEAD and TH tags. No other browser or platform has
+ * rendering this table if we use THEAD and TH tags. No other browser or platform has
* this issue. We will use TR/TD w/ another CSS class to work around this.
*/
?>
switch ($iCol) {
case SQM_COL_CHECK:
if ($javascript_on) {
- echo '<input type="checkbox" name="toggleAll" title="'._("Toggle All").'" onclick="toggle_all(\''.$form_id."',".$fancy_index_highlite.')" />'."\n";
+ echo '<input type="checkbox" name="toggleAll" title="'._("Toggle All").'" onclick="toggle_all(\''.$form_name."',".$fancy_index_highlite.')" />'."\n";
} else {
- $link = $baseurl . "&startMessage=$pageOffset&&checkall=";
+ $link = $baseurl . "&startMessage=$pageOffset&checkall=";
if (sqgetGlobalVar('checkall',$checkall,SQ_GET)) {
$link .= ($checkall) ? '0' : '1';
} else {
case SQM_COL_DATE: echo _("Date")."\n"; break;
case SQM_COL_SUBJ: echo _("Subject")."\n"; break;
case SQM_COL_FLAGS:
- if ($bIcons) {
- echo '<img src="' . $sImageLocation. 'msg_new.png" border="0" height="12" width="18" alt="!" title="'. _("Message Flags") . '" />'."\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 '<img src="' . $sImageLocation. 'prio_high.png" border="0" height="10" width="5" alt="!" title="'. _("Priority") . '" />'."\n";
- } else {
- echo '!'."\n";
- }
- break;
+ echo getIcon($icon_theme_path, 'prio_high.png', '!', _("Priority")) . "\n";
+ break;
case SQM_COL_ATTACHMENT:
- if ($bIcons) {
- echo '<img src="' . $sImageLocation. 'attach.png" border="0" height="10" width="6" alt="+" title="' . _("Attachment") . '"/>'."\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;
// 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 = '⇑';
} else if ($sort == $aSortSupported[$iCol][1]) {
- $newsort = 0;
- $img = 'down_pointer.png';
+ $newsort = 0;
+ $img = 'down_pointer.png';
+ $text_icon = '⇓';
} else {
- $newsort = $aSortSupported[$iCol][0];
- $img = 'sort_none.png';
+ $newsort = $aSortSupported[$iCol][0];
+ $img = 'sort_none.png';
+ $text_icon = '[ ]';
}
/* Now that we have everything figured out, show the actual button. */
- echo " <a href=\"$baseurl&startMessage=1&srt=$newsort\">";
- echo '<img src="../images/' . $img
- . '" border="0" width="12" height="10" alt="sort" title="'
- . _("Click here to change the sorting of the message list") .'" /></a>'."\n";
+ echo " <a href=\"$baseurl&startMessage=1&srt=$newsort\">" .
+ getIcon($icon_theme_path, $img, $text_icon, _("Click here to change the sorting of the message list")) . "\n" .
+ '</a>';
}
?>
</td>
*/
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;
}
* Check the priority column
*/
if (isset($aColumns[SQM_COL_PRIO])) {
- /* FIX ME, we should use separate templates for icons */
- if ($bIcons) {
- $sValue = '<img src="' . $sImageLocation;
- switch ($aColumns[SQM_COL_PRIO]['value']) {
- case 1:
- case 2: $sValue .= 'prio_high.png" border="0" height="10" width="5" alt="" /> ' ; 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 .= '<span class="high_priority">!</span>'; break;
- // use downwards arrow for low priority emails
- case 5: $sValue .= '<span class="low_priority">↓</span>'; break;
- default: break;
- }
- }
+ $sValue = getPriorityIcon($aColumns[SQM_COL_PRIO]['value'], $icon_theme_path);
$aColumns[SQM_COL_PRIO]['value'] = $sValue;
}
* Check the attachment column
*/
if (isset($aColumns[SQM_COL_ATTACHMENT])) {
- /* FIX ME, we should use separate templates for icons */
- if ($bIcons) {
- $sValue = '<img src="' . $sImageLocation;
- $sValue .= ($aColumns[SQM_COL_ATTACHMENT]['value'])
- ? 'attach.png" border="0" height="10" width="6" alt=""/>'
- : '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;
}
// 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 = '<span class="unread">'; $sEnd = '</span>';
}
if (in_array('deleted',$aFlags) && $aFlags['deleted']) {
switch ($iCol) {
case SQM_COL_CHECK:
- echo '<td class="col_check"'. $javascript_auto_click. '>' ?>
- <input type="checkbox" name="<?php echo "msg[$i]";?>" id="<?php echo $form_id."_msg$i";?>" value="<?php echo $iUid;?>" <?php echo $checkbox_javascript;?> /></td>
+ if ($javascript_on) {
+ echo '<td class="col_check"'. $javascript_auto_click. '>' ?>
+ <input type="checkbox" name="<?php echo "msg[$i]";?>" id="<?php echo $form_id."_msg$i";?>" value="<?php echo $iUid;?>" <?php echo $checkbox_javascript;?> /></td>
<?php
+ } else {
+ echo '<td class="col_check">';
+ $checked = ($checkall) ? " checked=checked " : " ";
+ echo "<input type=\"checkbox\" name=\"msg[".$i."]\" id=\"".$form_id."_msg$i\" value=\"$iUid\" $checked/></td>";
+ }
break;
case SQM_COL_SUBJ:
$indent = $aCol['indent'];
projects / squirrelmail.git / blobdiff