diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 8bb0f74731..ef2496b135 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -569,8 +569,8 @@ celerity_register_resource_map(array( ), '/rsrc/image/texture/dust_background.jpg' => array( - 'hash' => 'c32ab9819d4af583f5609bbd3750721a', - 'uri' => '/res/c32ab981/rsrc/image/texture/dust_background.jpg', + 'hash' => '1ff330c03712e08ca2eed006ccc6c1e7', + 'uri' => '/res/1ff330c0/rsrc/image/texture/dust_background.jpg', 'disk' => '/rsrc/image/texture/dust_background.jpg', 'type' => 'jpg', ), @@ -683,7 +683,7 @@ celerity_register_resource_map(array( ), 'aphront-form-view-css' => array( - 'uri' => '/res/efaecc2d/rsrc/css/aphront/form-view.css', + 'uri' => '/res/accfc3a4/rsrc/css/aphront/form-view.css', 'type' => 'css', 'requires' => array( @@ -692,7 +692,7 @@ celerity_register_resource_map(array( ), 'aphront-list-filter-view-css' => array( - 'uri' => '/res/e783d6e1/rsrc/css/aphront/list-filter-view.css', + 'uri' => '/res/cc6e940e/rsrc/css/aphront/list-filter-view.css', 'type' => 'css', 'requires' => array( @@ -828,7 +828,7 @@ celerity_register_resource_map(array( ), 'conpherence-widget-pane-css' => array( - 'uri' => '/res/e67ad581/rsrc/css/application/conpherence/widget-pane.css', + 'uri' => '/res/2b4113f7/rsrc/css/application/conpherence/widget-pane.css', 'type' => 'css', 'requires' => array( @@ -2591,7 +2591,7 @@ celerity_register_resource_map(array( ), 'maniphest-task-summary-css' => array( - 'uri' => '/res/14e825ce/rsrc/css/application/maniphest/task-summary.css', + 'uri' => '/res/b3930263/rsrc/css/application/maniphest/task-summary.css', 'type' => 'css', 'requires' => array( @@ -2708,7 +2708,7 @@ celerity_register_resource_map(array( ), 'phabricator-core-buttons-css' => array( - 'uri' => '/res/7320ca6d/rsrc/css/core/buttons.css', + 'uri' => '/res/4e6b94c8/rsrc/css/core/buttons.css', 'type' => 'css', 'requires' => array( @@ -2717,7 +2717,7 @@ celerity_register_resource_map(array( ), 'phabricator-core-css' => array( - 'uri' => '/res/1e7afaa9/rsrc/css/core/core.css', + 'uri' => '/res/9df0488c/rsrc/css/core/core.css', 'type' => 'css', 'requires' => array( @@ -3562,7 +3562,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'b481b309' => + '4a549b8b' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3605,7 +3605,7 @@ celerity_register_resource_map(array( 35 => 'phabricator-object-item-list-view-css', 36 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/b481b309/core.pkg.css', + 'uri' => '/res/pkg/4a549b8b/core.pkg.css', 'type' => 'css', ), '95ceba95' => @@ -3765,7 +3765,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/cd1d650a/javelin.pkg.js', 'type' => 'js', ), - 'eb35a026' => + 'c41b4907' => array( 'name' => 'maniphest.pkg.css', 'symbols' => @@ -3775,7 +3775,7 @@ celerity_register_resource_map(array( 2 => 'aphront-attached-file-view-css', 3 => 'phabricator-project-tag-css', ), - 'uri' => '/res/pkg/eb35a026/maniphest.pkg.css', + 'uri' => '/res/pkg/c41b4907/maniphest.pkg.css', 'type' => 'css', ), '7707de41' => @@ -3795,18 +3795,18 @@ celerity_register_resource_map(array( ), 'reverse' => array( - 'aphront-attached-file-view-css' => 'eb35a026', - 'aphront-crumbs-view-css' => 'b481b309', - 'aphront-dialog-view-css' => 'b481b309', - 'aphront-error-view-css' => 'b481b309', - 'aphront-form-view-css' => 'b481b309', - 'aphront-list-filter-view-css' => 'b481b309', - 'aphront-pager-view-css' => 'b481b309', - 'aphront-panel-view-css' => 'b481b309', - 'aphront-table-view-css' => 'b481b309', - 'aphront-tokenizer-control-css' => 'b481b309', - 'aphront-tooltip-css' => 'b481b309', - 'aphront-typeahead-control-css' => 'b481b309', + 'aphront-attached-file-view-css' => 'c41b4907', + 'aphront-crumbs-view-css' => '4a549b8b', + 'aphront-dialog-view-css' => '4a549b8b', + 'aphront-error-view-css' => '4a549b8b', + 'aphront-form-view-css' => '4a549b8b', + 'aphront-list-filter-view-css' => '4a549b8b', + 'aphront-pager-view-css' => '4a549b8b', + 'aphront-panel-view-css' => '4a549b8b', + 'aphront-table-view-css' => '4a549b8b', + 'aphront-tokenizer-control-css' => '4a549b8b', + 'aphront-tooltip-css' => '4a549b8b', + 'aphront-typeahead-control-css' => '4a549b8b', 'differential-changeset-view-css' => '8aaacd1b', 'differential-core-view-css' => '8aaacd1b', 'differential-inline-comment-editor' => '322728f3', @@ -3820,7 +3820,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '8aaacd1b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => 'b481b309', + 'global-drag-and-drop-css' => '4a549b8b', 'inline-comment-summary-css' => '8aaacd1b', 'javelin-aphlict' => '95ceba95', 'javelin-behavior' => 'cd1d650a', @@ -3892,48 +3892,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'cd1d650a', 'javelin-vector' => 'cd1d650a', 'javelin-workflow' => 'cd1d650a', - 'lightbox-attachment-css' => 'b481b309', - 'maniphest-task-summary-css' => 'eb35a026', - 'maniphest-transaction-detail-css' => 'eb35a026', + 'lightbox-attachment-css' => '4a549b8b', + 'maniphest-task-summary-css' => 'c41b4907', + 'maniphest-transaction-detail-css' => 'c41b4907', 'phabricator-busy' => '95ceba95', 'phabricator-content-source-view-css' => '8aaacd1b', - 'phabricator-core-buttons-css' => 'b481b309', - 'phabricator-core-css' => 'b481b309', - 'phabricator-crumbs-view-css' => 'b481b309', - 'phabricator-directory-css' => 'b481b309', + 'phabricator-core-buttons-css' => '4a549b8b', + 'phabricator-core-css' => '4a549b8b', + 'phabricator-crumbs-view-css' => '4a549b8b', + 'phabricator-directory-css' => '4a549b8b', 'phabricator-drag-and-drop-file-upload' => '322728f3', 'phabricator-dropdown-menu' => '95ceba95', 'phabricator-file-upload' => '95ceba95', - 'phabricator-filetree-view-css' => 'b481b309', - 'phabricator-flag-css' => 'b481b309', - 'phabricator-form-view-css' => 'b481b309', - 'phabricator-header-view-css' => 'b481b309', - 'phabricator-jump-nav' => 'b481b309', + 'phabricator-filetree-view-css' => '4a549b8b', + 'phabricator-flag-css' => '4a549b8b', + 'phabricator-form-view-css' => '4a549b8b', + 'phabricator-header-view-css' => '4a549b8b', + 'phabricator-jump-nav' => '4a549b8b', 'phabricator-keyboard-shortcut' => '95ceba95', 'phabricator-keyboard-shortcut-manager' => '95ceba95', - 'phabricator-main-menu-view' => 'b481b309', + 'phabricator-main-menu-view' => '4a549b8b', 'phabricator-menu-item' => '95ceba95', - 'phabricator-nav-view-css' => 'b481b309', + 'phabricator-nav-view-css' => '4a549b8b', 'phabricator-notification' => '95ceba95', - 'phabricator-notification-css' => 'b481b309', - 'phabricator-notification-menu-css' => 'b481b309', - 'phabricator-object-item-list-view-css' => 'b481b309', + 'phabricator-notification-css' => '4a549b8b', + 'phabricator-notification-menu-css' => '4a549b8b', + 'phabricator-object-item-list-view-css' => '4a549b8b', 'phabricator-object-selector-css' => '8aaacd1b', 'phabricator-paste-file-upload' => '95ceba95', 'phabricator-prefab' => '95ceba95', - 'phabricator-project-tag-css' => 'eb35a026', - 'phabricator-remarkup-css' => 'b481b309', + 'phabricator-project-tag-css' => 'c41b4907', + 'phabricator-remarkup-css' => '4a549b8b', 'phabricator-shaped-request' => '322728f3', - 'phabricator-side-menu-view-css' => 'b481b309', - 'phabricator-standard-page-view' => 'b481b309', + 'phabricator-side-menu-view-css' => '4a549b8b', + 'phabricator-standard-page-view' => '4a549b8b', 'phabricator-textareautils' => '95ceba95', 'phabricator-tooltip' => '95ceba95', - 'phabricator-transaction-view-css' => 'b481b309', - 'phabricator-zindex-css' => 'b481b309', - 'sprite-apps-large-css' => 'b481b309', - 'sprite-gradient-css' => 'b481b309', - 'sprite-icon-css' => 'b481b309', - 'sprite-menu-css' => 'b481b309', - 'syntax-highlighting-css' => 'b481b309', + 'phabricator-transaction-view-css' => '4a549b8b', + 'phabricator-zindex-css' => '4a549b8b', + 'sprite-apps-large-css' => '4a549b8b', + 'sprite-gradient-css' => '4a549b8b', + 'sprite-icon-css' => '4a549b8b', + 'sprite-menu-css' => '4a549b8b', + 'syntax-highlighting-css' => '4a549b8b', ), )); diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php index 35bc3fb802..ad1be4bf00 100644 --- a/src/applications/differential/controller/DifferentialRevisionListController.php +++ b/src/applications/differential/controller/DifferentialRevisionListController.php @@ -162,6 +162,7 @@ final class DifferentialRevisionListController extends DifferentialController { $filter_form = id(new AphrontFormView()) ->setMethod('GET') + ->setNoShading(true) ->setAction('/differential/filter/'.$this->filter.'/') ->setUser($user); foreach ($controls as $control) { @@ -199,6 +200,7 @@ final class DifferentialRevisionListController extends DifferentialController { $side_nav, array( 'title' => pht('Differential Home'), + 'dust' => true, )); } diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php index 7ecd0db24c..e73c632bdf 100644 --- a/src/applications/maniphest/controller/ManiphestBatchEditController.php +++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php @@ -60,11 +60,11 @@ final class ManiphestBatchEditController extends ManiphestController { 'sources' => array( 'project' => array( 'src' => '/typeahead/common/projects/', - 'placeholder' => 'Type a project name...', + 'placeholder' => pht('Type a project name...'), ), 'owner' => array( 'src' => '/typeahead/common/searchowner/', - 'placeholder' => 'Type a user name...', + 'placeholder' => pht('Type a user name...'), 'limit' => 1, ), ), @@ -96,7 +96,8 @@ final class ManiphestBatchEditController extends ManiphestController { 'name' => 'actions', 'id' => 'batch-form-actions', ))); - $form->appendChild(phutil_tag('p', array(), 'These tasks will be edited:')); + $form->appendChild( + phutil_tag('p', array(), pht('These tasks will be edited:'))); $form->appendChild($list); $form->appendChild( id(new AphrontFormInsetView()) @@ -109,7 +110,7 @@ final class ManiphestBatchEditController extends ManiphestController { 'sigil' => 'add-action', 'mustcapture' => true, ), - 'Add Another Action')) + pht('Add Another Action'))) ->setContent(javelin_tag( 'table', array( @@ -119,7 +120,7 @@ final class ManiphestBatchEditController extends ManiphestController { ''))) ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue('Update Tasks') + ->setValue(pht('Update Tasks')) ->addCancelButton('/maniphest/', 'Done')); $panel->appendChild($form); @@ -128,7 +129,7 @@ final class ManiphestBatchEditController extends ManiphestController { return $this->buildStandardPageResponse( $panel, array( - 'title' => 'Batch Editor', + 'title' => pht('Batch Editor'), )); } diff --git a/src/applications/maniphest/controller/ManiphestController.php b/src/applications/maniphest/controller/ManiphestController.php index 9439fe8c77..c93a248c89 100644 --- a/src/applications/maniphest/controller/ManiphestController.php +++ b/src/applications/maniphest/controller/ManiphestController.php @@ -10,7 +10,7 @@ abstract class ManiphestController extends PhabricatorController { public function buildStandardPageResponse($view, array $data) { $page = $this->buildStandardPageView(); - $page->setApplicationName('Maniphest'); + $page->setApplicationName(pht('Maniphest')); $page->setBaseURI('/maniphest/'); $page->setTitle(idx($data, 'title')); $page->setGlyph("\xE2\x9A\x93"); @@ -22,7 +22,7 @@ abstract class ManiphestController extends PhabricatorController { return $response->setContent($page->render()); } - protected function buildBaseSideNav() { + protected function buildBaseSideNav($filter = null, $for_app = false) { $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI('/maniphest/view/')); @@ -50,28 +50,36 @@ abstract class ManiphestController extends PhabricatorController { $query->getName(), '/maniphest/view/custom/?key='.$query->getQueryKey()); } - $nav->addFilter('saved', 'Edit...', '/maniphest/custom/'); + $nav->addFilter('saved', pht('Edit...'), '/maniphest/custom/'); } - $nav->addLabel('User Tasks'); - $nav->addFilter('action', 'Assigned'); - $nav->addFilter('created', 'Created'); - $nav->addFilter('subscribed', 'Subscribed'); - $nav->addFilter('triage', 'Need Triage'); - $nav->addLabel('User Projects'); - $nav->addFilter('projecttriage', 'Need Triage'); - $nav->addFilter('projectall', 'All Tasks'); + if ($for_app) { + $nav->addFilter('', pht('Create Task'), + $this->getApplicationURI('task/create/')); + } + + $nav->addLabel(pht('User Tasks')); + $nav->addFilter('action', pht('Assigned')); + $nav->addFilter('created', pht('Created')); + $nav->addFilter('subscribed', pht('Subscribed')); + $nav->addFilter('triage', pht('Need Triage')); + $nav->addLabel(pht('User Projects')); + $nav->addFilter('projecttriage', pht('Need Triage')); + $nav->addFilter('projectall', pht('All Tasks')); $nav->addLabel('All Tasks'); - $nav->addFilter('alltriage', 'Need Triage'); - $nav->addFilter('all', 'All Tasks'); - $nav->addLabel('Custom'); - $nav->addFilter('custom', 'Custom Query'); - $nav->addLabel('Reports'); - $nav->addFilter('report', 'Reports', '/maniphest/report/'); + $nav->addFilter('alltriage', pht('Need Triage')); + $nav->addFilter('all', pht('All Tasks')); + $nav->addLabel(pht('Custom')); + $nav->addFilter('custom', pht('Custom Query')); + $nav->addFilter('report', pht('Reports'), '/maniphest/report/'); return $nav; } + public function buildApplicationMenu() { + return $this->buildBaseSideNav(null, true)->getMenu(); + } + protected function getDefaultQuery() { return $this->defaultQuery; } diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php index d3a22a9a42..1fc4988850 100644 --- a/src/applications/maniphest/controller/ManiphestExportController.php +++ b/src/applications/maniphest/controller/ManiphestExportController.php @@ -27,18 +27,26 @@ final class ManiphestExportController extends ManiphestController { $dialog = new AphrontDialogView(); $dialog->setUser($user); - $dialog->setTitle('Excel Export Not Configured'); - $dialog->appendChild(hsprintf( - '

This system does not have PHPExcel installed. This software '. + $inst1 = pht( + 'This system does not have PHPExcel installed. This software '. 'component is required to export tasks to Excel. Have your system '. - 'administrator install it from:

'. + 'administrator install it from:'); + + $inst2 = pht( + 'Your PHP "include_path" needs to be updated to include the '. + 'PHPExcel Classes directory.'); + + $dialog->setTitle(pht('Excel Export Not Configured')); + $dialog->appendChild(hsprintf( + '

%s

'. '
'. '

'. 'http://www.phpexcel.net/'. '

'. '
'. - '

Your PHP "include_path" needs to be updated to include the '. - 'PHPExcel Classes/ directory.

')); + '

%s

', + $inst1, + $inst2)); $dialog->addCancelButton('/maniphest/'); return id(new AphrontDialogResponse())->setDialog($dialog); @@ -58,12 +66,12 @@ final class ManiphestExportController extends ManiphestController { $dialog = new AphrontDialogView(); $dialog->setUser($user); - $dialog->setTitle('Export Tasks to Excel'); + $dialog->setTitle(pht('Export Tasks to Excel')); $dialog->appendChild(phutil_tag('p', array(), pht( 'Do you want to export the query results to Excel?'))); $dialog->addCancelButton('/maniphest/'); - $dialog->addSubmitButton('Export to Excel'); + $dialog->addSubmitButton(pht('Export to Excel')); return id(new AphrontDialogResponse())->setDialog($dialog); } @@ -85,7 +93,7 @@ final class ManiphestExportController extends ManiphestController { $workbook = new PHPExcel(); $sheet = $workbook->setActiveSheetIndex(0); - $sheet->setTitle('Tasks'); + $sheet->setTitle(pht('Tasks')); $widths = array( null, @@ -113,16 +121,16 @@ final class ManiphestExportController extends ManiphestController { $rows = array(); $rows[] = array( - 'ID', - 'Owner', - 'Status', - 'Priority', - 'Date Created', - 'Date Updated', - 'Title', - 'Projects', - 'URI', - 'Description', + pht('ID'), + pht('Owner'), + pht('Status'), + pht('Priority'), + pht('Date Created'), + pht('Date Updated'), + pht('Title'), + pht('Projects'), + pht('URI'), + pht('Description'), ); $is_date = array( diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php index b5a1baf73d..ff5f6ba1f3 100644 --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -34,11 +34,11 @@ final class ManiphestReportController extends ManiphestController { $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI('/maniphest/report/')); - $nav->addLabel('Open Tasks'); - $nav->addFilter('user', 'By User'); - $nav->addFilter('project', 'By Project'); - $nav->addLabel('Burnup'); - $nav->addFilter('burn', 'Burnup Rate'); + $nav->addLabel(pht('Open Tasks')); + $nav->addFilter('user', pht('By User')); + $nav->addFilter('project', pht('By Project')); + $nav->addLabel(pht('Burnup')); + $nav->addFilter('burn', pht('Burnup Rate')); $this->view = $nav->selectFilter($this->view, 'user'); @@ -210,20 +210,20 @@ final class ManiphestReportController extends ManiphestController { if ($week) { $rows[] = $this->formatBurnRow( - 'Week To Date', + pht('Week To Date'), $week); $rowc[] = 'week'; } if ($month) { $rows[] = $this->formatBurnRow( - 'Month To Date', + pht('Month To Date'), $month); $rowc[] = 'month'; } $rows[] = $this->formatBurnRow( - 'All Time', + pht('All Time'), $period); $rowc[] = 'aggregate'; @@ -234,10 +234,10 @@ final class ManiphestReportController extends ManiphestController { $table->setRowClasses($rowc); $table->setHeaders( array( - 'Period', - 'Opened', - 'Closed', - 'Change', + pht('Period'), + pht('Opened'), + pht('Closed'), + pht('Change'), )); $table->setColumnClasses( array( @@ -248,16 +248,17 @@ final class ManiphestReportController extends ManiphestController { )); if ($handle) { - $header = pht("Task Burn Rate for Project %s", $handle->renderLink()); - $caption = hsprintf( - "

NOTE: This table reflects tasks currently in ". + $inst = pht( + "NOTE: This table reflects tasks currently in ". "the project. If a task was opened in the past but added to ". "the project recently, it is counted on the day it was ". "opened, not the day it was categorized. If a task was part ". "of this project in the past but no longer is, it is not ". - "counted at all.

"); + "counted at all."); + $header = pht("Task Burn Rate for Project %s", $handle->renderLink()); + $caption = hsprintf("

%s

", $inst); } else { - $header = "Task Burn Rate for All Tasks"; + $header = pht("Task Burn Rate for All Tasks"); $caption = null; } @@ -315,7 +316,7 @@ final class ManiphestReportController extends ManiphestController { ->appendChild( id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/searchproject/') - ->setLabel('Project') + ->setLabel(pht('Project')) ->setLimit(1) ->setName('set_project') ->setValue($tokens)); @@ -325,10 +326,10 @@ final class ManiphestReportController extends ManiphestController { $form ->appendChild( id(new AphrontFormTextControl()) - ->setLabel('"Recently" Means') + ->setLabel(pht('Recently Means')) ->setName('set_window') ->setCaption( - 'Configure the cutoff for the "Recently Closed" column.') + pht('Configure the cutoff for the "Recently Closed" column.')) ->setValue($window_str) ->setError($window_error)); } @@ -336,7 +337,7 @@ final class ManiphestReportController extends ManiphestController { $form ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue('Filter By Project')); + ->setValue(pht('Filter By Project'))); $filter = new AphrontListFilterView(); $filter->appendChild($form); @@ -419,9 +420,9 @@ final class ManiphestReportController extends ManiphestController { array( 'href' => $base_link.ManiphestTaskOwner::OWNER_UP_FOR_GRABS, ), - phutil_tag('em', array(), '(Up For Grabs)')); - $col_header = 'User'; - $header = 'Open Tasks by User and Priority ('.$date.')'; + phutil_tag('em', array(), pht('(Up For Grabs)'))); + $col_header = pht('User'); + $header = pht('Open Tasks by User and Priority (%s)', $date); break; case 'project': $result = array(); @@ -456,9 +457,9 @@ final class ManiphestReportController extends ManiphestController { array( 'href' => $base_link.ManiphestTaskOwner::PROJECT_NO_PROJECT, ), - phutil_tag('em', array(), '(No Project)')); - $col_header = 'Project'; - $header = 'Open Tasks by Project and Priority ('.$date.')'; + phutil_tag('em', array(), pht('(No Project)'))); + $col_header = pht('Project'); + $header = pht('Open Tasks by Project and Priority (%s)', $date); break; } @@ -584,36 +585,37 @@ final class ManiphestReportController extends ManiphestController { array( 'sigil' => 'has-tooltip', 'meta' => array( - 'tip' => 'Oldest open task.', + 'tip' => pht('Oldest open task.'), 'size' => 200, ), ), - 'Oldest (All)'); + pht('Oldest (All)')); $cclass[] = 'n'; $cname[] = javelin_tag( 'span', array( 'sigil' => 'has-tooltip', 'meta' => array( - 'tip' => 'Oldest open task, excluding those with Low or Wishlist '. - 'priority.', + 'tip' => pht('Oldest open task, excluding those with Low or '. + 'Wishlist priority.'), 'size' => 200, ), ), - 'Oldest (Pri)'); + pht('Oldest (Pri)')); $cclass[] = 'n'; list($ignored, $window_epoch) = $this->getWindow(); + $edate = phabricator_datetime($window_epoch, $user); $cname[] = javelin_tag( 'span', array( 'sigil' => 'has-tooltip', 'meta' => array( - 'tip' => 'Closed after '.phabricator_datetime($window_epoch, $user), + 'tip' => pht('Closed after %s', $edate), 'size' => 260 ), ), - 'Recently Closed'); + pht('Recently Closed')); $cclass[] = 'n'; $table = new AphrontTableView($rows); diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php b/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php index 9fae6869aa..c4fa4d9123 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php @@ -30,15 +30,17 @@ final class ManiphestSavedQueryDeleteController extends ManiphestController { } $name = $query->getName(); + $inst = pht( + 'Really delete the query "%s"? It will be lost forever!', $name); $dialog = id(new AphrontDialogView()) ->setUser($user) - ->setTitle('Really delete this query?') + ->setTitle(pht('Really delete this query?')) ->appendChild(hsprintf( - '

Really delete the query "%s"? It will be lost forever!

', - $name)) + '

%s

', + $inst)) ->addCancelButton('/maniphest/custom/') - ->addSubmitButton('Delete'); + ->addSubmitButton(pht('Delete')); return id(new AphrontDialogResponse())->setDialog($dialog); } diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php b/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php index 8fd0e5b32d..fde8404934 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php @@ -42,8 +42,8 @@ final class ManiphestSavedQueryEditController extends ManiphestController { $e_name = null; $query->setName($request->getStr('name')); if (!strlen($query->getName())) { - $e_name = 'Required'; - $errors[] = 'Saved query name is required.'; + $e_name = pht('Required'); + $errors[] = pht('Saved query name is required.'); } if (!$errors) { @@ -54,17 +54,17 @@ final class ManiphestSavedQueryEditController extends ManiphestController { if ($errors) { $error_view = new AphrontErrorView(); - $error_view->setTitle('Form Errors'); + $error_view->setTitle(pht('Form Errors')); $error_view->setErrors($errors); } else { $error_view = null; } if ($query->getID()) { - $header = 'Edit Saved Query'; + $header = pht('Edit Saved Query'); $cancel_uri = '/maniphest/custom/'; } else { - $header = 'New Saved Query'; + $header = pht('New Saved Query'); $cancel_uri = '/maniphest/view/custom/?key='.$key; } @@ -74,14 +74,14 @@ final class ManiphestSavedQueryEditController extends ManiphestController { ->addHiddenInput('id', $query->getID()) ->appendChild( id(new AphrontFormTextControl()) - ->setLabel('Name') + ->setLabel(pht('Name')) ->setValue($query->getName()) ->setName('name') ->setError($e_name)) ->appendChild( id(new AphrontFormSubmitControl()) ->addCancelButton($cancel_uri) - ->setValue('Save')); + ->setValue(pht('Save'))); $panel = new AphrontPanelView(); $panel->setHeader($header); @@ -94,10 +94,11 @@ final class ManiphestSavedQueryEditController extends ManiphestController { $nav->appendChild($error_view); $nav->appendChild($panel); - return $this->buildStandardPageResponse( + return $this->buildApplicationPage( $nav, array( - 'title' => 'Saved Queries', + 'title' => pht('Saved Queries'), + 'device' => true, )); } diff --git a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php index 2f80e6028d..c308739c3f 100644 --- a/src/applications/maniphest/controller/ManiphestSavedQueryListController.php +++ b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php @@ -81,7 +81,7 @@ final class ManiphestSavedQueryListController extends ManiphestController { 'value' => 0, 'checked' => ($default === null ? 'checked' : null), )), - phutil_tag('em', array(), 'No Default'), + phutil_tag('em', array(), pht('No Default')), '', '', ); @@ -89,10 +89,10 @@ final class ManiphestSavedQueryListController extends ManiphestController { $table = new AphrontTableView($rows); $table->setHeaders( array( - 'Default', - 'Name', - 'Edit', - 'Delete', + pht('Default'), + pht('Name'), + pht('Edit'), + pht('Delete'), )); $table->setColumnClasses( array( @@ -103,12 +103,12 @@ final class ManiphestSavedQueryListController extends ManiphestController { )); $panel = new AphrontPanelView(); - $panel->setHeader('Saved Custom Queries'); + $panel->setHeader(pht('Saved Custom Queries')); $panel->addButton( phutil_tag( 'button', array(), - 'Save Default Query')); + pht('Save Default Query'))); $panel->appendChild($table); $form = phabricator_form( @@ -122,10 +122,11 @@ final class ManiphestSavedQueryListController extends ManiphestController { $nav->selectFilter('saved', 'saved'); $nav->appendChild($form); - return $this->buildStandardPageResponse( + return $this->buildApplicationPage( $nav, array( - 'title' => 'Saved Queries', + 'title' => pht('Saved Queries'), + 'device' => true, )); } diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index d90643cc0c..ad7bda8316 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -107,7 +107,7 @@ final class ManiphestTaskDetailController extends ManiphestController { 'href' => '/maniphest/task/create/?parent='.$parent_task->getID(), 'class' => 'green button', ), - 'Create Another Subtask')); + pht('Create Another Subtask'))); $context_bar->appendChild(hsprintf( 'Created a subtask of %s', $this->getHandle($parent_task->getPHID())->renderLink())); @@ -120,15 +120,15 @@ final class ManiphestTaskDetailController extends ManiphestController { 'href' => '/maniphest/task/create/?template='.$task->getID(), 'class' => 'green button', ), - 'Similar Task')); + pht('Similar Task'))); $context_bar->addButton(phutil_tag( 'a', array( 'href' => '/maniphest/task/create/', 'class' => 'green button', ), - 'Empty Task')); - $context_bar->appendChild('New task created.'); + pht('Empty Task'))); + $context_bar->appendChild(pht('New task created.')); } $engine = new PhabricatorMarkupEngine(); @@ -201,20 +201,20 @@ final class ManiphestTaskDetailController extends ManiphestController { ->addHiddenInput('taskID', $task->getID()) ->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Action') + ->setLabel(pht('Action')) ->setName('action') ->setOptions($transaction_types) ->setID('transaction-action')) ->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Resolution') + ->setLabel(pht('Resolution')) ->setName('resolution') ->setControlID('resolution') ->setControlStyle('display: none') ->setOptions($resolution_types)) ->appendChild( id(new AphrontFormTokenizerControl()) - ->setLabel('Assign To') + ->setLabel(pht('Assign To')) ->setName('assign_to') ->setControlID('assign_to') ->setControlStyle('display: none') @@ -222,7 +222,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setDisableBehavior(true)) ->appendChild( id(new AphrontFormTokenizerControl()) - ->setLabel('CCs') + ->setLabel(pht('CCs')) ->setName('ccs') ->setControlID('ccs') ->setControlStyle('display: none') @@ -230,7 +230,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setDisableBehavior(true)) ->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Priority') + ->setLabel(pht('Priority')) ->setName('priority') ->setOptions($priority_map) ->setControlID('priority') @@ -238,7 +238,7 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setValue($task->getPriority())) ->appendChild( id(new AphrontFormTokenizerControl()) - ->setLabel('Projects') + ->setLabel(pht('Projects')) ->setName('projects') ->setControlID('projects') ->setControlStyle('display: none') @@ -246,25 +246,25 @@ final class ManiphestTaskDetailController extends ManiphestController { ->setDisableBehavior(true)) ->appendChild( id(new AphrontFormFileControl()) - ->setLabel('File') + ->setLabel(pht('File')) ->setName('file') ->setControlID('file') ->setControlStyle('display: none')) ->appendChild( id(new PhabricatorRemarkupControl()) - ->setLabel('Comments') + ->setLabel(pht('Comments')) ->setName('comments') ->setValue($draft_text) ->setID('transaction-comments') ->setUser($user)) ->appendChild( id(new AphrontFormDragAndDropUploadControl()) - ->setLabel('Attached Files') + ->setLabel(pht('Attached Files')) ->setName('files') ->setActivatedClass('aphront-panel-view-drag-and-drop')) ->appendChild( id(new AphrontFormSubmitControl()) - ->setValue($is_serious ? 'Submit' : 'Avast!')); + ->setValue($is_serious ? pht('Submit') : pht('Avast!'))); $control_map = array( ManiphestTransactionType::TYPE_STATUS => 'resolution', @@ -280,7 +280,7 @@ final class ManiphestTaskDetailController extends ManiphestController { 'id' => 'projects-tokenizer', 'src' => '/typeahead/common/projects/', 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'), - 'placeholder' => 'Type a project name...', + 'placeholder' => pht('Type a project name...'), ), ManiphestTransactionType::TYPE_OWNER => array( 'id' => 'assign-tokenizer', @@ -288,13 +288,13 @@ final class ManiphestTaskDetailController extends ManiphestController { 'value' => $default_claim, 'limit' => 1, 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'), - 'placeholder' => 'Type a user name...', + 'placeholder' => pht('Type a user name...'), ), ManiphestTransactionType::TYPE_CCS => array( 'id' => 'cc-tokenizer', 'src' => '/typeahead/common/mailable/', 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'), - 'placeholder' => 'Type a user or mailing list...', + 'placeholder' => pht('Type a user or mailing list...'), ), ); diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php index 10e1e1a20b..77e4be866a 100644 --- a/src/applications/maniphest/controller/ManiphestTaskEditController.php +++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php @@ -112,15 +112,15 @@ final class ManiphestTaskEditController extends ManiphestController { $aux_field->setValueFromRequest($request); if ($aux_field->isRequired() && !$aux_field->getValue()) { - $errors[] = $aux_field->getLabel() . ' is required.'; - $aux_field->setError('Required'); + $errors[] = pht('%s is required.', $aux_field->getLabel()); + $aux_field->setError(pht('Required')); } try { $aux_field->validate(); } catch (Exception $e) { $errors[] = $e->getMessage(); - $aux_field->setError('Invalid'); + $aux_field->setError(pht('Invalid')); } } @@ -501,18 +501,22 @@ final class ManiphestTaskEditController extends ManiphestController { $panel->setHeader($header_name); $panel->appendChild($form); $panel->setNoBackground(); + $inst1 = pht('Description Preview'); + $inst2 = pht('Loading preview...'); $description_preview_panel = hsprintf( '
- Description Preview + %s
- Loading preview... + %s
-
'); + ', + $inst1, + $inst2); Javelin::initBehavior( 'maniphest-description-preview', @@ -537,7 +541,7 @@ final class ManiphestTaskEditController extends ManiphestController { array( 'title' => $header_name, 'pageObjects' => $page_objects, - 'device' => true + 'device' => true, )); } } diff --git a/src/applications/maniphest/controller/ManiphestTaskListController.php b/src/applications/maniphest/controller/ManiphestTaskListController.php index 42b6fc8cae..598c385341 100644 --- a/src/applications/maniphest/controller/ManiphestTaskListController.php +++ b/src/applications/maniphest/controller/ManiphestTaskListController.php @@ -120,6 +120,7 @@ final class ManiphestTaskListController extends ManiphestController { $form = id(new AphrontFormView()) ->setUser($user) + ->setNoShading(true) ->setAction( $request->getRequestURI() ->alter('key', null) @@ -142,7 +143,7 @@ final class ManiphestTaskListController extends ManiphestController { id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/searchowner/') ->setName('set_users') - ->setLabel('Users') + ->setLabel(pht('Users')) ->setValue($tokens)); } @@ -150,12 +151,12 @@ final class ManiphestTaskListController extends ManiphestController { $form->appendChild( id(new AphrontFormTextControl()) ->setName('set_search') - ->setLabel('Search') + ->setLabel(pht('Search')) ->setValue($search_text)); $form->appendChild( id(new AphrontFormTextControl()) ->setName('set_tasks') - ->setLabel('Task IDs') + ->setLabel(pht('Task IDs')) ->setValue(join(',', $task_ids))); $tokens = array(); @@ -166,7 +167,7 @@ final class ManiphestTaskListController extends ManiphestController { id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/searchowner/') ->setName('set_owners') - ->setLabel('Owners') + ->setLabel(pht('Owners')) ->setValue($tokens)); $tokens = array(); @@ -177,7 +178,7 @@ final class ManiphestTaskListController extends ManiphestController { id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/users/') ->setName('set_authors') - ->setLabel('Authors') + ->setLabel(pht('Authors')) ->setValue($tokens)); } @@ -189,14 +190,14 @@ final class ManiphestTaskListController extends ManiphestController { $caption = null; if ($this->view == 'custom') { - $caption = 'Find tasks in ALL of these projects ("AND" query).'; + $caption = pht('Find tasks in ALL of these projects ("AND" query).'); } $form->appendChild( id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/searchproject/') ->setName('set_projects') - ->setLabel('Projects') + ->setLabel(pht('Projects')) ->setCaption($caption) ->setValue($tokens)); } @@ -210,8 +211,8 @@ final class ManiphestTaskListController extends ManiphestController { id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/projects/') ->setName('set_aprojects') - ->setLabel('Any Projects') - ->setCaption('Find tasks in ANY of these projects ("OR" query).') + ->setLabel(pht('Any Projects')) + ->setCaption(pht('Find tasks in ANY of these projects ("OR" query).')) ->setValue($atokens)); $tokens = array(); @@ -222,8 +223,8 @@ final class ManiphestTaskListController extends ManiphestController { id(new AphrontFormTokenizerControl()) ->setDatasource('/typeahead/common/projects/') ->setName('set_xprojects') - ->setLabel('Exclude Projects') - ->setCaption('Find tasks NOT in any of these projects.') + ->setLabel(pht('Exclude Projects')) + ->setCaption(pht('Find tasks NOT in any of these projects.')) ->setValue($tokens)); $priority = ManiphestTaskPriority::getLowestPriority(); @@ -233,7 +234,7 @@ final class ManiphestTaskListController extends ManiphestController { $form->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Min Priority') + ->setLabel(pht('Min Priority')) ->setName('set_lpriority') ->setValue($priority) ->setOptions(array_reverse( @@ -246,7 +247,7 @@ final class ManiphestTaskListController extends ManiphestController { $form->appendChild( id(new AphrontFormSelectControl()) - ->setLabel('Max Priority') + ->setLabel(pht('Max Priority')) ->setName('set_hpriority') ->setValue($priority) ->setOptions(ManiphestTaskPriority::getTaskPriorityMap())); @@ -259,7 +260,7 @@ final class ManiphestTaskListController extends ManiphestController { ->appendChild($this->renderOrderControl($q_order)); $submit = id(new AphrontFormSubmitControl()) - ->setValue('Filter Tasks'); + ->setValue(pht('Filter Tasks')); // Only show "Save..." for novel queries which have some kind of query // parameters set. @@ -268,7 +269,7 @@ final class ManiphestTaskListController extends ManiphestController { && $request->getRequestURI()->getQueryParams()) { $submit->addCancelButton( '/maniphest/custom/edit/?key='.$query->getQueryKey(), - 'Save Custom Query...'); + pht('Save Custom Query...')); } $form->appendChild($submit); @@ -285,8 +286,6 @@ final class ManiphestTaskListController extends ManiphestController { $filter->appendChild($form); } - $nav->appendChild($filter); - $have_tasks = false; foreach ($tasks as $group => $list) { if (count($list)) { @@ -302,10 +301,12 @@ final class ManiphestTaskListController extends ManiphestController { '
')); if (!$have_tasks) { + $no_tasks = pht('No matching tasks.'); $list_container->appendChild(hsprintf( '

'. - 'No matching tasks.'. - '

')); + '%s'. + '', + $no_tasks)); } else { $pager = new AphrontPagerView(); $pager->setURI($request->getRequestURI(), 'offset'); @@ -317,13 +318,16 @@ final class ManiphestTaskListController extends ManiphestController { $max = min($pager->getOffset() + $page_size, $total_count); $tot = $total_count; - $list_container->appendChild(hsprintf( - '
'. - "Displaying tasks %s - %s of %s.". - '
', + $results = pht('Displaying tasks %s - %s of %s.', number_format($cur), number_format($max), - number_format($tot))); + number_format($tot)); + $result_count = phutil_tag( + 'div', + array( + 'class' => 'maniphest-total-result-count' + ), + $results); $selector = new AphrontNullView(); @@ -333,8 +337,7 @@ final class ManiphestTaskListController extends ManiphestController { ($order == 'priority') && ($group == 'none' || $group == 'priority'); - $lists = new AphrontNullView(); - $lists->appendChild(hsprintf('
')); + $lists = array(); foreach ($tasks as $group => $list) { $task_list = new ManiphestTaskListView(); $task_list->setShowBatchControls(true); @@ -359,18 +362,19 @@ final class ManiphestTaskListController extends ManiphestController { ), $group.' ('.$count.')'); - - $panel = new AphrontPanelView(); - $panel->appendChild($header); - $panel->appendChild($task_list); - $panel->setNoBackground(); - - $lists->appendChild($panel); + $lists[] = + phutil_tag( + 'div', + array( + 'class' => 'maniphest-task-group' + ), + array( + $header, + $task_list, + )); } - $lists->appendChild(hsprintf('
')); - $selector->appendChild($lists); - + $selector->appendChild($lists); $selector->appendChild($this->renderBatchEditor($query)); $form_id = celerity_generate_unique_node_id(); @@ -394,7 +398,8 @@ final class ManiphestTaskListController extends ManiphestController { )); } - $list_container->appendChild(hsprintf('
')); + $nav->appendChild($filter); + $nav->appendChild($result_count); $nav->appendChild($list_container); $title = pht('Task List'); @@ -411,10 +416,12 @@ final class ManiphestTaskListController extends ManiphestController { $nav->setCrumbs($crumbs); - return $this->buildStandardPageResponse( + return $this->buildApplicationPage( $nav, array( 'title' => $title, + 'device' => true, + 'dust' => true, )); } @@ -653,7 +660,7 @@ final class ManiphestTaskListController extends ManiphestController { 'class' => 'grey button', 'id' => 'batch-select-all', ), - 'Select All'); + pht('Select All')); $select_none = javelin_tag( 'a', @@ -663,7 +670,7 @@ final class ManiphestTaskListController extends ManiphestController { 'class' => 'grey button', 'id' => 'batch-select-none', ), - 'Clear Selection'); + pht('Clear Selection')); $submit = phutil_tag( 'button', @@ -672,7 +679,7 @@ final class ManiphestTaskListController extends ManiphestController { 'disabled' => 'disabled', 'class' => 'disabled', ), - "Batch Edit Selected Tasks \xC2\xBB"); + pht("Batch Edit Selected \xC2\xBB")); $export = javelin_tag( 'a', @@ -680,22 +687,25 @@ final class ManiphestTaskListController extends ManiphestController { 'href' => '/maniphest/export/'.$search_query->getQueryKey().'/', 'class' => 'grey button', ), - 'Export Tasks to Excel...'); + pht('Export to Excel')); return hsprintf( '
'. - '
Batch Task Editor
'. + '
%s
'. ''. ''. ''. ''. - ''. + ''. ''. ''. '
%s%s%s0 Selected Tasks%s%s
'. '', - $select_all, $select_none, + pht('Batch Task Editor'), + $select_all, + $select_none, $export, + pht('0 Selected'), $submit); } @@ -871,35 +881,35 @@ final class ManiphestTaskListController extends ManiphestController { private function getStatusButtonMap() { return array( - 'o' => 'Open', - 'c' => 'Closed', - 'oc' => 'All', + 'o' => pht('Open'), + 'c' => pht('Closed'), + 'oc' => pht('All'), ); } private function getGroupButtonMap() { return array( - 'p' => 'Priority', - 'o' => 'Owner', - 's' => 'Status', - 'j' => 'Project', - 'n' => 'None', + 'p' => pht('Priority'), + 'o' => pht('Owner'), + 's' => pht('Status'), + 'j' => pht('Project'), + 'n' => pht('None'), ); } private function getOrderButtonMap() { return array( - 'p' => 'Priority', - 'u' => 'Updated', - 'c' => 'Created', - 't' => 'Title', + 'p' => pht('Priority'), + 'u' => pht('Updated'), + 'c' => pht('Created'), + 't' => pht('Title'), ); } public function renderStatusControl($value) { $request = $this->getRequest(); return id(new AphrontFormToggleButtonsControl()) - ->setLabel('Status') + ->setLabel(pht('Status')) ->setValue($this->getStatusRequestValue($value)) ->setBaseURI($request->getRequestURI(), $this->getStatusRequestKey()) ->setButtons($this->getStatusButtonMap()); @@ -908,7 +918,7 @@ final class ManiphestTaskListController extends ManiphestController { public function renderOrderControl($value) { $request = $this->getRequest(); return id(new AphrontFormToggleButtonsControl()) - ->setLabel('Order') + ->setLabel(pht('Order')) ->setValue($this->getOrderRequestValue($value)) ->setBaseURI($request->getRequestURI(), $this->getOrderRequestKey()) ->setButtons($this->getOrderButtonMap()); @@ -917,7 +927,7 @@ final class ManiphestTaskListController extends ManiphestController { public function renderGroupControl($value) { $request = $this->getRequest(); return id(new AphrontFormToggleButtonsControl()) - ->setLabel('Group') + ->setLabel(pht('Group')) ->setValue($this->getGroupRequestValue($value)) ->setBaseURI($request->getRequestURI(), $this->getGroupRequestKey()) ->setButtons($this->getGroupButtonMap()); diff --git a/src/applications/maniphest/view/ManiphestTaskSummaryView.php b/src/applications/maniphest/view/ManiphestTaskSummaryView.php index 6e7b13c7ea..6e67098ee5 100644 --- a/src/applications/maniphest/view/ManiphestTaskSummaryView.php +++ b/src/applications/maniphest/view/ManiphestTaskSummaryView.php @@ -63,6 +63,7 @@ final class ManiphestTaskSummaryView extends ManiphestView { $batch = phutil_tag( 'td', array( + 'rowspan' => 2, 'class' => 'maniphest-task-batch', ), javelin_tag( @@ -91,45 +92,67 @@ final class ManiphestTaskSummaryView extends ManiphestView { $handle = javelin_tag( 'td', array( + 'rowspan' => 2, 'class' => 'maniphest-task-handle '.$pri_class.' '.$control_class, 'sigil' => $control_sigil, ), ''); - $task_id = phutil_tag( - 'td', + $task_name = phutil_tag( + 'span', array( - 'class' => 'maniphest-task-number', + 'class' => 'maniphest-task-name', ), - 'T'.$task->getID()); + phutil_tag( + 'a', + array( + 'href' => '/T'.$task->getID(), + ), + $task->getTitle())); - $task_status = phutil_tag( + $task_updated = phutil_tag( + 'span', + array( + 'class' => 'maniphest-task-updated', + ), + phabricator_date($task->getDateModified(), $this->user)); + + $task_info = phutil_tag( 'td', array( - 'class' => 'maniphest-task-status', + 'colspan' => 2, + 'class' => 'maniphest-task-number', ), - idx($status_map, $task->getStatus(), 'Unknown')); + array( + 'T'.$task->getID(), + $task_name, + $task_updated, + )); + + $owner = ''; + if ($handles[$task->getOwnerPHID()]) { + $owner = pht('Assigned to %s', + $handles[$task->getOwnerPHID()]->renderLink()); + } $task_owner = phutil_tag( - 'td', + 'span', array( 'class' => 'maniphest-task-owner', ), $task->getOwnerPHID() - ? $handles[$task->getOwnerPHID()]->renderLink() + ? $owner : phutil_tag('em', array(), pht('None'))); - $task_name = phutil_tag( + $task_status = phutil_tag( 'td', array( - 'class' => 'maniphest-task-name', + 'class' => 'maniphest-task-status', ), - phutil_tag( - 'a', - array( - 'href' => '/T'.$task->getID(), - ), - $task->getTitle())); + array( + idx($status_map, $task->getStatus(), pht('Unknown')), + $task_owner, + )); $task_projects = phutil_tag( 'td', @@ -138,25 +161,21 @@ final class ManiphestTaskSummaryView extends ManiphestView { ), $projects_view->render()); - $task_updated = phutil_tag( - 'td', - array( - 'class' => 'maniphest-task-updated', - ), - phabricator_date($task->getDateModified(), $this->user)); + $row1 = phutil_tag( + 'tr', + array(), + array( + $handle, + $batch, + $task_info, + )); - $row = phutil_tag( + $row2 = phutil_tag( 'tr', array(), array( - $handle, - $batch, - $task_id, $task_status, - $task_owner, - $task_name, $task_projects, - $task_updated, )); return javelin_tag( @@ -168,7 +187,10 @@ final class ManiphestTaskSummaryView extends ManiphestView { 'taskID' => $task->getID(), ), ), - $row); + array( + $row1, + $row2, + )); } } diff --git a/src/view/form/AphrontFormView.php b/src/view/form/AphrontFormView.php index 95e3bd2b74..8bc1c88f68 100644 --- a/src/view/form/AphrontFormView.php +++ b/src/view/form/AphrontFormView.php @@ -10,6 +10,7 @@ final class AphrontFormView extends AphrontView { private $workflow; private $id; private $flexible; + private $noShading; private $sigils = array(); public function setFlexible($flexible) { @@ -17,6 +18,11 @@ final class AphrontFormView extends AphrontView { return $this; } + public function setNoShading($shading) { + $this->noShading = $shading; + return $this; + } + public function setID($id) { $this->id = $id; return $this; @@ -60,7 +66,7 @@ final class AphrontFormView extends AphrontView { $layout = new AphrontFormLayoutView(); - if (!$this->flexible) { + if ((!$this->flexible) && (!$this->noShading)) { $layout ->setBackgroundShading(true) ->setPadded(true); diff --git a/src/view/layout/AphrontListFilterView.php b/src/view/layout/AphrontListFilterView.php index cca43fa770..7470e5a059 100644 --- a/src/view/layout/AphrontListFilterView.php +++ b/src/view/layout/AphrontListFilterView.php @@ -5,11 +5,13 @@ final class AphrontListFilterView extends AphrontView { public function render() { require_celerity_resource('aphront-list-filter-view-css'); return hsprintf( - ''. - ''. - ''. - ''. - '
%s
', + '
'. + ''. + ''. + ''. + ''. + '
%s
'. + '
', $this->renderChildren()); } diff --git a/webroot/rsrc/css/aphront/form-view.css b/webroot/rsrc/css/aphront/form-view.css index 299502a0fc..a4a88a6844 100644 --- a/webroot/rsrc/css/aphront/form-view.css +++ b/webroot/rsrc/css/aphront/form-view.css @@ -14,7 +14,6 @@ padding: 1em; } - .aphront-form-view label.aphront-form-label { padding-top: 4px; width: 19%; @@ -22,7 +21,7 @@ text-align: right; font-weight: bold; font-size: 13px; - color: #666666; + color: #666; } .device-phone .aphront-form-view label.aphront-form-label { @@ -30,6 +29,8 @@ float: none; text-align: left; width: 100%; + color: #777; + margin-bottom: 3px; } .aphront-form-input { @@ -159,7 +160,7 @@ } .aphront-form-control-togglebuttons .aphront-form-input { - padding-top: 5px; + padding: 2px 0 0 0; } table.aphront-form-control-radio-layout, @@ -368,42 +369,3 @@ table.aphront-form-control-checkbox-layout th { padding: 12px; float: right; } - -.aphront-form-control-counted-togglebuttons { - padding-top: 7px; -} - -.aphront-form-control-counted-togglebuttons .toggle { - position: relative; -} - -.aphront-form-control-counted-togglebuttons .toggle-fixed { - cursor: pointer; -} - -.aphront-form-control-counted-togglebuttons .toggle .counter { - font-size: smaller; - display: none; - position: absolute; - top: -9px; - right: -8px; - padding: 0px 3px; - border-radius: 3px; -} - -.aphront-form-control-counted-togglebuttons:hover .toggle .counter { - display: block; -} - -.aphront-form-control-counted-togglebuttons .toggle .counter { - background: gray; - color: #ddd; -} - -.aphront-form-control-counted-togglebuttons .toggle-selected .counter { - color: white; -} - -.aphront-form-control-counted-togglebuttons .toggle.disabled:hover { - background-color: #a7a7a7; -} diff --git a/webroot/rsrc/css/aphront/list-filter-view.css b/webroot/rsrc/css/aphront/list-filter-view.css index da6b24c987..2765482741 100644 --- a/webroot/rsrc/css/aphront/list-filter-view.css +++ b/webroot/rsrc/css/aphront/list-filter-view.css @@ -2,11 +2,23 @@ * @provides aphront-list-filter-view-css */ +.aphront-filter-table-wrapper { + border-left: 1px solid #e7e7e7; + border-right: 1px solid #e7e7e7; + border-bottom: 1px solid #c0c5d1; + margin: 0 20px; +} + +.device-phone .aphront-filter-table-wrapper { + margin: 0; + padding: 0; + background: #fff; +} + .aphront-list-filter-view { - background: #f4f5f8; - border-bottom: 1px solid #d4dae0; + background: #fff; width: 100%; - margin-bottom: 1em; + box-shadow: inset 0px 2px 1px rgba(150,150,150,0.25); } .aphront-list-filter-view-controls { @@ -15,6 +27,7 @@ .aphront-list-filter-view-controls .aphront-form-view { border-width: 0; + border-bottom: 1px solid #c0c5d1; padding: 12px 0 6px; } diff --git a/webroot/rsrc/css/application/maniphest/task-summary.css b/webroot/rsrc/css/application/maniphest/task-summary.css index 379a0c2fd9..4d0609d2c6 100644 --- a/webroot/rsrc/css/application/maniphest/task-summary.css +++ b/webroot/rsrc/css/application/maniphest/task-summary.css @@ -4,22 +4,19 @@ .maniphest-task-summary { width: 100%; - margin: 4px 0; + margin: 0 0 -1px 0; border-collapse: separate; - - font-size: 12px; color: #333; + border: 1px solid #c0c5d1; +} + +.maniphest-task-group { + padding-bottom: 30px; } .maniphest-task-summary td { - padding: 6px 4px; + padding: 0 10px; background: #fff; - white-space: nowrap; - - border-style: solid; - border-top-color: #d5dadf; - border-bottom-color: #d5dadf; - border-width: 1px 0; } .maniphest-task-summary td em { @@ -30,21 +27,23 @@ background: #fff; } -.maniphest-task-summary td.maniphest-task-handle { - padding: 0 4px; - width: 1px; - - border-right-width: 1px; - border-right-color: #d5dadf; +.maniphest-task-summary .maniphest-task-handle { + padding: 0 4px 0 0; + width: 5px; } .maniphest-task-summary td.maniphest-task-batch { - padding-right: 0px; - width: 16px; + padding: 15px 4px 0 10px; + width: 8px; text-align: center; overflow: hidden; } +.device-phone .maniphest-task-batch, +.device-phone .maniphest-task-updated { + display: none; +} + .maniphest-task-summary td.maniphest-task-batch, .maniphest-task-summary td.maniphest-task-batch input { cursor: pointer; @@ -55,43 +54,39 @@ } .maniphest-task-summary td.maniphest-task-number { + padding: 6px 0 2px 10px; font-weight: bold; color: #333; - width: 50px; - text-align: right; } .maniphest-task-summary td.maniphest-task-status { - width: 60px; - text-align: center; + padding: 2px 10px 6px 10px; + text-align: left; + color: #777; + font-size: 12px; } -.maniphest-task-summary td.maniphest-task-owner { - width: 100px; +.maniphest-task-summary .maniphest-task-owner { + padding-left: 20px; } -.maniphest-task-summary td.maniphest-task-name { +.maniphest-task-summary .maniphest-task-name { font-weight: bold; - white-space: normal; overflow: hidden; + margin-left: 5px; } .maniphest-task-summary td.maniphest-task-projects { - width: 180px; - text-align: right; - white-space: normal; -} - -.maniphest-task-summary td.maniphest-task-updated { text-align: right; - width: 85px; - padding-right: 8px; - border-right-width: 1px; - border-right-style: solid; - border-right-color: #d5dadf; + padding: 0px 8px; } -.maniphest-task-summary .pri-bullet { +.maniphest-task-summary .maniphest-task-updated { + float: right; + padding: 0 8px; + color: #777; + font-size: 11px; + font-weight: normal; } .maniphest-task-summary .pri-unbreak { @@ -128,19 +123,18 @@ font-size: 16px; font-weight: bold; color: #555; - padding: 5px 0; - margin-left: 20px; -} - -.aphront-panel-view .maniphest-task-group-header { - margin-left: 0; + padding: 0 0 8px 0; } .maniphest-total-result-count { text-align: right; - padding-right: 2em; + padding: 5px 20px 0 0; font-size: 11px; - color: #666666; + color: #777; +} + +.device-phone .maniphest-total-result-count { + padding-right: 5px; } .batch-editor-header { @@ -150,14 +144,17 @@ font-weight: bold; } -.maniphest-batch-editor { - margin: 20px; +/* TODO: Implement */ +.device-phone .maniphest-batch-editor { + display: none; } .maniphest-batch-editor-layout { width: 100%; - border-top: 1px solid #d5dadf; - background: #f4f5f8; + border-left: 1px solid #e7e7e7; + border-right: 1px solid #e7e7e7; + border-bottom: 1px solid #c0c5d1; + background: #fff; } .maniphest-batch-editor-layout td { @@ -203,3 +200,11 @@ td.maniphest-active-handle { position: relative; opacity: 0.5; } + +.maniphest-list-container { + padding: 20px; +} + +.device-phone .maniphest-list-container { + padding: 20px 5px; +} diff --git a/webroot/rsrc/css/core/buttons.css b/webroot/rsrc/css/core/buttons.css index ff2bf696bf..5d4d92b27e 100644 --- a/webroot/rsrc/css/core/buttons.css +++ b/webroot/rsrc/css/core/buttons.css @@ -153,35 +153,28 @@ button.link:hover { a.toggle { display: inline-block; padding: 4px 8px; + font-size: 12px; font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 1px 0 #777; + color: #555; text-decoration: none; white-space: nowrap; vertical-align: baseline; - background-color: #a7a7a7; - font-family: 'Helvetica Neue', Helvetica, Arial; - font-size: 12px; - margin: 0 5px 2px; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; + background-color: #f7f7f7; + margin: 0 6px 0 0; border-radius: 3px; + box-shadow: inset 0 0 3px rgba(0,0,0,.4); } a.toggle:hover { - background-color: #bbb; + background-color: #14568e; + color: #fff } a.toggle-selected { - background-color: #555; + background-color: #14568e; + color: #fff } a.toggle-fixed { cursor: default; } - -a.toggle-fixed:hover { - background-color: #555; -} diff --git a/webroot/rsrc/image/texture/dust_background.jpg b/webroot/rsrc/image/texture/dust_background.jpg index 0c7a7f78b1459d03d1601364c245e8e89d6c3a5b..dc55a68836b59e852ded5f249bc0602da5fb3c52 100644 GIT binary patch literal 7947 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 AL;wH) literal 6827 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 LWWowJ`TsWo#T6hu