WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
48,417 Commits 50 Branches 749 Tags 982 MiB
Commit Graph

271 Commits

Author SHA1 Message Date
Scott Taylor 7f8b548df1 In HTML5, the `action` attribute is no longer required. Remove this attribute when empty. 
The admin HTML is served with the HTML5 doctype.

"The action and formaction content attributes, if specified, must have a value that is a valid non-empty URL potentially surrounded by spaces." 
http://www.w3.org/html/wg/drafts/html/master/forms.html#attr-fs-action

Props voldemortensen.
Fixes #30126.

Built from https://develop.svn.wordpress.org/trunk@31200


git-svn-id: http://core.svn.wordpress.org/trunk@31181 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-01-16 04:16:24 +00:00
John Blackbourn d88ed475b0 Switch to a `403` response code in places where it is more appropriate than a `500` due to permissions errors. 
Fixes #10551
Props nacin

Built from https://develop.svn.wordpress.org/trunk@30356


git-svn-id: http://core.svn.wordpress.org/trunk@30355 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-16 06:16:22 +00:00
Sergey Biryukov 16a55620c3 Twenty Fifteen: Update some more bundled theme references after [29895]. 
see #29799.
Built from https://develop.svn.wordpress.org/trunk@29900


git-svn-id: http://core.svn.wordpress.org/trunk@29655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-10-15 14:35:18 +00:00
Sergey Biryukov 504d4ad5eb Change the default orderby value in wp_get_nav_menus() to 'name'. 
props voldemortensen, igmoweb.
fixes #29460.
Built from https://develop.svn.wordpress.org/trunk@29792


git-svn-id: http://core.svn.wordpress.org/trunk@29564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-09-29 15:45:16 +00:00
Drew Jaynes 097dc8ee15 Fix syntax for single- and multi-line comments in wp-admin-directory files. 
See #28931.

Built from https://develop.svn.wordpress.org/trunk@29206


git-svn-id: http://core.svn.wordpress.org/trunk@28990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-17 09:14:16 +00:00
Mark Jaquith a43313fe12 Use '— Select —' instead of '-- Select --' for nav menus. Looks nicer. 
see #27878
Built from https://develop.svn.wordpress.org/trunk@28205


git-svn-id: http://core.svn.wordpress.org/trunk@28035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-25 00:35:25 +00:00
Andrew Nacin dce0b9adea Use SSL when linking to WordPress.org. see #27115. 
Built from https://develop.svn.wordpress.org/trunk@27469


git-svn-id: http://core.svn.wordpress.org/trunk@27314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-08 04:14:15 +00:00
Sergey Biryukov 3533e3575f Use esc_attr_e() instead of _e() for attribute values. 
props DJPaul.
fixes #27274.
Built from https://develop.svn.wordpress.org/trunk@27400


git-svn-id: http://core.svn.wordpress.org/trunk@27247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-04 21:10:15 +00:00
Andrew Ozz 87589dd445 Remove table cellspacing attribute from the admin, part-props MattyRob, fixes #22086. 
Built from https://develop.svn.wordpress.org/trunk@27036


git-svn-id: http://core.svn.wordpress.org/trunk@26912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-26 20:28:12 +00:00
Sergey Biryukov cac815c4e9 Avoid a PHP notice on Edit Menus screen when a menu is attached to a non-existing location. 
props nofearinc.
fixes #26287.
Built from https://develop.svn.wordpress.org/trunk@26634


git-svn-id: http://core.svn.wordpress.org/trunk@26524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-04 20:37:11 +00:00
Andrew Ozz 8d6059b383 Remove all screen_icon() calls and deprecate the functions, props TobiasBg, fixes #26119 
Built from https://develop.svn.wordpress.org/trunk@26518


git-svn-id: http://core.svn.wordpress.org/trunk@26411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-02 03:53:11 +00:00
Sergey Biryukov 72d4b140fb Make Twenty Fourteen the default theme. props markmcwilliams. fixes #25702. 
Built from https://develop.svn.wordpress.org/trunk@26024


git-svn-id: http://core.svn.wordpress.org/trunk@25955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-06 20:02:09 +00:00
Drew Jaynes f34eb77cbc Inline documentation for hooks in wp-admin/nav-menus.php. 
Props pauldewouters for the intial patch.
Fixes #25528.

Built from https://develop.svn.wordpress.org/trunk@25993


git-svn-id: http://core.svn.wordpress.org/trunk@25926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-10-30 15:45:08 +00:00
Andrew Nacin fd57b239d2 Don't rely on include_path to include files. 
Always use dirname() or, once available, ABSPATH.

props ketwaroo, hakre.
fixes #17092.

Built from https://develop.svn.wordpress.org/trunk@25616


git-svn-id: http://core.svn.wordpress.org/trunk@25533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-25 00:18:11 +00:00
Sergey Biryukov 145809b457 Consolidate similar menu locations strings. props DrewAPicture. fixes #24945. 
Built from https://develop.svn.wordpress.org/trunk@25218


git-svn-id: http://core.svn.wordpress.org/trunk@25189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-03 01:42:10 +00:00
Andrew Nacin 8e56222a1a Nav menus: Allow assigning a new menu to an existing location when no theme setting is currently saved. 
props ocean90.
see #25064, for trunk.

Built from https://develop.svn.wordpress.org/trunk@25195


git-svn-id: http://core.svn.wordpress.org/trunk@25167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-31 01:37:08 +00:00
Andrew Nacin cf9dad79f1 Adjust menus help text to reflect how a menu item is actually edited. props nullvariable, fixes #24935. 
git-svn-id: http://core.svn.wordpress.org/trunk@24981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 22:02:34 +00:00
Andrew Nacin a226d1ea5e Change nav menus help text to reflect the proper name of the "Custom Menu" widget. props SergeyBiryukov, fixes #24860. 
git-svn-id: http://core.svn.wordpress.org/trunk@24980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 22:01:53 +00:00
Andrew Nacin 1ecc494434 Change nav menus help text to reflect the proper name of the "Custom Menu" widget. props DrewAPicture, fixes #24860. 
git-svn-id: http://core.svn.wordpress.org/trunk@24979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-08-05 22:01:04 +00:00
Helen Hou-Sandí 0da48b8335 Tweaks to the accordion: 
* Enqueues JS in `do_accordion_sections()`.
* Top and bottom rounded corners for the nav menu accordion.
* Better RTL and no-JS.

props lessbloat, DrewAPicture, aaroncampbell, helen. fixes #23449.


git-svn-id: http://core.svn.wordpress.org/trunk@24680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-12 18:16:29 +00:00
Mark Jaquith 98ff20d1d4 Recombine a fragmented help paragraph so its integrity does not depend on translaters noticing a trailing space in the first sentence. 
props xibe. fixes #24546.

git-svn-id: http://core.svn.wordpress.org/trunk@24567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-05 18:39:27 +00:00
Sergey Biryukov 8eeb2fe48d Make the notice on Edit Menus screen more in line with the help text. props DrewAPicture. see #24115. 
git-svn-id: http://core.svn.wordpress.org/trunk@24218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-09 03:06:14 +00:00
Sergey Biryukov 8c8a8d6e0d Don't show "Manage Locations" tab if the theme has no menu locations defined. props DrewAPicture. fixes #24115. 
git-svn-id: http://core.svn.wordpress.org/trunk@24217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-09 02:43:26 +00:00
Sergey Biryukov 415a5c60da * Pass ellipsis as a parameter to wp_html_excerpt() instead of appending it manually. 
* Consolidate the logic to avoid appending ellipsis if the entire string is shown.
* Show ellipsis after truncated filenames and post titles.

props solarissmoke, bpetty, SergeyBiryukov. fixes #11446.

git-svn-id: http://core.svn.wordpress.org/trunk@24214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-09 00:22:02 +00:00
Sergey Biryukov 44ca305fbd Clarify the instructions on Edit Menus screen. props tw2113. fixes #23936. 
git-svn-id: http://core.svn.wordpress.org/trunk@24183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-07 12:55:39 +00:00
Sergey Biryukov d55dfbf477 Remove obsolete reference in menus help tab. props DrewAPicture. fixes #24262. 
git-svn-id: http://core.svn.wordpress.org/trunk@24181 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-07 09:21:04 +00:00
Sergey Biryukov e043f2ad8a Fix localization on Edit Menus screen. props kovshenin. fixes #24228. 
git-svn-id: http://core.svn.wordpress.org/trunk@24158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-02 12:38:25 +00:00
Andrew Nacin 10d898ecbb Remove _wp_delete_nav_menu(). wp_delete_nav_menu() should instead remove the menu from theme locations, which was the only difference between the functions. see #23119. 
git-svn-id: http://core.svn.wordpress.org/trunk@23897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-04-04 04:28:12 +00:00
Mark Jaquith adb61a1876 Nav Menus help tab updates. 
fixes #23608. props DrewAPicture, Ipstenu, JerrySarcastic.

git-svn-id: http://core.svn.wordpress.org/trunk@23844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-29 03:39:34 +00:00
Mark Jaquith 19810a259c Move nav menus to a tabbed interface, so that users with a lot of locations can do bulk assignment. 
props DrewAPicture, lessbloat. fixes #23770

git-svn-id: http://core.svn.wordpress.org/trunk@23810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-27 11:46:08 +00:00
Mark Jaquith 503210913d Use GET for nav menu selection, and default action. 
fixes #23813. props helen.

git-svn-id: http://core.svn.wordpress.org/trunk@23807 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-27 08:51:17 +00:00
Sergey Biryukov 9f26938da3 Use placeholders in menu strings instead of manual concatenation. fixes #14045. 
git-svn-id: http://core.svn.wordpress.org/trunk@23761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-20 05:49:29 +00:00
Sergey Biryukov f0a60fb9c9 Fix object name. props GaryJ. see #14045. 
git-svn-id: http://core.svn.wordpress.org/trunk@23760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-20 05:46:39 +00:00
Mark Jaquith 9bd740f616 Accessibility revamp for nav menus. 
props lessbloat. fixes #14045

git-svn-id: http://core.svn.wordpress.org/trunk@23727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-16 04:47:19 +00:00
Mark Jaquith 83bb916b81 Turn the Nav Menu meta boxes into an accordion. Less sprawling and overwhelming. 
* Registration stays the same — they're meta boxes
* Call `do_accordion_sections()` instead of `do_meta_boxes()` and they render as an accordion

props DrewAPicture, lessbloat, jkudish. fixes #23450. see #23449

git-svn-id: http://core.svn.wordpress.org/trunk@23707 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-15 13:16:38 +00:00
Mark Jaquith adecc9f798 Add back "Add New" next to h2 on Nav Menus screen. 
props DrewAPicture. see #23641

git-svn-id: http://core.svn.wordpress.org/trunk@23641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-07 17:04:32 +00:00
Mark Jaquith 68bc33d128 Tweak the Nav Menu UX, especially around menu creation. 
props lessbloat, DrewAPicture, jkudish. fixes #23641

git-svn-id: http://core.svn.wordpress.org/trunk@23622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-06 19:34:01 +00:00
Ryan Boren 43a7e695e9 Revert 23416, 23419, 23445 except for wp_reset_vars() changes. We are going a different direction with the slashing cleanup, so resetting to a clean slate. see #21767 
git-svn-id: http://core.svn.wordpress.org/trunk@23554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-01 16:28:40 +00:00
Sergey Biryukov 87f2c02462 Ensure that get_nav_menu_locations() always returns an array. props JustinSainton for initial patch. fixes #23508. 
git-svn-id: http://core.svn.wordpress.org/trunk@23550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-01 15:51:16 +00:00
Andrew Nacin afd9cbced9 Make Twenty Thirteen the default theme. 
Has the added benefit of ensuring the WordPress Beta Tester plugin allows updates of Twenty Thirteen.

props JustinSainton.
fixes #23573.



git-svn-id: http://core.svn.wordpress.org/trunk@23529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-28 19:01:07 +00:00
Sergey Biryukov 2baf2d5b56 Fix a warning on Menus screen if $menu_locations is false. 
Fix menu selection after creating a first menu on new install.

props jkudish.
fixes #23508. see #23119.

git-svn-id: http://core.svn.wordpress.org/trunk@23453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-19 01:31:42 +00:00
Mark Jaquith 52c46736df Improve the UX of the Nav Menus screen. Kill the tabs, and change to a 
dropdown, unless you have zero or one menus (which is the most common),
in which case you jump right into editing your sole menu.

Do assignment to location using checkboxes in the main menu editing
section instead of the backwards menu => location assignment in a
random meta box.

More to come, but this gets us started.

props lessbloat, DrewAPicture, jkudish. see #23119

git-svn-id: http://core.svn.wordpress.org/trunk@23441 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-16 04:53:59 +00:00
Ryan Boren cc5ed3a485 Change all core API to expect unslashed rather than slashed arguments. 
The exceptions to this are update_post_meta() and add_post_meta() which are often used by plugins in POST handlers and will continue accepting slashed data for now.

Introduce wp_upate_post_meta() and wp_add_post_meta() as unslashed alternatives to update_post_meta() and add_post_meta(). These functions could become methods in WP_Post so don't use them too heavily yet.

Remove all escape() calls from wp_xmlrpc_server. Now that core expects unslashed data this is no longer needed.

Remove addslashes(), addslashes_gpc(), add_magic_quotes() calls on data being prepared for handoff to core functions that until now expected slashed data. Adding slashes in no longer necessary.

Introduce wp_unslash() and use to it remove slashes from GPCS data before using it in core API. Almost every instance of stripslashes() in core should now be wp_unslash(). In the future (a release or three) when GPCS is no longer slashed, wp_unslash() will stop stripping slashes and simply return what is passed. At this point wp_unslash() calls can be removed from core.

Introduce wp_slash() for slashing GPCS data. This will also turn into a noop once GPCS is no longer slashed. wp_slash() should almost never be used. It is mainly of use in unit tests.

Plugins should use wp_unslash() on data being passed to core API.

Plugins should no longer slash data being passed to core. So when you get_post() and then wp_insert_post() the post data from get_post() no longer needs addslashes(). Most plugins were not bothering with this. They will magically start doing the right thing. Unfortunately, those few souls who did it properly will now have to avoid calling addslashes() for 3.6 and newer.

Use wp_kses_post() and wp_kses_data(), which expect unslashed data, instead of wp_filter_post_kses() and wp_filter_kses(), which expect slashed data. Filters are no longer passed slashed data.

Remove many no longer necessary calls to $wpdb->escape() and esc_sql().

In wp_get_referer() and wp_get_original_referer(), return unslashed data.

Remove old stripslashes() calls from WP_Widget::update() handlers. These haven't been necessary since WP_Widget.

Switch several queries over to prepare().

Expect something to break.

Props alexkingorg
see #21767


git-svn-id: http://core.svn.wordpress.org/trunk@23416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-14 22:51:06 +00:00
Andrew Nacin 9bba27f4e5 Fix various typos and omissions across a number of help tabs. props DrewAPicture, Ipstenu. see #22451. 
git-svn-id: http://core.svn.wordpress.org/trunk@22812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-22 08:45:15 +00:00
Andrew Nacin b2553f0cb9 Replace multiple wp_enqueue_script() calls in nav-menus.php with dependencies. props SergeyBiryukov. fixes #21777. 
git-svn-id: http://core.svn.wordpress.org/trunk@21696 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-03 15:35:22 +00:00
azaozz 6aaf0dad43 Add the jQuery UI Touch Punch plugin to handle dragging on mobile devices, props georgestephanis, see #20014 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20433 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-11 02:20:51 +00:00
ryan 616c35e71c One newline is enough. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-05 20:10:39 +00:00
ryan 340e93324c Remove extraneous spaces. Props kenan3008, dimadin. fixes #19501 #19433 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-12-14 17:36:38 +00:00
ryan 6bba5a265b Pinking shears 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-12-01 04:51:35 +00:00
nacin 65a10cedbb Help tweaks for themes, plugins screens. props jane, see #19020. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-12-01 01:24:39 +00:00
ryan efbbab1b3c Help tabs. Props chexee. see #19020 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-24 00:21:39 +00:00
nacin bfb98c193e s/add_help_sidebar/set_help_sidebar/g and introduce screen->remove_help_tab($id) and screen->remove_help_tabs(). see #19020, #18785. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-02 20:14:10 +00:00
ryan 3ad1f67958 Use add_help_sidebar(). see #19020 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-02 03:12:37 +00:00
nacin 795ca8d394 Revert [18861], [18862], [18864], [18874], [18879], and [18880]. see #18785. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-07 04:57:12 +00:00
dd32 5ad995f089 Fix admin_body_class filter for Menu's and Widgets pages, Include the filter in Iframe's. Props SergeyBiryukov & johnbillion. Fixes #18853 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-05 07:09:51 +00:00
azaozz bbafdfa0e5 Use add_option() method, introduce add_option_context() method for adding specific text above the screen options, see #18690 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-03 04:00:57 +00:00
azaozz 3575537e5f Add screen_options with contextual content, see #18690 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-02 06:59:36 +00:00
azaozz 1cdec6ff6e Merge most admin css files, first run, see #18314 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-21 03:46:43 +00:00
westi 1443193079 Help Tab text updatates. Fixes #17312 prop dougwrites. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-06-01 15:37:04 +00:00
ryan 8192d0dae8 Validation fixes. Props ocean90, peaceablewhale. see #17364 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18010 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-05-23 23:33:30 +00:00
nacin 9cb6e158fc Switch from Panel/SubPanel to Screen in inline documentation and Codex links. props michaelh, fixes #17265. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-04-28 15:24:49 +00:00
nacin 28f5f2357c Don't show two 'Create Menu' buttons on nav-menus.php. fixes #16715. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-03-23 18:47:45 +00:00
nacin 74ee0ad290 Fix one of my typos. props SergeyBiryukov, fixes #15346. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-18 06:18:44 +00:00
nacin 411b6fed54 Help fixes. props zeo, fixes #15346. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-17 03:32:46 +00:00
nacin 1cd758dc89 Help text edits. props dougwrites, fixes #15346. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-16 06:37:03 +00:00
markjaquith fc6e89da45 Expand submit_button() capabilities. Replace all (or almost all) manual HTML instances in WP. props sbressler. see #15064 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-28 21:56:43 +00:00
markjaquith 07c704aad2 Duplicate Save button for nav menus at the bottom. fixes #14265. props duck_ 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-07 04:40:53 +00:00
markjaquith 7944bd5d82 These are not verbs. http://notaverb.com/badbad_verbs 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-27 18:02:45 +00:00
nacin 5fd01d8cce Don't publish the first menu to the first menu location immediately on create. Bad UX. for 3.1. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-14 15:13:01 +00:00
nacin 68849c1bd5 Give nav-menus.php some better include paths. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-01 00:24:36 +00:00
nacin 2ff7c13096 Proper handling of menu nonsupport message. props deanjrobinson, fixes #14098 for trunk. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-26 07:12:15 +00:00
nacin 48bc4e220c Revert [15219], [15250], some of [15249] for 3.0, revisit in 3.0.1. see #13822. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-14 19:52:30 +00:00
wpmuguru 9eaf91db65 hide unpublished items on frontend nav menus, props filosofo, fixes #13822 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-11 15:34:32 +00:00
nacin 975b2cdb6d Horizontal scrolling/resizing fixes for nav menu UI. Also some RTL fixes. props koopersmith, see #13525 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-11 05:19:36 +00:00
nacin e13e6254dc Switch to current_theme_supports(menus) internally. Adding theme support for 'nav-menus' is deprecated in favor of register_nav_menu(s). fixes #13825. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-10 17:57:30 +00:00
nacin 2010aac02c Don't show an error when the theme supports widgets but not menus. see #13825. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15191 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-10 17:37:15 +00:00
nacin 5f4f0112a8 Server-side check for an empty menu name on save. props ocean90, fixes #13703. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-10 15:28:39 +00:00
nacin 34c1fa6d0b target=blank for help. props jorbin, see #13467 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-03 21:00:39 +00:00
ryan 17129fb62e Cut 'em out, move 'em on, trailing whitespace 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-02 20:04:07 +00:00
nacin c23dadb3a2 Clear nav menu from menu locations on delete. Additional sanity checks. fixes #13690. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-02 05:10:31 +00:00
ryan f31c1f21d6 Punctuation fix. Props dougwrites. see #13467 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-01 17:45:56 +00:00
markjaquith 7aa4551ec7 Do not load window.onbeforeonload event if we are not on an existing nav menu. props filosofo. Reduce opacity on nav menu postboxes if we are not on an existing nav menu, and for JS users, deactivate all links and form elements, to make it obvious that those UI elements are not usable at this stage. fixes #13615 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15062 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-29 19:39:40 +00:00
nacin 35d800986f Sanity check menu item parents and fix HTML issues. props filosofo, fixes #13600. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-28 23:04:00 +00:00
nacin 4b9021ce98 Menu touchups. see #13525. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15010 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 22:45:52 +00:00
nacin 15a1a43cd1 New pending menu item behavior. props filosofo, see #13579. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 22:22:09 +00:00
nacin a324b52cc5 Some minor IE6/7 tweaks for menus. props ocean90, see #13525. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 13:54:14 +00:00
nbachiyski bb00d56a67 Menu translatable strings cleanup. 
* Take out <strong> of the translatable part of For more information:
 * Include support forums and Codex links inside translations, because most translators would want to change them to their local documentation sites or Codex prefixes


git-svn-id: http://svn.automattic.com/wordpress/trunk@14989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 11:52:15 +00:00
nacin c029f47d0e Clean up the menu name/actions section. see #13525. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 04:19:23 +00:00
nacin da7b990fb5 Move the "Add Home Link" functionality to a checkbox on the View All tab of the Pages metabox. Also makes it work non-JS. props filosofo, fixes #13213. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 02:24:33 +00:00
ryan 013d15ebd4 Help for Appearance screens. Props duck_, jane. see #13467 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-26 18:27:13 +00:00
nacin c0289daf99 Don't store nonexistent (deleted) menus in the auto-add option. see #13447. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14934 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-26 05:11:46 +00:00
ryan 1a552dd029 Strip trailing whitespace 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-26 02:42:15 +00:00
ryan 82f7d72f89 s/navigation menu/custom menu/ see #13519 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 15:42:57 +00:00
nacin 913dd27ef5 Allow pages to be added automattically to menus. see #13447. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 13:49:56 +00:00
nacin 7a5d3f2688 First pass on better UX for menu item save. props koopersmith, see #13525. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-24 19:50:20 +00:00
nacin 4e4337f65a Don't override menu locations on a non-js save. see #13378. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-24 11:15:31 +00:00
nacin f15cdc78cf Menu tweaks. Save menu locations when saving the menu. Also, centralize theme support checks and add them to menu.php. Improve some branching. Remove some old JS vars, add a missing semicolon, etc. props koopersmith. see #13378. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-24 09:23:56 +00:00
ryan 2d3d649182 Menu styling fixes for IE. Props filosofo, ocean90. fixes #13388 #13348 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-20 19:33:57 +00:00
ryan f0b4112f0c Make the next available tab active after deleting a tab. Props koopersmith. fixes #13338 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14758 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-20 16:57:48 +00:00
ryan f1f5f4f8f7 Order menu tabs by name. Allow passing args to wp_get_nav_menus() which are passed on to get_terms(). Default orderby for wo_get_nav_menus() to none since most requests won't care about order. fixes #13334 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-19 18:52:37 +00:00
nacin b4c50f1b5e Rename wp_save_nav_menu_item to wp_save_nav_menu_items. Though it could handle one item, it expects a mess of post data containing an array of menu items. see #13447. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-19 05:59:43 +00:00
ryan f3992a551d Don't allow clicking the[+] tab when it is active. Props koopersmith. fixes #13333 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-17 16:43:41 +00:00
nacin 6c01265794 First pass at fixing search for add menu item boxes. props koopersmith, see #13283. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14686 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-16 05:39:53 +00:00
nacin fa29e51128 i18n a string. props zeo, fixes #12896 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-16 03:49:50 +00:00
nacin c5801cf36d Don't link active menu tabs. props koopersmith, fixes #13333. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14667 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-15 19:18:35 +00:00
nacin f00bc39c20 If theme has registered menus, set the first menu created to the first registered location by default. see #13378. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-14 06:44:54 +00:00
nacin c3d2c8ff79 Remove trailing space from a localized string. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-14 06:38:01 +00:00
nacin a743de0788 First pass on 'Theme Locations' for navigation menus. Themes need to specify a location when calling wp_nav_menu and register locations in functions.php. Users then map menus to locations in the nav menu admin. Subject to review. see #13378. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14620 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-14 06:20:30 +00:00
nacin 3f796315da Only save menu item positions on save. Had implications for draft items otherwise. see #13337, props koopersmith. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-14 01:32:48 +00:00
ryan ed425661e9 Remove 'slots' from menu tabs. Going a different direction. see #14611 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-13 22:57:42 +00:00
wpmuguru 21bef33fc6 add menu slots/theme_menus, props ryan, see #13378 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-13 22:14:54 +00:00
ryan e4ca88c1e8 Go to first tab instead of + after deleting a menu. see #13338 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-13 17:22:02 +00:00
nacin 7389ea41ea Use the edit_theme_options capability. fixes #13290. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-12 19:19:57 +00:00
nbachiyski 46afe7c285 I18n for custom post type labels. Props demetris, dimadin. Fixes #12968 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-11 19:52:50 +00:00
ryan 4138294f52 Defer term counting until all nav menu items are updated. see #12734 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-11 16:41:23 +00:00
nacin 00ff1537d6 PHP4 compat in nav menu name truncation. props blepoxp, fixes #13295. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-07 20:49:45 +00:00
nacin 1e13b43af0 Ensure valid HTML in the nav menu UI. props ocean90, see #13220. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14482 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-06 19:19:53 +00:00
nacin eded683486 Non-JS menu ordering fixes, also parent handling fixes. props filosofo, fixes #13135, fixes #13249 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-04 19:40:04 +00:00
nacin 86b856ee1b Truncate really long menu names. props koopersmith, see #13220. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-03 20:40:32 +00:00
ryan 7b7243d94a Strip trailing whites. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-03 20:26:11 +00:00
nacin 08f650de1a First pass on sliding tabs for the nav menu admin UI. props koopersmith, see #13215. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-03 10:28:35 +00:00
nacin 421cade8cb Tweaks for nav menu admin tabs with JS disabled. props koopersmith, see #13215 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-02 23:51:43 +00:00
nacin 16f6590bc3 Alot of drag/drop/sortable improvements to nav menu admin UI. props koopersmith, fixes #12675. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-02 19:09:10 +00:00
nacin 54763a0e76 Clarify menu creation versus save. props duck_, see #13134. Check in scripts for r14332, see #13204. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-02 18:15:41 +00:00
ryan 8420f41a24 Fix initial hidden meta boxes for nav menus. see #13134 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-29 18:27:46 +00:00
nacin d1a37c1f31 When posts/terms are deleted/trashed, update associated menu items. Deleted post = deleted menu item, trashed post = menu item becomes a draft. props filosofo, see #13174 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14295 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-29 07:33:56 +00:00
nacin 91e39b0336 Small fixes to the initial nav menu message. props koopersmith, see #13134. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-29 05:12:12 +00:00
nacin cd9ab80421 Nav menu UI updates. props koopersmith, see #13134. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-29 03:43:39 +00:00
nacin 90ea03383f Fix handling of nav menu search, also menu naming conflicts. props filosofo, fixes #13138 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14285 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-28 20:44:08 +00:00
nacin e34d128fad Remove space between screen meta and screen icon on nav menu admin. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-28 13:37:15 +00:00
nacin 4374cee7cd Show correct nav menu title on first pageload after change. props filosofo, fixes #13142. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-28 02:24:39 +00:00
nacin f01d1883e4 Verify nav menu items. props filosofo, fixes #13154. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-28 02:04:30 +00:00
ryan 2afc14810f Explanatory text for the plus tab. see #13134 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-27 17:40:48 +00:00
ryan 75569d56f7 Menu styling updates. Props koopersmith. see #13134 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-27 16:04:18 +00:00
ryan e879a9ab0e New menu UI. Props filosofo. see #12713 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-27 01:05:58 +00:00
nacin 6ec7cb4540 Use relative paths when including files, avoiding include_path. fixes #12594, props sorich87. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-18 06:14:45 +00:00
ryan 96bc63439a Nav menu fixes. Props ptahdunbar. see #12896 fixes #12844 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-07 15:25:48 +00:00
nacin 589997d8cb Don't use target="_self" in nav menu links, just omit the attribute. Also fix and run earlier db upgrades. fixes #12808 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-03 22:52:30 +00:00
nacin 90db286b69 Add beta testers note to nav menus admin panel. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-02 22:46:48 +00:00
nacin 40773a776b Remove trailing whites and double semicolons. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-26 19:36:49 +00:00
ryan c2a6f28bf5 Enable nav menu admin if theme supports widgets. Show notice if theme supports widgets but not nav-menus. see #11817 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-24 18:35:31 +00:00
nacin ba6f1cba07 Various bug fixes and improvements to menu management. props ptahdunbar, see #11817. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-22 19:56:16 +00:00
nacin 0ac55fc053 Coding standards: When vertically aligning for readability, use spaces (not tabs). see #11817 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-18 17:07:05 +00:00
markjaquith 6786e3ddb3 Nav Menus: blur/Focus behavior for Create Menu and Add Custom Links. Route "return" presses in each of those areas to proper button press. Better create/save logic on the PHP side. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13739 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-17 19:57:08 +00:00
ryan e25a65b36a Trim trailing whitespace 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-17 16:27:25 +00:00
markjaquith d5296edfad Separate update/create menu logic so new menus have name created properly. see #11817 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-17 16:19:58 +00:00
markjaquith 7cf7df44d1 No need for three separate JS files if they are only ever enqueued together. see #11817 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13730 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-17 16:13:16 +00:00
markjaquith 7f826c2420 "setup" is not a verb. http://notaverb.com/setup 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13723 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-16 22:56:38 +00:00
ryan b98f319bcf Default target to _self. Add some sanitization and gettext. see #11817 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13719 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-16 19:20:10 +00:00
ryan f635d99754 Menus rework. Props ptahdunbar. see #11817 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-15 16:26:46 +00:00