recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Update PHUIStatusItemView to FontAwesome

Summary: Changes to using FontAwesome

Test Plan:
Testing UIExamples and each of the pages (except releelph)

{F155942}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9157

Chad Little 31cd9b21 43d45c49

+191 -86
+2 -2
resources/celerity/map.php
··· 113 113 'rsrc/css/diviner/diviner-shared.css' => '38813222', 114 114 'rsrc/css/font/font-awesome.css' => '73d075c3', 115 115 'rsrc/css/font/font-source-sans-pro.css' => '91d53463', 116 - 'rsrc/css/font/phui-font-icon-base.css' => '104caddd', 116 + 'rsrc/css/font/phui-font-icon-base.css' => '74cfb6a9', 117 117 'rsrc/css/layout/phabricator-action-header-view.css' => 'c14dfc57', 118 118 'rsrc/css/layout/phabricator-action-list-view.css' => 'dcd9875f', 119 119 'rsrc/css/layout/phabricator-crumbs-view.css' => '6a23399c', ··· 763 763 'phui-calendar-month-css' => 'a92e47d2', 764 764 'phui-document-view-css' => '3b078dc0', 765 765 'phui-feed-story-css' => '3a59c2cf', 766 - 'phui-font-icon-base-css' => '104caddd', 766 + 'phui-font-icon-base-css' => '74cfb6a9', 767 767 'phui-fontkit-css' => 'de84aa4a', 768 768 'phui-form-css' => 'b78ec020', 769 769 'phui-form-view-css' => '867463b4',
+26 -10
src/applications/differential/view/DifferentialReviewersView.php
··· 43 43 44 44 switch ($reviewer->getStatus()) { 45 45 case DifferentialReviewerStatus::STATUS_ADDED: 46 - $item->setIcon('open', pht('Review Requested')); 46 + $item->setIcon( 47 + PHUIStatusItemView::ICON_OPEN, 48 + 'bluegrey', 49 + pht('Review Requested')); 47 50 break; 48 51 49 52 case DifferentialReviewerStatus::STATUS_ACCEPTED: 50 53 if ($is_current) { 51 54 $item->setIcon( 52 - 'accept-green', 55 + PHUIStatusItemView::ICON_ACCEPT, 56 + 'green', 53 57 pht('Accepted')); 54 58 } else { 55 59 $item->setIcon( 56 - 'accept-dark', 60 + PHUIStatusItemView::ICON_ACCEPT, 61 + 'dark', 57 62 pht('Accepted Prior Diff')); 58 63 } 59 64 break; 60 65 61 66 case DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER: 62 67 $item->setIcon( 63 - 'accept-dark', 68 + PHUIStatusItemView::ICON_ACCEPT, 69 + 'dark', 64 70 pht('Accepted Prior Diff')); 65 71 break; 66 72 67 73 case DifferentialReviewerStatus::STATUS_REJECTED: 68 74 if ($is_current) { 69 75 $item->setIcon( 70 - 'reject-red', 76 + PHUIStatusItemView::ICON_REJECT, 77 + 'red', 71 78 pht('Requested Changes')); 72 79 } else { 73 80 $item->setIcon( 74 - 'reject-dark', 81 + PHUIStatusItemView::ICON_REJECT, 82 + 'dark', 75 83 pht('Requested Changes to Prior Diff')); 76 84 } 77 85 break; 78 86 79 87 case DifferentialReviewerStatus::STATUS_REJECTED_OLDER: 80 88 $item->setIcon( 81 - 'reject-dark', 89 + PHUIStatusItemView::ICON_REJECT, 90 + 'dark', 82 91 pht('Rejected Prior Diff')); 83 92 break; 84 93 85 94 case DifferentialReviewerStatus::STATUS_COMMENTED: 86 95 if ($is_current) { 87 96 $item->setIcon( 88 - 'info', 97 + PHUIStatusItemView::ICON_INFO, 98 + 'bluegrey', 89 99 pht('Commented')); 90 100 } else { 91 101 $item->setIcon( ··· 95 105 break; 96 106 97 107 case DifferentialReviewerStatus::STATUS_BLOCKING: 98 - $item->setIcon('minus-red', pht('Blocking Review')); 108 + $item->setIcon( 109 + PHUIStatusItemView::ICON_MINUS, 110 + 'red', 111 + pht('Blocking Review')); 99 112 break; 100 113 101 114 default: 102 - $item->setIcon('question', pht('%s?', $reviewer->getStatus())); 115 + $item->setIcon( 116 + PHUIStatusItemView::ICON_QUESTION, 117 + 'bluegrey', 118 + pht('%s?', $reviewer->getStatus())); 103 119 break; 104 120 105 121 }
+34 -9
src/applications/diffusion/controller/DiffusionCommitController.php
··· 1073 1073 1074 1074 switch ($request->getAuditStatus()) { 1075 1075 case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED: 1076 - $item->setIcon('open-blue', pht('Commented')); 1076 + $item->setIcon( 1077 + PHUIStatusItemView::ICON_OPEN, 1078 + 'blue', 1079 + pht('Commented')); 1077 1080 break; 1078 1081 case PhabricatorAuditStatusConstants::AUDIT_REQUIRED: 1079 - $item->setIcon('warning-blue', pht('Audit Required')); 1082 + $item->setIcon( 1083 + PHUIStatusItemView::ICON_WARNING, 1084 + 'blue', 1085 + pht('Audit Required')); 1080 1086 break; 1081 1087 case PhabricatorAuditStatusConstants::CONCERNED: 1082 - $item->setIcon('reject-red', pht('Concern Raised')); 1088 + $item->setIcon( 1089 + PHUIStatusItemView::ICON_REJECT, 1090 + 'red', 1091 + pht('Concern Raised')); 1083 1092 break; 1084 1093 case PhabricatorAuditStatusConstants::ACCEPTED: 1085 - $item->setIcon('accept-green', pht('Accepted')); 1094 + $item->setIcon( 1095 + PHUIStatusItemView::ICON_ACCEPT, 1096 + 'green', 1097 + pht('Accepted')); 1086 1098 break; 1087 1099 case PhabricatorAuditStatusConstants::AUDIT_REQUESTED: 1088 - $item->setIcon('warning-dark', pht('Audit Requested')); 1100 + $item->setIcon( 1101 + PHUIStatusItemView::ICON_WARNING, 1102 + 'dark', 1103 + pht('Audit Requested')); 1089 1104 break; 1090 1105 case PhabricatorAuditStatusConstants::RESIGNED: 1091 - $item->setIcon('open-dark', pht('Resigned')); 1106 + $item->setIcon( 1107 + PHUIStatusItemView::ICON_OPEN, 1108 + 'dark', 1109 + pht('Resigned')); 1092 1110 break; 1093 1111 case PhabricatorAuditStatusConstants::CLOSED: 1094 - $item->setIcon('accept-blue', pht('Closed')); 1112 + $item->setIcon( 1113 + PHUIStatusItemView::ICON_ACCEPT, 1114 + 'blue', 1115 + pht('Closed')); 1095 1116 break; 1096 1117 case PhabricatorAuditStatusConstants::CC: 1097 - $item->setIcon('info-dark', pht('Subscribed')); 1118 + $item->setIcon( 1119 + PHUIStatusItemView::ICON_INFO, 1120 + 'dark', 1121 + pht('Subscribed')); 1098 1122 break; 1099 1123 default: 1100 1124 $item->setIcon( 1101 - 'question-dark', 1125 + PHUIStatusItemView::ICON_QUESTION, 1126 + 'dark', 1102 1127 pht('%s?', $request->getAuditStatus())); 1103 1128 break; 1104 1129 }
+23 -23
src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
··· 684 684 if ($repository->isTracked()) { 685 685 $view->addItem( 686 686 id(new PHUIStatusItemView()) 687 - ->setIcon('accept-green') 687 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 688 688 ->setTarget(pht('Repository Active'))); 689 689 } else { 690 690 $view->addItem( 691 691 id(new PHUIStatusItemView()) 692 - ->setIcon('warning') 692 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'bluegrey') 693 693 ->setTarget(pht('Repository Inactive')) 694 694 ->setNote( 695 695 pht('Activate this repository to begin or resume import.'))); ··· 752 752 if (!$where) { 753 753 $view->addItem( 754 754 id(new PHUIStatusItemView()) 755 - ->setIcon('warning-red') 755 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 756 756 ->setTarget( 757 757 pht('Missing Binary %s', phutil_tag('tt', array(), $binary))) 758 758 ->setNote(pht( ··· 762 762 } else { 763 763 $view->addItem( 764 764 id(new PHUIStatusItemView()) 765 - ->setIcon('accept-green') 765 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 766 766 ->setTarget( 767 767 pht('Found Binary %s', phutil_tag('tt', array(), $binary))) 768 768 ->setNote(phutil_tag('tt', array(), $where))); ··· 787 787 if (!$in_path) { 788 788 $view->addItem( 789 789 id(new PHUIStatusItemView()) 790 - ->setIcon('warning-red') 790 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 791 791 ->setTarget( 792 792 pht('Missing Binary %s', phutil_tag('tt', array(), $binary))) 793 793 ->setNote(pht( ··· 822 822 if ($pull_daemon) { 823 823 $view->addItem( 824 824 id(new PHUIStatusItemView()) 825 - ->setIcon('accept-green') 825 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 826 826 ->setTarget(pht('Pull Daemon Running'))); 827 827 } else { 828 828 $view->addItem( 829 829 id(new PHUIStatusItemView()) 830 - ->setIcon('warning-red') 830 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 831 831 ->setTarget(pht('Pull Daemon Not Running')) 832 832 ->setNote($daemon_instructions)); 833 833 } ··· 842 842 if ($task_daemon) { 843 843 $view->addItem( 844 844 id(new PHUIStatusItemView()) 845 - ->setIcon('accept-green') 845 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 846 846 ->setTarget(pht('Task Daemon Running'))); 847 847 } else { 848 848 $view->addItem( 849 849 id(new PHUIStatusItemView()) 850 - ->setIcon('warning-red') 850 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 851 851 ->setTarget(pht('Task Daemon Not Running')) 852 852 ->setNote($daemon_instructions)); 853 853 } ··· 857 857 if (Filesystem::pathExists($local_parent)) { 858 858 $view->addItem( 859 859 id(new PHUIStatusItemView()) 860 - ->setIcon('accept-green') 860 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 861 861 ->setTarget(pht('Storage Directory OK')) 862 862 ->setNote(phutil_tag('tt', array(), $local_parent))); 863 863 } else { 864 864 $view->addItem( 865 865 id(new PHUIStatusItemView()) 866 - ->setIcon('warning-red') 866 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 867 867 ->setTarget(pht('No Storage Directory')) 868 868 ->setNote( 869 869 pht( ··· 880 880 case PhabricatorRepositoryStatusMessage::CODE_ERROR: 881 881 $view->addItem( 882 882 id(new PHUIStatusItemView()) 883 - ->setIcon('warning-red') 883 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 884 884 ->setTarget(pht('Initialization Error')) 885 885 ->setNote($message->getParameter('message'))); 886 886 return $view; ··· 888 888 if (Filesystem::pathExists($local_path)) { 889 889 $view->addItem( 890 890 id(new PHUIStatusItemView()) 891 - ->setIcon('accept-green') 891 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 892 892 ->setTarget(pht('Working Copy OK')) 893 893 ->setNote(phutil_tag('tt', array(), $local_path))); 894 894 } else { 895 895 $view->addItem( 896 896 id(new PHUIStatusItemView()) 897 - ->setIcon('warning-red') 897 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 898 898 ->setTarget(pht('Working Copy Error')) 899 899 ->setNote( 900 900 pht( ··· 909 909 case PhabricatorRepositoryStatusMessage::CODE_WORKING: 910 910 $view->addItem( 911 911 id(new PHUIStatusItemView()) 912 - ->setIcon('time-green') 912 + ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green') 913 913 ->setTarget(pht('Initializing Working Copy')) 914 914 ->setNote(pht('Daemons are initializing the working copy.'))); 915 915 return $view; 916 916 default: 917 917 $view->addItem( 918 918 id(new PHUIStatusItemView()) 919 - ->setIcon('warning-red') 919 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 920 920 ->setTarget(pht('Unknown Init Status')) 921 921 ->setNote($message->getStatusCode())); 922 922 return $view; ··· 924 924 } else { 925 925 $view->addItem( 926 926 id(new PHUIStatusItemView()) 927 - ->setIcon('time-orange') 927 + ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange') 928 928 ->setTarget(pht('No Working Copy Yet')) 929 929 ->setNote( 930 930 pht('Waiting for daemons to build a working copy.'))); ··· 938 938 case PhabricatorRepositoryStatusMessage::CODE_ERROR: 939 939 $view->addItem( 940 940 id(new PHUIStatusItemView()) 941 - ->setIcon('warning-red') 941 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red') 942 942 ->setTarget(pht('Update Error')) 943 943 ->setNote($message->getParameter('message'))); 944 944 return $view; 945 945 case PhabricatorRepositoryStatusMessage::CODE_OKAY: 946 946 $view->addItem( 947 947 id(new PHUIStatusItemView()) 948 - ->setIcon('accept-green') 948 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 949 949 ->setTarget(pht('Updates OK')) 950 950 ->setNote( 951 951 pht( ··· 956 956 } else { 957 957 $view->addItem( 958 958 id(new PHUIStatusItemView()) 959 - ->setIcon('time-orange') 959 + ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange') 960 960 ->setTarget(pht('Waiting For Update')) 961 961 ->setNote( 962 962 pht('Waiting for daemons to read updates.'))); ··· 1005 1005 1006 1006 $view->addItem( 1007 1007 id(new PHUIStatusItemView()) 1008 - ->setIcon('time-green') 1008 + ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green') 1009 1009 ->setTarget(pht('Importing')) 1010 1010 ->setNote( 1011 1011 pht('%s Complete', $percentage))); 1012 1012 } else { 1013 1013 $view->addItem( 1014 1014 id(new PHUIStatusItemView()) 1015 - ->setIcon('accept-green') 1015 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green') 1016 1016 ->setTarget(pht('Fully Imported'))); 1017 1017 } 1018 1018 1019 1019 if (idx($messages, PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE)) { 1020 1020 $view->addItem( 1021 1021 id(new PHUIStatusItemView()) 1022 - ->setIcon('up') 1022 + ->setIcon(PHUIStatusItemView::ICON_UP, 'indigo') 1023 1023 ->setTarget(pht('Prioritized')) 1024 1024 ->setNote(pht('This repository will be updated soon.'))); 1025 1025 }
+13 -7
src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
··· 252 252 foreach ($targets as $target) { 253 253 switch ($target->getTargetStatus()) { 254 254 case HarbormasterBuildTarget::STATUS_PENDING: 255 - $icon = 'time-green'; 255 + $icon = PHUIStatusItemView::ICON_CLOCK; 256 + $color = 'green'; 256 257 $status_name = pht('Pending'); 257 258 break; 258 259 case HarbormasterBuildTarget::STATUS_BUILDING: 259 - $icon = 'right-green'; 260 + $icon = PHUIStatusItemView::ICON_RIGHT; 261 + $color = 'green'; 260 262 $status_name = pht('Building'); 261 263 break; 262 264 case HarbormasterBuildTarget::STATUS_WAITING: 263 - $icon = 'time-orange'; 265 + $icon = PHUIStatusItemView::ICON_CLOCK; 266 + $color = 'orange'; 264 267 $status_name = pht('Waiting'); 265 268 break; 266 269 case HarbormasterBuildTarget::STATUS_PASSED: 267 - $icon = 'accept-green'; 270 + $icon = PHUIStatusItemView::ICON_ACCEPT; 271 + $color = 'green'; 268 272 $status_name = pht('Passed'); 269 273 break; 270 274 case HarbormasterBuildTarget::STATUS_FAILED: 271 - $icon = 'reject-red'; 275 + $icon = PHUIStatusItemView::ICON_REJECT; 276 + $color = 'red'; 272 277 $status_name = pht('Failed'); 273 278 break; 274 279 default: 275 - $icon = 'question'; 280 + $icon = PHUIStatusItemView::ICON_QUESTION; 281 + $color = 'bluegrey'; 276 282 $status_name = pht('Unknown'); 277 283 break; 278 284 } ··· 286 292 287 293 $target_list->addItem( 288 294 id(new PHUIStatusItemView()) 289 - ->setIcon($icon, $status_name) 295 + ->setIcon($icon, $color, $status_name) 290 296 ->setTarget(pht('Target %d', $target->getID())) 291 297 ->setNote($name)); 292 298 }
+13 -7
src/applications/harbormaster/controller/HarbormasterPlanViewController.php
··· 314 314 $bound = phutil_tag('em', array(), pht('(null)')); 315 315 if ($is_input) { 316 316 // This is an unbound input. For now, all inputs are always required. 317 - $icon = 'warning-red'; 317 + $icon = PHUIStatusItemView::ICON_WARNING; 318 + $color = 'red'; 318 319 $icon_label = pht('Required Input'); 319 320 $has_conflicts = true; 320 321 $error = pht('This input is required, but not configured.'); 321 322 } else { 322 323 // This is an unnamed output. Outputs do not necessarily need to be 323 324 // named. 324 - $icon = 'open'; 325 + $icon = PHUIStatusItemView::ICON_OPEN; 326 + $color = 'bluegrey'; 325 327 $icon_label = pht('Unused Output'); 326 328 } 327 329 } else { ··· 329 331 if ($is_input) { 330 332 if (isset($available_artifacts[$key])) { 331 333 if ($available_artifacts[$key] == idx($artifact, 'type')) { 332 - $icon = 'accept-green'; 334 + $icon = PHUIStatusItemView::ICON_ACCEPT; 335 + $color = 'green'; 333 336 $icon_label = pht('Valid Input'); 334 337 } else { 335 - $icon = 'warning-red'; 338 + $icon = PHUIStatusItemView::ICON_WARNING; 339 + $color = 'red'; 336 340 $icon_label = pht('Bad Input Type'); 337 341 $has_conflicts = true; 338 342 $error = pht( ··· 342 346 idx($artifact, 'type')); 343 347 } 344 348 } else { 345 - $icon = 'question-red'; 349 + $icon = PHUIStatusItemView::ICON_QUESTION; 350 + $color = 'red'; 346 351 $icon_label = pht('Unknown Input'); 347 352 $has_conflicts = true; 348 353 $error = pht( ··· 351 356 $key); 352 357 } 353 358 } else { 354 - $icon = 'down-green'; 359 + $icon = PHUIStatusItemView::ICON_DOWN; 360 + $color = 'green'; 355 361 $icon_label = pht('Valid Output'); 356 362 } 357 363 } ··· 367 373 368 374 $list->addItem( 369 375 id(new PHUIStatusItemView()) 370 - ->setIcon($icon, $icon_label) 376 + ->setIcon($icon, $color, $icon_label) 371 377 ->setTarget($artifact['name']) 372 378 ->setNote($note)); 373 379 }
+17 -9
src/applications/harbormaster/event/HarbormasterUIEventListener.php
··· 77 77 78 78 switch ($status) { 79 79 case HarbormasterBuild::STATUS_INACTIVE: 80 - $icon = 'open-dark'; 80 + $icon = PHUIStatusItemView::ICON_OPEN; 81 + $color = 'dark'; 81 82 break; 82 83 case HarbormasterBuild::STATUS_PENDING: 83 - $icon = 'open-blue'; 84 + $icon = PHUIStatusItemView::ICON_OPEN; 85 + $color = 'blue'; 84 86 break; 85 87 case HarbormasterBuild::STATUS_BUILDING: 86 - $icon = 'right-blue'; 88 + $icon = PHUIStatusItemView::ICON_RIGHT; 89 + $color = 'blue'; 87 90 break; 88 91 case HarbormasterBuild::STATUS_PASSED: 89 - $icon = 'accept-green'; 92 + $icon = PHUIStatusItemView::ICON_ACCEPT; 93 + $color = 'green'; 90 94 break; 91 95 case HarbormasterBuild::STATUS_FAILED: 92 - $icon = 'reject-red'; 96 + $icon = PHUIStatusItemView::ICON_REJECT; 97 + $color = 'red'; 93 98 break; 94 99 case HarbormasterBuild::STATUS_ERROR: 95 - $icon = 'minus-red'; 100 + $icon = PHUIStatusItemView::ICON_MINUS; 101 + $color = 'red'; 96 102 break; 97 103 case HarbormasterBuild::STATUS_STOPPED: 98 - $icon = 'minus-dark'; 104 + $icon = PHUIStatusItemView::ICON_MINUS; 105 + $color = 'dark'; 99 106 break; 100 107 default: 101 - $icon = 'question'; 108 + $icon = PHUIStatusItemView::ICON_QUESTION; 109 + $color = 'bluegrey'; 102 110 break; 103 111 } 104 112 105 - $item->setIcon($icon, $status_name); 113 + $item->setIcon($icon, $color, $status_name); 106 114 107 115 108 116 $status_view->addItem($item);
+12 -3
src/applications/phrequent/event/PhrequentUIEventListener.php
··· 117 117 118 118 switch ($state) { 119 119 case 'active': 120 - $item->setIcon('time-green', pht('Working Now')); 120 + $item->setIcon( 121 + PHUIStatusItemView::ICON_CLOCK, 122 + 'green', 123 + pht('Working Now')); 121 124 break; 122 125 case 'suspended': 123 - $item->setIcon('time-yellow', pht('Interrupted')); 126 + $item->setIcon( 127 + PHUIStatusItemView::ICON_CLOCK, 128 + 'yellow', 129 + pht('Interrupted')); 124 130 break; 125 131 case 'stopped': 126 - $item->setIcon('time-orange', pht('Not Working Now')); 132 + $item->setIcon( 133 + PHUIStatusItemView::ICON_CLOCK, 134 + 'bluegrey', 135 + pht('Not Working Now')); 127 136 break; 128 137 } 129 138
+7 -4
src/applications/releeph/field/specification/ReleephIntentFieldSpecification.php
··· 44 44 foreach ($intents as $phid => $intent) { 45 45 switch ($intent) { 46 46 case ReleephRequest::INTENT_WANT: 47 - $icon = 'accept-green'; 47 + $icon = PHUIStatusItemView::ICON_ACCEPT; 48 + $color = 'green'; 48 49 $label = pht('Want'); 49 50 break; 50 51 case ReleephRequest::INTENT_PASS: 51 - $icon = 'reject-red'; 52 + $icon = PHUIStatusItemView::ICON_REJECT; 53 + $color = 'red'; 52 54 $label = pht('Pass'); 53 55 break; 54 56 default: 55 - $icon = 'question'; 57 + $icon = PHUIStatusItemView::ICON_QUESTION; 58 + $color = 'bluegrey'; 56 59 $label = pht('Unknown Intent (%s)', $intent); 57 60 break; 58 61 } ··· 64 67 65 68 $view->addItem( 66 69 id(new PHUIStatusItemView()) 67 - ->setIcon($icon, $label) 70 + ->setIcon($icon, $color, $label) 68 71 ->setTarget($target)); 69 72 } 70 73
+22 -9
src/applications/uiexample/examples/PhabricatorUIStatusExample.php
··· 19 19 20 20 $view->addItem( 21 21 id(new PHUIStatusItemView()) 22 - ->setIcon('accept-green', pht('Yum')) 22 + ->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green', pht('Yum')) 23 23 ->setTarget(pht('Apple')) 24 24 ->setNote(pht('You can eat them.'))); 25 25 26 26 $view->addItem( 27 27 id(new PHUIStatusItemView()) 28 - ->setIcon('add-blue', pht('Has Peel')) 28 + ->setIcon(PHUIStatusItemView::ICON_ADD, 'blue', pht('Has Peel')) 29 29 ->setTarget(pht('Banana')) 30 30 ->setNote(pht('Comes in bunches.')) 31 31 ->setHighlighted(true)); 32 32 33 33 $view->addItem( 34 34 id(new PHUIStatusItemView()) 35 - ->setIcon('warning-dark', pht('Caution')) 35 + ->setIcon(PHUIStatusItemView::ICON_WARNING, 'dark', pht('Caution')) 36 36 ->setTarget(pht('Pomegranite')) 37 37 ->setNote(pht('Lots of seeds. Watch out.'))); 38 38 39 39 $view->addItem( 40 40 id(new PHUIStatusItemView()) 41 - ->setIcon('reject-red', pht('Bleh!')) 41 + ->setIcon(PHUIStatusItemView::ICON_REJECT, 'red', pht('Bleh!')) 42 42 ->setTarget(pht('Zucchini')) 43 43 ->setNote(pht('Slimy and gross. Yuck!'))); 44 44 ··· 54 54 55 55 $view = new PHUIStatusListView(); 56 56 57 - $manifest = PHUIIconView::getSheetManifest(PHUIIconView::SPRITE_STATUS); 57 + $manifest = array( 58 + PHUIStatusItemView::ICON_ACCEPT => 'PHUIStatusItemView::ICON_ACCEPT', 59 + PHUIStatusItemView::ICON_REJECT => 'PHUIStatusItemView::ICON_REJECT', 60 + PHUIStatusItemView::ICON_LEFT => 'PHUIStatusItemView::ICON_LEFT', 61 + PHUIStatusItemView::ICON_RIGHT => 'PHUIStatusItemView::ICON_RIGHT', 62 + PHUIStatusItemView::ICON_UP => 'PHUIStatusItemView::ICON_UP', 63 + PHUIStatusItemView::ICON_DOWN => 'PHUIStatusItemView::ICON_DOWN', 64 + PHUIStatusItemView::ICON_QUESTION => 'PHUIStatusItemView::ICON_QUESTION', 65 + PHUIStatusItemView::ICON_WARNING => 'PHUIStatusItemView::ICON_WARNING', 66 + PHUIStatusItemView::ICON_INFO => 'PHUIStatusItemView::ICON_INFO', 67 + PHUIStatusItemView::ICON_ADD => 'PHUIStatusItemView::ICON_ADD', 68 + PHUIStatusItemView::ICON_MINUS => 'PHUIStatusItemView::ICON_MINUS', 69 + PHUIStatusItemView::ICON_OPEN => 'PHUIStatusItemView::ICON_OPEN', 70 + PHUIStatusItemView::ICON_CLOCK => 'PHUIStatusItemView::ICON_CLOCK', 71 + ); 58 72 59 - foreach ($manifest as $sprite) { 60 - $name = substr($sprite['name'], strlen('status-')); 73 + foreach ($manifest as $icon => $label) { 61 74 62 75 $view->addItem( 63 76 id(new PHUIStatusItemView()) 64 - ->setIcon($name) 65 - ->setTarget($name)); 77 + ->setIcon($icon, 'indigo') 78 + ->setTarget($label)); 66 79 } 67 80 68 81 $out[] = id(new PHUIHeaderView())
+19 -3
src/view/phui/PHUIStatusItemView.php
··· 4 4 5 5 private $icon; 6 6 private $iconLabel; 7 + private $iconColor; 7 8 private $target; 8 9 private $note; 9 10 private $highlighted; 10 11 11 - public function setIcon($icon, $label = null) { 12 + const ICON_ACCEPT = 'fa-check-circle'; 13 + const ICON_REJECT = 'fa-times-circle'; 14 + const ICON_LEFT = 'fa-chevron-circle-left'; 15 + const ICON_RIGHT = 'fa-chevron-circle-right'; 16 + const ICON_UP = 'fa-chevron-circle-up'; 17 + const ICON_DOWN = 'fa-chevron-circle-down'; 18 + const ICON_QUESTION = 'fa-question-circle'; 19 + const ICON_WARNING = 'fa-exclamation-circle'; 20 + const ICON_INFO = 'fa-info-circle'; 21 + const ICON_ADD = 'fa-plus-circle'; 22 + const ICON_MINUS = 'fa-minus-circle'; 23 + const ICON_OPEN = 'fa-circle-o'; 24 + const ICON_CLOCK = 'fa-clock-o'; 25 + 26 + /* render_textarea */ 27 + public function setIcon($icon, $color = null, $label = null) { 12 28 $this->icon = $icon; 13 29 $this->iconLabel = $label; 30 + $this->iconColor = $color; 14 31 return $this; 15 32 } 16 33 ··· 53 70 $icon = null; 54 71 if ($this->icon) { 55 72 $icon = id(new PHUIIconView()) 56 - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) 57 - ->setSpriteIcon($this->icon); 73 + ->setIconFont($this->icon.' '.$this->iconColor); 58 74 59 75 if ($this->iconLabel) { 60 76 Javelin::initBehavior('phabricator-tooltips');
+3
webroot/rsrc/css/font/phui-font-icon-base.css
··· 104 104 } 105 105 } 106 106 107 + .phui-icon-view.dark { 108 + color: {$darkgreytext}; 109 + } 107 110 .phui-icon-view.bluegrey { 108 111 color: #7787a6; 109 112 }