From f705c978b5d732e6523ef1b370af65ab85783c07 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 30 Jan 2013 11:30:38 -0800 Subject: [PATCH] render_tag -> tag: phabricator_render_form -> phabricator_form Summary: Convert most phabricator_render_form callsites. In the case of the "headsup view", it converts it by deleting the element entirely (this is the very old Maniphest/Differential header which we no longer use). Test Plan: Poked around a bit. Reviewers: vrana Reviewed By: vrana CC: aran Maniphest Tasks: T2432 Differential Revision: https://secure.phabricator.com/D4726 --- scripts/celerity_mapper.php | 2 - src/__celerity_resource_map__.php | 182 ++++++++---------- src/__phutil_library_map__.php | 6 - .../PhabricatorMustVerifyEmailController.php | 2 +- .../DifferentialDiffViewController.php | 9 +- .../PhabricatorDirectoryMainController.php | 8 +- .../flag/view/PhabricatorFlagListView.php | 4 +- ...habricatorProjectMembersEditController.php | 4 +- .../PhabricatorProjectProfileController.php | 2 +- src/view/layout/PhabricatorActionView.php | 2 +- .../headsup/AphrontHeadsupActionListView.php | 28 --- .../headsup/AphrontHeadsupActionView.php | 73 ------- .../layout/headsup/AphrontHeadsupView.php | 81 -------- src/view/page/PhabricatorStandardPageView.php | 2 +- .../css/aphront/headsup-action-list-view.css | 74 ------- webroot/rsrc/css/aphront/headsup.css | 49 ----- 16 files changed, 98 insertions(+), 430 deletions(-) delete mode 100644 src/view/layout/headsup/AphrontHeadsupActionListView.php delete mode 100644 src/view/layout/headsup/AphrontHeadsupActionView.php delete mode 100644 src/view/layout/headsup/AphrontHeadsupView.php delete mode 100644 webroot/rsrc/css/aphront/headsup-action-list-view.css delete mode 100644 webroot/rsrc/css/aphront/headsup.css diff --git a/scripts/celerity_mapper.php b/scripts/celerity_mapper.php index 93867c86ff..d62d84b1a3 100755 --- a/scripts/celerity_mapper.php +++ b/scripts/celerity_mapper.php @@ -81,7 +81,6 @@ $package_spec = array( 'aphront-pager-view-css', 'phabricator-transaction-view-css', 'aphront-tooltip-css', - 'aphront-headsup-view-css', 'phabricator-flag-css', 'aphront-error-view-css', @@ -115,7 +114,6 @@ $package_spec = array( 'differential-revision-add-comment-css', 'differential-revision-comment-list-css', 'phabricator-object-selector-css', - 'aphront-headsup-action-list-view-css', 'phabricator-content-source-view-css', 'differential-local-commits-view-css', 'inline-comment-summary-css', diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index e6b8caacdf..4d694646f7 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -653,24 +653,6 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/aphront/form-view.css', ), - 'aphront-headsup-action-list-view-css' => - array( - 'uri' => '/res/1dce0ad7/rsrc/css/aphront/headsup-action-list-view.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/headsup-action-list-view.css', - ), - 'aphront-headsup-view-css' => - array( - 'uri' => '/res/73874cd2/rsrc/css/aphront/headsup.css', - 'type' => 'css', - 'requires' => - array( - ), - 'disk' => '/rsrc/css/aphront/headsup.css', - ), 'aphront-list-filter-view-css' => array( 'uri' => '/res/e783d6e1/rsrc/css/aphront/list-filter-view.css', @@ -1166,7 +1148,7 @@ celerity_register_resource_map(array( ), 'javelin-behavior-dark-console' => array( - 'uri' => '/res/c3e8a3d8/rsrc/js/application/core/behavior-dark-console.js', + 'uri' => '/res/52444d4e/rsrc/js/application/core/behavior-dark-console.js', 'type' => 'js', 'requires' => array( @@ -3375,7 +3357,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '0cb71c48' => + '0e6165d0' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3399,27 +3381,26 @@ celerity_register_resource_map(array( 16 => 'aphront-pager-view-css', 17 => 'phabricator-transaction-view-css', 18 => 'aphront-tooltip-css', - 19 => 'aphront-headsup-view-css', - 20 => 'phabricator-flag-css', - 21 => 'aphront-error-view-css', - 22 => 'sprite-icon-css', - 23 => 'sprite-gradient-css', - 24 => 'sprite-menu-css', - 25 => 'sprite-apps-large-css', - 26 => 'phabricator-main-menu-view', - 27 => 'phabricator-notification-css', - 28 => 'phabricator-notification-menu-css', - 29 => 'lightbox-attachment-css', - 30 => 'phabricator-header-view-css', - 31 => 'phabricator-form-view-css', - 32 => 'phabricator-filetree-view-css', - 33 => 'phabricator-nav-view-css', - 34 => 'phabricator-side-menu-view-css', - 35 => 'phabricator-crumbs-view-css', - 36 => 'phabricator-object-item-list-view-css', - 37 => 'global-drag-and-drop-css', + 19 => 'phabricator-flag-css', + 20 => 'aphront-error-view-css', + 21 => 'sprite-icon-css', + 22 => 'sprite-gradient-css', + 23 => 'sprite-menu-css', + 24 => 'sprite-apps-large-css', + 25 => 'phabricator-main-menu-view', + 26 => 'phabricator-notification-css', + 27 => 'phabricator-notification-menu-css', + 28 => 'lightbox-attachment-css', + 29 => 'phabricator-header-view-css', + 30 => 'phabricator-form-view-css', + 31 => 'phabricator-filetree-view-css', + 32 => 'phabricator-nav-view-css', + 33 => 'phabricator-side-menu-view-css', + 34 => 'phabricator-crumbs-view-css', + 35 => 'phabricator-object-item-list-view-css', + 36 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/0cb71c48/core.pkg.css', + 'uri' => '/res/pkg/0e6165d0/core.pkg.css', 'type' => 'css', ), 'ff199687' => @@ -3464,7 +3445,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/ff199687/core.pkg.js', 'type' => 'js', ), - '032118cf' => + '74593df4' => array( 'name' => 'darkconsole.pkg.js', 'symbols' => @@ -3472,10 +3453,10 @@ celerity_register_resource_map(array( 0 => 'javelin-behavior-dark-console', 1 => 'javelin-behavior-error-log', ), - 'uri' => '/res/pkg/032118cf/darkconsole.pkg.js', + 'uri' => '/res/pkg/74593df4/darkconsole.pkg.js', 'type' => 'js', ), - 'ec01d039' => + '8aaacd1b' => array( 'name' => 'differential.pkg.css', 'symbols' => @@ -3490,12 +3471,11 @@ celerity_register_resource_map(array( 7 => 'differential-revision-add-comment-css', 8 => 'differential-revision-comment-list-css', 9 => 'phabricator-object-selector-css', - 10 => 'aphront-headsup-action-list-view-css', - 11 => 'phabricator-content-source-view-css', - 12 => 'differential-local-commits-view-css', - 13 => 'inline-comment-summary-css', + 10 => 'phabricator-content-source-view-css', + 11 => 'differential-local-commits-view-css', + 12 => 'inline-comment-summary-css', ), - 'uri' => '/res/pkg/ec01d039/differential.pkg.css', + 'uri' => '/res/pkg/8aaacd1b/differential.pkg.css', 'type' => 'css', ), '9dae5f20' => @@ -3608,34 +3588,32 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'e30a3fa8', - 'aphront-crumbs-view-css' => '0cb71c48', - 'aphront-dialog-view-css' => '0cb71c48', - 'aphront-error-view-css' => '0cb71c48', - 'aphront-form-view-css' => '0cb71c48', - 'aphront-headsup-action-list-view-css' => 'ec01d039', - 'aphront-headsup-view-css' => '0cb71c48', - 'aphront-list-filter-view-css' => '0cb71c48', - 'aphront-pager-view-css' => '0cb71c48', - 'aphront-panel-view-css' => '0cb71c48', - 'aphront-table-view-css' => '0cb71c48', - 'aphront-tokenizer-control-css' => '0cb71c48', - 'aphront-tooltip-css' => '0cb71c48', - 'aphront-typeahead-control-css' => '0cb71c48', - 'differential-changeset-view-css' => 'ec01d039', - 'differential-core-view-css' => 'ec01d039', + 'aphront-crumbs-view-css' => '0e6165d0', + 'aphront-dialog-view-css' => '0e6165d0', + 'aphront-error-view-css' => '0e6165d0', + 'aphront-form-view-css' => '0e6165d0', + 'aphront-list-filter-view-css' => '0e6165d0', + 'aphront-pager-view-css' => '0e6165d0', + 'aphront-panel-view-css' => '0e6165d0', + 'aphront-table-view-css' => '0e6165d0', + 'aphront-tokenizer-control-css' => '0e6165d0', + 'aphront-tooltip-css' => '0e6165d0', + 'aphront-typeahead-control-css' => '0e6165d0', + 'differential-changeset-view-css' => '8aaacd1b', + 'differential-core-view-css' => '8aaacd1b', 'differential-inline-comment-editor' => '9dae5f20', - 'differential-local-commits-view-css' => 'ec01d039', - 'differential-results-table-css' => 'ec01d039', - 'differential-revision-add-comment-css' => 'ec01d039', - 'differential-revision-comment-css' => 'ec01d039', - 'differential-revision-comment-list-css' => 'ec01d039', - 'differential-revision-history-css' => 'ec01d039', - 'differential-revision-list-css' => 'ec01d039', - 'differential-table-of-contents-css' => 'ec01d039', + 'differential-local-commits-view-css' => '8aaacd1b', + 'differential-results-table-css' => '8aaacd1b', + 'differential-revision-add-comment-css' => '8aaacd1b', + 'differential-revision-comment-css' => '8aaacd1b', + 'differential-revision-comment-list-css' => '8aaacd1b', + 'differential-revision-history-css' => '8aaacd1b', + 'differential-revision-list-css' => '8aaacd1b', + 'differential-table-of-contents-css' => '8aaacd1b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '0cb71c48', - 'inline-comment-summary-css' => 'ec01d039', + 'global-drag-and-drop-css' => '0e6165d0', + 'inline-comment-summary-css' => '8aaacd1b', 'javelin-aphlict' => 'ff199687', 'javelin-behavior' => '1c6f020b', 'javelin-behavior-aphlict-dropdown' => 'ff199687', @@ -3645,7 +3623,7 @@ celerity_register_resource_map(array( 'javelin-behavior-aphront-drag-and-drop-textarea' => '9dae5f20', 'javelin-behavior-aphront-form-disable-on-submit' => 'ff199687', 'javelin-behavior-audit-preview' => 'f96657b8', - 'javelin-behavior-dark-console' => '032118cf', + 'javelin-behavior-dark-console' => '74593df4', 'javelin-behavior-device' => 'ff199687', 'javelin-behavior-differential-accept-with-errors' => '9dae5f20', 'javelin-behavior-differential-add-reviewers-and-ccs' => '9dae5f20', @@ -3661,7 +3639,7 @@ celerity_register_resource_map(array( 'javelin-behavior-differential-user-select' => '9dae5f20', 'javelin-behavior-diffusion-commit-graph' => 'f96657b8', 'javelin-behavior-diffusion-pull-lastmodified' => 'f96657b8', - 'javelin-behavior-error-log' => '032118cf', + 'javelin-behavior-error-log' => '74593df4', 'javelin-behavior-global-drag-and-drop' => 'ff199687', 'javelin-behavior-konami' => 'ff199687', 'javelin-behavior-lightbox-attachments' => 'ff199687', @@ -3703,48 +3681,48 @@ celerity_register_resource_map(array( 'javelin-util' => '1c6f020b', 'javelin-vector' => '1c6f020b', 'javelin-workflow' => '1c6f020b', - 'lightbox-attachment-css' => '0cb71c48', + 'lightbox-attachment-css' => '0e6165d0', 'maniphest-task-summary-css' => 'e30a3fa8', 'maniphest-transaction-detail-css' => 'e30a3fa8', 'phabricator-busy' => 'ff199687', - 'phabricator-content-source-view-css' => 'ec01d039', - 'phabricator-core-buttons-css' => '0cb71c48', - 'phabricator-core-css' => '0cb71c48', - 'phabricator-crumbs-view-css' => '0cb71c48', - 'phabricator-directory-css' => '0cb71c48', + 'phabricator-content-source-view-css' => '8aaacd1b', + 'phabricator-core-buttons-css' => '0e6165d0', + 'phabricator-core-css' => '0e6165d0', + 'phabricator-crumbs-view-css' => '0e6165d0', + 'phabricator-directory-css' => '0e6165d0', 'phabricator-drag-and-drop-file-upload' => '9dae5f20', 'phabricator-dropdown-menu' => 'ff199687', 'phabricator-file-upload' => 'ff199687', - 'phabricator-filetree-view-css' => '0cb71c48', - 'phabricator-flag-css' => '0cb71c48', - 'phabricator-form-view-css' => '0cb71c48', - 'phabricator-header-view-css' => '0cb71c48', - 'phabricator-jump-nav' => '0cb71c48', + 'phabricator-filetree-view-css' => '0e6165d0', + 'phabricator-flag-css' => '0e6165d0', + 'phabricator-form-view-css' => '0e6165d0', + 'phabricator-header-view-css' => '0e6165d0', + 'phabricator-jump-nav' => '0e6165d0', 'phabricator-keyboard-shortcut' => 'ff199687', 'phabricator-keyboard-shortcut-manager' => 'ff199687', - 'phabricator-main-menu-view' => '0cb71c48', + 'phabricator-main-menu-view' => '0e6165d0', 'phabricator-menu-item' => 'ff199687', - 'phabricator-nav-view-css' => '0cb71c48', + 'phabricator-nav-view-css' => '0e6165d0', 'phabricator-notification' => 'ff199687', - 'phabricator-notification-css' => '0cb71c48', - 'phabricator-notification-menu-css' => '0cb71c48', - 'phabricator-object-item-list-view-css' => '0cb71c48', - 'phabricator-object-selector-css' => 'ec01d039', + 'phabricator-notification-css' => '0e6165d0', + 'phabricator-notification-menu-css' => '0e6165d0', + 'phabricator-object-item-list-view-css' => '0e6165d0', + 'phabricator-object-selector-css' => '8aaacd1b', 'phabricator-paste-file-upload' => 'ff199687', 'phabricator-prefab' => 'ff199687', 'phabricator-project-tag-css' => 'e30a3fa8', - 'phabricator-remarkup-css' => '0cb71c48', + 'phabricator-remarkup-css' => '0e6165d0', 'phabricator-shaped-request' => '9dae5f20', - 'phabricator-side-menu-view-css' => '0cb71c48', - 'phabricator-standard-page-view' => '0cb71c48', + 'phabricator-side-menu-view-css' => '0e6165d0', + 'phabricator-standard-page-view' => '0e6165d0', 'phabricator-textareautils' => 'ff199687', 'phabricator-tooltip' => 'ff199687', - 'phabricator-transaction-view-css' => '0cb71c48', - 'phabricator-zindex-css' => '0cb71c48', - 'sprite-apps-large-css' => '0cb71c48', - 'sprite-gradient-css' => '0cb71c48', - 'sprite-icon-css' => '0cb71c48', - 'sprite-menu-css' => '0cb71c48', - 'syntax-highlighting-css' => '0cb71c48', + 'phabricator-transaction-view-css' => '0e6165d0', + 'phabricator-zindex-css' => '0e6165d0', + 'sprite-apps-large-css' => '0e6165d0', + 'sprite-gradient-css' => '0e6165d0', + 'sprite-icon-css' => '0e6165d0', + 'sprite-menu-css' => '0e6165d0', + 'syntax-highlighting-css' => '0e6165d0', ), )); diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 617299a3de..70424e5d79 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -55,9 +55,6 @@ phutil_register_library_map(array( 'AphrontHTMLResponse' => 'aphront/response/AphrontHTMLResponse.php', 'AphrontHTTPSink' => 'aphront/sink/AphrontHTTPSink.php', 'AphrontHTTPSinkTestCase' => 'aphront/sink/__tests__/AphrontHTTPSinkTestCase.php', - 'AphrontHeadsupActionListView' => 'view/layout/headsup/AphrontHeadsupActionListView.php', - 'AphrontHeadsupActionView' => 'view/layout/headsup/AphrontHeadsupActionView.php', - 'AphrontHeadsupView' => 'view/layout/headsup/AphrontHeadsupView.php', 'AphrontIsolatedDatabaseConnectionTestCase' => 'infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php', 'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php', 'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php', @@ -1544,9 +1541,6 @@ phutil_register_library_map(array( 'AphrontFormView' => 'AphrontView', 'AphrontHTMLResponse' => 'AphrontResponse', 'AphrontHTTPSinkTestCase' => 'PhabricatorTestCase', - 'AphrontHeadsupActionListView' => 'AphrontView', - 'AphrontHeadsupActionView' => 'AphrontView', - 'AphrontHeadsupView' => 'AphrontView', 'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase', 'AphrontIsolatedHTTPSink' => 'AphrontHTTPSink', 'AphrontJSONResponse' => 'AphrontResponse', diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php index 21af745ed2..7aa356f9e6 100644 --- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php +++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php @@ -51,7 +51,7 @@ final class PhabricatorMustVerifyEmailController '

'); $error_view->appendChild( '
'. - phabricator_render_form( + phabricator_form( $user, array( 'action' => '/login/mustverify/', diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php index 1ca4a9de73..d764f560e3 100644 --- a/src/applications/differential/controller/DifferentialDiffViewController.php +++ b/src/applications/differential/controller/DifferentialDiffViewController.php @@ -113,9 +113,10 @@ final class DifferentialDiffViewController extends DifferentialController { } } - $action_panel = new AphrontHeadsupView(); - $action_panel->setProperties($dict); - $action_panel->setHeader(pht('Diff Properties')); + $property_view = new PhabricatorPropertyListView(); + foreach ($dict as $key => $value) { + $property_view->addProperty($key, $value); + } $changesets = $diff->loadChangesets(); $changesets = msort($changesets, 'getSortKey'); @@ -144,7 +145,7 @@ final class DifferentialDiffViewController extends DifferentialController { ->appendChild( array( $top_panel->render(), - $action_panel->render(), + $property_view, $table_of_contents->render(), $details->render(), )), diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index 15eeda8453..eca0c28b1a 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -322,15 +322,17 @@ final class PhabricatorDirectoryMainController $panel = new AphrontPanelView(); $panel->setHeader('Jump Nav'); $panel->appendChild( - phabricator_render_form( + phabricator_form( $user, array( 'action' => '/jump/', 'method' => 'POST', 'class' => 'phabricator-jump-nav-form', ), - $jump_input. - $jump_caption)); + array( + $jump_input, + $jump_caption, + ))); return $panel; } diff --git a/src/applications/flag/view/PhabricatorFlagListView.php b/src/applications/flag/view/PhabricatorFlagListView.php index 332f683418..90be2b8f2f 100644 --- a/src/applications/flag/view/PhabricatorFlagListView.php +++ b/src/applications/flag/view/PhabricatorFlagListView.php @@ -29,7 +29,7 @@ final class PhabricatorFlagListView extends AphrontView { $flag->getHandle()->renderLink(), phutil_escape_html($flag->getNote()), phabricator_datetime($flag->getDateCreated(), $user), - phabricator_render_form( + phabricator_form( $user, array( 'method' => 'POST', @@ -42,7 +42,7 @@ final class PhabricatorFlagListView extends AphrontView { 'class' => 'small grey', ), 'Edit Flag')), - phabricator_render_form( + phabricator_form( $user, array( 'method' => 'POST', diff --git a/src/applications/project/controller/PhabricatorProjectMembersEditController.php b/src/applications/project/controller/PhabricatorProjectMembersEditController.php index 1e89cb307f..1e84d2823e 100644 --- a/src/applications/project/controller/PhabricatorProjectMembersEditController.php +++ b/src/applications/project/controller/PhabricatorProjectMembersEditController.php @@ -151,13 +151,13 @@ final class PhabricatorProjectMembersEditController $list->addButton( $handle, - phabricator_render_form( + phabricator_form( $user, array( 'method' => 'POST', 'action' => $request->getRequestURI(), ), - $hidden_input.$button)); + array($hidden_input, $button))); } return $list; diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php index 4d6e4b8eee..9e18af9849 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -85,7 +85,7 @@ final class PhabricatorProjectProfileController $class = 'grey disabled'; } - $action = phabricator_render_form( + $action = phabricator_form( $user, array( 'action' => '/project/update/'.$project->getID().'/join/', diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php index bb030b60c2..9cac7a6723 100644 --- a/src/view/layout/PhabricatorActionView.php +++ b/src/view/layout/PhabricatorActionView.php @@ -91,7 +91,7 @@ final class PhabricatorActionView extends AphrontView { $sigils[] = 'download'; } - $item = phabricator_render_form( + $item = phabricator_form( $this->user, array( 'action' => $this->href, diff --git a/src/view/layout/headsup/AphrontHeadsupActionListView.php b/src/view/layout/headsup/AphrontHeadsupActionListView.php deleted file mode 100644 index d3777d362b..0000000000 --- a/src/view/layout/headsup/AphrontHeadsupActionListView.php +++ /dev/null @@ -1,28 +0,0 @@ -actions = $actions; - return $this; - } - - public function render() { - - require_celerity_resource('aphront-headsup-action-list-view-css'); - - $actions = array(); - foreach ($this->actions as $action_view) { - $actions[] = $action_view->render(); - } - $actions = implode("\n", $actions); - - return - '
'. - $actions. - '
'; - } - -} diff --git a/src/view/layout/headsup/AphrontHeadsupActionView.php b/src/view/layout/headsup/AphrontHeadsupActionView.php deleted file mode 100644 index eaffca17a2..0000000000 --- a/src/view/layout/headsup/AphrontHeadsupActionView.php +++ /dev/null @@ -1,73 +0,0 @@ -name = $name; - return $this; - } - - public function setClass($class) { - $this->class = $class; - return $this; - } - - public function setURI($uri) { - $this->uri = $uri; - return $this; - } - - public function setWorkflow($workflow) { - $this->workflow = $workflow; - return $this; - } - - public function setInstant($instant) { - $this->instant = $instant; - return $this; - } - - public function render() { - if ($this->instant) { - $button_class = $this->class.' link'; - return phabricator_render_form( - $this->user, - array( - 'action' => $this->uri, - 'method' => 'post', - 'style' => 'display: inline', - ), - '' - ); - } - - if ($this->uri) { - $tag = 'a'; - } else { - $tag = 'span'; - } - - $attrs = array( - 'href' => $this->uri, - 'class' => $this->class, - ); - - if ($this->workflow) { - $attrs['sigil'] = 'workflow'; - } - - return javelin_tag( - $tag, - $attrs, - $this->name); - } - -} diff --git a/src/view/layout/headsup/AphrontHeadsupView.php b/src/view/layout/headsup/AphrontHeadsupView.php deleted file mode 100644 index 9e3b8f0896..0000000000 --- a/src/view/layout/headsup/AphrontHeadsupView.php +++ /dev/null @@ -1,81 +0,0 @@ -actionList = $action_list; - return $this; - } - - public function setHeader($header) { - $this->header = $header; - return $this; - } - - public function setProperties(array $dict) { - $this->properties = $dict; - return $this; - } - - public function setObjectName($name) { - $this->objectName = $name; - return $this; - } - - public function render() { - $header = - '

'. - phutil_tag( - 'a', - array( - 'href' => '/'.$this->objectName, - 'class' => 'aphront-headsup-object-name', - ), - $this->objectName). - ' '. - phutil_escape_html($this->header). - '

'; - - require_celerity_resource('aphront-headsup-view-css'); - - $prop_table = null; - if ($this->properties) { - $prop_table = array(); - foreach ($this->properties as $key => $value) { - $prop_table[] = - ''. - ''.phutil_escape_html($key.':').''. - ''.$value.''. - ''; - } - $prop_table = - ''. - implode("\n", $prop_table). - '
'; - } - - $children = $this->renderChildren(); - if (strlen($children)) { - $children = - '
'. - $children. - '
'; - } - - return - '
'. - self::renderSingleView($this->actionList). - '
'. - $header. - $prop_table. - $children. - '
'. - '
'; - } - -} diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php index e2db6f8d34..1821a0cda7 100644 --- a/src/view/page/PhabricatorStandardPageView.php +++ b/src/view/page/PhabricatorStandardPageView.php @@ -119,7 +119,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView { PhabricatorEnv::getCDNURI( '/rsrc/image/icon/fatcow/document_black.png' ); - $download_form = phabricator_render_form( + $download_form = phabricator_form( $user, array( 'action' => '#', diff --git a/webroot/rsrc/css/aphront/headsup-action-list-view.css b/webroot/rsrc/css/aphront/headsup-action-list-view.css deleted file mode 100644 index c69e102e97..0000000000 --- a/webroot/rsrc/css/aphront/headsup-action-list-view.css +++ /dev/null @@ -1,74 +0,0 @@ -/** - * @provides aphront-headsup-action-list-view-css - */ - -.aphront-headsup-action-list { - float: right; - width: 250px; - background: #cfcfbf; - border: 1px solid #666622; - border-width: 0px 0px 1px 1px; - margin: -15px 0px 1em 0; - font-size: 11px; -} - -.aphront-headsup-action-list a, -.aphront-headsup-action-list span, -.aphront-headsup-action-list button { - background-position: 8px center; - background-repeat: no-repeat; - display: block; - padding: 4px 4px 4px 32px; - line-height: normal; -} - -.aphront-headsup-action-list span.unavailable { - color: #666666; - font-style: italic; -} - -.aphront-headsup-action-list .subscribe-rem { - background-image: url(/rsrc/image/icon/unsubscribe.png); -} - -.aphront-headsup-action-list .subscribe-add { - background-image: url(/rsrc/image/icon/subscribe.png); -} - -.aphront-headsup-action-list .action-edit, -.aphront-headsup-action-list .revision-edit { - background-image: url(/rsrc/image/icon/tango/edit.png); -} - -.aphront-headsup-action-list .action-attach, -.aphront-headsup-action-list .attach-maniphest { - background-image: url(/rsrc/image/icon/tango/attachment.png); -} - -.aphront-headsup-action-list .action-upload { - background-image: url(/rsrc/image/icon/tango/upload.png); -} - -.aphront-headsup-action-list .action-download { - background-image: url(/rsrc/image/icon/tango/go-down.png); -} - -.aphront-headsup-action-list .transcripts-metamta { - background-image: url(/rsrc/image/icon/tango/log.png); -} - -.aphront-headsup-action-list .transcripts-herald { - background-image: url(/rsrc/image/icon/tango/log.png); -} - -.aphront-headsup-action-list .action-merge { - background-image: url(/rsrc/image/icon/fatcow/arrow_merge.png); -} - -.aphront-headsup-action-list .action-branch { - background-image: url(/rsrc/image/icon/fatcow/arrow_branch.png); -} - -.aphront-headsup-action-list .action-dependencies { - background-image: url(/rsrc/image/icon/fatcow/link.png); -} diff --git a/webroot/rsrc/css/aphront/headsup.css b/webroot/rsrc/css/aphront/headsup.css deleted file mode 100644 index 4384cc3044..0000000000 --- a/webroot/rsrc/css/aphront/headsup.css +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @provides aphront-headsup-view-css - */ - -.aphront-headsup-panel { - border: 1px solid #666622; - background: #efefdf; - font-size: 13px; - margin: .5em 2em .25em; - padding: 15px 0 0; -} - -.aphront-headsup-panel h1 { - border-bottom: 1px solid #aaaa99; - - margin: 0 285px 8px 20px; - padding-bottom: 8px; -} - -.aphront-headsup-property-table { - font-size: 12px; - width: auto; - margin: 0 285px 15px 20px; -} - -.aphront-headsup-property-table th { - font-weight: bold; - width: 100px; - text-align: right; - padding: 3px; - color: #333333; - white-space: nowrap; -} - -.aphront-headsup-property-table td { - padding: 3px; -} - -.aphront-headsup-details { - clear: both; - border-top: 1px solid #666622; - background: #fbfbef; - margin-top: 1em; - padding: .75em 20px; -} - -.aphront-headsup-object-name { - margin-right: 0.25em; -}