Changeset 9020 for trunk/wp-admin/upload.php

Timestamp:

09/28/2008 03:00:20 PM (17 years ago)

Author:

azaozz

Message:

Media library: move filter above tablenav

File:

• trunk/wp-admin/upload.php (modified) (5 diffs)

trunk/wp-admin/upload.php

@@ -150 +150 @@
 </div></form>
 </div></div>
+
+<?php
+if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
+    $_GET['message'] = '1';
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+}
+
+$messages[1] = __('Media attachment updated.');
+$messages[2] = __('Media deleted.');
+$messages[3] = __('Error saving media attachment.');
+
+if ( isset($_GET['message']) && (int) $_GET['message'] )
+    $message = $messages[$_GET['message']];
+
+if ( isset($message) ) { ?>
+<div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+}
+?>
+
+<?php do_action('restrict_manage_posts'); ?>
 
 <div class="wrap">
@@ -186 +207 @@
 ?></h2>
 
-<form id="posts-filter" action="" method="get">
 <ul class="subsubsub">
 <?php
@@ -218 +238 @@
 </ul>
 
-<?php
-if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Your media has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View media'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit media'); ?></a></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
-endif;
-
-$messages[1] = __('Media attachment updated.');
-$messages[2] = __('Media deleted.');
-$messages[3] = __('Error saving media attachment.');
-
-if ( isset($_GET['message']) && (int) $_GET['message'] )
-    $message = $messages[$_GET['message']];
-
-if ( isset($message) ) { ?>
-<div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
-}
-?>
-
-<?php do_action('restrict_manage_posts'); ?>
+<div class="filter">
+<form id="list-filter" action="" method="get">
+<?php
+if ( ! is_singular() && ! isset($_GET['detached']) ) {
+    $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
+
+    $arc_result = $wpdb->get_results( $arc_query );
+
+    $month_count = count($arc_result);
+
+    if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) : ?>
+<select name='m'>
+<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
+<?php
+foreach ($arc_result as $arc_row) {
+    if ( $arc_row->yyear == 0 )
+        continue;
+    $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
+
+    if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] )
+        $default = ' selected="selected"';
+    else
+        $default = '';
+
+    echo "<option$default value='$arc_row->yyear$arc_row->mmonth'>";
+    echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
+    echo "</option>\n";
+}
+?>
+</select>
+<?php endif; // month_count ?>
+
+<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
+
+<?php } // ! is_singular ?>
+</form></div>
+
+<form id="posts-filter" action="" method="get">
 
 <div class="tablenav">
-
 <?php
 if ( ! isset($page_links_total) )
@@ -266 +303 @@
 <input type="submit" id="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-media'); ?>
-<?php
-
-if ( ! is_singular() && ! isset($_GET['detached']) ) {
-    $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
-
-    $arc_result = $wpdb->get_results( $arc_query );
-
-    $month_count = count($arc_result);
-
-    if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) : ?>
-<select name='m'>
-<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
-<?php
-foreach ($arc_result as $arc_row) {
-    if ( $arc_row->yyear == 0 )
-        continue;
-    $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
-
-    if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] )
-        $default = ' selected="selected"';
-    else
-        $default = '';
-
-    echo "<option$default value='$arc_row->yyear$arc_row->mmonth'>";
-    echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
-    echo "</option>\n";
-}
-?>
-</select>
-<?php endif; // month_count ?>
-
-<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
-
-<?php } // ! is_singular ?>
 
 <?php if ( isset($_GET['detached']) ) { ?>
@@ -428 +431 @@
 <table class="widefat" style="margin-top: .5em">
 <thead>
-  <tr>
-    <th scope="col"><?php _e('Comment') ?></th>
-    <th scope="col"><?php _e('Date') ?></th>
-    <th scope="col"><?php _e('Actions') ?></th>
-  </tr>
+    <tr>
+        <th scope="col"><?php _e('Comment') ?></th>
+        <th scope="col"><?php _e('Date') ?></th>
+        <th scope="col"><?php _e('Actions') ?></th>
+    </tr>
 </thead>
 <tbody id="the-comment-list" class="list:comment">
 <?php
-        foreach ($comments as $comment)
-                _wp_comment_row( $comment->comment_ID, 'detail', false, false );
+        foreach ($comments as $comment)
+            _wp_comment_row( $comment->comment_ID, 'detail', false, false );
 ?>
 </tbody>