Ticket #15355: garyc40.15355.diff

File garyc40.15355.diff, 2.6 KB (added by garyc40, 2 years ago)

put #clear-search inside search box

Line 
1diff --git wp-admin/css/colors-classic.dev.css wp-admin/css/colors-classic.dev.css
2index 26cb708..39abbd2 100644
3--- wp-admin/css/colors-classic.dev.css
4+++ wp-admin/css/colors-classic.dev.css
5@@ -675,12 +675,14 @@ table.widefat span.spam a,
6 }
7 
8 .tagchecklist span a,
9-#bulk-titles div a {
10+#bulk-titles div a,
11+#clear-search {
12        background: url(../images/xit.gif) no-repeat;
13 }
14 
15 .tagchecklist span a:hover,
16-#bulk-titles div a:hover {
17+#bulk-titles div a:hover,
18+#clear-search:hover {
19        background: url(../images/xit.gif) no-repeat -10px 0;
20 }
21 
22diff --git wp-admin/css/colors-fresh.dev.css wp-admin/css/colors-fresh.dev.css
23index 6325917..feac81d 100644
24--- wp-admin/css/colors-fresh.dev.css
25+++ wp-admin/css/colors-fresh.dev.css
26@@ -675,12 +675,14 @@ table.widefat span.spam a,
27 }
28 
29 .tagchecklist span a,
30-#bulk-titles div a {
31+#bulk-titles div a,
32+#clear-search {
33        background: url(../images/xit.gif) no-repeat;
34 }
35 
36 .tagchecklist span a:hover,
37-#bulk-titles div a:hover {
38+#bulk-titles div a:hover,
39+#clear-search:hover {
40        background: url(../images/xit.gif) no-repeat -10px 0;
41 }
42 
43diff --git wp-admin/css/wp-admin.dev.css wp-admin/css/wp-admin.dev.css
44index ce194eb..c331706 100644
45--- wp-admin/css/wp-admin.dev.css
46+++ wp-admin/css/wp-admin.dev.css
47@@ -270,6 +270,26 @@ p.search-box {
48        margin: -5px 0 0;
49 }
50 
51+p.search-box span {
52+       display:inline-block;
53+       position:relative;
54+}
55+
56+#clear-search {
57+       display:none;
58+       height:10px;
59+       width:10px;
60+       text-decoration:none;
61+       position:absolute;
62+       right:5px;
63+       top:7px;
64+       text-indent:-999em;
65+}
66+
67+.searching #clear-search {
68+       display:block;
69+}
70+
71 
72 /*------------------------------------------------------------------------------
73   3.0 - Actions
74diff --git wp-admin/includes/class-wp-list-table.php wp-admin/includes/class-wp-list-table.php
75index 13a688c..4480e62 100644
76--- wp-admin/includes/class-wp-list-table.php
77+++ wp-admin/includes/class-wp-list-table.php
78@@ -195,11 +195,13 @@ class WP_List_Table {
79                        return;
80 
81                $input_id = $input_id . '-search-input';
82-
83 ?>
84 <p class="search-box">
85        <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
86-       <input type="text" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
87+       <span<?php echo is_search() ? ' class="searching"' : ''; ?>>
88+               <input type="text" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
89+               <a id="clear-search" title="<?php _e( 'Clear search results' ); ?>" class="ntdelbutton" href="<?php echo remove_query_arg( array( 's', 'action', 'action2' ) ); ?>">X</a>
90+       </span>
91        <?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
92 </p>
93 <?php