<!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>[3285] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations: Translate: Bring header in line with the header of make/polyglots.</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/3285">3285</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/3285","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-01 14:55:27 +0000 (Wed, 01 Jun 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'>Translate: Bring header in line with the header of make/polyglots.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationsincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesheaderphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/header.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationsincclasspluginphp"></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/plugins/wporg-gp-customizations/inc/class-plugin.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/plugins/wporg-gp-customizations/inc/class-plugin.php 2016-05-31 23:40:20 UTC (rev 3284)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php 2016-06-01 14:55:27 UTC (rev 3285)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,6 +40,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'gp_project_saved', array( $this, 'update_projects_last_updated' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_handle_404', array( $this, 'short_circuit_handle_404' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_default_scripts', array( $this, 'bump_script_versions' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
+ add_filter( 'body_class', array( $this, 'wporg_add_make_site_body_class' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the API endpoints.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'rest_api_init', array( __NAMESPACE__ . '\REST_API\Base', 'load_endpoints' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,9 +52,25 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Registers a menu location for a sub-navigation.
+ */
+ public function after_setup_theme() {
+ register_nav_menu( 'wporg_header_subsite_nav', 'WordPress.org Header Sub-Navigation' );
+ }
+
+ /**
+ * Adds the CSS classes from make/polyglots to the body to sync the headline icon.
+ */
+ function wporg_add_make_site_body_class( $classes ) {
+ $classes[] = 'wporg-make';
+ $classes[] = 'make-polyglots';
+ return $classes;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Registers CLI commands if WP-CLI is loaded.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function register_cli_commands() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function register_cli_commands() {
</ins><span class="cx" style="display: block; padding: 0 10px"> WP_CLI::add_command( 'wporg-translate init-locale', __NAMESPACE__ . '\CLI\Init_Locale' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesheaderphp"></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/plugins/wporg-gp-customizations/templates/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/plugins/wporg-gp-customizations/templates/header.php 2016-05-31 23:40:20 UTC (rev 3284)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/header.php 2016-06-01 14:55:27 UTC (rev 3285)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,28 +3,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pagetitle = gp_title();
</span><span class="cx" style="display: block; padding: 0 10px"> require WPORGPATH . 'header.php';
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <script type="text/javascript">document.body.className = document.body.className.replace('no-js','js');</script>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<script type="text/javascript">document.body.className = document.body.className.replace('no-js','js');</script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="headline">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrapper">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><a href="//make.wordpress.org/polyglots/">Translating WordPress</a></h2>
- <span id="hello">
- <a class="menu-link" href="//make.wordpress.org/polyglots/">Blog</a>
- <a class="menu-link" href="//make.wordpress.org/polyglots/teams/">Teams</a>
- <a class="menu-link" href="//make.wordpress.org/polyglots/handbook/">Translator Handbook</a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><a href="<?php echo home_url( '/' ); ?>"><?php bloginfo( 'name' ); ?></a></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_user_logged_in() ):
- $user = wp_get_current_user();
-
- printf( __('Hi, %s.'), '<a href="'.gp_url( '/settings' ).'">'.$user->user_login.'</a>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_nav_menu( array(
+ 'theme_location' => 'wporg_header_subsite_nav',
+ 'fallback_cb' => '__return_false'
+ ) );
+ ?>
+ </div>
+ <div class="wrapper">
+ <ul class="translate-meta-nav">
+ <?php
+ if ( is_user_logged_in() ) {
+ $user = wp_get_current_user();
+ printf(
+ '<li>logged in as %s</li>',
+ '<a href="' . esc_url( gp_url_profile( $user->user_login ) ) . '">@' . esc_html( $user->user_nicename ) . '</a>'
+ );
+ ?>
+ <li><a href="<?php echo esc_url( gp_url( '/settings' ) ); ?>">Settings</a></li>
+ <li><a href="<?php echo esc_url( wp_logout_url( home_url( '/' ) ) ); ?>">Log out</a></li>
+ <?php
+ } else {
+ ?>
+ <li><a href="<?php echo esc_url( wp_login_url() ); ?>"><strong>Log in</strong></a></li>
+ <?php
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo esc_url( wp_logout_url( home_url( '/' ) ) ); ?>"><?php _e( 'Log out' ); ?></a>
- <?php else: ?>
- <strong><a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a></strong>
- <?php endif; ?>
- <?php do_action( 'after_hello' ); ?>
- </span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="gp-content">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="gp-js-message"></div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss"></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/plugins/wporg-gp-customizations/templates/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/plugins/wporg-gp-customizations/templates/style.css 2016-05-31 23:40:20 UTC (rev 3284)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css 2016-06-01 14:55:27 UTC (rev 3285)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,84 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-html, body {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Secondary header design */
+#headline .menu {
+ list-style: none;
+ float: right;
+ font-size: 14px;
+ font-weight: bold;
+ padding-top: 22px;
+ margin-right: 15px;
+}
+
+#headline .menu li {
+ display: inline;
+ padding-left: 20px;
+}
+
+/* Responsive design for secondary header */
+@media (max-width: 480px) {
+ #headline h2 {
+ margin-left: 6px;
+ font-size: 20px;
+ }
+
+ #headline h2 a:before {
+ font-size: 20px;
+ width: 24px;
+ }
+}
+
+@media (max-width: 770px) {
+ #headline {
+ height: auto;
+ }
+
+ #headline h2 {
+ float: none;
+ }
+
+ #headline .menu {
+ float: left;
+ margin: 0;
+ padding: 8px 0;
+ background: #f5f5f5;
+ border-top: 1px solid #d7d7d7;
+ width: 100%;
+ }
+}
+
+.wrapper {
+ position: relative;
+}
+
+ul.translate-meta-nav {
+ list-style: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 0;
+ font-size: 12px;
+ text-align: right;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#headline ul.translate-meta-nav a {
+ color: #0073aa;
+}
+
+#headline ul a:hover,
+#headline ul a:focus {
+ color: #00a0d2;
+}
+
+@media (min-width: 771px) {
+ ul.translate-meta-nav {
+ position: absolute;
+ bottom: -18px;
+ right: 6px;
+ }
+}
+
+ul.translate-meta-nav li {
+ display: inline-block;
+ margin: 0 8px
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .gp-content {
</span><span class="cx" style="display: block; padding: 0 10px"> font-family: 'Open Sans', sans-serif !important;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 20px auto;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,11 +112,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .actionlist a:link,
</span><span class="cx" style="display: block; padding: 0 10px"> .actionlist a:visited,
</span><span class="cx" style="display: block; padding: 0 10px"> .gp-content a {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #0074a2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #0073aa;
</ins><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"> .gp-content a:hover {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #2ea2cc;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #00a0d2;
</ins><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,12 +261,12 @@
</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"> .gp-content .meta a {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #0074a2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #0073aa;
</ins><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 0;
</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"> .gp-content .meta a:hover {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #2ea2cc;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #00a0d2;
</ins><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1294,11 +1371,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> outline: none;
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</span><span class="cx" style="display: block; padding: 0 10px"> font: inherit;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #0074a2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #0073aa;
</ins><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"> .button-link:hover {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- color: #2ea2cc;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #00a0d2;
</ins><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"> .contributors-list-filter .filter.active {
</span></span></pre>
</div>
</div>
</body>
</html>