Commit Graph

73 Commits

Author SHA1 Message Date
Konstantin Obenland 7dc1d06e64 Proper heading for admin screens.
First step towards restoring a good heading structure in wp-admin.
The previous `<h1>` contained the site title and a link to the front page and was removed with the toolbar refactoring in 3.2.

Props joedolson, afercia.
Fixes #31650.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-27 15:41:25 +00:00
Dominik Schilling 64fc7294b6 Use HTTPS URLs for codex.wordpress.org.
see #27115.
Built from https://develop.svn.wordpress.org/trunk@32116


git-svn-id: http://core.svn.wordpress.org/trunk@32095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-12 21:29:32 +00:00
Scott Taylor a4963672d6 Add a single responsibility function for outputting Revisions JS templates: `wp_print_revision_templates()`.
Use it in `wp-admin/revision.php`.

Props ericlewis.
Fixes #30220.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-01 00:15:24 +00:00
Scott Taylor 2f513d3320 Fix some `hackificator` odds and ends in `wp-admin`:
* `wp-activate.php` and `wp-admin/themes.php` don't need the closing PHP tag
* Switch single quotes for HTML attribute values to double in a few places
* Convert `include_once file.php` syntax to `include_once( 'file.php' )`
* Add access modifiers to methods/members in: `_WP_List_Table_Compat`, `Walker_Nav_Menu_Edit`, `Walker_Nav_Menu_Checklist`, `WP_Screen`, `Walker_Category_Checklist`
* `edit_user()` doesn't need to import the `$wpdb` global
* `wp_list_widgets()` doesn't need to import the `$sidebars_widgets` global
* switch/endswitch syntax is not supported in Hack
* A `<ul>` in `wp-admin/users.php` is unclosed

See #27881.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-19 05:04:16 +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
Andrew Nacin abe142d2c6 Revisions: Add 'Return to post editor' link.
props adamsilverstein, jenmylo.
fixes #24682.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27231 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 19:50:15 +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
Andrew Nacin 70fd806759 Revert r25824:25875 from the core.svn.wordpress.org repository.
These commits were accidentally re-synced commits from develop.svn.wordpress.org due to a race condition. Thankfully, the history of this repository matters fairly little. It also happened only for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@25876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-25 02:29:52 +00:00
Andrew Nacin 8ae8e01b67 Remove the old wp_auto_updates_maybe_update cron event. Schedule the new wp_maybe_auto_update event at 7 a.m. and 7 p.m. in the site's timezone.
see #27704.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:53:14 +00:00
Ryan Boren b87d4b77e5 Pinking shears
Built from https://develop.svn.wordpress.org/trunk@25880


git-svn-id: http://core.svn.wordpress.org/trunk@25792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-23 14:38:10 +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 b01adf9615 Inline documentation fixes and additions for wp-admin/revision.php and wp-admin/includes/revision.php.
props adamsilverstein.
see #25283.
Built from https://develop.svn.wordpress.org/trunk@25419


git-svn-id: http://core.svn.wordpress.org/trunk@25344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-12 22:59:08 +00:00
Andrew Nacin c7a35ddee1 Update help text for [24860]. props ocean90. see #24804. for trunk.
git-svn-id: http://core.svn.wordpress.org/trunk@24922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-31 15:27:02 +00:00
Andrew Nacin c8450ceff1 Change 'Change two revisions' to 'Compare any two revisions' for clarity. props siobhan. see #24804.
git-svn-id: http://core.svn.wordpress.org/trunk@24859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-29 06:56:49 +00:00
Aaron Campbell c168ef72cc Disable ability to restore a revision if another user has the post lock
props adamsilverstein. Fixes #24829 for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@24827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-28 21:51:44 +00:00
Mark Jaquith 174bbc20d8 Revisions: Combine our tooltip and from/to templates into one generic template
We had three copies of essentially the same template. Now just one, with minor logic inside.

Also fixes a bug where tooltip.revision was being initially set to a diff instead of a revision.

For trunk. See #24804.

git-svn-id: http://core.svn.wordpress.org/trunk@24814 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-28 20:15:28 +00:00
Andrew Nacin c8fe64a602 Revisions changes.
* Eliminates the bloated Revisions meta box in favor of 'Revisions: #' in the publish box.
 * Adds ability to compare autosave to current post, when revisions are disabled.
 * Makes autosaves stand out visually, including "Restore This Autosave".

Also:
 * Adds missing capability check for restoring a revision.
 * When no revision matches the post's current modified time, avoid marking an autosave as 'current'.
 * Fixes wp_get_post_autosave() to return an autosave even when revisions are disabled.
 * Add 'check_enabled' arg to wp_get_post_revisions(); false avoids the wp_revisions_enabled() check.
 * Adds a responsive slider that is narrower for fewer versions. props markjaquith.

see #24804.



git-svn-id: http://core.svn.wordpress.org/trunk@24790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-24 06:08:14 +00:00
Andrew Nacin 9f58cc923c Fix strings in revisions UI. see #24804, [24761].
git-svn-id: http://core.svn.wordpress.org/trunk@24763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-22 05:32:14 +00:00
Mark Jaquith 13c63d211a Revisions: Pinned controls, layout tweaks, copy tweaks, misc.
* When you scroll down the diff view, the controls will pin to the top.
* The revisions meta view was cleaned up. Copy changes.
* Loading indicator in the center of the screen (so it follows as you scroll).
* Tooltips "flip" when you cross the center line, so that they don't hit the container edge and wrap for later revisions.
* The "Restore" button's inactive state is handled on render, instead of after.
* Make sure we always have a current revision, even if the timestamp doesn't work out on the most recent one.

See #24804. Props markjaquith, nacin, ocean90, aaroncampbell.

git-svn-id: http://core.svn.wordpress.org/trunk@24761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-22 05:05:45 +00:00
Mark Jaquith 65b08eeece Revisions: Re-work how tick marks and tooltips are aligned. IE fixes.
* Pixel-based alignment of tooltips.
* Bottom-based alignment, so arrow lines up using CSS only.
* Better RTL styles (mostly mirror-imaged).
* Better RTL calculations in `revisions.js` (less logic).
* Better IE support.

See #24736. Props markjaquith, adamsilverstein, ocean90.

git-svn-id: http://core.svn.wordpress.org/trunk@24751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-19 13:49:15 +00:00
Mark Jaquith 93514ba101 Revisions: Better error handling.
* Shows an error message if the current diff can't be loaded.
* For bulk pre-loading, catches errors, and cuts subsequent requests in half, until eventually giving up.
* Some CSS fixes related to this, and the loading spinner.
* `wp.revisions.loadAll()` now returns a promise representing whether or not all revisions could be loaded.

Fixes #24758.

git-svn-id: http://core.svn.wordpress.org/trunk@24732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-18 16:35:19 +00:00
Mark Jaquith 32522054c8 Revisions: use escaped templating for some of the tags.
Fixes #24775.

git-svn-id: http://core.svn.wordpress.org/trunk@24729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-18 14:01:58 +00:00
Mark Jaquith e8b9088c5f Revisions: Cleanup, bug fixes, refactoring, polish.
* Hide the tooltip initially.
* Fix a bug with routing.
* Further separate the Slider model and view, refactoring its code.
* More reliance on events than direct calls between areas.
* Smarter background diff loading (single mode). Loads the diffs closest to your position first.
* Removed a bunch of manual templating and `render()` methods. Now relies more on the WP Backbone Views functionality.
* include the requested `id` in `ensure:load`.
* new trigger: `ensure`, for `ensure()` attempts, regardless of whether they are already loaded.
* pass along a promise in both `ensure` and `ensure:load`.
* in `ensure`, remove requests for diffs we aready have

See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-12 14:01:39 +00:00
Mark Jaquith 13a7d2a743 Revisions: Loading indicator, cleanup, bug fixes.
* Loading indicator when the user is waiting for a trip to the server.
* Bug fixes for diff priming.
* Fix the date display.
* Forget about local comparator, instead order by `modified` on the server.
* Initialize the frame model before the view (this was the source of a LOT of heartache).

git-svn-id: http://core.svn.wordpress.org/trunk@24667 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-12 05:11:56 +00:00
Mark Jaquith c44ce3b6e6 Revisions: real URLs and preloading of the requested diff.
* Real URLs are being used now, using pushState. `?revision={id}` or `?from={from}&to={to}`.
* Drop the redundant `action=edit` from the URLs (this is the default).
* The initial comparison is preloaded, whether a single revision or a compare-two situation.

See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-11 22:56:48 +00:00
Andrew Nacin bcd2644d92 Proper translation of '<time> ago' in revisions. props johnbillion, fixes #24721.
git-svn-id: http://core.svn.wordpress.org/trunk@24643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-10 16:15:18 +00:00
Mark Jaquith 8035bd88ad Revisions: Get rid of an unneccessary ID. IDs are a bad idea.
See #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-10 04:37:50 +00:00
Daryl Koopersmith 79ea6dcb98 Revisions: Remove unused template. See #24425.
git-svn-id: http://core.svn.wordpress.org/trunk@24604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-09 07:34:54 +00:00
Mark Jaquith 561db4a6da Tick marks are back for revisions
* Simple tick marks
* Tooltips snap to tick marks
* Tooltips arrow reverses side for LTR/RTL
* Fix for routing issue where just the hash is changed in the URL bar relating to compare two mode

see #24425. props adamsilverstein, ocean90.

git-svn-id: http://core.svn.wordpress.org/trunk@24595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-08 21:37:03 +00:00
Dominik Schilling 4fc5e70228 Revisions improvements
* Corrected routing behavior
* Simplified CSS for tooltips
* Compare two mode for RTL
* Support for posts without titles 

props adamsilverstein, ocean90. see #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-06 10:48:14 +00:00
Dominik Schilling b95c432870 Revisions: CSS cleanup, see #24425.
git-svn-id: http://core.svn.wordpress.org/trunk@24574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-05 22:15:37 +00:00
Dominik Schilling f6ca108240 Revisions UI update:
* Restore Compare two mode
* Restore tooltips
* RTL support
* First pass for URL routing and history

props adamsilverstein, see #24425.

git-svn-id: http://core.svn.wordpress.org/trunk@24549 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-03 20:27:19 +00:00
Mark Jaquith 77abb9ff01 Cleanup of the revisions screen, both on the PHP API side, and the JS.
* Much simpler PHP API
* Cleaner and more Backbone-y JS API
* Consequently, does batch queries; this now scales up to hundreds of revisions

Currently missing, but much easier considering the cleaned up base:

* Compare two mode
* RTL

props koopersmith, nacin, adamsilverstein, ocean90. see #24425

git-svn-id: http://core.svn.wordpress.org/trunk@24520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-06-26 21:06:50 +00:00
Andrew Nacin 4263262f40 Use wp_revisions_enabled(). props ethitter. fixes #24525.
git-svn-id: http://core.svn.wordpress.org/trunk@24425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-06-07 02:06:22 +00:00
Dominik Schilling 62b1b71b02 Revisions UI: Redesigned slider handlers.
Also:
* Fix diff header styling in grey admin theme
* Prevent an overlap of the compare two checkbox on smaller screens

props melchoyce, DrewAPicture, adamsilverstein. fixes #24276.

git-svn-id: http://core.svn.wordpress.org/trunk@24219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-09 10:07:26 +00:00
Dominik Schilling 2f1777986c Revisions UI: Just another update - Now with improved tick marks and tooltips.
props adamsilverstein. see #23935.

git-svn-id: http://core.svn.wordpress.org/trunk@24174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-03 23:17:06 +00:00
Dominik Schilling baab49b174 Revisions UI: Add a help tab. props siobhan, DrewAPicture. see #23899.
git-svn-id: http://core.svn.wordpress.org/trunk@24173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-03 23:00:14 +00:00
Dominik Schilling be44073d5f Fix typo in [24157]. props johnjamesjacoby. fixes #24253.
git-svn-id: http://core.svn.wordpress.org/trunk@24166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-03 07:05:19 +00:00
Dominik Schilling ea1cecebee Revisions UI: Add translation contexts and remove unneeded lines.
props nao. fixes #23917.

git-svn-id: http://core.svn.wordpress.org/trunk@24157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-02 10:12:19 +00:00
Dominik Schilling 45ccae1092 Revisions UI update:
* Style status loading as a regular update message like on the other screens
 * Move compare two checkbox to diff header to avoid an overlap on long post titles
 * Restore color shades for the scope of changes visualisation 
 * Show tooltips while moving the slider handle
 * Diff header styling
 * Move color declarations to classic/fresh stylesheets
 * Sync admin color stylesheets

props jrbeilke for initial patch. see #23935.

git-svn-id: http://core.svn.wordpress.org/trunk@24119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-28 10:56:57 +00:00
Dominik Schilling 45a9b723ee Revisions: Clean up JavaScript variable names, see #23901.
git-svn-id: http://core.svn.wordpress.org/trunk@24019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-17 19:34:21 +00:00
Dominik Schilling 731f040664 Revisions UI: Remove the "To:" prefix from the header when viewing a single revision. Also prefix a revision field with a label.
props SergeyBiryukov, adamsilverstein, faishal. fixes #23903.

git-svn-id: http://core.svn.wordpress.org/trunk@23994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-15 18:40:17 +00:00
Sergey Biryukov beffadaefc Fix closing tag in revisions UI. props adamsilverstein. fixes #23999.
git-svn-id: http://core.svn.wordpress.org/trunk@23934 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-08 23:38:48 +00:00
Sergey Biryukov 9e78cd0042 Fix typo in revisions JS/CSS. props mgibbs189, JustinSainton. fixes #23941.
git-svn-id: http://core.svn.wordpress.org/trunk@23908 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-04 20:49:26 +00:00
Mark Jaquith 979b1c14c3 Revisions CSS cleanup.
props ocean90. fixes #23933

git-svn-id: http://core.svn.wordpress.org/trunk@23901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-04 15:49:28 +00:00
Mark Jaquith 2a38966a97 Further cleanup of revisions code. Probably not the last.
see #23901. props adamsilverstein, azaozz, ocean90.

git-svn-id: http://core.svn.wordpress.org/trunk@23898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-04 07:53:49 +00:00
Mark Jaquith 3ad740c9c8 Kill the HR on revisions page. see #23497
git-svn-id: http://core.svn.wordpress.org/trunk@23834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-28 03:17:03 +00:00
Mark Jaquith acfeb6f20f Take revision control out of the realm of a pure constant. Make it filterable.
* New filter: wp_revisions_to_keep

props ethitter, SergeyBiryukov. fixes #22289.

git-svn-id: http://core.svn.wordpress.org/trunk@23818 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-27 18:11:56 +00:00
Peter Westwood 9d6988a221 Revisions: UI Update.
* Refines the UI to make it clearer and easier to use
* Introduces weighted tickmarks
* Fixes comparison bugs.

See #23497 props adamsilverstein


git-svn-id: http://core.svn.wordpress.org/trunk@23769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-21 15:54:11 +00:00
Peter Westwood 51db623107 Revisions: Updates to the new Revisions UI.
Various Updates including:
 * i18n fixes
 * Added tracking of what revision ID was restored
 * async fetching of diffs so that slider works sooner even with many revisions

See #23497 props adamsilverstein, ethitter


git-svn-id: http://core.svn.wordpress.org/trunk@23639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-07 15:32:26 +00:00