revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-15 01:01:09 +01:00
Code Issues Releases Wiki Activity

Align textarea in diff comment

Browse source 
Summary: Better aligns the text area when leaving an inline comment. Also, phts

Test Plan: reload page, view new padding.

Reviewers: epriestley

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D8370
This commit is contained in:
Chad Little 2014-02-28 08:40:02 -08:00
parent 024c331d2b
commit 3a188de328
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/celerity/map.php
View file

@ -10,7 +10,7 @@ return array(
'core.pkg.css' => 'f12d87a6', 'core.pkg.css' => 'f12d87a6',
'core.pkg.js' => 'b7bdab05', 'core.pkg.js' => 'b7bdab05',
'darkconsole.pkg.js' => 'ca8671ce', 'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '5db87a66', 'differential.pkg.css' => 'd1b3a605',
'differential.pkg.js' => 'e0d3b0da', 'differential.pkg.js' => 'e0d3b0da',
'diffusion.pkg.css' => '3783278d', 'diffusion.pkg.css' => '3783278d',
'diffusion.pkg.js' => '5b4010f4', 'diffusion.pkg.js' => '5b4010f4',
@ -55,7 +55,7 @@ return array(
'rsrc/css/application/countdown/timer.css' => '86b7b0a0', 'rsrc/css/application/countdown/timer.css' => '86b7b0a0',
'rsrc/css/application/diff/inline-comment-summary.css' => '14a91639', 'rsrc/css/application/diff/inline-comment-summary.css' => '14a91639',
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa', 'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
'rsrc/css/application/differential/changeset-view.css' => '82431767', 'rsrc/css/application/differential/changeset-view.css' => 'e710a360',
'rsrc/css/application/differential/core.css' => '7ac3cabc', 'rsrc/css/application/differential/core.css' => '7ac3cabc',
'rsrc/css/application/differential/local-commits-view.css' => '19649019', 'rsrc/css/application/differential/local-commits-view.css' => '19649019',
'rsrc/css/application/differential/results-table.css' => '239924f9', 'rsrc/css/application/differential/results-table.css' => '239924f9',
@ -503,7 +503,7 @@ return array(
'conpherence-notification-css' => '403cf598', 'conpherence-notification-css' => '403cf598',
'conpherence-update-css' => '1099a660', 'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '87b12e0c', 'conpherence-widget-pane-css' => '87b12e0c',
'differential-changeset-view-css' => '82431767', 'differential-changeset-view-css' => 'e710a360',
'differential-core-view-css' => '7ac3cabc', 'differential-core-view-css' => '7ac3cabc',
'differential-inline-comment-editor' => 'f2441746', 'differential-inline-comment-editor' => 'f2441746',
'differential-local-commits-view-css' => '19649019', 'differential-local-commits-view-css' => '19649019',

2
src/applications/differential/view/DifferentialInlineCommentEditView.php
View file

@ -95,7 +95,7 @@ final class DifferentialInlineCommentEditView extends AphrontView {
private function renderBody() { private function renderBody() {
$buttons = array(); $buttons = array();
$buttons[] = phutil_tag('button', array(), 'Ready'); $buttons[] = phutil_tag('button', array(), pht('Ready'));
$buttons[] = javelin_tag( $buttons[] = javelin_tag(
'button', 'button',
array( array(

10
src/infrastructure/diff/PhabricatorInlineCommentController.php
View file

@ -72,14 +72,14 @@ abstract class PhabricatorInlineCommentController
$dialog->setUser($user); $dialog->setUser($user);
$dialog->setSubmitURI($request->getRequestURI()); $dialog->setSubmitURI($request->getRequestURI());
$dialog->setTitle('Really delete this comment?'); $dialog->setTitle(pht('Really delete this comment?'));
$dialog->addHiddenInput('id', $this->getCommentID()); $dialog->addHiddenInput('id', $this->getCommentID());
$dialog->addHiddenInput('op', 'delete'); $dialog->addHiddenInput('op', 'delete');
$dialog->appendChild( $dialog->appendChild(
phutil_tag('p', array(), pht('Delete this inline comment?'))); phutil_tag('p', array(), pht('Delete this inline comment?')));
$dialog->addCancelButton('#'); $dialog->addCancelButton('#');
$dialog->addSubmitButton('Delete'); $dialog->addSubmitButton(pht('Delete'));
return id(new AphrontDialogResponse())->setDialog($dialog); return id(new AphrontDialogResponse())->setDialog($dialog);
case 'edit': case 'edit':
@ -101,7 +101,7 @@ abstract class PhabricatorInlineCommentController
} }
$edit_dialog = $this->buildEditDialog(); $edit_dialog = $this->buildEditDialog();
$edit_dialog->setTitle('Edit Inline Comment'); $edit_dialog->setTitle(pht('Edit Inline Comment'));
$edit_dialog->addHiddenInput('id', $this->getCommentID()); $edit_dialog->addHiddenInput('id', $this->getCommentID());
$edit_dialog->addHiddenInput('op', 'edit'); $edit_dialog->addHiddenInput('op', 'edit');
@ -139,13 +139,13 @@ abstract class PhabricatorInlineCommentController
if ($this->getOperation() == 'reply') { if ($this->getOperation() == 'reply') {
$inline = $this->loadComment($this->getCommentID()); $inline = $this->loadComment($this->getCommentID());
$edit_dialog->setTitle('Reply to Inline Comment'); $edit_dialog->setTitle(pht('Reply to Inline Comment'));
$changeset = $inline->getChangesetID(); $changeset = $inline->getChangesetID();
$is_new = $inline->getIsNewFile(); $is_new = $inline->getIsNewFile();
$number = $inline->getLineNumber(); $number = $inline->getLineNumber();
$length = $inline->getLineLength(); $length = $inline->getLineLength();
} else { } else {
$edit_dialog->setTitle('New Inline Comment'); $edit_dialog->setTitle(pht('New Inline Comment'));
$changeset = $this->getChangesetID(); $changeset = $this->getChangesetID();
$is_new = $this->getIsNewFile(); $is_new = $this->getIsNewFile();
$number = $this->getLineNumber(); $number = $this->getLineNumber();

4
webroot/rsrc/css/application/differential/changeset-view.css
View file

@ -246,6 +246,10 @@ td.cov-X {
white-space: normal; white-space: normal;
} }
.differential-inline-comment-edit .aphront-form-control-textarea {
padding: 0;
}
.differential-inline-comment-unsaved-draft { .differential-inline-comment-unsaved-draft {
background: #f1f1f1; background: #f1f1f1;
border: 1px dashed {$greytext}; border: 1px dashed {$greytext};