|
@@ -131,7 +136,13 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
* $this is the Template class object.
*/
$paginator_str = $this->fetch('paginator.tpl');
- echo $paginator_str . $thread_link_str ."\n"; ?>
+ echo $paginator_str . '['
+ : '">')
+ . $thread_name . '] ';
+ if (!empty($plugin_output['mailbox_paginator_after'])) echo $plugin_output['mailbox_paginator_after'];
+ ?>
|
@@ -194,34 +205,41 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
switch ($iCol) {
case SQM_COL_CHECK:
if ($javascript_on) {
- echo ''."\n";
+ $checked = ($checkall ? ' checked="checked" ' : '');
+ $accesskey = ($accesskey_mailbox_toggle_selected == 'NONE' ? ''
+ : ' accesskey="' . $accesskey_mailbox_toggle_selected . '" ');
+ echo '' . "\n";
} else {
- $link = $baseurl . "&startMessage=$pageOffset&checkall=";
- if (sqgetGlobalVar('checkall',$checkall,SQ_GET)) {
- $link .= ($checkall) ? '0' : '1';
- } else {
- $link .= '1';
- }
- echo ""._("All").'';
+ $link = $baseurl
+ . "&startMessage=$pageOffset&checkall="
+ . ($checkall ? '0' : '1');
+ echo "" . _("All") . '';
}
break;
- case SQM_COL_FROM: echo _("From")."\n"; break;
- case SQM_COL_DATE: echo _("Date")."\n"; break;
- case SQM_COL_SUBJ: echo _("Subject")."\n"; break;
+ case SQM_COL_FROM:
+ echo '\n";
+ break;
+ case SQM_COL_DATE: echo _("Date") . "\n"; break;
+ case SQM_COL_SUBJ: echo _("Subject") . "\n"; break;
case SQM_COL_FLAGS:
echo getIcon($icon_theme_path, 'msg_new.png', ' ', _("Message Flags")) . "\n";
break;
- case SQM_COL_SIZE: echo _("Size")."\n"; break;
+ case SQM_COL_SIZE: echo _("Size") . "\n"; break;
case SQM_COL_PRIO:
echo getIcon($icon_theme_path, 'prio_high.png', '!', _("Priority")) . "\n";
break;
case SQM_COL_ATTACHMENT:
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;
- case SQM_COL_BCC: echo _("Bcc")."\n"; break;
+ case SQM_COL_INT_DATE: echo _("Received") . "\n"; break;
+ case SQM_COL_TO:
+ echo '\n";
+ break;
+ case SQM_COL_CC: echo _("Cc") . "\n"; break;
+ case SQM_COL_BCC: echo _("Bcc") . "\n"; break;
default: break;
}
// add the sort buttons
@@ -254,29 +272,34 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
$aMsg) {
+
echo $sLine;
+
/**
* Display message header row in messages list
*
@@ -311,45 +334,68 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
$aColumns[SQM_COL_ATTACHMENT]['value'] = $sValue;
}
- $class = 'even';
+ $class = (($checkall || in_array($iUid, $preselected)) && $javascript_on && $fancy_index_highlite ? 'clicked_even' : 'even');
+ $non_clicked_class = 'even';
+
/**
* If alternating row colors is set, adapt the CSS class
*/
if (isset($alt_index_colors) && $alt_index_colors) {
if (!($i % 2)) {
- $class = 'odd';
+ $class = (($checkall || in_array($iUid, $preselected)) && $javascript_on && $fancy_index_highlite ? 'clicked_odd' : 'odd');
+ $non_clicked_class = 'odd';
}
}
+
+ /**
+ * Message Highlighting Functionality
+ */
if (isset($aMsg['row']['color']))
{
- $bgcolor = $aMsg['row']['color'];
- $class = 'misc'.$i;
+ if (($checkall || in_array($iUid, $preselected)) && $javascript_on && $fancy_index_highlite) {
+//FIXME: would be best not to use $color directly here; want to move this to be a CSS style-defined value only, but the problem is that this CSS class is being defined on the fly right here
+ $bgcolor = $color[16];
+ $class = 'clicked_misc'.$i;
+ } else {
+ $bgcolor = $aMsg['row']['color'];
+ $class = 'misc'.$i;
+ }
+ $non_clicked_class = 'misc'.$i;
+ $non_clicked_bgcolor = $aMsg['row']['color'];
+ }
+ else
+ {
+ $bgcolor = '';
+ $non_clicked_bgcolor = '';
}
- 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.'\');" onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $class . '\', \'mouse_over\', \'clicked\');" onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $class . '\', \'mouse_over\', \'clicked\');"';
+ $row_extra = ' onmouseover="rowOver(\''.$form_id . '_msg' . $i.'\');" onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $non_clicked_class . '\', \'mouse_over\', \'clicked\');" onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $non_clicked_class . '\', \'mouse_over\', \'clicked\');"';
}
// this does the auto-checking of the checkbox no matter
// where on the row you click
//
$javascript_auto_click = '';
+ $row_click_extra = '';
+ if (!empty($plugin_output['row_click_extra'])) $row_click_extra = $plugin_output['row_click_extra'];
if ($javascript_on && $fancy_index_highlite) {
// include the form_id in order to show multiple messages lists. Otherwise id isn't unique
- $javascript_auto_click = " onMouseDown=\"row_click('$form_id"."_msg$i')\"";
+ $javascript_auto_click = " onmousedown=\"row_click('$form_id"."_msg$i', event, '$form_name', 'msg[' + $i + ']', '$row_click_extra')\"";
}
+
/*
* 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')
+if ($class != 'even' && $class != 'odd'
+ && $class != 'clicked_even' && $class != 'clicked_odd')
{
?>
+
+
>
' ?>
- " id="" value="" />
+ " id="" value="" />
';
- $checked = ($checkall) ? " checked=checked " : " ";
echo "";
}
break;
@@ -427,12 +496,11 @@ if ($class != 'even' && $class != 'odd')
if ($onclick) { $sText .= " onclick=\"$onclick\""; }
if ($link_extra) { $sText .= " $link_extra"; }
if ($javascript_on && $fancy_index_highlite) {
- $sText .= " onmousedown=\"row_click('$form_id"."_msg$i'); setPointer(this." . (empty($bold) ? '' : 'parentNode.') .
- 'parentNode.parentNode, ' . $i . ', \'click\', \''. $class. '\', \'mouse_over\', \'' .
- $clickedColor .'\');"';
+ $sText .= " onmousedown=\"row_click('$form_id"."_msg$i', event, '$form_name', 'msg[' + $i + ']', '$row_click_extra'); setPointer(this." . (empty($bold) ? '' : 'parentNode.') .
+ 'parentNode.parentNode, ' . $i . ', \'click\', \''. $non_clicked_class. '\', \'mouse_over\', \'clicked\');"';
}
- $sText .= ">";
- $sText .= $value . '';
+ $sText .= ">"
+ . $value . '';
if ($align['left'] == 'right') {
$sText .= str_repeat(' ',$indent);
}
@@ -440,14 +508,14 @@ if ($class != 'even' && $class != 'odd')
break;
case SQM_COL_SIZE:
case SQM_COL_FLAGS:
- $sText = " | ";
- $sText .= "$value | \n";
+ $sText = " "
+ . "$value | \n";
echo $sText;
break;
case SQM_COL_INT_DATE:
case SQM_COL_DATE:
- $sText = " ";
- $sText .= $value. " | \n";
+ $sText = " "
+ . $value. " | \n";
echo $sText;
break;
default:
@@ -467,9 +535,8 @@ if ($class != 'even' && $class != 'odd')
break;
}
}
-?>
-
-';
$sLine = " |
\n";
++$i;
@@ -494,7 +561,16 @@ if ($class != 'even' && $class != 'odd')
- |
+ fetch('paginator.tpl');
+ echo $paginator_str;
+ if (!empty($plugin_output['mailbox_paginator_after'])) echo $plugin_output['mailbox_paginator_after'];
+ ?> |
|
@@ -504,10 +580,14 @@ if ($class != 'even' && $class != 'odd')
|
- |
-
+ |
+
|