Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Convert filter links into standard form buttons
Fixes #17834
  • Loading branch information
syncguru authored and vboctor committed Nov 24, 2014
1 parent 2fa31b8 commit e704f56
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 22 deletions.
32 changes: 19 additions & 13 deletions core/filter_api.php
Expand Up @@ -3472,24 +3472,30 @@ function filter_draw_selection_area2( $p_page_number, $p_for_screen = true, $p_e
}
?>

<div id="filter-links" class="filter-links">
<ul>
<div class="filter-links">
<?php
$f_switch_view_link = ( config_get( 'use_dynamic_filters' ) ) ? 'view_all_set.php?type=6&amp;view_type=' : 'view_filters_page.php?view_type=';
$t_view_filters = config_get( 'view_filters' );
if( ( SIMPLE_ONLY != $t_view_filters ) && ( ADVANCED_ONLY != $t_view_filters ) ) {
if( 'advanced' == $t_view_type ) {
echo '<li><a href="', $f_switch_view_link, 'simple">', lang_get( 'simple_filters' ), '</a></li>';
} else {
echo '<li><a href="', $f_switch_view_link, 'advanced">', lang_get( 'advanced_filters' ), '</a></li>';
}
if( access_has_project_level( config_get( 'create_permalink_threshold' ) ) ) {
?>
<form method="get" action="permalink_page.php">
<?php # CSRF protection not required here - form does not result in modifications ?>
<input type="hidden" name="url" value="<?php echo urlencode( filter_get_url( $t_filter ) ) ?>" />
<input type="submit" name="reset_query_button" class="button-small" value="<?php echo lang_get( 'create_filter_link' ) ?>" />
</form>
<?php
}

if( access_has_project_level( config_get( 'create_permalink_threshold' ) ) ) {
echo '<li><a href="permalink_page.php?url=', urlencode( filter_get_url( $t_filter ) ), '">', lang_get( 'create_filter_link' ), '</a></li>';
$t_view_filters = config_get( 'view_filters' );
if( ( SIMPLE_ONLY != $t_view_filters ) && ( ADVANCED_ONLY != $t_view_filters ) ) {
?>
<form method="get" action="view_all_set.php">
<?php # CSRF protection not required here - form does not result in modifications ?>
<input type="hidden" name="type" value="<?php echo config_get( 'use_dynamic_filters' ) ? '6' : '' ?>" />
<input type="hidden" name="view_type" value="<?php echo 'advanced' == $t_view_type ? 'simple' : 'advanced' ?>" />
<input type="submit" name="reset_query_button" class="button-small" value="<?php echo 'advanced' == $t_view_type ? lang_get( 'simple_filters' ) : lang_get( 'advanced_filters' ) ?>" />
</form>
<?php
}
?>
</ul>
</div>

</div>
Expand Down
10 changes: 1 addition & 9 deletions css/default.css
Expand Up @@ -155,7 +155,6 @@ tr.bugnote .time-tracked,

#manage-menu { margin-top: 0.5em; }

#filter-links ul,
#manage-menu ul,
#manage-config-menu ul,
#summary-menu ul,
Expand All @@ -164,9 +163,7 @@ tr.bugnote .time-tracked,
#manage-tags-filter-menu ul,
#admin-menu ul
{ clear: left; float: left; list-style: none; position: relative; left: 50%; padding: 0; margin: 0; text-align: center; }
#filter-links ul { left: 0; }

#filter-links ul li,
#manage-menu ul li,
#manage-config-menu ul li,
#summary-menu ul li,
Expand All @@ -175,9 +172,7 @@ tr.bugnote .time-tracked,
#manage-tags-filter-menu ul li,
#admin-menu ul li
{ display:block; float: left; list-style: none; margin: .5em 0; padding: 0 .25em; position: relative; right: 50%; }
#filter-links ul li { right: 0; }

#filter-links ul a,
#manage-menu ul a,
#manage-config-menu ul a,
#summary-menu ul a,
Expand All @@ -189,7 +184,6 @@ tr.bugnote .time-tracked,
#admin-menu ul a
{ text-decoration: underline; padding: 0 .25em; }

#filter-links ul span,
#manage-menu ul span,
#manage-config-menu ul span,
#summary-menu ul span,
Expand All @@ -206,7 +200,6 @@ tr.bugnote .time-tracked,
#account-menu ul li, #doc-menu ul li { display: block; float: left; padding: 0; margin: 0; }

/* bracket links */
#filter-links ul li:before,
#manage-user-link:before,
#manage-menu ul li:before,
#manage-config-menu ul li:before,
Expand All @@ -219,7 +212,6 @@ span.permalink:before,
span.switch-view:before
{ content: "[" }

#filter-links ul li:after,
#manage-user-link:after,
#manage-menu ul li:after,
#manage-config-menu ul li:after,
Expand Down Expand Up @@ -376,7 +368,7 @@ select.tainted { background-color: #ffffff; color: red; }
#filter_open, #filter_closed { position: relative; border: 1px solid #000; padding: 0; margin: 0; }
#filter_open_link, #filter_closed_link { float: left; position: relative; top: 0.5em; padding: 0 .5em; margin: 0; }
.search-box { float: left; position: relative; padding: 0; margin: 0; }
.manage-queries, .reset-query, .save-query, .search-box, .stored-queries, .submit-query { top: .3em; }
.filter-links, .manage-queries, .reset-query, .save-query, .search-box, .stored-queries, .submit-query { top: .3em; }
.submit-query, .save-query { float: left; position: relative; padding: 0 .5em; margin: 0; font-size: 1em; }
.filter-links, .stored-queries, .manage-queries, .reset-query { float: right; position: relative; padding: 0 .5em; margin: 0; z-index: 100; }
.save-query { float: right; }
Expand Down

0 comments on commit e704f56

Please sign in to comment.