archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Conpherence CSS Widget Tweaks

Browse Source 
Summary: Semi-decent pass at cleaning up the Conpherence dropdown and widgets. Will continue to update but have diff questions.

Test Plan: Testing Conpherence in my sb.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D6043
This commit is contained in:
Chad Little
2013-05-27 09:56:45 -07:00
parent da60c71fb8
commit b12cb2ccfc
9 changed files with 149 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/__celerity_resource_map__.php
View File

@@ -916,15 +916,6 @@ celerity_register_resource_map(array(
),
'disk' => '/rsrc/css/application/config/config-options.css',
),
'conpherence-header-pane-css' =>
array(
'uri' => '/res/6d7bfc7e/rsrc/css/application/conpherence/header-pane.css',
'type' => 'css',
'requires' =>
array(
),
'disk' => '/rsrc/css/application/conpherence/header-pane.css',
),
'conpherence-menu-css' =>
array(
'uri' => '/res/c955650e/rsrc/css/application/conpherence/menu.css',
@@ -954,7 +945,7 @@ celerity_register_resource_map(array(
),
'conpherence-widget-pane-css' =>
array(
'uri' => '/res/999e21da/rsrc/css/application/conpherence/widget-pane.css',
'uri' => '/res/d3829b07/rsrc/css/application/conpherence/widget-pane.css',
'type' => 'css',
'requires' =>
array(
@@ -2935,7 +2926,7 @@ celerity_register_resource_map(array(
),
'phabricator-core-buttons-css' =>
array(
'uri' => '/res/8853cc81/rsrc/css/core/buttons.css',
'uri' => '/res/073fc5eb/rsrc/css/core/buttons.css',
'type' => 'css',
'requires' =>
array(
@@ -3983,7 +3974,7 @@ celerity_register_resource_map(array(
), array(
'packages' =>
array(
'7b1cbdd9' =>
'c3ade478' =>
array(
'name' => 'core.pkg.css',
'symbols' =>
@@ -4032,7 +4023,7 @@ celerity_register_resource_map(array(
41 => 'phabricator-property-list-view-css',
42 => 'phabricator-tag-view-css',
),
'uri' => '/res/pkg/7b1cbdd9/core.pkg.css',
'uri' => '/res/pkg/c3ade478/core.pkg.css',
'type' => 'css',
),
'77faef00' =>
@@ -4226,16 +4217,16 @@ celerity_register_resource_map(array(
'reverse' =>
array(
'aphront-attached-file-view-css' => '6b1fccc6',
'aphront-dialog-view-css' => '7b1cbdd9',
'aphront-error-view-css' => '7b1cbdd9',
'aphront-form-view-css' => '7b1cbdd9',
'aphront-list-filter-view-css' => '7b1cbdd9',
'aphront-pager-view-css' => '7b1cbdd9',
'aphront-panel-view-css' => '7b1cbdd9',
'aphront-table-view-css' => '7b1cbdd9',
'aphront-tokenizer-control-css' => '7b1cbdd9',
'aphront-tooltip-css' => '7b1cbdd9',
'aphront-typeahead-control-css' => '7b1cbdd9',
'aphront-dialog-view-css' => 'c3ade478',
'aphront-error-view-css' => 'c3ade478',
'aphront-form-view-css' => 'c3ade478',
'aphront-list-filter-view-css' => 'c3ade478',
'aphront-pager-view-css' => 'c3ade478',
'aphront-panel-view-css' => 'c3ade478',
'aphront-table-view-css' => 'c3ade478',
'aphront-tokenizer-control-css' => 'c3ade478',
'aphront-tooltip-css' => 'c3ade478',
'aphront-typeahead-control-css' => 'c3ade478',
'differential-changeset-view-css' => 'dd27a69b',
'differential-core-view-css' => 'dd27a69b',
'differential-inline-comment-editor' => '9488bb69',
@@ -4249,7 +4240,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => 'dd27a69b',
'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => '7b1cbdd9',
'global-drag-and-drop-css' => 'c3ade478',
'inline-comment-summary-css' => 'dd27a69b',
'javelin-aphlict' => '77faef00',
'javelin-behavior' => 'c1359b5d',
@@ -4323,56 +4314,56 @@ celerity_register_resource_map(array(
'javelin-util' => 'c1359b5d',
'javelin-vector' => 'c1359b5d',
'javelin-workflow' => 'c1359b5d',
'lightbox-attachment-css' => '7b1cbdd9',
'lightbox-attachment-css' => 'c3ade478',
'maniphest-task-summary-css' => '6b1fccc6',
'maniphest-transaction-detail-css' => '6b1fccc6',
'phabricator-action-list-view-css' => '7b1cbdd9',
'phabricator-application-launch-view-css' => '7b1cbdd9',
'phabricator-action-list-view-css' => 'c3ade478',
'phabricator-application-launch-view-css' => 'c3ade478',
'phabricator-busy' => '77faef00',
'phabricator-content-source-view-css' => 'dd27a69b',
'phabricator-core-buttons-css' => '7b1cbdd9',
'phabricator-core-css' => '7b1cbdd9',
'phabricator-crumbs-view-css' => '7b1cbdd9',
'phabricator-directory-css' => '7b1cbdd9',
'phabricator-core-buttons-css' => 'c3ade478',
'phabricator-core-css' => 'c3ade478',
'phabricator-crumbs-view-css' => 'c3ade478',
'phabricator-directory-css' => 'c3ade478',
'phabricator-drag-and-drop-file-upload' => '9488bb69',
'phabricator-dropdown-menu' => '77faef00',
'phabricator-file-upload' => '77faef00',
'phabricator-filetree-view-css' => '7b1cbdd9',
'phabricator-flag-css' => '7b1cbdd9',
'phabricator-form-view-css' => '7b1cbdd9',
'phabricator-header-view-css' => '7b1cbdd9',
'phabricator-filetree-view-css' => 'c3ade478',
'phabricator-flag-css' => 'c3ade478',
'phabricator-form-view-css' => 'c3ade478',
'phabricator-header-view-css' => 'c3ade478',
'phabricator-hovercard' => '77faef00',
'phabricator-jump-nav' => '7b1cbdd9',
'phabricator-jump-nav' => 'c3ade478',
'phabricator-keyboard-shortcut' => '77faef00',
'phabricator-keyboard-shortcut-manager' => '77faef00',
'phabricator-main-menu-view' => '7b1cbdd9',
'phabricator-main-menu-view' => 'c3ade478',
'phabricator-menu-item' => '77faef00',
'phabricator-nav-view-css' => '7b1cbdd9',
'phabricator-nav-view-css' => 'c3ade478',
'phabricator-notification' => '77faef00',
'phabricator-notification-css' => '7b1cbdd9',
'phabricator-notification-menu-css' => '7b1cbdd9',
'phabricator-object-item-list-view-css' => '7b1cbdd9',
'phabricator-notification-css' => 'c3ade478',
'phabricator-notification-menu-css' => 'c3ade478',
'phabricator-object-item-list-view-css' => 'c3ade478',
'phabricator-object-selector-css' => 'dd27a69b',
'phabricator-phtize' => '77faef00',
'phabricator-prefab' => '77faef00',
'phabricator-project-tag-css' => '6b1fccc6',
'phabricator-property-list-view-css' => '7b1cbdd9',
'phabricator-remarkup-css' => '7b1cbdd9',
'phabricator-property-list-view-css' => 'c3ade478',
'phabricator-remarkup-css' => 'c3ade478',
'phabricator-shaped-request' => '9488bb69',
'phabricator-side-menu-view-css' => '7b1cbdd9',
'phabricator-standard-page-view' => '7b1cbdd9',
'phabricator-tag-view-css' => '7b1cbdd9',
'phabricator-side-menu-view-css' => 'c3ade478',
'phabricator-standard-page-view' => 'c3ade478',
'phabricator-tag-view-css' => 'c3ade478',
'phabricator-textareautils' => '77faef00',
'phabricator-tooltip' => '77faef00',
'phabricator-transaction-view-css' => '7b1cbdd9',
'phabricator-zindex-css' => '7b1cbdd9',
'phui-form-css' => '7b1cbdd9',
'phui-icon-view-css' => '7b1cbdd9',
'spacing-css' => '7b1cbdd9',
'sprite-apps-large-css' => '7b1cbdd9',
'sprite-gradient-css' => '7b1cbdd9',
'sprite-icons-css' => '7b1cbdd9',
'sprite-menu-css' => '7b1cbdd9',
'syntax-highlighting-css' => '7b1cbdd9',
'phabricator-transaction-view-css' => 'c3ade478',
'phabricator-zindex-css' => 'c3ade478',
'phui-form-css' => 'c3ade478',
'phui-icon-view-css' => 'c3ade478',
'spacing-css' => 'c3ade478',
'sprite-apps-large-css' => 'c3ade478',
'sprite-gradient-css' => 'c3ade478',
'sprite-icons-css' => 'c3ade478',
'sprite-menu-css' => 'c3ade478',
'syntax-highlighting-css' => 'c3ade478',
),
));

1
src/applications/conpherence/controller/ConpherenceViewController.php
View File

@@ -104,7 +104,6 @@ final class ConpherenceViewController extends
}
private function renderHeaderPaneContent() {
require_celerity_resource('conpherence-header-pane-css');
$conpherence = $this->getConpherence();
$header = $this->buildHeaderPaneContent($conpherence);
return hsprintf('%s', $header);

34
src/applications/conpherence/controller/ConpherenceWidgetController.php
View File

@@ -168,9 +168,9 @@ final class ConpherenceWidgetController extends
'button',
array(
'type' => 'submit',
'class' => 'notifications-update grey',
'class' => 'notifications-update',
),
pht('Update Notifications'))
pht('Save'))
);
return phabricator_form(
@@ -263,18 +263,15 @@ final class ConpherenceWidgetController extends
$user,
$time_str);
$secondary_info = pht('%s, %s',
$handles[$status->getUserPHID()]->getName(), $epoch_range);
$content[] = phutil_tag(
'div',
array(
'class' => 'user-status '.$status->getTextStatus(),
'class' => 'pm user-status '.$status->getTextStatus(),
),
array(
phutil_tag(
'div',
array(
'class' => 'epoch-range'
),
$epoch_range),
phutil_tag(
'div',
array(
@@ -286,17 +283,24 @@ final class ConpherenceWidgetController extends
array(
'class' => 'description'
),
$status->getTerseSummary($user)),
phutil_tag(
'div',
array(
'class' => 'participant'
),
$handles[$status->getUserPHID()]->getName())
$status->getTerseSummary($user),
phutil_tag(
'div',
array(
'class' => 'participant'
),
$secondary_info)))
));
$first_status_of_the_day = false;
} else {
$content[] = phutil_tag(
'div',
array('class' => 'no-events pmt pml'),
pht('No Events Scheduled.'));
}
}
// we didn't get a status on this day so add a spacer
if ($first_status_of_the_day) {
$content[] = phutil_tag(

33
src/applications/conpherence/view/ConpherenceFileWidgetView.php
View File

@@ -32,7 +32,7 @@ final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
// system generated files don't have authors
if ($file->getAuthorPHID()) {
$who_done_it_text = pht(
'by %s ',
'By %s ',
$files_authors[$file->getPHID()]->renderLink());
}
$date_text = phabricator_relative_date(
@@ -44,32 +44,7 @@ final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
array(
'class' => 'file-uploaded-by'
),
pht('Uploaded %s%s.', $who_done_it_text, $date_text));
$extra = '';
if ($file->isViewableImage()) {
$meta = $file_view->getMetadata();
$extra = javelin_tag(
'a',
array(
'sigil' => 'lightboxable',
'meta' => $meta,
'class' => 'file-extra',
),
phutil_tag(
'img',
array(
'src' => $file->getThumb160x120URI()
),
''));
}
$divider = phutil_tag(
'div',
array(
'class' => 'divider'
),
'');
pht('%s%s.', $who_done_it_text, $date_text));
$files_html[] = phutil_tag(
'div',
@@ -79,9 +54,7 @@ final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
array(
$icon_view,
$file_view,
$who_done_it,
$extra,
$divider
$who_done_it
));
}

8
src/applications/conpherence/view/ConpherencePeopleWidgetView.php
View File

@@ -49,13 +49,7 @@ final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
array(
'class' => 'add-people-widget',
),
$add_widget),
phutil_tag(
'div',
array(
'class' => 'divider'
),
'')
$add_widget)
));
$body = array();