From f07a9f28a8bc59c31d9dcd5f51da0ba4aa6281a8 Mon Sep 17 00:00:00 2001
From: helen <helen@602fd350-edb4-49c9-b593-d223f7449a82>
Date: Thu, 4 Sep 2014 15:04:02 +0000
Subject: [PATCH] Final about page for 4.0. Enjoy the videos!

props ryelle, melchoyce, smashcut, wonderboymusic, helen.
fixes #29494.


git-svn-id: https://develop.svn.wordpress.org/trunk@29706 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/about.php     | 70 ++++++++++++++++++++++++++------------
 src/wp-admin/css/about.css | 63 ++++++++++++++++++++++++++++++++--
 2 files changed, 110 insertions(+), 23 deletions(-)

diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php
index 736b41f519..2e2ba5cf38 100644
--- a/src/wp-admin/about.php
+++ b/src/wp-admin/about.php
@@ -11,7 +11,10 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 
 wp_enqueue_style( 'wp-mediaelement' );
 wp_enqueue_script( 'wp-mediaelement' );
-add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
+wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
+	'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+	'pauseOtherPlayers' => ''
+) );
 
 $title = __( 'About' );
 
@@ -40,27 +43,42 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 <div class="changelog">
 	<div class="about-overview">
-		<h2 class="about-headline-callout"><?php _e( 'Manage your media with style' ); ?></h2>
-		<!-- media-grid-cropped.png -->
-		<img class="about-overview-img" src="https://i.cloudup.com/gFjdHZjkbI.png" />
-		<p><?php _e( 'Explore your uploads in a beautiful, endless grid. A new details preview makes viewing and editing any amount of media in sequence a snap.' ); ?></p>
+		<?php if ( ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?>
+			<embed src="//v.wordpress.com/bUdzKMro" type="application/x-shockwave-flash" width="640" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent"></embed>
+		<?php else : ?>
+			<img class="about-overview-img" src="//s.w.org/images/core/4.0/wp40.png" width="640" height="360" />
+		<?php endif; ?>
 	</div>
 
 	<hr />
 
 	<div class="feature-section col two-col">
 		<div class="col-1">
-			<!-- oembed.mp4 -->
-			<?php
-				echo wp_video_shortcode( array(
-					'mp4'      => 'https://i.cloudup.com/IdZ7t3ixES.mp4',
-					// 'ogv'      => '//s.w.org/images/core/3.9/widgets.ogv',
-					// 'webm'     => '//s.w.org/images/core/3.9/widgets.webm',
-					'loop'     => true,
-					'autoplay' => true,
-					'width'    => 499
-				) );
-			?>
+			<h3><?php _e( 'Manage your media with style' ); ?></h3>
+			<p><?php _e( 'Explore your uploads in a beautiful, endless grid. A new details preview makes viewing and editing any amount of media in sequence a snap.' ); ?></p>
+		</div>
+		<div class="col-2 last-feature">
+			<img src="//s.w.org/images/core/4.0/media.jpg" />
+		</div>
+	</div>
+
+	<hr />
+
+	<div class="feature-section col two-col">
+		<div class="col-1">
+			<div class="about-video about-video-embed">
+				<?php
+					echo wp_video_shortcode( array(
+						'mp4'      => '//s.w.org/images/core/4.0/embed.mp4',
+						'ogv'      => '//s.w.org/images/core/4.0/embed.ogv',
+						'webm'      => '//s.w.org/images/core/4.0/embed.webm',
+						'loop'     => true,
+						'autoplay' => true,
+						'width'    => 500,
+						'height'   => 352
+					) );
+				?>
+			</div>
 		</div>
 		<div class="col-2 last-feature">
 			<h3><?php _e( 'Working with embeds has never been easier' ); ?></h3>
@@ -77,8 +95,19 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<p><?php _e( 'Writing and editing is smoother and more immersive with an editor that expands to fit your content as you write, and keeps the formatting tools available at all times.' ); ?></p>
 		</div>
 		<div class="col-2 last-feature">
-			<!-- focus.png -->
-			<img src="https://i.cloudup.com/DhokGXMLmR.png" />
+			<div class="about-video about-video-focus">
+				<?php
+					echo wp_video_shortcode( array(
+						'mp4'      => '//s.w.org/images/core/4.0/focus.mp4',
+						'ogv'      => '//s.w.org/images/core/4.0/focus.ogv',
+						'webm'      => '//s.w.org/images/core/4.0/focus.webm',
+						'loop'     => true,
+						'autoplay' => true,
+						'width'    => 500,
+						'height'   => 281
+					) );
+				?>
+			</div>
 		</div>
 	</div>
 
@@ -86,11 +115,10 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 	<div class="feature-section col two-col">
 		<div class="col-1">
-			<!-- plugins.png -->
-			<img src="https://i.cloudup.com/6hlYGuLiTq.png" />
+			<img src="//s.w.org/images/core/4.0/plugins.png" />
 		</div>
 		<div class="col-2 last-feature">
-			<h3><?php _e( 'Finding the right plugin' ); ?></h3>
+			<h3 class="higher"><?php _e( 'Finding the right plugin' ); ?></h3>
 			<p><?php _e( 'There are more than 30,000 free and open source plugins in the WordPress plugin directory. WordPress 4.0 makes it easier to find the right one for your needs, with new metrics, improved search, and a more visual browsing experience.' ); ?></p>
 			<a href="<?php echo admin_url( 'plugin-install.php' ); ?>" class="button button-large button-primary"><?php _e( 'Browse plugins' ); ?></a>
 		</div>
diff --git a/src/wp-admin/css/about.css b/src/wp-admin/css/about.css
index 0312a4912d..b3cdffb505 100644
--- a/src/wp-admin/css/about.css
+++ b/src/wp-admin/css/about.css
@@ -80,6 +80,10 @@
 	line-height: 1.5em;
 }
 
+.about-wrap h3.higher {
+	margin-top: .5em;
+}
+
 .customize h3 {
 	margin-top: 1.75em;
 	text-align: center;
@@ -174,6 +178,7 @@
 
 .about-overview {
 	margin-top: 40px;
+	margin-bottom: 40px;
 	text-align: center;
 }
 
@@ -192,8 +197,8 @@
 
 .about-wrap .feature-section.two-col > div {
 	position: relative;
-	width: 47.5%;
-	margin-right: 4.999999999%;
+	width: 47.6%;
+	margin-right: 4.799999999%;
 	float: left;
 }
 
@@ -226,6 +231,31 @@
 	max-width: 20%;
 }
 
+/* responsive videos for 4.0 */
+.about-video {
+	position: relative;
+	width: 100%;
+	height: 0;
+}
+
+.about-video-embed {
+	padding-bottom: 70.4%; /* 352 / 500 */
+}
+
+.about-video-focus {
+	padding-bottom: 56.2%; /* 281 / 500 */
+}
+
+.about-video .wp-video,
+.about-video .mejs-container,
+.about-video video {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100% !important;
+	height: 100% !important;
+}
+
 .about-wrap .changelog li {
 	list-style-type: disc;
 	margin-left: 3em;
@@ -347,6 +377,24 @@
 
 }
 
+/* Responsive release video */
+@media screen and ( max-width: 710px ) {
+	.about-overview {
+		position: relative;
+		padding-bottom: 56.25%; /* 360 / 640 */
+		width: 100%;
+		height: 0;
+	}
+
+	.about-overview embed {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
+}
+
 @media only screen and (max-width: 500px) {
 	.about-wrap {
 		margin-right: 20px;
@@ -368,6 +416,17 @@
 		width: 100%;
 	}
 
+	.about-wrap h2.nav-tab-wrapper {
+		padding-left: 0;
+		border-bottom: 0;
+	}
+
+	.about-wrap h2 .nav-tab {
+		margin-top: 10px;
+		margin-right: 10px;
+		border-bottom: 1px solid #ccc;
+	}
+
 	.about-wrap .feature-section.three-col div {
 		width: 100%;
 		float: none;