Page MenuHomePhabricator
Files F15425543

D15097.id36451.diff
No OneTemporary
Actions

D15097.id36451.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => '1d1e9a3a',
+ 'core.pkg.css' => '1e582cfb',
'core.pkg.js' => '573e6664',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9',
@@ -93,6 +93,7 @@
'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43',
'rsrc/css/application/policy/policy.css' => '957ea14c',
'rsrc/css/application/ponder/ponder-view.css' => '7b0df4da',
+ 'rsrc/css/application/project/project-view.css' => 'd9df835b',
'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733',
'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
@@ -122,8 +123,8 @@
'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
'rsrc/css/phui/phui-badge.css' => 'f25c3476',
'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
- 'rsrc/css/phui/phui-box.css' => '10939564',
- 'rsrc/css/phui/phui-button.css' => '16020a60',
+ 'rsrc/css/phui/phui-box.css' => 'fd269ed1',
+ 'rsrc/css/phui/phui-button.css' => 'd6ac72db',
'rsrc/css/phui/phui-crumbs-view.css' => '414406b5',
'rsrc/css/phui/phui-document-pro.css' => '8799acf7',
'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
@@ -140,10 +141,10 @@
'rsrc/css/phui/phui-info-view.css' => '6d7c3509',
'rsrc/css/phui/phui-list.css' => '9da2aa00',
'rsrc/css/phui/phui-object-box.css' => '407eaf5a',
- 'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
+ 'rsrc/css/phui/phui-object-item-list-view.css' => 'bbc929b3',
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
- 'rsrc/css/phui/phui-profile-menu.css' => '43826c43',
+ 'rsrc/css/phui/phui-profile-menu.css' => '8730e66a',
'rsrc/css/phui/phui-property-list-view.css' => '27b2849e',
'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -151,7 +152,7 @@
'rsrc/css/phui/phui-tag-view.css' => 'e60e227b',
'rsrc/css/phui/phui-text.css' => 'cf019f54',
'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
- 'rsrc/css/phui/phui-two-column-view.css' => '39ecafb1',
+ 'rsrc/css/phui/phui-two-column-view.css' => 'c75bfc5b',
'rsrc/css/phui/phui-workboard-view.css' => 'f488d036',
'rsrc/css/phui/phui-workpanel-view.css' => 'adec7699',
'rsrc/css/sprite-login.css' => '60e8560e',
@@ -792,8 +793,8 @@
'phui-action-panel-css' => '91c7b835',
'phui-badge-view-css' => 'f25c3476',
'phui-big-info-view-css' => 'bd903741',
- 'phui-box-css' => '10939564',
- 'phui-button-css' => '16020a60',
+ 'phui-box-css' => 'fd269ed1',
+ 'phui-button-css' => 'd6ac72db',
'phui-calendar-css' => 'ccabe893',
'phui-calendar-day-css' => 'd1cf6f93',
'phui-calendar-list-css' => 'c1c7f338',
@@ -816,10 +817,10 @@
'phui-inline-comment-view-css' => '0fdb3667',
'phui-list-view-css' => '9da2aa00',
'phui-object-box-css' => '407eaf5a',
- 'phui-object-item-list-view-css' => '26c30d3f',
+ 'phui-object-item-list-view-css' => 'bbc929b3',
'phui-pager-css' => 'bea33d23',
'phui-pinboard-view-css' => '2495140e',
- 'phui-profile-menu-css' => '43826c43',
+ 'phui-profile-menu-css' => '8730e66a',
'phui-property-list-view-css' => '27b2849e',
'phui-remarkup-preview-css' => '1a8f2591',
'phui-spacing-css' => '042804d6',
@@ -828,7 +829,7 @@
'phui-text-css' => 'cf019f54',
'phui-theme-css' => '981a58f8',
'phui-timeline-view-css' => '2efceff8',
- 'phui-two-column-view-css' => '39ecafb1',
+ 'phui-two-column-view-css' => 'c75bfc5b',
'phui-workboard-view-css' => 'f488d036',
'phui-workpanel-view-css' => 'adec7699',
'phuix-action-list-view' => 'b5c256b8',
@@ -841,6 +842,7 @@
'policy-edit-css' => '815c66f7',
'policy-transaction-detail-css' => '82100a43',
'ponder-view-css' => '7b0df4da',
+ 'project-view-css' => 'd9df835b',
'raphael-core' => '51ee6b43',
'raphael-g' => '40dde778',
'raphael-g-line' => '40da039e',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2889,7 +2889,6 @@
'PhabricatorProjectHeraldAction' => 'applications/project/herald/PhabricatorProjectHeraldAction.php',
'PhabricatorProjectHeraldAdapter' => 'applications/project/herald/PhabricatorProjectHeraldAdapter.php',
'PhabricatorProjectHeraldFieldGroup' => 'applications/project/herald/PhabricatorProjectHeraldFieldGroup.php',
- 'PhabricatorProjectHistoryController' => 'applications/project/controller/PhabricatorProjectHistoryController.php',
'PhabricatorProjectIconSet' => 'applications/project/icon/PhabricatorProjectIconSet.php',
'PhabricatorProjectIconsConfigOptionType' => 'applications/project/config/PhabricatorProjectIconsConfigOptionType.php',
'PhabricatorProjectInterface' => 'applications/project/interface/PhabricatorProjectInterface.php',
@@ -2901,6 +2900,8 @@
'PhabricatorProjectLogicalOrNotDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalOrNotDatasource.php',
'PhabricatorProjectLogicalUserDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalUserDatasource.php',
'PhabricatorProjectLogicalViewerDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalViewerDatasource.php',
+ 'PhabricatorProjectManageController' => 'applications/project/controller/PhabricatorProjectManageController.php',
+ 'PhabricatorProjectManageProfilePanel' => 'applications/project/profilepanel/PhabricatorProjectManageProfilePanel.php',
'PhabricatorProjectMaterializedMemberEdgeType' => 'applications/project/edge/PhabricatorProjectMaterializedMemberEdgeType.php',
'PhabricatorProjectMemberListView' => 'applications/project/view/PhabricatorProjectMemberListView.php',
'PhabricatorProjectMemberOfProjectEdgeType' => 'applications/project/edge/PhabricatorProjectMemberOfProjectEdgeType.php',
@@ -7298,7 +7299,6 @@
'PhabricatorProjectHeraldAction' => 'HeraldAction',
'PhabricatorProjectHeraldAdapter' => 'HeraldAdapter',
'PhabricatorProjectHeraldFieldGroup' => 'HeraldFieldGroup',
- 'PhabricatorProjectHistoryController' => 'PhabricatorProjectController',
'PhabricatorProjectIconSet' => 'PhabricatorIconSet',
'PhabricatorProjectIconsConfigOptionType' => 'PhabricatorConfigJSONOptionType',
'PhabricatorProjectListController' => 'PhabricatorProjectController',
@@ -7309,6 +7309,8 @@
'PhabricatorProjectLogicalOrNotDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
'PhabricatorProjectLogicalUserDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
'PhabricatorProjectLogicalViewerDatasource' => 'PhabricatorTypeaheadDatasource',
+ 'PhabricatorProjectManageController' => 'PhabricatorProjectController',
+ 'PhabricatorProjectManageProfilePanel' => 'PhabricatorProfilePanel',
'PhabricatorProjectMaterializedMemberEdgeType' => 'PhabricatorEdgeType',
'PhabricatorProjectMemberListView' => 'PhabricatorProjectUserListView',
'PhabricatorProjectMemberOfProjectEdgeType' => 'PhabricatorEdgeType',
diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
--- a/src/applications/project/application/PhabricatorProjectApplication.php
+++ b/src/applications/project/application/PhabricatorProjectApplication.php
@@ -86,7 +86,7 @@
),
'update/(?P<id>[1-9]\d*)/(?P<action>[^/]+)/'
=> 'PhabricatorProjectUpdateController',
- 'history/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectHistoryController',
+ 'manage/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectManageController',
'(?P<action>watch|unwatch)/(?P<id>[1-9]\d*)/'
=> 'PhabricatorProjectWatchController',
'silence/(?P<id>[1-9]\d*)/'
diff --git a/src/applications/project/controller/PhabricatorProjectArchiveController.php b/src/applications/project/controller/PhabricatorProjectArchiveController.php
--- a/src/applications/project/controller/PhabricatorProjectArchiveController.php
+++ b/src/applications/project/controller/PhabricatorProjectArchiveController.php
@@ -20,7 +20,7 @@
return new Aphront404Response();
}
- $edit_uri = $this->getApplicationURI('history/'.$project->getID().'/');
+ $edit_uri = $this->getApplicationURI('manage/'.$project->getID().'/');
if ($request->isFormPost()) {
if ($project->isArchived()) {
diff --git a/src/applications/project/controller/PhabricatorProjectEditPictureController.php b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
--- a/src/applications/project/controller/PhabricatorProjectEditPictureController.php
+++ b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
@@ -23,8 +23,8 @@
$this->setProject($project);
- $edit_uri = $this->getApplicationURI('history/'.$project->getID().'/');
- $view_uri = $this->getApplicationURI('history/'.$project->getID().'/');
+ $edit_uri = $this->getApplicationURI('manage/'.$project->getID().'/');
+ $view_uri = $this->getApplicationURI('manage/'.$project->getID().'/');
$supported_formats = PhabricatorFile::getTransformableImageFormats();
$e_file = true;
@@ -255,7 +255,7 @@
->setForm($upload_form);
$nav = $this->getProfileMenu();
- $nav->selectFilter(PhabricatorProject::PANEL_PROFILE);
+ $nav->selectFilter(PhabricatorProject::PANEL_MANAGE);
return $this->newPage()
->setTitle($title)
diff --git a/src/applications/project/controller/PhabricatorProjectHistoryController.php b/src/applications/project/controller/PhabricatorProjectManageController.php
rename from src/applications/project/controller/PhabricatorProjectHistoryController.php
rename to src/applications/project/controller/PhabricatorProjectManageController.php
--- a/src/applications/project/controller/PhabricatorProjectHistoryController.php
+++ b/src/applications/project/controller/PhabricatorProjectManageController.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorProjectHistoryController
+final class PhabricatorProjectManageController
extends PhabricatorProjectController {
public function shouldAllowPublic() {
@@ -43,10 +43,10 @@
$timeline->setShouldTerminate(true);
$nav = $this->getProfileMenu();
- $nav->selectFilter(PhabricatorProject::PANEL_PROFILE);
+ $nav->selectFilter(PhabricatorProject::PANEL_MANAGE);
$crumbs = $this->buildApplicationCrumbs();
- $crumbs->addTextCrumb(pht('History'));
+ $crumbs->addTextCrumb(pht('Manage'));
return $this->newPage()
->setNavigation($nav)
@@ -75,12 +75,6 @@
$view->addAction(
id(new PhabricatorActionView())
- ->setName(pht('Back to Profile'))
- ->setIcon('fa-chevron-left')
- ->setHref($project->getURI()));
-
- $view->addAction(
- id(new PhabricatorActionView())
->setName(pht('Edit Details'))
->setIcon('fa-pencil')
->setHref($this->getApplicationURI("edit/{$id}/"))
@@ -89,6 +83,14 @@
$view->addAction(
id(new PhabricatorActionView())
+ ->setName(pht('Edit Menu'))
+ ->setIcon('fa-th-list')
+ ->setHref($this->getApplicationURI("{$id}/panel/configure/"))
+ ->setDisabled(!$can_edit)
+ ->setWorkflow(!$can_edit));
+
+ $view->addAction(
+ id(new PhabricatorActionView())
->setName(pht('Edit Picture'))
->setIcon('fa-picture-o')
->setHref($this->getApplicationURI("picture/{$id}/"))
@@ -126,6 +128,10 @@
->setUser($viewer)
->setActionList($actions);
+ $view->addProperty(
+ pht('Looks Like'),
+ $viewer->renderHandle($project->getPHID())->setAsTag(true));
+
return $view;
}
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -30,12 +30,9 @@
$header->setStatus('fa-ban', 'red', pht('Archived'));
}
- $actions = $this->buildActionListView($project);
- $properties = $this->buildPropertyListView($project, $actions);
-
- $object_box = id(new PHUIObjectBoxView())
- ->setHeader($header)
- ->addPropertyList($properties);
+ $properties = $this->buildPropertyListView($project);
+ $watch_action = $this->renderWatchAction($project);
+ $header->addActionLink($watch_action);
$member_list = id(new PhabricatorProjectMemberListView())
->setUser($viewer)
@@ -52,8 +49,6 @@
$nav = $this->getProfileMenu();
$nav->selectFilter(PhabricatorProject::PANEL_PROFILE);
- $watch_action = $this->renderWatchAction($project);
-
$stories = id(new PhabricatorFeedQuery())
->setViewer($viewer)
->setFilterPHIDs(
@@ -63,27 +58,44 @@
->setLimit(50)
->execute();
-
$feed = $this->renderStories($stories);
+ $feed = phutil_tag_div('project-view-feed', $feed);
$feed_header = id(new PHUIHeaderView())
- ->setHeader(pht('Recent Activity'))
- ->addActionLink($watch_action);
-
- $feed = id(new PHUIObjectBoxView())
- ->setHeader($feed_header)
- ->appendChild($feed);
+ ->setHeader(pht('Recent Activity'));
- $columns = id(new AphrontMultiColumnView())
- ->setFluidLayout(true)
- ->addColumn($feed)
- ->addColumn(
+ $columns = id(new PHUITwoColumnView())
+ ->setMainColumn(
+ array(
+ $properties,
+ $feed,
+ ))
+ ->setSideColumn(
array(
$member_list,
$watcher_list,
));
$crumbs = $this->buildApplicationCrumbs();
+ $crumbs->setBorder(true);
+
+ $header = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'project-view-header',
+ ),
+ $header);
+
+ require_celerity_resource('project-view-css');
+ $home = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'project-view-home',
+ ),
+ array(
+ $header,
+ $columns,
+ ));
return $this->newPage()
->setNavigation($nav)
@@ -92,50 +104,29 @@
->setPageObjectPHIDs(array($project->getPHID()))
->appendChild(
array(
- $object_box,
- $columns,
+ $home,
));
}
- private function buildActionListView(PhabricatorProject $project) {
- $request = $this->getRequest();
- $viewer = $request->getUser();
-
- $id = $project->getID();
-
- $view = id(new PhabricatorActionListView())
- ->setUser($viewer)
- ->setObject($project);
-
- $view->addAction(
- id(new PhabricatorActionView())
- ->setName(pht('Edit Project'))
- ->setIcon('fa-pencil')
- ->setHref($this->getApplicationURI("history/{$id}/")));
-
- return $view;
- }
-
private function buildPropertyListView(
- PhabricatorProject $project,
- PhabricatorActionListView $actions) {
+ PhabricatorProject $project) {
$request = $this->getRequest();
$viewer = $request->getUser();
$view = id(new PHUIPropertyListView())
->setUser($viewer)
- ->setObject($project)
- ->setActionList($actions);
-
- $view->addProperty(
- pht('Looks Like'),
- $viewer->renderHandle($project->getPHID())->setAsTag(true));
+ ->setObject($project);
$field_list = PhabricatorCustomField::getObjectFields(
$project,
PhabricatorCustomField::ROLE_VIEW);
$field_list->appendFieldsToPropertyList($project, $viewer, $view);
+ $view = id(new PHUIBoxView())
+ ->setColor(PHUIBoxView::GREY)
+ ->appendChild($view)
+ ->addClass('project-view-properties');
+
return $view;
}
@@ -147,7 +138,7 @@
$builder->setShowHovercards(true);
$view = $builder->buildView();
- return phutil_tag_div('profile-feed', $view->render());
+ return $view;
}
private function renderWatchAction(PhabricatorProject $project) {
diff --git a/src/applications/project/engine/PhabricatorProjectEditEngine.php b/src/applications/project/engine/PhabricatorProjectEditEngine.php
--- a/src/applications/project/engine/PhabricatorProjectEditEngine.php
+++ b/src/applications/project/engine/PhabricatorProjectEditEngine.php
@@ -82,7 +82,7 @@
return $object->getURI();
} else {
$id = $object->getID();
- return "/project/history/{$id}/";
+ return "/project/manage/{$id}/";
}
}
diff --git a/src/applications/project/engine/PhabricatorProjectProfilePanelEngine.php b/src/applications/project/engine/PhabricatorProjectProfilePanelEngine.php
--- a/src/applications/project/engine/PhabricatorProjectProfilePanelEngine.php
+++ b/src/applications/project/engine/PhabricatorProjectProfilePanelEngine.php
@@ -24,6 +24,10 @@
->setBuiltinKey(PhabricatorProject::PANEL_MEMBERS)
->setPanelKey(PhabricatorProjectMembersProfilePanel::PANELKEY);
+ $panels[] = $this->newPanel()
+ ->setBuiltinKey(PhabricatorProject::PANEL_MANAGE)
+ ->setPanelKey(PhabricatorProjectManageProfilePanel::PANELKEY);
+
return $panels;
}
diff --git a/src/applications/project/profilepanel/PhabricatorProjectManageProfilePanel.php b/src/applications/project/profilepanel/PhabricatorProjectManageProfilePanel.php
new file mode 100644
--- /dev/null
+++ b/src/applications/project/profilepanel/PhabricatorProjectManageProfilePanel.php
@@ -0,0 +1,64 @@
+<?php
+
+final class PhabricatorProjectManageProfilePanel
+ extends PhabricatorProfilePanel {
+
+ const PANELKEY = 'project.manage';
+
+ public function getPanelTypeName() {
+ return pht('Manage Project');
+ }
+
+ private function getDefaultName() {
+ return pht('Manage');
+ }
+
+ public function canMakeDefault(
+ PhabricatorProfilePanelConfiguration $config) {
+ return true;
+ }
+
+ public function getDisplayName(
+ PhabricatorProfilePanelConfiguration $config) {
+ $name = $config->getPanelProperty('name');
+
+ if (strlen($name)) {
+ return $name;
+ }
+
+ return $this->getDefaultName();
+ }
+
+ public function buildEditEngineFields(
+ PhabricatorProfilePanelConfiguration $config) {
+ return array(
+ id(new PhabricatorTextEditField())
+ ->setKey('name')
+ ->setLabel(pht('Name'))
+ ->setPlaceholder($this->getDefaultName())
+ ->setValue($config->getPanelProperty('name')),
+ );
+ }
+
+ protected function newNavigationMenuItems(
+ PhabricatorProfilePanelConfiguration $config) {
+
+ $project = $config->getProfileObject();
+
+ $id = $project->getID();
+
+ $name = $this->getDisplayName($config);
+ $icon = 'fa-gears';
+ $href = "/project/manage/{$id}/";
+
+ $item = $this->newItem()
+ ->setHref($href)
+ ->setName($name)
+ ->setIcon($icon);
+
+ return array(
+ $item,
+ );
+ }
+
+}
diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
--- a/src/applications/project/storage/PhabricatorProject.php
+++ b/src/applications/project/storage/PhabricatorProject.php
@@ -49,6 +49,7 @@
const PANEL_PROFILE = 'project.profile';
const PANEL_WORKBOARD = 'project.workboard';
const PANEL_MEMBERS = 'project.members';
+ const PANEL_MANAGE = 'project.manage';
const PANEL_MILESTONES = 'project.milestones';
const PANEL_SUBPROJECTS = 'project.subprojects';
diff --git a/src/applications/project/view/PhabricatorProjectUserListView.php b/src/applications/project/view/PhabricatorProjectUserListView.php
--- a/src/applications/project/view/PhabricatorProjectUserListView.php
+++ b/src/applications/project/view/PhabricatorProjectUserListView.php
@@ -120,7 +120,8 @@
return id(new PHUIObjectBoxView())
->setHeader($header)
- ->setObjectList($list);
+ ->setObjectList($list)
+ ->setBackground(PHUIBoxView::GREY);
}
}
diff --git a/src/applications/search/engine/PhabricatorProfilePanelEngine.php b/src/applications/search/engine/PhabricatorProfilePanelEngine.php
--- a/src/applications/search/engine/PhabricatorProfilePanelEngine.php
+++ b/src/applications/search/engine/PhabricatorProfilePanelEngine.php
@@ -363,55 +363,8 @@
private function newAutomaticMenuItems(AphrontSideNavFilterView $nav) {
$items = array();
- // NOTE: We're adding a spacer item for the fixed footer, so that if the
- // menu taller than the page content you can still scroll down the page far
- // enough to access the last item without the content being obscured by the
- // fixed items.
- $items[] = id(new PHUIListItemView())
- ->setHideInApplicationMenu(true)
- ->addClass('phui-profile-menu-spacer');
-
- if ($this->isPanelEngineConfigurable()) {
- $viewer = $this->getViewer();
- $object = $this->getProfileObject();
-
- $can_edit = PhabricatorPolicyFilter::hasCapability(
- $viewer,
- $object,
- PhabricatorPolicyCapability::CAN_EDIT);
-
- $expanded_edit_icon = id(new PHUIIconCircleView())
- ->addClass('phui-list-item-icon')
- ->addClass('phui-profile-menu-visible-when-expanded')
- ->setIconFont('fa-pencil');
-
- $collapsed_edit_icon = id(new PHUIIconCircleView())
- ->addClass('phui-list-item-icon')
- ->addClass('phui-profile-menu-visible-when-collapsed')
- ->setIconFont('fa-pencil')
- ->addSigil('has-tooltip')
- ->setMetadata(
- array(
- 'tip' => pht('Edit Menu'),
- 'align' => 'E',
- ));
-
- $items[] = id(new PHUIListItemView())
- ->setName('Edit Menu')
- ->setKey('panel.configure')
- ->addIcon($expanded_edit_icon)
- ->addIcon($collapsed_edit_icon)
- ->addClass('phui-profile-menu-footer')
- ->addClass('phui-profile-menu-footer-1')
- ->setHref($this->getPanelURI('configure/'))
- ->setDisabled(!$can_edit)
- ->setWorkflow(!$can_edit);
- }
-
$collapse_id = celerity_generate_unique_node_id();
-
$viewer = $this->getViewer();
-
$collapse_key =
PhabricatorUserPreferences::PREFERENCE_PROFILE_MENU_COLLAPSED;
@@ -461,7 +414,7 @@
->addIcon($expand_icon)
->setID($collapse_id)
->addClass('phui-profile-menu-footer')
- ->addClass('phui-profile-menu-footer-2')
+ ->addClass('phui-profile-menu-footer-1')
->setHideInApplicationMenu(true)
->setHref('#');
@@ -891,84 +844,24 @@
->addCancelButton($done_uri);
}
- if ($request->isFormPost()) {
- $key = $configuration->getID();
- if (!$key) {
- $key = $configuration->getBuiltinKey();
- }
-
- $this->adjustDefault($key);
-
- return id(new AphrontRedirectResponse())
- ->setURI($done_uri);
- }
-
- return $controller->newDialog()
- ->setTitle(pht('Make Default'))
- ->appendParagraph(
- pht(
- 'Set this item as the default for this menu? Users arriving on '.
- 'this page will be shown the content of this item by default.'))
- ->addCancelButton($done_uri)
- ->addSubmitButton(pht('Make Default'));
- }
-
- protected function newPanel() {
- return PhabricatorProfilePanelConfiguration::initializeNewBuiltin();
- }
-
- public function adjustDefault($key) {
- $controller = $this->getController();
- $request = $controller->getRequest();
- $viewer = $request->getViewer();
-
- $panels = $this->loadPanels();
-
- // To adjust the default panel, we first change any existing panels that
- // are marked as defaults to "visible", then make the new default panel
- // the default.
-
- $default = array();
- $visible = array();
-
- foreach ($panels as $panel) {
- $builtin_key = $panel->getBuiltinKey();
- $id = $panel->getID();
-
- $is_target =
- (($builtin_key !== null) && ($builtin_key === $key)) ||
- (($id !== null) && ($id === (int)$key));
-
- if ($is_target) {
- if (!$panel->isDefault()) {
- $default[] = $panel;
- }
- } else {
- if ($panel->isDefault()) {
- $visible[] = $panel;
- }
- }
- }
-
$type_visibility =
PhabricatorProfilePanelConfigurationTransaction::TYPE_VISIBILITY;
$v_visible = PhabricatorProfilePanelConfiguration::VISIBILITY_VISIBLE;
$v_default = PhabricatorProfilePanelConfiguration::VISIBILITY_DEFAULT;
- $apply = array(
- array($v_visible, $visible),
- array($v_default, $default),
- );
-
- foreach ($apply as $group) {
- list($value, $panels) = $group;
+ if ($request->isFormPost()) {
+ // First, mark any existing default panels as merely visible.
foreach ($panels as $panel) {
+ if (!$panel->isDefault()) {
+ continue;
+ }
+
$xactions = array();
$xactions[] = id(new PhabricatorProfilePanelConfigurationTransaction())
->setTransactionType($type_visibility)
- ->setNewValue($value);
+ ->setNewValue($v_visible);
$editor = id(new PhabricatorProfilePanelEditor())
->setContentSourceFromRequest($request)
@@ -977,9 +870,37 @@
->setContinueOnNoEffect(true)
->applyTransactions($panel, $xactions);
}
+
+ // Now, make this panel the default.
+ $xactions = array();
+
+ $xactions[] = id(new PhabricatorProfilePanelConfigurationTransaction())
+ ->setTransactionType($type_visibility)
+ ->setNewValue($v_default);
+
+ $editor = id(new PhabricatorProfilePanelEditor())
+ ->setContentSourceFromRequest($request)
+ ->setActor($viewer)
+ ->setContinueOnMissingFields(true)
+ ->setContinueOnNoEffect(true)
+ ->applyTransactions($configuration, $xactions);
+
+ return id(new AphrontRedirectResponse())
+ ->setURI($done_uri);
}
- return $this;
+ return $controller->newDialog()
+ ->setTitle(pht('Make Default'))
+ ->appendParagraph(
+ pht(
+ 'Set this item as the default for this menu? Users arriving on '.
+ 'this page will be shown the content of this item by default.'))
+ ->addCancelButton($done_uri)
+ ->addSubmitButton(pht('Make Default'));
+ }
+
+ protected function newPanel() {
+ return PhabricatorProfilePanelConfiguration::initializeNewBuiltin();
}
}
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -190,7 +190,7 @@
if ($this->actionLinks) {
$actions = array();
foreach ($this->actionLinks as $button) {
- $button->setColor(PHUIButtonView::SIMPLE);
+ $button->setColor(PHUIButtonView::GREY);
$button->addClass(PHUI::MARGIN_SMALL_LEFT);
$button->addClass('phui-header-action-link');
$actions[] = $button;
diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php
--- a/src/view/phui/PHUIObjectBoxView.php
+++ b/src/view/phui/PHUIObjectBoxView.php
@@ -4,6 +4,7 @@
private $headerText;
private $color;
+ private $background;
private $formErrors = null;
private $formSaved = false;
private $infoView;
@@ -106,6 +107,11 @@
return $this;
}
+ public function setBackground($color) {
+ $this->background = $color;
+ return $this;
+ }
+
public function setFormErrors(array $errors, $title = null) {
if ($errors) {
$this->formErrors = id(new PHUIInfoView())
@@ -387,6 +393,10 @@
$content->addClass('phui-object-box-'.$this->color);
}
+ if ($this->background) {
+ $content->setColor($this->background);
+ }
+
if ($this->collapsed) {
$content->addClass('phui-object-box-collapsed');
}
diff --git a/webroot/rsrc/css/application/project/project-view.css b/webroot/rsrc/css/application/project/project-view.css
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/css/application/project/project-view.css
@@ -0,0 +1,79 @@
+/**
+ * @provides project-view-css
+ */
+
+.project-view-home {
+ background: #fff;
+}
+
+.project-view-header {
+ padding: 32px 24px 32px;
+}
+
+.project-view-header .phui-header-shell {
+ margin: 0;
+ padding: 0;
+ border: none;
+}
+
+.project-view-header .phui-header-image {
+ height: 80px;
+ width: 80px;
+}
+
+.project-view-header .phui-header-col1 {
+ width: 96px;
+}
+
+.project-view-header .phui-header-subheader {
+ margin-top: 12px;
+}
+
+.project-view-header .phui-header-shell .phui-header-header {
+ font-family: 'Aleo', {$fontfamily};
+ font-size: 24px;
+}
+
+.phui-box.phui-box-grey.project-view-properties {
+ margin: 0 16px 0 16px;
+ padding: 4px 12px;
+}
+
+.project-view-properties .phui-property-list-key {
+ width: auto;
+ margin-left: 4px;
+}
+
+.project-view-properties .phui-property-list-section-header {
+ display: none;
+}
+
+.project-view-feed .phui-object-box.phui-box-border {
+ border: none;
+ padding: 8px;
+}
+
+.project-view-feed .phui-header-shell {
+ padding: 8px 4px;
+}
+
+.project-view-feed .phui-header-header {
+ font-size: {$biggerfontsize};
+ margin-left: 4px;
+}
+
+.project-view-home .phui-box-grey {
+ padding: 0;
+}
+
+.project-view-home .phui-box-grey .phui-header-shell {
+ padding: 8px 8px 8px 12px;
+}
+
+.project-view-home .phui-box-grey .phui-header-header {
+ font-size: {$biggerfontsize};
+}
+
+.project-view-home .phui-box-grey .phui-object-item-list-view {
+ padding: 8px;
+}
diff --git a/webroot/rsrc/css/phui/phui-box.css b/webroot/rsrc/css/phui/phui-box.css
--- a/webroot/rsrc/css/phui/phui-box.css
+++ b/webroot/rsrc/css/phui/phui-box.css
@@ -15,9 +15,33 @@
.phui-box-grey {
background-color: rgba(71,87,120,0.1);
border-radius: 3px;
+ border: none;
}
.phui-box-blue {
background-color: {$bluebackground};
border-radius: 3px;
+ border: none;
+}
+
+.phui-box-blue .phui-object-item,
+.phui-box-grey .phui-object-item {
+ background: transparent;
+}
+
+.phui-box-blue .phui-object-item-link,
+.phui-box-grey .phui-object-item-link {
+ color: {$darkbluetext};
+}
+
+.phui-box-blue .phui-header-shell,
+.phui-box-grey .phui-header-shell {
+ border-bottom: 2px solid #fff;
+}
+
+.phui-box-blue .phui-info-severity-nodata,
+.phui-box-grey .phui-info-severity-nodata {
+ background: transparent;
+ padding: 12px 4px;
+ text-align: center;
}
diff --git a/webroot/rsrc/css/phui/phui-button.css b/webroot/rsrc/css/phui/phui-button.css
--- a/webroot/rsrc/css/phui/phui-button.css
+++ b/webroot/rsrc/css/phui/phui-button.css
@@ -59,8 +59,8 @@
input[type="submit"].grey,
a.grey,
a.grey:visited {
- background-color: {$lightgreybackground};
- border-color: {$lightgreyborder};
+ background-color: rgba(71, 87, 120, 0.06);
+ border-color: rgba(71, 87, 120, 0.12);
color: {$darkgreytext};
}
@@ -101,27 +101,33 @@
button:hover {
text-decoration: none;
background-color: {$sky};
+ transition: 0.1s;
}
a.button.grey:hover,
button.grey:hover {
- background-color: #fff;
+ background-color: rgba(71, 87, 120, 0.12);
+ border-color: rgba(71, 87, 120, 0.2);
+ transition: 0.1s;
}
a.button.green:hover,
button.green:hover {
background-color: #0DAD48;
+ transition: 0.1s;
}
a.button.simple:hover,
button.simple:hover {
background-color: {$blue};
color: #fff;
+ transition: 0.1s;
}
a.button.simple:hover .phui-icon-view,
button.simple:hover .phui-icon-view {
color: #fff;
+ transition: 0.1s;
}
a.button.simple .phui-icon-view {
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -735,6 +735,8 @@
.phui-object-item-image {
width: 40px;
height: 40px;
+ box-shadow: inset 0 0 0 1px rgba(55,55,55,.15);
+ border-radius: 3px;
background-size: 100%;
margin: 6px;
position: absolute;
diff --git a/webroot/rsrc/css/phui/phui-profile-menu.css b/webroot/rsrc/css/phui/phui-profile-menu.css
--- a/webroot/rsrc/css/phui/phui-profile-menu.css
+++ b/webroot/rsrc/css/phui/phui-profile-menu.css
@@ -210,25 +210,17 @@
}
div.phui-profile-menu .phabricator-side-menu .phui-profile-menu-footer-1 {
- bottom: 40px;
+ bottom: 8px;
position: fixed;
background-color: {$menu.profile.background};
}
-div.phui-profile-menu .phabricator-side-menu .phui-profile-menu-footer-2 {
- bottom: 0;
- position: fixed;
- background-color: {$menu.profile.background};
-}
-
-.phui-profile-menu .phui-profile-menu-footer-1,
-.phui-profile-menu .phui-profile-menu-footer-2 {
+.phui-profile-menu .phui-profile-menu-footer-1 {
width: {$menu.profile.width};
transition: .2s;
}
-.phui-profile-menu .phui-profile-menu-collapsed .phui-profile-menu-footer-1,
-.phui-profile-menu .phui-profile-menu-collapsed .phui-profile-menu-footer-2 {
+.phui-profile-menu .phui-profile-menu-collapsed .phui-profile-menu-footer-1 {
width: {$menu.profile.width.collapsed};
transition: .2s;
}
diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css
--- a/webroot/rsrc/css/phui/phui-two-column-view.css
+++ b/webroot/rsrc/css/phui/phui-two-column-view.css
@@ -28,7 +28,7 @@
}
.device-desktop .phui-two-column-view
- .phui-side-column .phui-object-box:first-child {
+ .phui-side-column .phui-object-box {
margin: 0 16px 16px 0;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 24, 4:53 AM (2 w, 1 d ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/e2/wk/mpl5m26h3ngaiy7z
Default Alt Text
D15097.id36451.diff (33 KB)

Event Timeline

Phabricator · Built by Phacility