<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2313] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login: WordPress.org SSO: new custom template handling for login experience.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2313">2313</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2313","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>stephdau</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-18 21:10:41 +0000 (Mon, 18 Jan 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordPress.org SSO: new custom template handling for login experience.
See <a href="http://meta.trac.wordpress.org/ticket/1524">#1524</a>: `wporg-login` theme partof the work.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfooterphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/footer.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginheaderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginindexphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/index.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginstylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/footer.php 2016-01-18 21:03:25 UTC (rev 2312)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/footer.php 2016-01-18 21:10:41 UTC (rev 2313)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,5 +4,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package wporg-login
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
+ </div>
+ <div class="loginfooter">wordpress.org • code is poetry</div>
+</div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require WPORGPATH . 'footer.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php wp_footer(); ?>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php 2016-01-18 21:03:25 UTC (rev 2312)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php 2016-01-18 21:10:41 UTC (rev 2313)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_login_replace_css() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_deregister_style( 'login' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_register_style( 'login', get_stylesheet_directory_uri() . '/login.css', array( 'buttons', 'dashicons', 'open-sans' ), filemtime( __DIR__ . '/login.css' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_register_style( 'login', get_stylesheet_directory_uri() . '/stylesheets/login.css', array( 'buttons', 'dashicons', 'open-sans' ), filemtime( __DIR__ . '/login.css' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_init', 'wporg_login_replace_css' );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php 2016-01-18 21:03:25 UTC (rev 2312)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/header.php 2016-01-18 21:10:41 UTC (rev 2313)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,14 +5,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package wporg-login
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-global $pagetitle, $wporg_global_header_options;
-$pagetitle = wp_title( '', false );
-wp_enqueue_style( 'blog-wp4', 'https://wordpress.org/style/blog-wp4.css', array(), 12 );
-wp_enqueue_style( 'theme', get_stylesheet_uri(), array(), filemtime( __DIR__ . '/style.css' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//global $pagetitle, $wporg_global_header_options;
+//$pagetitle = wp_title( '', false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wporg_global_header_options = array(
- 'menu' => '',
- 'search' => '',
-);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_enqueue_style( 'normalize', get_template_directory_uri() . '/stylesheets/normalize.css', array(), filemtime( __DIR__ . '/style.css' ) );
+wp_enqueue_style( 'custom-login', get_template_directory_uri() . '/stylesheets/login.css', array(), filemtime( __DIR__ . '/style.css' ) );
+?>
+<!doctype html>
+<html class="no-js" lang="">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="x-ua-compatible" content="ie=edge">
+<title>WordPress.org OAuth Login</title>
+<meta name="description" content="">
+<meta name="viewport" content="width=device-width, initial-scale=1">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require WPORGPATH . 'header.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php wp_head(); ?>
+</head>
+<body>
+
+<div class="wrapper">
+ <div class="login">
+ <h1><a href="https://wordpress.org/" title="WordPress.org" tabindex="-1">WordPress.org Login</a></h1>
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/index.php 2016-01-18 21:03:25 UTC (rev 2312)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/index.php 2016-01-18 21:10:41 UTC (rev 2313)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,21 +6,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_header();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="pagebody">
- <div id="login-welcome" class="wrapper">
- <h1><?php _e( 'Welcome!', 'wporg-login' ); ?></h1>
- <ul>
- <?php if ( is_user_logged_in() ) : ?>
- <li class="button"><a href="<?php echo wp_logout_url(); ?>"><?php _e( 'Log Out', 'wporg-login' ); ?></a></li>
- <?php else : ?>
- <li class="button"><a href="<?php echo wp_login_url(); ?>"><?php _e( 'Log In', 'wporg-login' ); ?></a></li>
- <li class="button"><a href="https://wordpress.org/support/register.php"><?php _e( 'Register', 'wporg-login' ); ?></a></li>
- <?php endif; ?>
- </ul>
- <?php /* Could display wp_login_form(); */ ?>
- </div>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['screen'] ) ) {
+ $screen = preg_replace( '/[^a-z0-9-]/', '', $_GET['screen'] );
+} else if ( preg_match( '/^\/oauth([\/\?]{1}.*)?$/', $_SERVER['REQUEST_URI'] ) ) {
+ $screen = 'oauth';
+} else {
+ $screen = 'login';
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$partial = __DIR__ . '/partials/' . $screen . '.php';
+
+if ( file_exists( $partial ) ) {
+ require_once( $partial );
+}
+
+get_footer();
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/style.css 2016-01-18 21:03:25 UTC (rev 2312)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/style.css 2016-01-18 21:10:41 UTC (rev 2313)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,24 +5,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Version: 0.9
</span><span class="cx" style="display: block; padding: 0 10px"> * Author: The WordPress.org Team
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-#mobile-menu-button,
-.survey-wrapper,
-#wporg-footer {
- display: none;
-}
-#wporg-header {
- text-align: center;
- height: 100px !important;
-}
-#wporg-header h1 {
- float: none;
- display: inline-block;
-}
-body {
- background: #ffffff url("/wp-content/themes/pub/wporg-login/images/background.jpg") no-repeat left top;
- background-size: cover;
-}
-#login-welcome {
- text-align: center;
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>