Menu
▾
▴
[Serverfilters-commit] server_side_filters/templates/default options.tpl, 1.2, 1.3
|
From: Paul L. <pdo...@us...> - 2011-04-29 14:11:00
|
Update of /cvsroot/serverfilters/server_side_filters/templates/default
In directory vz-cvs-3.sog:/tmp/cvs-serv3810/templates/default
Modified Files:
options.tpl
Log Message:
Fix poorly formed HTML (form tags in middle of table rows - argh)
Index: options.tpl
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/templates/default/options.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.tpl 10 Jan 2011 21:40:12 -0000 1.2
--- options.tpl 29 Apr 2011 14:10:58 -0000 1.3
***************
*** 190,196 ****
--- 190,200 ----
$rule_count = sizeof($filter_rules);
$show_move_controls = $rule_count > 3; // account for 'PRECEDING_TEXT' and 'SUCCEEDING_TEXT'
+ $show_all_move_controls = $rule_count > 4; // account for 'PRECEDING_TEXT' and 'SUCCEEDING_TEXT'
$suggested_rule_count = 0;
+ $base_uri = sqm_baseuri();
+
+
$token = sm_generate_security_token();
***************
*** 314,318 ****
{
?>
! <form method="post" action="<?php echo $form_action . '"'; if ($javascript_on) echo ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"'; ?>>
<?php
--- 318,325 ----
{
?>
! <tr>
! <td style="padding:0px" colspan="6">
! <form method="post" action="<?php echo $form_action . '"'; if ($javascript_on) echo ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"'; ?> style="display:inline; margin:0px">
! <table border="0" rules="rows" noshade="0" bordercolor="<?php echo $color[0]; ?>" cellpadding="5" cellspacing="0">
<?php
***************
*** 332,336 ****
?>
<tr>
! <td align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
--- 339,343 ----
?>
<tr>
! <td width="100%" align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
***************
*** 341,345 ****
<input type="hidden" name="min_create_only_success_call" value="<?php echo $min_create_only_success_call; ?>" />
<input type="hidden" name="min_create_only_close_self" value="<?php echo $min_create_only_close_self; ?>" />
! <input type="image" src="images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
--- 348,352 ----
<input type="hidden" name="min_create_only_success_call" value="<?php echo $min_create_only_success_call; ?>" />
<input type="hidden" name="min_create_only_close_self" value="<?php echo $min_create_only_close_self; ?>" />
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
***************
*** 384,390 ****
</td>
<td align="center">
! <input type="image" src="images/save_new.png" border="0" name="create" id="create_new_rule" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </form>
<?php
--- 391,400 ----
</td>
<td align="center">
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/save_new.png" border="0" name="create" id="create_new_rule" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </table>
! </form>
! </td>
! </tr>
<?php
***************
*** 466,472 ****
! echo '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . '>'
! . '<tr><td align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
--- 476,484 ----
! echo '<tr><td style="padding:0px" colspan="6">'
! . '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . ' style="display:inline; margin:0px">'
! . '<table border="0" rules="rows" noshade="0" bordercolor="' . $color[0] . '" cellpadding="5" cellspacing="0">'
! . '<tr><td width="100%" align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
***************
*** 494,500 ****
. '</td></tr></table>'
. '</td><td colspan="4" align="center">'
! . '<input type="image" src="images/save_new.png" border="0" name="create" id="create_new_rule_' . $rule_name . '" alt="'
. _("Save New Filter")
! . '" /></td></tr></form>';
}
} // END if (empty($message_headers))
--- 506,513 ----
. '</td></tr></table>'
. '</td><td colspan="4" align="center">'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/save_new.png" border="0" name="create" id="create_new_rule_' . $rule_name . '" alt="'
. _("Save New Filter")
! . '" /></td></tr></table>'
! . '</form></td></tr>';
}
} // END if (empty($message_headers))
***************
*** 533,541 ****
}
! echo '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . '>';
?>
<tr>
! <td align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
--- 546,556 ----
}
! echo '<tr><td style="padding:0px" colspan="6">'
! . '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . ' style="display:inline; margin:0px">';
?>
+ <table border="0" rules="rows" noshade="0" bordercolor="<?php echo $color[0]; ?>" cellpadding="5" cellspacing="0">
<tr>
! <td width="100%" align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
***************
*** 550,554 ****
<input type="hidden" name="passed_id" value="<?php echo $passed_id; ?>" />
<input type="hidden" name="passed_ent_id" value="<?php echo $passed_ent_id; ?>" />
! <input type="image" src="images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
--- 565,569 ----
<input type="hidden" name="passed_id" value="<?php echo $passed_id; ?>" />
<input type="hidden" name="passed_ent_id" value="<?php echo $passed_ent_id; ?>" />
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
***************
*** 598,604 ****
</td>
<td align="center">
! <input type="image" src="images/save_new.png" border="0" name="create" id="create_new_rule_<?php echo $index; ?>" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </form>
<?php
}
--- 613,622 ----
</td>
<td align="center">
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/save_new.png" border="0" name="create" id="create_new_rule_<?php echo $index; ?>" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </table>
! </form>
! </td>
! </tr>
<?php
}
***************
*** 645,651 ****
! echo '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . '>'
! . '<tr><td align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
--- 663,671 ----
! echo '<tr><td style="padding:0px" colspan="6">'
! . '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . ' style="display:inline; margin:0px">'
! . '<table border="0" rules="rows" noshade="0" bordercolor="' . $color[0] . '" cellpadding="5" cellspacing="0">'
! . '<tr><td width="100%" align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
***************
*** 745,751 ****
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
--- 765,771 ----
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
***************
*** 758,780 ****
//
else if ($index == 0)
! echo '<td colspan="2" align="center"><input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo '<td colspan="2" align="center"><input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// show both arrows
//
else
! {
echo '<td>'
! . '<input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></form>';
}
--- 778,803 ----
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
//
else
! {
echo '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></table></form></td></tr>';
}
***************
*** 787,791 ****
// languages, but the whole hard-coded table thing ruins that anyway...
//
! echo '<input type="image" src="images/add.png" border="0" name="add" alt="' . _("Add More Criteria") . '" /> ' . sprintf(_("If %s %s %s"),
create_header_field_dropdown_list($ssf_header_fields, ($rule_number == $index && !is_null($repopulate_header_field) ? $repopulate_header_field : $rule['HEADER_FIELD'])),
create_matching_method_dropdown_list($ssf_matching_methods, ($rule_number == $index && !is_null($repopulate_matching_method) ? $repopulate_matching_method : $rule['MATCHING_METHOD'])),
--- 810,814 ----
// languages, but the whole hard-coded table thing ruins that anyway...
//
! echo '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/add.png" border="0" name="add" alt="' . _("Add More Criteria") . '" /> ' . sprintf(_("If %s %s %s"),
create_header_field_dropdown_list($ssf_header_fields, ($rule_number == $index && !is_null($repopulate_header_field) ? $repopulate_header_field : $rule['HEADER_FIELD'])),
create_matching_method_dropdown_list($ssf_matching_methods, ($rule_number == $index && !is_null($repopulate_matching_method) ? $repopulate_matching_method : $rule['MATCHING_METHOD'])),
***************
*** 823,829 ****
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
--- 846,852 ----
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
***************
*** 836,845 ****
//
else if ($index == 0)
! echo '<td colspan="2" align="center"><input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo '<td colspan="2" align="center"><input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// show both arrows
--- 859,871 ----
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
***************
*** 848,858 ****
{
echo '<td>'
! . '<input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></form>';
}
}
--- 874,884 ----
{
echo '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></table></form></td></tr>';
}
}
|
