<!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>[8987] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions: Translate, Discussion: Start with basic UI elements for creating a new discussion and rejecting with feedback.</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 { white-space: pre-line; 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/8987">8987</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/8987","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>2019-06-22 10:33:28 +0000 (Sat, 22 Jun 2019)</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, Discussion: Start with basic UI elements for creating a new discussion and rejecting with feedback.
See <a href="http://meta.trac.wordpress.org/ticket/4518">#4518</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpdiscussionsincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/inc/class-plugin.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/css/</li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpdiscussionscsstranslationdiscussionscss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/css/translation-discussions.css</a></li>
<li>sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/js/</li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpdiscussionsjstranslationdiscussionsjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/js/translation-discussions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpdiscussionscsstranslationdiscussionscss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/css/translation-discussions.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-discussions/css/translation-discussions.css (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/css/translation-discussions.css 2019-06-22 10:33:28 UTC (rev 8987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,67 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.feedback-modal .wporg-translate-modal__frame {
+ max-width: 500px;
+}
+
+.feedback-modal .wporg-translate-modal__content {
+ display: block;
+}
+
+.feedback-modal textarea {
+ max-width: 100%;
+ min-height: 100px;
+ padding: 10px;
+ margin: 0 0 15px 0;
+ border-top: 1px solid;
+ border-bottom: 1px solid;
+ border-color: #e2e4e7;
+ background: #fff;
+ outline: none;
+}
+
+.feedback-modal textarea:focus {
+ box-shadow: 0 0 2px 1px #33b3db;
+}
+
+.feedback__actions {
+ text-align: right;
+}
+
+.feedback-modal .feedback__action-submit {
+ font-size: 15px;
+ height: 35px;
+ line-height: 1;
+ background: #0085ba;
+ border-color: #0073aa #006799 #006799;
+ box-shadow: 0 1px 0 #006799;
+ color: #fff;
+ text-decoration: none;
+ text-shadow: 0 -1px 1px #006799, 1px 0 1px #006799, 0 1px 1px #006799, -1px 0 1px #006799;
+}
+
+
+.feedback-modal .feedback__action-submit:hover {
+ background: #008ec2;
+ border-color: #006799;
+ color: #fff;
+}
+
+.feedback-modal .feedback__action-submit:focus {
+ background: #008ec2;
+ border-color: #006799;
+ box-shadow: 0 1px 0 #0073aa, 0 0 2px 1px #33b3db;
+ color: #fff;
+}
+
+.feedback-modal ul.feedback__reasons {
+ list-style: none;
+ padding: 0;
+ margin: 0 0 15px 0;
+ column-count: 2;
+}
+
+
+@media (min-width: 600px) {
+ .feedback-modal ul.feedback__reasons {
+ column-count: 3;
+ }
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpdiscussionsincclasspluginphp"></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-discussions/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-discussions/inc/class-plugin.php 2019-06-22 07:22:16 UTC (rev 8986)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/inc/class-plugin.php 2019-06-22 10:33:28 UTC (rev 8987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,9 +42,46 @@
</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"> add_action( 'wporg_translate_meta', [ $this, 'show_discussion_meta' ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'gp_pre_tmpl_load', [ $this, 'pre_tmpl_load' ], 10, 2 );
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue custom styles and scripts.
+ */
+ public function pre_tmpl_load( $template, $args ) {
+ if ( 'translations' !== $template || ! is_user_logged_in() ) {
+ return;
+ }
+
+ $blog_id = $this->get_blog_id( $args['locale_slug'] );
+ if ( ! $blog_id ) {
+ return;
+ }
+
+ wp_register_style(
+ 'gp-translation-discussions',
+ plugins_url( 'css/translation-discussions.css', PLUGIN_FILE ),
+ [],
+ '20190506'
+ );
+ gp_enqueue_style( 'gp-translation-discussions' );
+
+ wp_register_script(
+ 'gp-translation-discussions',
+ plugins_url( '/js/translation-discussions.js', PLUGIN_FILE ),
+ [ 'gp-editor' ],
+ '20190510'
+ );
+
+ wp_localize_script( 'gp-translation-discussions', 'WPORG_TRANSLATION_DISCUSSION', [
+ 'nonce' => wp_create_nonce( 'wp_rest' ),
+ 'endpoint' => get_rest_url( $blog_id ),
+ ] );
+
+ gp_enqueue_script( 'gp-translation-discussions' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds discussion items.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $entry Current translation row entry.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,15 +88,89 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function show_discussion_meta( $entry ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $set = GP::$translation_set->get( $entry->translation_set_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = $this->get_blog_id($set->locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = $this->get_blog_id( $set->locale );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $rest_url = get_rest_url( $blog_id );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $reject_reasons = [
+ 'style-guide' => 'Style Guide',
+ 'glossary' => 'Glossary',
+ 'grammar' => 'Grammar',
+ 'punctuation' => 'Punctuation',
+ 'branding' => 'Branding',
+ 'typos' => 'Typos',
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo 'đź“ť';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <div class="feedback-modal feedback-modal__reject-with-feedback wporg-translate-modal">
+ <div class="wporg-translate-modal__overlay">
+ <div class="wporg-translate-modal__frame" role="dialog" aria-labelledby="wporg-translation-help-modal-headline">
+ <div class="wporg-translate-modal__header">
+ <h1 id="wporg-translation-help-modal-headline" class="wporg-translate-modal__headline">Reject with Feedback</h1>
+ <button type="button" aria-label="Close modal" class="wporg-translate-modal__close"><span class="screen-reader-text">Close</span><span aria-hidden="true" class="dashicons dashicons-no-alt"></span></button>
+ </div>
+
+ <div class="wporg-translate-modal__content">
+ <form action="POST">
+ <fieldset>
+ <legend>Reason</legend>
+
+ <ul class="feedback__reasons">
+ <?php foreach ( $reject_reasons as $reason_code => $reason_text ) : ?>
+ <li class="feedback__reason">
+ <label >
+ <input type="checkbox" name="reject_reason[]" value="<?php echo esc_attr( $reason_code ); ?>" />
+ <?php echo esc_html( $reason_text ); ?>
+ </label>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ </fieldset>
+
+ <label class="feedback">
+ <?php _e( 'Comment:', 'glotpress' ); ?>
+ <textarea placeholder="Let the contributor know what they did wrong…" name="comment" rows="4"></textarea>
+ </label>
+
+ <p class="feedback__actions">
+ <button class="button feedback__action-submit" type="submit">Submit</button>
+ </p>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="meta">
+ <button type="button" class="button__start-discussion">Start Discussion</button>
+ </div>
+
+ <div class="feedback-modal feedback-modal__start-discussion wporg-translate-modal">
+ <div class="wporg-translate-modal__overlay">
+ <div class="wporg-translate-modal__frame" role="dialog" aria-labelledby="wporg-translation-help-modal-headline">
+ <div class="wporg-translate-modal__header">
+ <h1 id="wporg-translation-help-modal-headline" class="wporg-translate-modal__headline">Start Discussion</h1>
+ <button type="button" aria-label="Close modal" class="wporg-translate-modal__close"><span class="screen-reader-text">Close</span><span aria-hidden="true" class="dashicons dashicons-no-alt"></span></button>
+ </div>
+
+ <div class="wporg-translate-modal__content">
+ <form action="POST">
+ <label class="feedback">
+ <?php _e( 'Comment:', 'glotpress' ); ?>
+ <textarea required placeholder="Type your question or feedback to this string…" name="comment" rows="4"></textarea>
+ </label>
+
+ <p class="feedback__actions">
+ <button class="button feedback__action-submit" type="submit">Submit</button>
+ </p>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <?php
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,6 +180,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int Blog ID on success, 0 on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_blog_id( $locale_slug ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $mapping = [];
+
+ if ( isset( $mapping[ $locale_slug ] ) ) {
+ return $mapping[ $locale_slug ];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $gp_locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $gp_locale || ! isset( $gp_locale->wp_locale ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +201,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $site = array_shift( $result );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $site ? (int) $site->blog_id : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $mapping[ $locale_slug ] = $site ? (int) $site->blog_id : 0;
+
+ return $mapping[ $locale_slug ];
</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">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpdiscussionsjstranslationdiscussionsjs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/js/translation-discussions.js</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-discussions/js/translation-discussions.js (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-discussions/js/translation-discussions.js 2019-06-22 10:33:28 UTC (rev 8987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,61 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function( $ ){
+ var $html = $( 'html' );
+ var $document = $( document );
+
+
+ // Open the modal for translation help.
+ function openModal( $modal ) {
+ var $closeButton = $modal.find( '.wporg-translate-modal__close' );
+
+ $html.addClass( 'modal-open' );
+ $modal.addClass( 'wporg-translate-modal--open' );
+ $closeButton.focus();
+
+ $document.on( 'keydown.modal', function( event ) {
+ if ( 27 !== event.which ) { // ESC key.
+ return;
+ }
+
+ $modal.removeClass( 'wporg-translate-modal--open' );
+ $html.removeClass( 'modal-open' );
+ $document.off( 'keydown.modal' );
+ } );
+
+ $closeButton.one( 'click', function() {
+ $modal.removeClass( 'wporg-translate-modal--open' );
+ $html.removeClass( 'modal-open' );
+ $document.off( 'keydown.modal' );
+ } );
+ }
+
+ function openDiscussionModal() {
+ var $modal = $gp.editor.current.find( '.feedback-modal__start-discussion' );
+ openModal( $modal );
+ }
+
+ function submitDiscussion() {
+
+ }
+
+ function submitRejection() {
+
+ }
+
+ $gp.editor.hooks.set_status_rejected = function() {
+ var $modal = $gp.editor.current.find( '.feedback-modal__reject-with-feedback' );
+ openModal( $modal );
+
+ return false;
+ };
+
+ $gp.editor.install_hooks = ( function( original ) {
+ return function() {
+ original.apply( $gp.editor, arguments );
+
+ $( $gp.editor.table )
+ .on( 'click', 'button.button__start-discussion', openDiscussionModal )
+ .on( 'click', '.feedback-modal__reject-with-feedback button.feedback__action-submit', submitRejection )
+ .on( 'click', '.feedback-modal__start-discussion button.feedback__action-submit', submitDiscussion );
+ }
+ })( $gp.editor.install_hooks );
+})( jQuery );
</ins></span></pre>
</div>
</div>
</body>
</html>