-
-
+
+
-
+
-
-
+
fetch('paginator.tpl');
echo $paginator_str . $thread_link_str ."\n"; ?>
-
|
- |
+ |
|
@@ -118,27 +121,28 @@ else
if (count($aFormElements)) {
?>
-
+
-
+
@@ -180,31 +200,34 @@ else
?>
- |
+ |
-
+
-
-
-
+
-
+
+
+
+
$aMsg) {
echo $sLine;
@@ -283,30 +315,14 @@ 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.
*/
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;
}
@@ -314,24 +330,7 @@ else
* 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;
- case 5: $sValue .= "?"; break;
- default: break;
- }
- }
+ $sValue = getPriorityIcon($aColumns[SQM_COL_PRIO]['value'], $icon_theme_path);
$aColumns[SQM_COL_PRIO]['value'] = $sValue;
}
@@ -339,42 +338,33 @@ else
* 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;
}
-
- $bgcolor = $color[4];
-
+ $class = 'even';
/**
- * If alternating row colors is set, adapt the bgcolor
+ * If alternating row colors is set, adapt the CSS class
*/
if (isset($alt_index_colors) && $alt_index_colors) {
if (!($i % 2)) {
- if (!isset($color[12])) {
- $color[12] = '#EAEAEA';
- }
- $bgcolor = $color[12];
+ $class = 'odd';
}
}
- $bgcolor = (isset($aMsg['row']['color'])) ? $aMsg['row']['color']: $bgcolor;
- $class = 'msg_row';
+ if (isset($aMsg['row']['color']))
+ {
+ $bgcolor = $aMsg['row']['color'];
+ $class = 'misc'.$i;
+ }
+ else $bgcolor = '';
$row_extra = '';
// this stuff does the auto row highlighting on mouseover
//
if ($javascript_on && $fancy_index_highlite) {
- $row_extra .= ' onmouseover="rowOver(\''.$form_id . "_msg$i','". $mouseoverColor . '\', \'' . $clickedColor . '\');" onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $bgcolor . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');" onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $bgcolor . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');"';
+ $row_extra .= ' onmouseover="rowOver(\''.$form_id . '_msg' . $i.'\');" onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $class . '\', \'mouse_over\', \'clicked\');" onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $class . '\', \'mouse_over\', \'clicked\');"';
}
// this does the auto-checking of the checkbox no matter
// where on the row you click
@@ -385,21 +375,38 @@ else
$javascript_auto_click = " onMouseDown=\"row_click('$form_id"."_msg$i')\"";
}
+/*
+ * Message Highlighting requires a unique CSS class declaration for proper
+ * mouseover functionality. There is no harm in doing this when the mouseover
+ * functionality is disabled
+ */
+if ($class != 'even' && $class != 'odd')
+{
+?>
+
+
->
+ >
'; $sEnd = '';
- }
- if (in_array('deleted',$aFlags) && $aFlags['deleted']) {
- $sPre = "" . $sPre;
- $sEnd .= '';
- } else {
- if (in_array('flagged',$aFlags) && $aFlags['flagged']) {
- $sPre = "" . $sPre;
- $sEnd .= '';
+ if (isset($aColumns[SQM_COL_FLAGS])) {
+ if (!in_array('seen',$aFlags) || !$aFlags['seen']) {
+ $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 +414,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 = '
| ";
+ $sLine = " | \n";
++$i;
/*
@@ -499,16 +517,16 @@ else
|
- |
+ |
-
+
-
+
@@ -523,3 +541,4 @@ else
+
| | | | | | | |