Permalink
Browse files

Changed(hrs) "filter" is now labeled 'Highlight changed'

Pull request #81
  • Loading branch information...
2 parents b90d6fc + a757541 commit 328a6322770c8546ac684be11c06552ab3de4a82 @dregad dregad committed Feb 13, 2014
Showing with 31 additions and 18 deletions.
  1. +18 −7 core/filter_api.php
  2. +2 −2 lang/strings_english.txt
  3. +11 −9 view_filters_page.php
View
@@ -2854,7 +2854,6 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e
<a href="<?php echo $t_filters_url . FILTER_PROPERTY_STICKY;?>" id="sticky_issues_filter"<?php echo $t_dynamic_filter_expander_class ?>><?php echo lang_get( 'sticky_label' )?></a>
</td>
<td class="small-caption" colspan="2">
- <a href="<?php echo $t_filters_url . FILTER_PROPERTY_HIGHLIGHT_CHANGED;?>" id="highlight_changed_filter"<?php echo $t_dynamic_filter_expander_class ?>><?php echo lang_get( 'changed_label' )?></a>
</td>
<td class="small-caption" >
<a href="<?php echo $t_filters_url . FILTER_PROPERTY_FILTER_BY_DATE;?>" id="do_filter_by_date_filter"<?php echo $t_dynamic_filter_expander_class ?>><?php echo lang_get( 'use_date_filters_label' )?></a>
@@ -2895,11 +2894,7 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e
echo FILTER_PROPERTY_STICKY; ?>" value="<?php
echo $t_sticky_filter_state ? 'on' : 'off'; ?>" />
</td>
- <td class="small-caption" colspan="2" id="highlight_changed_filter_target">
- <?php
- echo $t_filter[FILTER_PROPERTY_HIGHLIGHT_CHANGED];
- echo '<input type="hidden" name="', FILTER_PROPERTY_HIGHLIGHT_CHANGED, '" value="', string_attribute( $t_filter[FILTER_PROPERTY_HIGHLIGHT_CHANGED] ), '" />';
- ?>
+ <td class="small-caption" colspan="2">&#160;
</td>
<td class="small-caption" id="do_filter_by_date_filter_target">
<?php
@@ -3431,7 +3426,23 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e
?>
<input type="hidden" name="match_type" value="<?php echo $t_filter[FILTER_PROPERTY_MATCH_TYPE] ?>"/>
</td>
- <td colspan="6">&#160;</td>
+
+ <td class="small-caption category2">
+ <a id="highlight_changed_filter"
+ href="<?php echo $t_filters_url . FILTER_PROPERTY_HIGHLIGHT_CHANGED; ?>"
+ <?php #echo $t_dynamic_filter_expander_class; ?>>
+ <?php echo lang_get( 'changed_label' )?>
+ </a>
+ </td>
+ <td class="small-caption" valign="top" id="highlight_changed_filter_target">
+ <?php echo $t_filter[FILTER_PROPERTY_HIGHLIGHT_CHANGED]; ?>
+ <input type="hidden"
+ name="<?php echo FILTER_PROPERTY_HIGHLIGHT_CHANGED; ?>"
+ value="<?php echo string_attribute( $t_filter[FILTER_PROPERTY_HIGHLIGHT_CHANGED] ); ?>"
+ />
+ </td>
+
+ <td colspan="4">&#160;</td>
</tr>
</table>
<?php
View
@@ -1169,8 +1169,8 @@ $s_any = 'any';
$s_all = 'all';
$s_show = 'Show';
$s_show_label = 'Show:';
-$s_changed = 'Changed(hrs)';
-$s_changed_label = 'Changed(hrs):';
+$s_changed = 'Highlight changed (hours)';
+$s_changed_label = 'Highlight changed (hours):';
$s_viewing_bugs_title = 'Viewing Issues';
$s_updated = 'Updated';
$s_sticky = 'Show Sticky Issues';
View
@@ -316,7 +316,6 @@
<th class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'show' ) ?></th>
<th class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'view_status' ) ?></th>
<th class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'sticky' ) ?></th>
- <th class="small-caption" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'changed' ) ?></th>
<th class="small-caption" colspan="<?php echo ( 3 * $t_custom_cols ); ?>">
<label>
<input type="checkbox" id="use_date_filters"
@@ -326,10 +325,9 @@
<?php echo lang_get( 'use_date_filters' )?>
</label>
</th>
- <th class="small-caption" colspan="<?php echo ( ( $t_filter_cols -7 ) * $t_custom_cols ); ?>">
+ <th class="small-caption" colspan="<?php echo ( ( $t_filter_cols -8 ) * $t_custom_cols ); ?>">
<?php echo lang_get( 'bug_relationships' ) ?>
</th>
- <!-- <th colspan="<?php echo ( ( $t_filter_cols - 8 ) * $t_custom_cols ); ?>">&#160;</th> -->
</tr>
<tr class="row-1">
<!-- Number of bugs per page -->
@@ -344,10 +342,6 @@
<td colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
<?php print_filter_sticky_issues(); ?>
</td>
- <!-- Highlight changed bugs -->
- <td colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
- <?php print_filter_highlight_changed(); ?>
- </td>
<!-- Date filters -->
<td class="left" colspan="<?php echo ( 3 * $t_custom_cols ); ?>">
<?php print_filter_do_filter_by_date( true ); # hide checkbox as it's already been shown ?>
@@ -356,7 +350,6 @@
<td colspan="<?php echo ( ( $t_filter_cols - 8 ) * $t_custom_cols ); ?>">
<?php print_filter_relationship_type(); ?>
</td>
- <!-- <td colspan="<?php echo ( ( $t_filter_cols - 7 ) * $t_custom_cols ); ?>">&#160;</td> -->
</tr>
<!-- Filter row 4 (custom fields) -->
@@ -413,17 +406,26 @@
?>
<tr class="row-1">
+ <!-- Sort by -->
<th class="small-caption category2" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
<?php echo lang_get( 'sort_label' ) ?>
</th>
- <td colspan="<?php echo ( ( $t_filter_cols - 1 - $t_project_cols ) * $t_custom_cols ); ?>">
+ <td colspan="<?php echo ( 2 * $t_custom_cols ); ?>">
<?php
print_filter_show_sort();
?>
</td>
+
+ <!-- Highlight changed bugs -->
+ <th class="small-caption category2" colspan="<?php echo ( 1 * $t_custom_cols ); ?>"><?php echo lang_get( 'changed' ) ?></th>
+ <td colspan="<?php echo ( $t_filter_cols - 4 - $t_project_cols ) * $t_custom_cols ; ?>">
+ <?php print_filter_highlight_changed(); ?>
+ </td>
+
<?php
if ( 'advanced' == $f_view_type ) {
?>
+ <!-- Projects -->
<th class="small-caption category2" colspan="<?php echo ( 1 * $t_custom_cols ); ?>">
<?php echo lang_get( 'email_project_label' ) ?>
</th>

0 comments on commit 328a632

Please sign in to comment.