From: stevetruckstuff Date: Wed, 23 Aug 2006 21:36:04 +0000 (+0000) Subject: Add templates for message highlighting. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=85c8aff629d6300297d01e73b9eb322a91547a87;p=squirrelmail.git Add templates for message highlighting. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11625 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/src/options_highlight.php b/src/options_highlight.php index aa6fae03..b71784e8 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -106,72 +106,51 @@ if (isset($theid) && ($action == 'delete') || } displayPageHeader($color, 'None'); -echo -html_tag( 'table', "\n" . - html_tag( 'tr', "\n" . - html_tag( 'td', '
' . _("Options") . ' - ' . _("Message Highlighting") . '
', 'left') - ), - 'center', $color[9], 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . "
\n" . -html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) . - html_tag( 'tr' ) . "\n" . - html_tag( 'td', '', 'left' ); - -echo '
[' . _("New") . ']'. - ' - ['._("Done").']

'."\n"; -$mhl_count = count($message_highlight_list); -if ($mhl_count > 0) { - echo html_tag( 'table', '', 'center', '', 'width="80%" border="0" cellpadding="3" cellspacing="0"' ) . "\n"; - for ($i=0; $i < $mhl_count; $i++) { - $match_type = ''; - switch ($message_highlight_list[$i]['match_type'] ) { +/** + * Display the current rule list + */ +$rules = array(); +foreach($message_highlight_list as $index=>$rule) { + $a = array(); + + $a['Name'] = htmlspecialchars($rule['name']); + $a['Color'] = $rule['color']; + $a['MatchField'] = ''; + $a['MatchValue'] = htmlspecialchars($rule['value']); + switch ($rule['match_type']) { case 'from' : - $match_type = _("From"); - break; + $a['MatchField'] = _("From"); + break; case 'to' : - $match_type = _("To"); - break; + $a['MatchField'] = _("To"); + break; case 'cc' : - $match_type = _("Cc"); - break; + $a['MatchField'] = _("Cc"); + break; case 'to_cc' : - $match_type = _("To or Cc"); - break; + $a['MatchField'] = _("To or Cc"); + break; case 'subject' : - $match_type = _("subject"); - break; - } - - $links = '[' . - _("Edit") . - '] [' . - _("Delete"); - if($i > 0) { - $links .= '] [' . _("Up"); - } - if($i+1 < $mhl_count) { - $links .= '] [' . _("Down"); - } - $links .= ']'; - - echo html_tag( 'tr', - html_tag( 'td', - $links, - 'left', $color[4], 'width="20%" style="white-space: nowrap;"' ) . - html_tag( 'td', - htmlspecialchars($message_highlight_list[$i]['name']) , - 'left' ) . - html_tag( 'td', - $match_type . ' = ' . - htmlspecialchars($message_highlight_list[$i]['value']) , - 'left' ) , - '', '#'.$message_highlight_list[$i]['color'] ) . "\n"; + $a['MatchField'] = _("subject"); + break; } - echo "\n". - "
\n"; -} else { - echo '
' . _("No highlighting is defined") . "

\n". - "
\n"; + + $rules[$index] = $a; } + +$oTemplate->assign('current_rules', $rules); + +$oTemplate->assign('add_rule', 'options_highlight.php?action=add'); +$oTemplate->assign('edit_rule', 'options_highlight.php?action=edit&theid='); +$oTemplate->assign('delete_rule', 'options_highlight.php?action=delete&theid='); +$oTemplate->assign('move_up', 'options_highlight.php?action=up&theid='); +$oTemplate->assign('move_down', 'options_highlight.php?action=down&theid='); + +$oTemplate->display('options_highlight_list.tpl'); + +/** + * Optionally, display the add/edit dialog + */ if ($action == 'edit' || $action == 'add') { $color_list[0] = '4444aa'; @@ -311,36 +290,29 @@ if ($action == 'edit' || $action == 'add') { $new_color_list["18,4"] = 'ff00ff'; $selected_input = FALSE; - $selected_i = null; $selected_choose = FALSE; $selected_predefined = FALSE; - for ($i=0; $i < 14; $i++) { - ${"selected".$i} = ''; - } + $name = $action=='edit' && isset($theid) && isset($message_highlight_list[$theid]['name']) ? $message_highlight_list[$theid]['name'] : ''; + $field = $action=='edit' && isset($theid) && isset($message_highlight_list[$theid]['match_type']) ? $message_highlight_list[$theid]['match_type'] : ''; + $value = $action=='edit' && isset($theid) && isset($message_highlight_list[$theid]['value']) ? $message_highlight_list[$theid]['value'] : ''; + $color = $action=='edit' && isset($theid) && isset($message_highlight_list[$theid]['color']) ? $message_highlight_list[$theid]['color'] : ''; + if ($action == 'edit' && isset($theid) && isset($message_highlight_list[$theid]['color'])) { for ($i=0; $i < 14; $i++) { if ($color_list[$i] == $message_highlight_list[$theid]['color']) { $selected_choose = TRUE; - $selected_i = $color_list[$i]; continue; } } } - if ($action == 'edit' && isset($theid) && isset($message_highlight_list[$theid]['color'])) { - $current_color = $message_highlight_list[$theid]['color']; - } - else { - $current_color = '63aa7f'; - } - $pre_defined_color = 0; for($x = 0; $x < 5; $x++) { for($y = 0; $y < 19; $y++) { $gridindex = "$y,$x"; $gridcolor = $new_color_list[$gridindex]; - if ($gridcolor == $current_color) { + if ($gridcolor == $color) { $pre_defined_color = 1; break; } @@ -353,113 +325,25 @@ if ($action == 'edit' || $action == 'add') { $selected_predefined = TRUE; else if ($selected_choose == '') $selected_input = TRUE; - + + $oTemplate->assign('rule_name', $name); + $oTemplate->assign('rule_value', $value); + $oTemplate->assign('rule_field', $field); + $oTemplate->assign('rule_color', $color); + $oTemplate->assign('color_radio', ($selected_choose ? 1 : ($selected_input ? 2 : 0))); + $oTemplate->assign('color_input', ($selected_input ? $color : '')); + echo addForm('options_highlight.php', 'post', 'f'). addHidden('action', 'save'); if($action == 'edit') { echo addHidden('theid', (isset($theid)?$theid:'')); } - echo html_tag( 'table', '', 'center', '', 'width="80%" cellpadding="3" cellspacing="0" border="0"' ) . "\n"; - echo html_tag( 'tr', '', '', $color[0] ) . "\n"; - echo html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . "\n"; - echo _("Identifying name") . ":"; - echo ' ' . "\n"; - echo html_tag( 'td', '', 'left' ) . "\n"; - if ($action == 'edit' && isset($theid) && isset($message_highlight_list[$theid]['name'])) - $disp = $message_highlight_list[$theid]['name']; - else - $disp = ''; - echo " ".addInput('identname', $disp); - echo " \n"; - echo " \n"; - echo html_tag( 'tr', html_tag( 'td', ' ', 'left' ) ) ."\n"; - echo html_tag( 'tr', '', '', $color[0] ) . "\n"; - echo html_tag( 'td', ''. _("Color") . ':', 'right' ); - echo html_tag( 'td', '', 'left' ); - echo ' '.addRadioBox('color_type', $selected_choose, '1'); - - $selops = array ( - $color_list[0] => _("Dark Blue"), - $color_list[1] => _("Dark Green"), - $color_list[2] => _("Dark Yellow"), - $color_list[3] => _("Dark Cyan"), - $color_list[4] => _("Dark Magenta"), - $color_list[5] => _("Light Blue"), - $color_list[6] => _("Light Green"), - $color_list[7] => _("Light Yellow"), - $color_list[8] => _("Light Cyan"), - $color_list[9] => _("Light Magenta"), - $color_list[10] => _("Dark Gray"), - $color_list[11] => _("Medium Gray"), - $color_list[12] => _("Light Gray"), - $color_list[13] => _("White") ); - - echo addSelect('newcolor_choose', $selops, $selected_i, TRUE); - echo "
\n"; - - echo ' '.addRadioBox('color_type', $selected_input, 2). - '  '. _("Other:") . - addInput('newcolor_input', - (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''), - '7'); - echo _("Ex: 63aa7f")."
\n"; - echo " \n"; - echo " \n"; - - # Show grid of color choices - echo html_tag( 'tr', '', '', $color[0] ) . "\n"; - echo html_tag( 'td', '', 'left', '', 'colspan="2"' ); - echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="1"' ) . "\n"; - - for($x = 0; $x < 5; $x++) { - echo html_tag( 'tr' ) . "\n"; - for($y = 0; $y < 19; $y++) { - $gridindex = "$y,$x"; - $gridcolor = $new_color_list[$gridindex]; - echo html_tag( 'td', addRadioBox('color_type', ($gridcolor == $current_color), '#'.$gridcolor), - 'left', '#'.$gridcolor, 'colspan="2"' ); - } - echo "\n"; - } - echo "\n"; - echo "\n"; - - echo html_tag( 'tr', html_tag( 'td', ' ', 'left' ) ) . "\n"; - echo html_tag( 'tr', '', '', $color[0] ) . "\n"; - echo html_tag( 'td', '', 'center', '', 'colspan="2"' ) . "\n"; - echo " \n"; - echo '' . _("Matches") . ': '; - if ($action == 'edit' && isset($theid) && isset($message_highlight_list[$theid]['value'])) - $disp = $message_highlight_list[$theid]['value']; - else - $disp = ''; - echo ' '.addInput('value', $disp, 40); - echo " \n"; - echo " \n"; - echo "\n"; - echo '
\n"; + + $oTemplate->display('options_highlight_addedit.tpl'); + echo "\n"; } do_hook('options_highlight_bottom'); -?> - -display('footer.tpl'); ?> \ No newline at end of file diff --git a/templates/default/options_highlight_addedit.tpl b/templates/default/options_highlight_addedit.tpl new file mode 100644 index 00000000..f6789b66 --- /dev/null +++ b/templates/default/options_highlight_addedit.tpl @@ -0,0 +1,331 @@ + + +
+
+ + + + + + + +
+ +
+ + + + + + + + + + + + +
+ +
+ : + + /> +
+ + : + + size="40" /> +
+ + + + + + + + + + + + + + + + + + +
+ +
+ /> + + +
+ /> + + : + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
/> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> />
/> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> />
/> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> />
/> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> />
/> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> /> />
+
+ " /> +
+
+
\ No newline at end of file diff --git a/templates/default/options_highlight_list.tpl b/templates/default/options_highlight_list.tpl new file mode 100644 index 00000000..06288b12 --- /dev/null +++ b/templates/default/options_highlight_list.tpl @@ -0,0 +1,110 @@ + +
+ + + + + + + + + + +
+ +
+ + + + + + $rule) { + ?> + + + + + + + + + +
+ +
+ [] + + [] + + 0) { + ?> + [] + +   + + + + [] + +   + + + + + +
+
+ [ ]   + [ ] +
+
\ No newline at end of file diff --git a/templates/default/options_order.tpl b/templates/default/options_order.tpl index ca933b85..1113be5d 100644 --- a/templates/default/options_order.tpl +++ b/templates/default/options_order.tpl @@ -31,7 +31,7 @@ extract($t); /** Begin template **/ ?> -
+
diff --git a/templates/default/stylesheet.tpl b/templates/default/stylesheet.tpl index 6298a4d3..92f8836e 100644 --- a/templates/default/stylesheet.tpl +++ b/templates/default/stylesheet.tpl @@ -126,13 +126,29 @@ table.table_empty, table.table_blank { width: 100%; } +table.table1 { + border: 1px solid ; + width: 90%; + margin-left: auto; + margin-right: auto; +} + +table.table1 td { + padding-left: 2px; + padding-right: 2px; +} + +td.emptyList { + text-align: center; + font-weight: bold; +} + td.header1 { background: ; text-align: center; font-weight: bold; } - td.header2 { background: ; text-align: center; @@ -532,11 +548,11 @@ tr.odd { text-align: left; } -#optionHighlight { +#optionOrder { text-align:center; } -#optionHighlight table { +#optionOrder table { margin-left: auto; margin-right: auto; margin-top: 8px; @@ -545,23 +561,74 @@ tr.odd { border: 1px solid } -#optionHighlight table.moveFields { +#optionOrder table.moveFields { width: auto; } -#optionHighlight table.moveFields td { +#optionOrder table.moveFields td { border-left: 1px solid ; border-right: 1px solid ; padding-left: 2px; padding-right: 2px; } -#optionHighlight td.moveLink { +#optionOrder td.moveLink { text-align: right; font-size: 75%; vertical-align: bottom; } -#optionHighlight td.fieldName { +#optionOrder td.fieldName { text-align: left; } + +#optionHightlightList { + text-align: center; +} + +#optionHighlightList table table { + margin-top: 10px; + margin-bottom: 10px; + width: 75%; +} + +#optionHighlightList td.ruleButtons { + text-align: center; + width: 1%; +} + +#optionHighlightList td.ruleName { + text-align: left; + width: 30%; + padding-left: 4px; + padding-right: 4px; +} + +#optionHighlightAdd { + text-align: center; +} + +#optionHighlightAdd table table { + margin-top: 10px; + margin-bottom: 10px; + width: 75%; +} + +#optionHighlightAdd td.ruleField { + text-align: right; + font-weight: bold; + width: 40%; +} + +#optionHighlightAdd td.fieldValue { + text-align: left; +} + +#optionHighlightAdd td.colorTable { + text-align: center; +} + +#optionHighlightAdd table.colorTable { + margin-left: auto; + margin-right: auto; +}