CodingPower47 has uploaded a new change for review. https://gerrit.wikimedia.org/r/254797
Change subject: Replaced Flow moderation textarea with input ...................................................................... Replaced Flow moderation textarea with input Bug: T116226 Change-Id: I57511457ca89b2585c253d30504a0ce33f19af2d --- M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php M handlebars/flow_moderate_post.partial.handlebars M handlebars/flow_moderate_topic.partial.handlebars 4 files changed, 22 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/97/254797/1 diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php index f702c01..93ba9d6 100644 --- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php +++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php @@ -37,14 +37,15 @@ '.$sp.'' : '').'</div> ';},'flow_moderate_post' => function ($cx, $in, $sp) {return ''.$sp.'<form method="POST" action="'.LCRun3::ch($cx, 'moderationAction', array(array(((isset($in['actions']) && is_array($in)) ? $in['actions'] : null),((isset($cx['sp_vars']['root']['submitted']['moderationState']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['moderationState'] : null)),array()), 'encq').'"> '.$sp.''.LCRun3::p($cx, 'flow_errors', array(array($in),array()), ' ').' <input type="hidden" name="wpEditToken" value="'.htmlentities((string)((isset($cx['sp_vars']['root']['editToken']) && is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['editToken'] : null), ENT_QUOTES, 'UTF-8').'" /> -'.$sp.' <textarea name="topic_reason" +'.$sp.' <input name="topic_reason" +'.$sp.' type="text" +'.$sp.' size="45" '.$sp.' required '.$sp.' data-flow-expandable="true" '.$sp.' class="mw-ui-input" '.$sp.' data-role="content" '.$sp.' placeholder="'.LCRun3::ch($cx, 'l10n', array(array(LCRun3::ch($cx, 'concat', array(array('flow-moderation-placeholder-',((isset($cx['sp_vars']['root']['submitted']['moderationState']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['moderationState'] : null),'-post'),array()), 'raw')),array()), 'encq').'" -'.$sp.' autofocus -'.$sp.' >'.((LCRun3::ifvar($cx, ((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null))) ? ''.htmlentities((string)((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'' : '').'</textarea> +'.$sp.' autofocus'.((LCRun3::ifvar($cx, ((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null))) ? 'value="'.htmlentities((string)((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'"' : '').'> '.$sp.' <div class="flow-form-actions flow-form-collapsible"> '.$sp.' <button data-flow-interactive-handler="apiRequest" '.$sp.' data-flow-api-handler="moderatePost" diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php index c83f511..9187050 100644 --- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php +++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php @@ -37,14 +37,15 @@ '.$sp.'' : '').'</div> ';},'flow_moderate_topic' => function ($cx, $in, $sp) {return ''.$sp.'<form method="POST" action="'.LCRun3::ch($cx, 'moderationAction', array(array(((isset($in['actions']) && is_array($in)) ? $in['actions'] : null),((isset($cx['sp_vars']['root']['submitted']['moderationState']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['moderationState'] : null)),array()), 'encq').'"> '.$sp.''.LCRun3::p($cx, 'flow_errors', array(array($in),array()), ' ').' <input type="hidden" name="wpEditToken" value="'.htmlentities((string)((isset($cx['sp_vars']['root']['editToken']) && is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['editToken'] : null), ENT_QUOTES, 'UTF-8').'" /> -'.$sp.' <textarea name="topic_reason" +'.$sp.' <input name="topic_reason" +'.$sp.' type="text" +'.$sp.' size="45" '.$sp.' required '.$sp.' data-flow-expandable="true" '.$sp.' class="mw-ui-input" '.$sp.' data-role="content" '.$sp.' placeholder="'.LCRun3::ch($cx, 'l10n', array(array(LCRun3::ch($cx, 'concat', array(array('flow-moderation-placeholder-',((isset($cx['sp_vars']['root']['submitted']['moderationState']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['moderationState'] : null),'-topic'),array()), 'raw')),array()), 'encq').'" -'.$sp.' autofocus -'.$sp.' >'.((LCRun3::ifvar($cx, ((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null))) ? ''.htmlentities((string)((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'' : '').'</textarea> +'.$sp.' autofocus'.((LCRun3::ifvar($cx, ((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null))) ? 'value="'.htmlentities((string)((isset($cx['sp_vars']['root']['submitted']['reason']) && is_array($cx['sp_vars']['root']['submitted'])) ? $cx['sp_vars']['root']['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'"' : '').'> '.$sp.' <div class="flow-form-actions flow-form-collapsible"> '.$sp.' <button class="mw-ui-button mw-ui-constructive" '.$sp.' data-flow-interactive-handler="apiRequest" diff --git a/handlebars/flow_moderate_post.partial.handlebars b/handlebars/flow_moderate_post.partial.handlebars index fb106ec..864c299 100644 --- a/handlebars/flow_moderate_post.partial.handlebars +++ b/handlebars/flow_moderate_post.partial.handlebars @@ -1,18 +1,19 @@ <form method="POST" action="{{moderationAction actions @root.submitted.moderationState}}"> {{> flow_errors}} <input type="hidden" name="wpEditToken" value="{{@root.editToken}}" /> - <textarea name="topic_reason" + <input name="topic_reason" + type="text" + size="45" required data-flow-expandable="true" class="mw-ui-input" data-role="content" placeholder="{{l10n (concat "flow-moderation-placeholder-" @root.submitted.moderationState "-post")}}" autofocus - > - {{~#if @root.submitted.reason~}} - {{~@root.submitted.reason~}} - {{~/if~}} - </textarea> + {{~#if @root.submitted.reason~}} + value="{{~@root.submitted.reason~}}" + {{~/if~}} + > <div class="flow-form-actions flow-form-collapsible"> <button data-flow-interactive-handler="apiRequest" data-flow-api-handler="moderatePost" diff --git a/handlebars/flow_moderate_topic.partial.handlebars b/handlebars/flow_moderate_topic.partial.handlebars index 493b18a..f5d3cae 100644 --- a/handlebars/flow_moderate_topic.partial.handlebars +++ b/handlebars/flow_moderate_topic.partial.handlebars @@ -1,18 +1,19 @@ <form method="POST" action="{{moderationAction actions @root.submitted.moderationState}}"> {{> flow_errors}} <input type="hidden" name="wpEditToken" value="{{@root.editToken}}" /> - <textarea name="topic_reason" + <input name="topic_reason" + type="text" + size="45" required data-flow-expandable="true" class="mw-ui-input" data-role="content" placeholder="{{l10n (concat "flow-moderation-placeholder-" @root.submitted.moderationState "-topic")}}" autofocus - > - {{~#if @root.submitted.reason~}} - {{~@root.submitted.reason~}} - {{~/if~}} - </textarea> + {{~#if @root.submitted.reason~}} + value="{{~@root.submitted.reason~}}" + {{~/if~}} + > <div class="flow-form-actions flow-form-collapsible"> <button class="mw-ui-button mw-ui-constructive" data-flow-interactive-handler="apiRequest" -- To view, visit https://gerrit.wikimedia.org/r/254797 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57511457ca89b2585c253d30504a0ce33f19af2d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: CodingPower47 <tech.master.ch...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits