revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 14:52:41 +01:00
Code Issues Releases Wiki Activity

Move people box on project pages

Browse source 
Summary: This removes the people box and adds a members property list item it's place. We may want some show/hide/see all if a project has more than //n// members, but these seems more reasonable than previous layout.

Test Plan: Tested a project with and without members, grepped for removed CSS, and tested mobile and desktop layouts.

Reviewers: epriestley

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D7870
This commit is contained in:
Chad Little 2013-12-31 16:28:35 -08:00
parent 234123b925
commit ba7ac39130
5 changed files with 75 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
src/__celerity_resource_map__.php
View file

@ -3504,7 +3504,7 @@ celerity_register_resource_map(array(
),
'phabricator-profile-css' =>
array(
'uri' => '/res/c1f72695/rsrc/css/application/profile/profile-view.css',
'uri' => '/res/ad614d5f/rsrc/css/application/profile/profile-view.css',
'type' => 'css',
'requires' =>
array(
@ -3965,7 +3965,7 @@ celerity_register_resource_map(array(
),
'phui-object-item-list-view-css' =>
array(
'uri' => '/res/6637c8f0/rsrc/css/phui/phui-object-item-list-view.css',
'uri' => '/res/ba048e0a/rsrc/css/phui/phui-object-item-list-view.css',
'type' => 'css',
'requires' =>
array(
@ -4380,7 +4380,7 @@ celerity_register_resource_map(array(
), array(
'packages' =>
array(
'5d75f7b6' =>
'8d147927' =>
array(
'name' => 'core.pkg.css',
'symbols' =>
@ -4429,7 +4429,7 @@ celerity_register_resource_map(array(
41 => 'phabricator-tag-view-css',
42 => 'phui-list-view-css',
),
'uri' => '/res/pkg/5d75f7b6/core.pkg.css',
'uri' => '/res/pkg/8d147927/core.pkg.css',
'type' => 'css',
),
'2c1dba03' =>
@ -4621,15 +4621,15 @@ celerity_register_resource_map(array(
),
'reverse' =>
array(
'aphront-dialog-view-css' => '5d75f7b6',
'aphront-error-view-css' => '5d75f7b6',
'aphront-list-filter-view-css' => '5d75f7b6',
'aphront-pager-view-css' => '5d75f7b6',
'aphront-panel-view-css' => '5d75f7b6',
'aphront-table-view-css' => '5d75f7b6',
'aphront-tokenizer-control-css' => '5d75f7b6',
'aphront-tooltip-css' => '5d75f7b6',
'aphront-typeahead-control-css' => '5d75f7b6',
'aphront-dialog-view-css' => '8d147927',
'aphront-error-view-css' => '8d147927',
'aphront-list-filter-view-css' => '8d147927',
'aphront-pager-view-css' => '8d147927',
'aphront-panel-view-css' => '8d147927',
'aphront-table-view-css' => '8d147927',
'aphront-tokenizer-control-css' => '8d147927',
'aphront-tooltip-css' => '8d147927',
'aphront-typeahead-control-css' => '8d147927',
'differential-changeset-view-css' => '9244273c',
'differential-core-view-css' => '9244273c',
'differential-inline-comment-editor' => '92f459f0',
@ -4643,7 +4643,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => '9244273c',
'diffusion-commit-view-css' => '7aa115b4',
'diffusion-icons-css' => '7aa115b4',
'global-drag-and-drop-css' => '5d75f7b6',
'global-drag-and-drop-css' => '8d147927',
'inline-comment-summary-css' => '9244273c',
'javelin-aphlict' => '2c1dba03',
'javelin-behavior' => '3e3be199',
@ -4718,56 +4718,56 @@ celerity_register_resource_map(array(
'javelin-util' => '3e3be199',
'javelin-vector' => '3e3be199',
'javelin-workflow' => '3e3be199',
'lightbox-attachment-css' => '5d75f7b6',
'lightbox-attachment-css' => '8d147927',
'maniphest-task-summary-css' => '49898640',
'phabricator-action-list-view-css' => '5d75f7b6',
'phabricator-application-launch-view-css' => '5d75f7b6',
'phabricator-action-list-view-css' => '8d147927',
'phabricator-application-launch-view-css' => '8d147927',
'phabricator-busy' => '2c1dba03',
'phabricator-content-source-view-css' => '9244273c',
'phabricator-core-css' => '5d75f7b6',
'phabricator-crumbs-view-css' => '5d75f7b6',
'phabricator-core-css' => '8d147927',
'phabricator-crumbs-view-css' => '8d147927',
'phabricator-drag-and-drop-file-upload' => '92f459f0',
'phabricator-dropdown-menu' => '2c1dba03',
'phabricator-file-upload' => '2c1dba03',
'phabricator-filetree-view-css' => '5d75f7b6',
'phabricator-flag-css' => '5d75f7b6',
'phabricator-filetree-view-css' => '8d147927',
'phabricator-flag-css' => '8d147927',
'phabricator-hovercard' => '2c1dba03',
'phabricator-jump-nav' => '5d75f7b6',
'phabricator-jump-nav' => '8d147927',
'phabricator-keyboard-shortcut' => '2c1dba03',
'phabricator-keyboard-shortcut-manager' => '2c1dba03',
'phabricator-main-menu-view' => '5d75f7b6',
'phabricator-main-menu-view' => '8d147927',
'phabricator-menu-item' => '2c1dba03',
'phabricator-nav-view-css' => '5d75f7b6',
'phabricator-nav-view-css' => '8d147927',
'phabricator-notification' => '2c1dba03',
'phabricator-notification-css' => '5d75f7b6',
'phabricator-notification-menu-css' => '5d75f7b6',
'phabricator-notification-css' => '8d147927',
'phabricator-notification-menu-css' => '8d147927',
'phabricator-object-selector-css' => '9244273c',
'phabricator-phtize' => '2c1dba03',
'phabricator-prefab' => '2c1dba03',
'phabricator-project-tag-css' => '49898640',
'phabricator-remarkup-css' => '5d75f7b6',
'phabricator-remarkup-css' => '8d147927',
'phabricator-shaped-request' => '92f459f0',
'phabricator-side-menu-view-css' => '5d75f7b6',
'phabricator-standard-page-view' => '5d75f7b6',
'phabricator-tag-view-css' => '5d75f7b6',
'phabricator-side-menu-view-css' => '8d147927',
'phabricator-standard-page-view' => '8d147927',
'phabricator-tag-view-css' => '8d147927',
'phabricator-textareautils' => '2c1dba03',
'phabricator-tooltip' => '2c1dba03',
'phabricator-transaction-view-css' => '5d75f7b6',
'phabricator-zindex-css' => '5d75f7b6',
'phui-button-css' => '5d75f7b6',
'phui-form-css' => '5d75f7b6',
'phui-form-view-css' => '5d75f7b6',
'phui-header-view-css' => '5d75f7b6',
'phui-icon-view-css' => '5d75f7b6',
'phui-list-view-css' => '5d75f7b6',
'phui-object-item-list-view-css' => '5d75f7b6',
'phui-property-list-view-css' => '5d75f7b6',
'phui-spacing-css' => '5d75f7b6',
'sprite-apps-large-css' => '5d75f7b6',
'sprite-gradient-css' => '5d75f7b6',
'sprite-icons-css' => '5d75f7b6',
'sprite-menu-css' => '5d75f7b6',
'sprite-status-css' => '5d75f7b6',
'syntax-highlighting-css' => '5d75f7b6',
'phabricator-transaction-view-css' => '8d147927',
'phabricator-zindex-css' => '8d147927',
'phui-button-css' => '8d147927',
'phui-form-css' => '8d147927',
'phui-form-view-css' => '8d147927',
'phui-header-view-css' => '8d147927',
'phui-icon-view-css' => '8d147927',
'phui-list-view-css' => '8d147927',
'phui-object-item-list-view-css' => '8d147927',
'phui-property-list-view-css' => '8d147927',
'phui-spacing-css' => '8d147927',
'sprite-apps-large-css' => '8d147927',
'sprite-gradient-css' => '8d147927',
'sprite-icons-css' => '8d147927',
'sprite-menu-css' => '8d147927',
'sprite-status-css' => '8d147927',
'syntax-highlighting-css' => '8d147927',
),
));

2
src/applications/people/controller/PhabricatorPeopleProfileController.php
View file

@ -126,7 +126,7 @@ final class PhabricatorPeopleProfileController
$view = $builder->buildView();
return phutil_tag_div(
'profile-feed profile-wrap-responsive',
'profile-feed',
$view->render());
}
}

49
src/applications/project/controller/PhabricatorProjectProfileController.php
View file

@ -45,16 +45,10 @@ final class PhabricatorProjectProfileController
$query->setViewer($this->getRequest()->getUser());
$stories = $query->execute();
$feed = $this->renderStories($stories);
$people = $this->renderPeoplePage($project, $profile);
$content = id(new AphrontMultiColumnView())
->addColumn($people)
->addColumn($feed)
->setFluidLayout(true);
$content = phutil_tag_div(
'phabricator-project-layout',
array($tasks, $content));
array($tasks, $feed));
$header = id(new PHUIHeaderView())
->setHeader($project->getName())
@ -92,37 +86,6 @@ final class PhabricatorProjectProfileController
));
}
private function renderPeoplePage(
PhabricatorProject $project,
PhabricatorProjectProfile $profile) {
$member_phids = $project->getMemberPHIDs();
$handles = $this->loadViewerHandles($member_phids);
$affiliated = array();
foreach ($handles as $phids => $handle) {
$affiliated[] = phutil_tag('li', array(), $handle->renderLink());
}
if ($affiliated) {
$affiliated = phutil_tag('ul', array(), $affiliated);
} else {
$affiliated = phutil_tag('p', array(),
phutil_tag('em', array(),
pht('No one is affiliated with this project.')));
}
return phutil_tag_div(
'phabricator-profile-info-group profile-wrap-responsive',
array(
phutil_tag(
'h1',
array('class' => 'phabricator-profile-info-header'),
pht('People')),
phutil_tag_div('phabricator-profile-info-pane', $affiliated),
));
}
private function renderFeedPage(
PhabricatorProject $project,
PhabricatorProjectProfile $profile) {
@ -149,7 +112,7 @@ final class PhabricatorProjectProfileController
$view = $builder->buildView();
return phutil_tag_div(
'profile-feed profile-wrap-responsive',
'profile-feed',
$view->render());
}
@ -267,6 +230,8 @@ final class PhabricatorProjectProfileController
$request = $this->getRequest();
$viewer = $request->getUser();
$this->loadHandles($project->getMemberPHIDs());
$view = id(new PHUIPropertyListView())
->setUser($viewer)
->setObject($project)
@ -276,6 +241,12 @@ final class PhabricatorProjectProfileController
pht('Created'),
phabricator_datetime($project->getDateCreated(), $viewer));
$view->addProperty(
pht('Members'),
$project->getMemberPHIDs()
? $this->renderHandlesForPHIDs($project->getMemberPHIDs(), ',')
: phutil_tag('em', array(), pht('None')));
$view->addSectionHeader(pht('Description'));
$view->addTextContent(
PhabricatorMarkupEngine::renderOneObject(

124
webroot/rsrc/css/application/profile/profile-view.css
View file

@ -2,127 +2,17 @@
* @provides phabricator-profile-css
*/
table.phabricator-profile-master-layout {
width: 100%;
}
td.phabricator-profile-navigation {
width: 300px;
background: #efefef;
border-right: 1px solid #cccccc;
padding-top: 8px;
padding-bottom: 8em;
}
td.phabricator-profile-navigation a,
td.phabricator-profile-navigation span {
display: block;
margin: 0 0 2px;
min-width: 150px;
font-weight: bold;
white-space: nowrap;
text-decoration: none;
}
td.phabricator-profile-navigation a {
padding: 4px 8px 4px 10px;
}
td.phabricator-profile-navigation a:hover {
text-decoration: none;
background: #cccccc;
}
td.phabricator-profile-navigation a.phabricator-profile-item-selected,
td.phabricator-profile-navigation a.phabricator-profile-item-selected :hover {
background: #cccccc;
}
td.phabricator-profile-navigation hr {
border: none;
background: #cccccc;
padding: 0;
margin: 10px 0;
height: 1px;
}
td.phabricator-profile-navigation h1,
td.phabricator-profile-navigation h2 {
padding: 2px 0px 0px 10px;
}
td.phabricator-profile-content {
padding: 2em 2%;
}
.phabricator-profile-info-table th {
font-weight: bold;
text-align: right;
color: {$greytext};
width: 10%;
padding: 4px;
}
.phabricator-profile-info-table td {
width: 100%;
padding: 4px;
}
.phabricator-profile-info-group {
box-shadow: 0 1px 1px rgba(0,0,0,.4);
}
.phabricator-profile-info-header {
padding: 8px;
background: #e7e7e7;
border-bottom: 1px solid #d9d9d9;
}
.phabricator-profile-info-pane {
padding: 8px .5em;
background: #fff;
}
.phabricator-profile-info-table {
width: 100%;
}
h2.phabricator-profile-realname {
color: {$greytext};
}
img.phabricator-profile-image {
width: 280px;
margin: 10px;
}
.phabricator-profile-info-pane-more-link {
text-align: right;
padding: .25em;
font-weight: bold;
margin: .5em 1em 0;
}
.profile-wrap-responsive {
margin: 20px;
}
.device .profile-wrap-responsive {
margin-left: 10px;
margin-right: 10px;
}
.device-desktop .profile-feed {
.device-desktop .profile-feed,
.device-tablet .profile-feed {
max-width: 640px;
padding: 12px 16px;
}
.device-phone .profile-feed {
padding: 12px 0;
}
.profile-feed .phabricator-action-header-title {
font-size: 16px;
margin-bottom: 5px;
}
.device-desktop .phabricator-project-layout
.aphront-multi-column-column-outer:first-child
.phabricator-profile-info-group {
margin-right: 0;
}

15
webroot/rsrc/css/phui/phui-object-item-list-view.css
View file

@ -10,11 +10,6 @@
padding: 20px;
}
.device-desktop .phui-object-box .phui-object-list-cards {
padding: 12px;
background-color: #E5E8EE;
}
.phui-object-item-list-view + .phui-object-item-list-view {
padding-top: 0;
}
@ -23,6 +18,16 @@
padding: 0;
}
.phui-object-box .phui-object-item-list-view.phui-object-list-flush {
padding: 12px;
background-color: #E5E8EE;
}
.device-phone .phui-object-box
.phui-object-item-list-view.phui-object-list-flush {
padding: 4px;
}
.phui-object-item-list-view .aphront-error-view {
margin: 0;
}