Revert "Add "state icons" to ObjectItemListView"

+45 -45

src/__celerity_resource_map__.php

··· 3249 3249 ), 3250 3250 'phabricator-object-item-list-view-css' => 3251 3251 array( 3252 - 'uri' => '/res/85921314/rsrc/css/layout/phabricator-object-item-list-view.css', 3252 + 'uri' => '/res/eea92c62/rsrc/css/layout/phabricator-object-item-list-view.css', 3253 3253 'type' => 'css', 3254 3254 'requires' => 3255 3255 array( ··· 4073 4073 ), array( 4074 4074 'packages' => 4075 4075 array( 4076 - 'e00fd709' => 4076 + 'f38244f0' => 4077 4077 array( 4078 4078 'name' => 'core.pkg.css', 4079 4079 'symbols' => ··· 4121 4121 40 => 'phabricator-property-list-view-css', 4122 4122 41 => 'phabricator-tag-view-css', 4123 4123 ), 4124 - 'uri' => '/res/pkg/e00fd709/core.pkg.css', 4124 + 'uri' => '/res/pkg/f38244f0/core.pkg.css', 4125 4125 'type' => 'css', 4126 4126 ), 4127 4127 'f2ad0683' => ··· 4315 4315 'reverse' => 4316 4316 array( 4317 4317 'aphront-attached-file-view-css' => 'adc3c36d', 4318 - 'aphront-dialog-view-css' => 'e00fd709', 4319 - 'aphront-error-view-css' => 'e00fd709', 4320 - 'aphront-form-view-css' => 'e00fd709', 4321 - 'aphront-list-filter-view-css' => 'e00fd709', 4322 - 'aphront-pager-view-css' => 'e00fd709', 4323 - 'aphront-panel-view-css' => 'e00fd709', 4324 - 'aphront-table-view-css' => 'e00fd709', 4325 - 'aphront-tokenizer-control-css' => 'e00fd709', 4326 - 'aphront-tooltip-css' => 'e00fd709', 4327 - 'aphront-typeahead-control-css' => 'e00fd709', 4318 + 'aphront-dialog-view-css' => 'f38244f0', 4319 + 'aphront-error-view-css' => 'f38244f0', 4320 + 'aphront-form-view-css' => 'f38244f0', 4321 + 'aphront-list-filter-view-css' => 'f38244f0', 4322 + 'aphront-pager-view-css' => 'f38244f0', 4323 + 'aphront-panel-view-css' => 'f38244f0', 4324 + 'aphront-table-view-css' => 'f38244f0', 4325 + 'aphront-tokenizer-control-css' => 'f38244f0', 4326 + 'aphront-tooltip-css' => 'f38244f0', 4327 + 'aphront-typeahead-control-css' => 'f38244f0', 4328 4328 'differential-changeset-view-css' => 'dd27a69b', 4329 4329 'differential-core-view-css' => 'dd27a69b', 4330 4330 'differential-inline-comment-editor' => '9488bb69', ··· 4338 4338 'differential-table-of-contents-css' => 'dd27a69b', 4339 4339 'diffusion-commit-view-css' => 'c8ce2d88', 4340 4340 'diffusion-icons-css' => 'c8ce2d88', 4341 - 'global-drag-and-drop-css' => 'e00fd709', 4341 + 'global-drag-and-drop-css' => 'f38244f0', 4342 4342 'inline-comment-summary-css' => 'dd27a69b', 4343 4343 'javelin-aphlict' => 'f2ad0683', 4344 4344 'javelin-behavior' => 'a9f14d76', ··· 4412 4412 'javelin-util' => 'a9f14d76', 4413 4413 'javelin-vector' => 'a9f14d76', 4414 4414 'javelin-workflow' => 'a9f14d76', 4415 - 'lightbox-attachment-css' => 'e00fd709', 4415 + 'lightbox-attachment-css' => 'f38244f0', 4416 4416 'maniphest-task-summary-css' => 'adc3c36d', 4417 4417 'maniphest-transaction-detail-css' => 'adc3c36d', 4418 - 'phabricator-action-list-view-css' => 'e00fd709', 4419 - 'phabricator-application-launch-view-css' => 'e00fd709', 4418 + 'phabricator-action-list-view-css' => 'f38244f0', 4419 + 'phabricator-application-launch-view-css' => 'f38244f0', 4420 4420 'phabricator-busy' => 'f2ad0683', 4421 4421 'phabricator-content-source-view-css' => 'dd27a69b', 4422 - 'phabricator-core-css' => 'e00fd709', 4423 - 'phabricator-crumbs-view-css' => 'e00fd709', 4422 + 'phabricator-core-css' => 'f38244f0', 4423 + 'phabricator-crumbs-view-css' => 'f38244f0', 4424 4424 'phabricator-drag-and-drop-file-upload' => '9488bb69', 4425 4425 'phabricator-dropdown-menu' => 'f2ad0683', 4426 4426 'phabricator-file-upload' => 'f2ad0683', 4427 - 'phabricator-filetree-view-css' => 'e00fd709', 4428 - 'phabricator-flag-css' => 'e00fd709', 4429 - 'phabricator-form-view-css' => 'e00fd709', 4430 - 'phabricator-header-view-css' => 'e00fd709', 4427 + 'phabricator-filetree-view-css' => 'f38244f0', 4428 + 'phabricator-flag-css' => 'f38244f0', 4429 + 'phabricator-form-view-css' => 'f38244f0', 4430 + 'phabricator-header-view-css' => 'f38244f0', 4431 4431 'phabricator-hovercard' => 'f2ad0683', 4432 - 'phabricator-jump-nav' => 'e00fd709', 4432 + 'phabricator-jump-nav' => 'f38244f0', 4433 4433 'phabricator-keyboard-shortcut' => 'f2ad0683', 4434 4434 'phabricator-keyboard-shortcut-manager' => 'f2ad0683', 4435 - 'phabricator-main-menu-view' => 'e00fd709', 4435 + 'phabricator-main-menu-view' => 'f38244f0', 4436 4436 'phabricator-menu-item' => 'f2ad0683', 4437 - 'phabricator-nav-view-css' => 'e00fd709', 4437 + 'phabricator-nav-view-css' => 'f38244f0', 4438 4438 'phabricator-notification' => 'f2ad0683', 4439 - 'phabricator-notification-css' => 'e00fd709', 4440 - 'phabricator-notification-menu-css' => 'e00fd709', 4441 - 'phabricator-object-item-list-view-css' => 'e00fd709', 4439 + 'phabricator-notification-css' => 'f38244f0', 4440 + 'phabricator-notification-menu-css' => 'f38244f0', 4441 + 'phabricator-object-item-list-view-css' => 'f38244f0', 4442 4442 'phabricator-object-selector-css' => 'dd27a69b', 4443 4443 'phabricator-phtize' => 'f2ad0683', 4444 4444 'phabricator-prefab' => 'f2ad0683', 4445 4445 'phabricator-project-tag-css' => 'adc3c36d', 4446 - 'phabricator-property-list-view-css' => 'e00fd709', 4447 - 'phabricator-remarkup-css' => 'e00fd709', 4446 + 'phabricator-property-list-view-css' => 'f38244f0', 4447 + 'phabricator-remarkup-css' => 'f38244f0', 4448 4448 'phabricator-shaped-request' => '9488bb69', 4449 - 'phabricator-side-menu-view-css' => 'e00fd709', 4450 - 'phabricator-standard-page-view' => 'e00fd709', 4451 - 'phabricator-tag-view-css' => 'e00fd709', 4449 + 'phabricator-side-menu-view-css' => 'f38244f0', 4450 + 'phabricator-standard-page-view' => 'f38244f0', 4451 + 'phabricator-tag-view-css' => 'f38244f0', 4452 4452 'phabricator-textareautils' => 'f2ad0683', 4453 4453 'phabricator-tooltip' => 'f2ad0683', 4454 - 'phabricator-transaction-view-css' => 'e00fd709', 4455 - 'phabricator-zindex-css' => 'e00fd709', 4456 - 'phui-button-css' => 'e00fd709', 4457 - 'phui-form-css' => 'e00fd709', 4458 - 'phui-icon-view-css' => 'e00fd709', 4459 - 'phui-spacing-css' => 'e00fd709', 4460 - 'sprite-apps-large-css' => 'e00fd709', 4461 - 'sprite-gradient-css' => 'e00fd709', 4462 - 'sprite-icons-css' => 'e00fd709', 4463 - 'sprite-menu-css' => 'e00fd709', 4464 - 'syntax-highlighting-css' => 'e00fd709', 4454 + 'phabricator-transaction-view-css' => 'f38244f0', 4455 + 'phabricator-zindex-css' => 'f38244f0', 4456 + 'phui-button-css' => 'f38244f0', 4457 + 'phui-form-css' => 'f38244f0', 4458 + 'phui-icon-view-css' => 'f38244f0', 4459 + 'phui-spacing-css' => 'f38244f0', 4460 + 'sprite-apps-large-css' => 'f38244f0', 4461 + 'sprite-gradient-css' => 'f38244f0', 4462 + 'sprite-icons-css' => 'f38244f0', 4463 + 'sprite-menu-css' => 'f38244f0', 4464 + 'syntax-highlighting-css' => 'f38244f0', 4465 4465 ), 4466 4466 ));

-51

src/applications/uiexample/examples/PhabricatorObjectItemListExample.php

··· 289 289 290 290 $out[] = array($head, $list); 291 291 292 - $head = id(new PhabricatorHeaderView()) 293 - ->setHeader(pht('State Icons')); 294 - $list = new PhabricatorObjectItemListView(); 295 - 296 - $list->addItem( 297 - id(new PhabricatorObjectItemView()) 298 - ->setHeader(pht('Item With State')) 299 - ->addStateIcon('blame')); 300 - 301 - $list->addItem( 302 - id(new PhabricatorObjectItemView()) 303 - ->setHeader(pht('Grippable Item With State')) 304 - ->setGrippable(true) 305 - ->addStateIcon('blame')); 306 - 307 - $list->addItem( 308 - id(new PhabricatorObjectItemView()) 309 - ->setHeader(pht('Two State')) 310 - ->setStateIconColumns(2) 311 - ->addStateIcon('blame') 312 - ->addStateIcon('blame')); 313 - 314 - $list->addItem( 315 - id(new PhabricatorObjectItemView()) 316 - ->setHeader(pht('Grippable Two State')) 317 - ->setGrippable(true) 318 - ->setStateIconColumns(2) 319 - ->addStateIcon('blame') 320 - ->addStateIcon('blame')); 321 - 322 - $list->addItem( 323 - id(new PhabricatorObjectItemView()) 324 - ->setHeader(pht('Three State')) 325 - ->addAttribute(pht('The quick brown fox...')) 326 - ->setStateIconColumns(2) 327 - ->addStateIcon('home') 328 - ->addStateIcon('tag') 329 - ->addStateIcon('unlock')); 330 - 331 - $list->addItem( 332 - id(new PhabricatorObjectItemView()) 333 - ->setHeader(pht('Four State')) 334 - ->addAttribute(pht('...jumps over the lazy dog.')) 335 - ->setStateIconColumns(2) 336 - ->addStateIcon('world-grey', pht('World')) 337 - ->addStateIcon('fork-grey', pht('Fork')) 338 - ->addStateIcon('herald-grey', pht('Herald')) 339 - ->addStateIcon('preview-grey', pht('Eye'))); 340 - 341 - $out[] = array($head, $list); 342 - 343 292 return $out; 344 293 } 345 294 }

-53

src/view/layout/PhabricatorObjectItemView.php

··· 16 16 private $bylines = array(); 17 17 private $grippable; 18 18 private $actions = array(); 19 - private $stateIconColumns = 0; 20 - private $stateIcons = array(); 21 19 private $headIcons = array(); 22 - 23 - public function setStateIconColumns($state_icon_columns) { 24 - $this->stateIconColumns = $state_icon_columns; 25 - return $this; 26 - } 27 - 28 - public function addStateIcon($name, $label = null, $attributes = array()) { 29 - $this->stateIcons[] = array( 30 - 'name' => $name, 31 - 'label' => $label, 32 - 'attributes' => $attributes, 33 - ); 34 - if (!$this->stateIconColumns) { 35 - $this->stateIconColumns = 1; 36 - } 37 - return $this; 38 - } 39 20 40 21 public function addHeadIcon($icon) { 41 22 $this->headIcons[] = $icon; ··· 206 187 207 188 if ($this->getGrippable()) { 208 189 $item_classes[] = 'phabricator-object-item-grippable'; 209 - } 210 - 211 - if ($this->stateIconColumns) { 212 - $cols = $this->stateIconColumns; 213 - $item_classes[] = 'phabricator-object-item-state-'.$cols.'-cols'; 214 190 } 215 191 216 192 return array( ··· 424 400 ''); 425 401 } 426 402 427 - $state_icons = null; 428 - if ($this->stateIconColumns) { 429 - $state_icon_list = array(); 430 - foreach ($this->stateIcons as $state_icon) { 431 - $sicon = id(new PHUIIconView()) 432 - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) 433 - ->setSpriteIcon($state_icon['name']); 434 - 435 - if ($state_icon['label']) { 436 - $sicon->addSigil('has-tooltip'); 437 - $sicon->setMetadata( 438 - array( 439 - 'tip' => $state_icon['label'], 440 - )); 441 - } 442 - 443 - $state_icon_list[] = $sicon; 444 - } 445 - $cols = $this->stateIconColumns; 446 - $state_icons = phutil_tag( 447 - 'div', 448 - array( 449 - 'class' => 'phabricator-object-item-state-icons '. 450 - 'state-icon-'.$cols.'-cols', 451 - ), 452 - $state_icon_list); 453 - } 454 - 455 403 $content = phutil_tag( 456 404 'div', 457 405 array( ··· 471 419 ), 472 420 array( 473 421 $grippable, 474 - $state_icons, 475 422 $header, 476 423 $icons, 477 424 $bylines,

-39

webroot/rsrc/css/layout/phabricator-object-item-list-view.css

··· 89 89 background: url(/rsrc/image/texture/grip.png) center center no-repeat; 90 90 } 91 91 92 - .phabricator-object-item-state-icons { 93 - top: 0; 94 - left: 4px; 95 - width: 20px; 96 - position: absolute; 97 - padding: 6px 4px; 98 - } 99 - 100 - .phabricator-object-item-state-icons span.phui-icon-view { 101 - display: inline-block; 102 - margin: 1px 2px 2px; 103 - } 104 - 105 - .phabricator-object-item-grippable .phabricator-object-item-state-icons { 106 - left: 15px; 107 - } 108 - 109 - .state-icon-2-cols { 110 - width: 40px; 111 - } 112 - 113 92 .phabricator-object-item-grippable .phabricator-object-item-frame { 114 93 padding-left: 11px; 115 - } 116 - 117 - .phabricator-object-item-state-1-cols .phabricator-object-item-frame { 118 - padding-left: 24px; 119 - } 120 - 121 - .phabricator-object-item-state-2-cols .phabricator-object-item-frame { 122 - padding-left: 44px; 123 - } 124 - 125 - .phabricator-object-item-grippable.phabricator-object-item-state-1-cols 126 - .phabricator-object-item-frame { 127 - padding-left: 35px; 128 - } 129 - 130 - .phabricator-object-item-grippable.phabricator-object-item-state-2-cols 131 - .phabricator-object-item-frame { 132 - padding-left: 55px; 133 94 } 134 95 135 96 .phabricator-object-item-list-header {

Configure Feed

Configure Feed