| @@ -57,25 +57,8 @@ | ||
| 57 | 57 | define('FWP_UNSUB_CHECKED', 'Unsubscribe'); |
| 58 | 58 | define('FWP_SYNDICATE_NEW', 'Syndicate ยป'); |
| 59 | 59 | endif; |
| 60 | 60 | |
| 61 | -function feedwordpress_syndication_toggles () { | |
| 62 | -?> | |
| 63 | - <script type="text/javascript"> | |
| 64 | - jQuery(document).ready( function($) { | |
| 65 | - // In case someone got here first. | |
| 66 | - $('.postbox h3, .postbox .handlediv').unbind('click'); | |
| 67 | - $('.postbox h3 a').unbind('click'); | |
| 68 | - $('.hide-postbox-tog').unbind('click'); | |
| 69 | - $('.columns-prefs input[type="radio"]').unbind('click'); | |
| 70 | - $('.meta-box-sortables').sortable('destroy'); | |
| 71 | - | |
| 72 | - postboxes.add_postbox_toggles('feedwordpresssyndication'); | |
| 73 | - } ); | |
| 74 | - </script> | |
| 75 | -<?php | |
| 76 | -} | |
| 77 | - | |
| 78 | 61 | function fwp_dashboard_update_if_requested () { |
| 79 | 62 | global $wpdb; |
| 80 | 63 | |
| 81 | 64 | if (isset($_POST['update']) or isset($_POST['action']) or isset($_POST['update_uri'])) : |
| @@ -189,14 +172,20 @@ | ||
| 189 | 172 | fwp_dashboard_update_if_requested(); |
| 190 | 173 | endif; |
| 191 | 174 | |
| 192 | 175 | if (fwp_test_wp_version(FWP_SCHEMA_27)) : |
| 193 | - if (fwp_test_wp_version(FWP_SCHEMA_27, FWP_SCHEMA_28)) : | |
| 194 | - $hook_it = 'admin_footer'; | |
| 195 | - else : // WordPress 2.8+ | |
| 196 | - $hook_it = 'admin_footer-feedwordpress/syndication.php'; | |
| 197 | - endif; | |
| 198 | - add_action($hook_it, 'feedwordpress_syndication_toggles', /*priority=*/ 10000); | |
| 176 | +?> | |
| 177 | + <script type="text/javascript"> | |
| 178 | + jQuery(document).ready( function($) { | |
| 179 | + // In case someone got here first. | |
| 180 | + $('.postbox h3, .postbox .handlediv').unbind('click'); | |
| 181 | + $('.hide-postbox-tog').unbind('click'); | |
| 182 | + $('.meta-box-sortables').sortable('destroy'); | |
| 183 | + | |
| 184 | + postboxes.add_postbox_toggles('feedwordpress_syndication'); | |
| 185 | + } ); | |
| 186 | + </script> | |
| 187 | +<?php | |
| 199 | 188 | echo "<form style='display: none' method='get' action=''>\n<p>\n"; |
| 200 | 189 | wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); |
| 201 | 190 | wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); |
| 202 | 191 | echo "</p>\n</form>\n"; |
| @@ -201,28 +190,16 @@ | ||
| 201 | 190 | wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); |
| 202 | 191 | echo "</p>\n</form>\n"; |
| 203 | 192 | |
| 204 | 193 | if ($links) : |
| 205 | - add_meta_box( | |
| 206 | - /*id=*/ 'feedwordpress_update_box', | |
| 207 | - /*title=*/ __('Update feeds now'), | |
| 208 | - /*callback=*/ 'fwp_syndication_manage_page_update_box', | |
| 209 | - /*page=*/ 'feedwordpresssyndication', | |
| 210 | - /*context =*/ 'feedwordpresssyndication' | |
| 211 | - ); | |
| 194 | + add_meta_box('feedwordpress_update_box', __('Update feeds now'), 'fwp_syndication_manage_page_update_box', /*page=*/ 'feedwordpress_syndication', /*context =*/ 'normal'); | |
| 212 | 195 | endif; |
| 213 | - add_meta_box( | |
| 214 | - /*id=*/ 'feedwordpress_feeds_box', | |
| 215 | - /*title=*/ __('Syndicated sources'), | |
| 216 | - /*callback=*/ 'fwp_syndication_manage_page_links_box', | |
| 217 | - /*page=*/ 'feedwordpresssyndication', | |
| 218 | - /*context =*/ 'feedwordpresssyndication' | |
| 219 | - ); | |
| 196 | + add_meta_box('feedwordpress_feeds_box', __('Syndicated sources'), 'fwp_syndication_manage_page_links_box', /*page=*/ 'feedwordpress_syndication', /*context =*/ 'normal'); | |
| 220 | 197 | ?> |
| 221 | 198 | <div class="metabox-holder"> |
| 222 | - <div id="feedwordpresssyndication-sortables" class="meta-box-sortables ui-sortable"> | |
| 199 | + <div id="feedwordpress-sortables" class="meta-box-sortables ui-sortable"> | |
| 223 | 200 | <?php |
| 224 | - do_meta_boxes('feedwordpresssyndication', 'feedwordpresssyndication', NULL); | |
| 201 | + do_meta_boxes('feedwordpress_syndication', 'normal', NULL); | |
| 225 | 202 | else : |
| 226 | 203 | if ($links): // only display Update panel if there are some links to update.... |
| 227 | 204 | fwp_syndication_manage_page_update_box(); |
| 228 | 205 | endif; |