Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-13 06:07:23 +01:00
Code Issues Projects Releases Wiki Activity
28,549 Commits 50 Branches 748 Tags 792 MiB
da4a8f56f5
Commit Graph

112 Commits

Author SHA1 Message Date
Andrew Ozz
a8a20f4bb7 Set minimum z-index for the TinyMCE modals and adjust the z-index in DFW, see #26952 
Built from https://develop.svn.wordpress.org/trunk@27460


git-svn-id: http://core.svn.wordpress.org/trunk@27305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-08 00:41:16 +00:00
Andrew Nacin
c4545fbbf4 Remove unnecessary quotes from urls in CSS. 
props TobiasBg.
fixes #22476.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-26 17:23:13 +00:00
Andrew Ozz
9c77339681 TinyMCE: revert style for the blocks drop-down in the toolbar, limit the styles imported for the same drop-down, make the menu highlight color grey. Part props avryl, see #26952 
Built from https://develop.svn.wordpress.org/trunk@27193


git-svn-id: http://core.svn.wordpress.org/trunk@27052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-19 03:51:15 +00:00
Andrew Ozz
d7db798635 TinyMCE: style the modals to match WordPress admin (first-run). Fix couple of IE problems in tiny_mce_popup.js. Props avryl, see #26952, see #24067 
Built from https://develop.svn.wordpress.org/trunk@27190


git-svn-id: http://core.svn.wordpress.org/trunk@27049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-18 06:32:14 +00:00
Andrew Ozz
1bce8d5b7e TinyMCE: wrap the toolbars buttons on narrow screens, props mikemanger, fixes #26882 
Built from https://develop.svn.wordpress.org/trunk@27182


git-svn-id: http://core.svn.wordpress.org/trunk@27043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-17 02:13:13 +00:00
Andrew Nacin
11c3695c77 Dev/build tools: Use grunt-autoprefixer for CSS vendor prefixes. 
We'll be using it for two distinct tasks:
 * Core CSS files will keep prefixes. `grunt autoprefixer:core` will update files directly in src/ as a pre-commit step, rather than doing it on build.
 * Color CSS files will receive prefixes when they are built.

This commit:
 * Adds prefixes we were missing to core CSS.
 * Removes prefixes that we no longer need from core CSS.
 * Removes all prefixes from colors CSS.

props ocean90.
fixes #27078.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-13 08:30:17 +00:00
Andrew Ozz
20fe8f026e TinyMCE: fix styling in the Charmap modal so the click targets are as large as the table cells. Remove the "Close" button and close the modal after inserting the special char. Fixes #27107. 
Built from https://develop.svn.wordpress.org/trunk@27165


git-svn-id: http://core.svn.wordpress.org/trunk@27031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-11 23:33:14 +00:00
Helen Hou-Sandí
0100dd772a Merge colors.css into wp-admin.css. Non-default color schemes became overloads rather than swaps in the 3.8 redesign. Benefits include: 
* No more border-width, border-style, border-color insanity.
* Point releases are much less likely to require extra finagling to avoid rebuilding the color schemes.
* Yours truly has a better overall vision of ~14,000 lines of admin CSS and where we go from here.

1,065 net lines of red, y'all.
props helen, jorbin. fixes #18380.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-06 06:25:18 +00:00
Andrew Ozz
7e7723f1de Editor: add :focus style for the Quicktags buttons, fixes #26932 
Built from https://develop.svn.wordpress.org/trunk@27078


git-svn-id: http://core.svn.wordpress.org/trunk@26951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-02 22:38:12 +00:00
Andrew Ozz
ede5c4d01c TinyMCE: add outline when a button is focused. Fixes #26931, see #24067. 
Built from https://develop.svn.wordpress.org/trunk@27058


git-svn-id: http://core.svn.wordpress.org/trunk@26931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-29 18:14:13 +00:00
Andrew Ozz
544116e76a TinyMCE: add dashicon for the "wp_page" button, see #24067. 
Built from https://develop.svn.wordpress.org/trunk@27044


git-svn-id: http://core.svn.wordpress.org/trunk@26918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-27 15:06:32 +00:00
Andrew Ozz
87c75ab93a DFW: fix buttons and the title width, make the fade out/in when opening and closing a bit faster. See #24067. 
Built from https://develop.svn.wordpress.org/trunk@26896


git-svn-id: http://core.svn.wordpress.org/trunk@26779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-02 04:18:10 +00:00
Andrew Ozz
a16cc19790 TinyMCE: 
- Fix toolbar icons in IE9.
- Remove background gradients in IE < 10.
- Lint our plugins.
- Add draggable attribute to the caption wrapper and make the captioned images non-draggable in Chrome.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26880


git-svn-id: http://core.svn.wordpress.org/trunk@26763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-30 01:54:11 +00:00
Andrew Ozz
855889f7aa TinyMCE 4.0.12, first run. 
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876


git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-28 23:53:15 +00:00
Andrew Ozz
448a401f77 Make older mobile browsers and IE7 usable: 
- Text labels in the toolbar.
- Image icons in the visual editor.
- Some IE7 structural css fixes.
Fixes #26369.
Built from https://develop.svn.wordpress.org/trunk@26819


git-svn-id: http://core.svn.wordpress.org/trunk@26706 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-09 02:41:10 +00:00
Andrew Nacin
1154c059ef RTL font-family overrides. (Tahoma generally, and Arial for Hebrew.) 
props yoavf.
fixes #24977.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26703 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-09 01:31:11 +00:00
Andrew Nacin
9b45d73073 Add icon to the help button in distraction-free writing. 
props ocean90.
fixes #26450.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-06 14:11:10 +00:00
Helen Hou-Sandí
dbe43017b5 Remove more references to MP6 and standardize on .wp-ui-* for prefixed generic class names. props nacin, kovshenin, fixes #26263. 
Built from https://develop.svn.wordpress.org/trunk@26635


git-svn-id: http://core.svn.wordpress.org/trunk@26525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-04 21:16:11 +00:00
Matt Thomas
8d6aa0ab25 Updating .wp-dialog styling to match the new admin design. Fixes #26328, props SergeyBiryukov, Ocean90. 
Built from https://develop.svn.wordpress.org/trunk@26528


git-svn-id: http://core.svn.wordpress.org/trunk@26421 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-02 17:59:10 +00:00
Andrew Ozz
89d464d9e5 TinyMCE: fix editor.css. 
- Re-enable the default images for buttons not used in WordPress.
- Remove redundant styles for the old buttons sprite.
Fixes #26294.
Built from https://develop.svn.wordpress.org/trunk@26446


git-svn-id: http://core.svn.wordpress.org/trunk@26344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-28 00:53:09 +00:00
Matt Thomas
6a61711d24 Better alignment of Visual and Text tabs with editor, better alignment of word count container with editor, eliminate gap between tabs and editor on Press This. Fixes #26238, props mattheu. 
Built from https://develop.svn.wordpress.org/trunk@26411


git-svn-id: http://core.svn.wordpress.org/trunk@26311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-26 17:48:09 +00:00
Andrew Ozz
146abf4cde TinyMCE: use CSS classes instead of instance specific IDs for styling, props mattheu, fixes #26197. 
Built from https://develop.svn.wordpress.org/trunk@26364


git-svn-id: http://core.svn.wordpress.org/trunk@26265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-24 21:47:10 +00:00
Andrew Ozz
7efd903498 Fix the editor switching tabs position on small screens, props ryelle, fixes #26151. 
Built from https://develop.svn.wordpress.org/trunk@26315


git-svn-id: http://core.svn.wordpress.org/trunk@26219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-22 02:23:09 +00:00
Andrew Ozz
7276f56681 MP6: remove left-over plugin reference, see #25858 
Built from https://develop.svn.wordpress.org/trunk@26290


git-svn-id: http://core.svn.wordpress.org/trunk@26195 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-20 19:24:10 +00:00
Andrew Nacin
fb69ea9028 Stop using .rtl classes, instead relying on flipping LTR CSS to RTL. 
props yoavf.
fixes #24977.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-17 16:18:11 +00:00
Helen Hou-Sandí
69d432410a Say hello to a fresh new look for the WordPress admin. 
Still to come: more color schemes, a responsive component, and more.

see #25858.
props iammattthomas, tillkruess, EmpireOfLight, melchoyce, ryelle, joen, mitchoyoshitaka, sirbrillig, andypeatling, isaackeyet, Otto42, dd32, matt, helen.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-10 00:27:10 +00:00
Andrew Ozz
debbfea3bf Upgrade TinyMCE to 3.5.9. Fix the css for the original 'fullscreen' plugin (not enabled by default). 
Fixes #25561, fixes #25281.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-10-10 21:50:09 +00:00
Andrew Ozz
2c93798e2b TinyMCE: normalize font size for H1 - H6 submenu, fixes #24586. 
git-svn-id: http://core.svn.wordpress.org/trunk@24545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-03 02:03:19 +00:00
Andrew Ozz
2fb4cd0d9d TinyMCE: reset line-height for the formats drop-down menu. Fixes a bug where the H1-H6 menu items are overlapping. 
git-svn-id: http://core.svn.wordpress.org/trunk@24311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-22 01:41:36 +00:00
Helen Hou-Sandí
cfe61426bc Remove input field focus styles in DFW to enhance the distraction-free-ness. props ocean90. fixes #23648. 
git-svn-id: http://core.svn.wordpress.org/trunk@23540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-28 22:22:48 +00:00
Andrew Nacin
a41d51a765 Fix internal linking dialog conflicts with jQuery UI 1.10.x. Syncs jQuery UI CSS styles. 
Remaining issue will be fixed in 1.10.2 final.
props ocean90.
see #23370.



git-svn-id: http://core.svn.wordpress.org/trunk@23515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-28 17:54:00 +00:00
Helen Hou-Sandí
05515ffbfb Revert [23407], thereby restoring gradients and shadows. see #23415. 
git-svn-id: http://core.svn.wordpress.org/trunk@23500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-28 00:58:26 +00:00
Helen Hou-Sandí
32562f25e9 Begin simplifying some of the visual elements in the admin, starting with gradients. White space purposefully not currently altered. props lessbloat, melchoyce, aaroncampbell, sabreuse. see #23415. 
git-svn-id: http://core.svn.wordpress.org/trunk@23407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-13 22:43:48 +00:00
Andrew Nacin
381b7246f9 Restore TinyMCE dropdowns to their 3.4 appearance in RTL. props helen. see #23101. 
git-svn-id: http://core.svn.wordpress.org/trunk@23275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-01-04 20:11:59 +00:00
Andrew Nacin
c31d11fc89 RTL fixes for internal linking. props SergeyBiryukov, helen. see #22835, for trunk. 
git-svn-id: http://core.svn.wordpress.org/trunk@23226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-12-28 22:57:32 +00:00
Andrew Nacin
0464ec77b5 Media: Ensure the edit image and gallery buttons appear above DFW. They only must appear below the media modal. fixes #22541. props koopersmith. 
git-svn-id: http://core.svn.wordpress.org/trunk@22881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-27 23:07:41 +00:00
Andrew Nacin
45ce9d2a96 Media: Introduce wp.media.editor.open(editor_id) and leverage it in distraction-free writing (fullscreen). props azaozz, koopersmith. fixes #22541. 
git-svn-id: http://core.svn.wordpress.org/trunk@22875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-27 19:09:00 +00:00
Andrew Ozz
e09ea56a23 RTL fixes and improvements: add-media, image-editor, the spinners, the featured image button, some css cleanup, props ocean90, maor, SergeyBiryukov, ramiy, see #22453 
git-svn-id: http://core.svn.wordpress.org/trunk@22640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-18 16:19:37 +00:00
Andrew Nacin
7183a9cce9 Introduce a new, cross-browser HiDPI CSS @media rule to be used everywhere. 
{{{
@media print,
  (-o-min-device-pixel-ratio: 5/4),
  (-webkit-min-device-pixel-ratio: 1.25),
  (min-resolution: 120dpi) {
}}}

Serve HiDPI graphics for printing, regardless of screen resolution.

Specify Opera's vendor-prefixed device pixel ratio property, for Opera desktop.

Specify a minimum Webkit device pixel ratio of 1.25 instead of 1.5, to serve
2x images to Android devices that are between 1 and 1.5x (like the Nexus 7).
Firefox and Opera will respond to 1.5x on these devices, but Chrome will not.

Specify min-resolution, which covers Firefox 19. Opera on Android also supports
min-resolution, but Opera Mini does not support dppx, so the dpi unit is used.

props iammattthomas for the exhaustive research.
props lessbloat for patching.

fixes #22238.



git-svn-id: http://core.svn.wordpress.org/trunk@22629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-17 06:50:08 +00:00
Andrew Ozz
1276bcefb5 More retina backgrounds and bits, props saracannon, empireoflight and lessbloat, see #21019 
git-svn-id: http://core.svn.wordpress.org/trunk@22439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-07 20:54:08 +00:00
Andrew Ozz
e58fb0852b Fix the right border of the editor textarea, props SergeyBiryukov, fixes #21906 
git-svn-id: http://core.svn.wordpress.org/trunk@22390 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-05 23:55:10 +00:00
Ryan Boren
ccac2185c1 Fix field alignment in the "Insert/edit link" dialog. 
Props SergeyBiryukov
fixes #22275


git-svn-id: http://core.svn.wordpress.org/trunk@22383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-05 22:42:22 +00:00
Andrew Ozz
5b8108a3fd Improve visible focus in the admin, props lessbloat, fixes #21324 
git-svn-id: http://core.svn.wordpress.org/trunk@22268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-10-22 19:51:51 +00:00
Andrew Ozz
d62abf57d6 Fix "add media" icon in DFW for IE < 9, restore media-button.png, add media-button-2x.png and make them background images, see #21019 
git-svn-id: http://core.svn.wordpress.org/trunk@22077 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-28 00:33:40 +00:00
Daryl Koopersmith
eec758fd26 BUTTON. 
Add a "Beta Media" button to the post editor. Currently, it is only capable of inserting images. Other attachment types and galleries need not apply... yet.

* Added `wp.media.string.image( attachment, props )` for generating an image as a string from an attachment and relevant attachment display properties.
* Properly localized the gallery workflow.
* Added `Workflow.update()`, which closes the modal, triggers an `update` event, and resets the selection.
* Added `wp.mce.media` to manage the various media workflows for editors.

see #21813, #21814, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-27 04:09:43 +00:00
Andrew Ozz
a43feb2b4d Fix image button in DFW, props ocean90, see #21019 
git-svn-id: http://core.svn.wordpress.org/trunk@22032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-27 02:17:04 +00:00
Andrew Ozz
3c6ef163d6 Fix background on split buttons, remove redundant !important, remove spacers, a little css cleanup, see #18141 
git-svn-id: http://core.svn.wordpress.org/trunk@22025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-27 00:41:49 +00:00
Andrew Nacin
1acd8b556f New HiDPI spinner. Uses clean <span class="spinner"></span> markup. 
Be on the lookout for weirdness.
props lessbloat. see #21456.



git-svn-id: http://core.svn.wordpress.org/trunk@22019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-26 19:57:44 +00:00
Andrew Nacin
ad572d63a1 A calmer, less distracting style for the TinyMCE toolbar. 
props helenyhou, lessbloat, trepmal, fadingdust.
fixes #18141.



git-svn-id: http://core.svn.wordpress.org/trunk@22016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-26 18:24:02 +00:00
Andrew Ozz
563c7caac5 Main editor: maintain the height when switching Visual to Text and back, save the height when resizing as user state, output the height in the textarea tag when loading, (thanks @nacin for the help), fixes #21718 
git-svn-id: http://core.svn.wordpress.org/trunk@22007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-26 03:30:21 +00:00
Andrew Nacin
5f8add5ad2 Fix typo in CSS. props SergeyBiryukov. fixes #20587. 
git-svn-id: http://core.svn.wordpress.org/trunk@21661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-30 03:04:10 +00:00
Andrew Ozz
3980c183a1 More visible :focus style for form elements, props lessbloat, see #21324 
git-svn-id: http://core.svn.wordpress.org/trunk@21641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-28 05:48:58 +00:00
Andrew Nacin
2710bcade1 Switch to .min for compressed JS and CSS files. 
* This moves our "development" versions from .dev.js to .js (same for css).
 * The compressed version then moves from .js to .min.js (same for css).

By switching to the standard .min convention, it sets expectations for developers,
and works nicely with existing tools such as ack.

fixes #21633.



git-svn-id: http://core.svn.wordpress.org/trunk@21592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-23 00:04:18 +00:00
bumpbot
cbacfc849c Compress scripts/styles: 3.5-alpha-21460. 
git-svn-id: http://core.svn.wordpress.org/trunk@21460 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-06 18:58:29 +00:00
bumpbot
fc62ad5e57 Compress scripts/styles: 3.5-alpha-21443. 
git-svn-id: http://core.svn.wordpress.org/trunk@21443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-05 22:58:29 +00:00
bumpbot
6c82674ea0 Compress scripts/styles: 3.5-alpha-21321. 
git-svn-id: http://core.svn.wordpress.org/trunk@21321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-25 06:58:20 +00:00
bumpbot
63df9ad5e0 Compress scripts/styles: 3.5-alpha-21309. 
git-svn-id: http://core.svn.wordpress.org/trunk@21309 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-23 22:58:26 +00:00
bumpbot
fc0ac0c0a9 Compress scripts/styles: 3.5-alpha-21297. 
git-svn-id: http://core.svn.wordpress.org/trunk@21297 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-21 00:58:19 +00:00
bumpbot
0230a753ec Compress scripts/styles: 3.5-alpha-21229. TinyMCE updated. 
git-svn-id: http://core.svn.wordpress.org/trunk@21229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-07 16:58:20 +00:00
bumpbot
f6669710e0 Compress scripts/styles: 3.5-alpha-21103. 
git-svn-id: http://core.svn.wordpress.org/trunk@21103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-06-22 00:58:22 +00:00
bumpbot
17ee4064b1 Compress scripts/styles: 3.4-beta3-20644. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-30 12:58:19 +00:00
nacin
cfacacde28 Move editor-buttons.css to editor.css to reflect its current use. see #19843. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-03-24 13:43:52 +00:00