1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 23:02:42 +01:00

Action Menu (mobile)

Summary: First pass here, still needs some UI work (maybe? tablets?). Getting it out to see if implementation is corrrect.

Test Plan: Shrink Maniphest task on Chrome, see new UI. Toggle menu. Test on iOS.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5631
This commit is contained in:
Chad Little 2013-04-09 12:42:03 -07:00
parent 0ad05e911b
commit e187312177
16 changed files with 345 additions and 249 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

View file

@ -1,6 +1,21 @@
{
"version" : 1,
"sprites" : {
"action-action-menu" : {
"name" : "action-action-menu",
"rule" : ".action-action-menu",
"hash" : "533fe3e36cfbf890ad7348330a2328a9"
},
"action-action-menu-grey" : {
"name" : "action-action-menu-grey",
"rule" : ".action-action-menu-grey",
"hash" : "9bc229a81b33bb62bcb4e025283ffbe5"
},
"action-action-menu-white" : {
"name" : "action-action-menu-white",
"rule" : ".action-action-menu-white, .device-desktop .phabricator-action-view:hover .action-action-menu",
"hash" : "db0ff28b9ee23cdbf6125a7864b693b0"
},
"action-arrow_left" : {
"name" : "action-arrow_left",
"rule" : ".action-arrow_left",

View file

@ -597,15 +597,15 @@ celerity_register_resource_map(array(
),
'/rsrc/image/sprite-icon-X2.png' =>
array(
'hash' => 'c9fae25bc6221922ce26517e654a18e4',
'uri' => '/res/c9fae25b/rsrc/image/sprite-icon-X2.png',
'hash' => '1610d410ca8730ec26232cd5698a962a',
'uri' => '/res/1610d410/rsrc/image/sprite-icon-X2.png',
'disk' => '/rsrc/image/sprite-icon-X2.png',
'type' => 'png',
),
'/rsrc/image/sprite-icon.png' =>
array(
'hash' => 'b690ea69bf5f2abe84d0a6e9ef64b03d',
'uri' => '/res/b690ea69/rsrc/image/sprite-icon.png',
'hash' => '891dea483c37bdc43c00372944c98165',
'uri' => '/res/891dea48/rsrc/image/sprite-icon.png',
'disk' => '/rsrc/image/sprite-icon.png',
'type' => 'png',
),
@ -2849,7 +2849,7 @@ celerity_register_resource_map(array(
),
'phabricator-action-list-view-css' =>
array(
'uri' => '/res/7a67c3b9/rsrc/css/layout/phabricator-action-list-view.css',
'uri' => '/res/3d02ca59/rsrc/css/layout/phabricator-action-list-view.css',
'type' => 'css',
'requires' =>
array(
@ -2923,7 +2923,7 @@ celerity_register_resource_map(array(
),
'phabricator-crumbs-view-css' =>
array(
'uri' => '/res/2857d229/rsrc/css/layout/phabricator-crumbs-view.css',
'uri' => '/res/31ef131e/rsrc/css/layout/phabricator-crumbs-view.css',
'type' => 'css',
'requires' =>
array(
@ -3830,7 +3830,7 @@ celerity_register_resource_map(array(
),
'sprite-icon-css' =>
array(
'uri' => '/res/e7d63fcf/rsrc/css/sprite-icon.css',
'uri' => '/res/fa36bb72/rsrc/css/sprite-icon.css',
'type' => 'css',
'requires' =>
array(
@ -3903,7 +3903,7 @@ celerity_register_resource_map(array(
), array(
'packages' =>
array(
'90eede2c' =>
'60914b69' =>
array(
'name' => 'core.pkg.css',
'symbols' =>
@ -3945,7 +3945,7 @@ celerity_register_resource_map(array(
34 => 'phabricator-object-item-list-view-css',
35 => 'global-drag-and-drop-css',
),
'uri' => '/res/pkg/90eede2c/core.pkg.css',
'uri' => '/res/pkg/60914b69/core.pkg.css',
'type' => 'css',
),
'bf16b308' =>
@ -4135,16 +4135,16 @@ celerity_register_resource_map(array(
'reverse' =>
array(
'aphront-attached-file-view-css' => '6b1fccc6',
'aphront-dialog-view-css' => '90eede2c',
'aphront-error-view-css' => '90eede2c',
'aphront-form-view-css' => '90eede2c',
'aphront-list-filter-view-css' => '90eede2c',
'aphront-pager-view-css' => '90eede2c',
'aphront-panel-view-css' => '90eede2c',
'aphront-table-view-css' => '90eede2c',
'aphront-tokenizer-control-css' => '90eede2c',
'aphront-tooltip-css' => '90eede2c',
'aphront-typeahead-control-css' => '90eede2c',
'aphront-dialog-view-css' => '60914b69',
'aphront-error-view-css' => '60914b69',
'aphront-form-view-css' => '60914b69',
'aphront-list-filter-view-css' => '60914b69',
'aphront-pager-view-css' => '60914b69',
'aphront-panel-view-css' => '60914b69',
'aphront-table-view-css' => '60914b69',
'aphront-tokenizer-control-css' => '60914b69',
'aphront-tooltip-css' => '60914b69',
'aphront-typeahead-control-css' => '60914b69',
'differential-changeset-view-css' => '8aaacd1b',
'differential-core-view-css' => '8aaacd1b',
'differential-inline-comment-editor' => 'e96b08f8',
@ -4158,7 +4158,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => '8aaacd1b',
'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => '90eede2c',
'global-drag-and-drop-css' => '60914b69',
'inline-comment-summary-css' => '8aaacd1b',
'javelin-aphlict' => 'bf16b308',
'javelin-behavior' => 'a2f94024',
@ -4230,47 +4230,47 @@ celerity_register_resource_map(array(
'javelin-util' => 'a2f94024',
'javelin-vector' => 'a2f94024',
'javelin-workflow' => 'a2f94024',
'lightbox-attachment-css' => '90eede2c',
'lightbox-attachment-css' => '60914b69',
'maniphest-task-summary-css' => '6b1fccc6',
'maniphest-transaction-detail-css' => '6b1fccc6',
'phabricator-busy' => 'bf16b308',
'phabricator-content-source-view-css' => '8aaacd1b',
'phabricator-core-buttons-css' => '90eede2c',
'phabricator-core-css' => '90eede2c',
'phabricator-crumbs-view-css' => '90eede2c',
'phabricator-directory-css' => '90eede2c',
'phabricator-core-buttons-css' => '60914b69',
'phabricator-core-css' => '60914b69',
'phabricator-crumbs-view-css' => '60914b69',
'phabricator-directory-css' => '60914b69',
'phabricator-drag-and-drop-file-upload' => 'e96b08f8',
'phabricator-dropdown-menu' => 'bf16b308',
'phabricator-file-upload' => 'bf16b308',
'phabricator-filetree-view-css' => '90eede2c',
'phabricator-flag-css' => '90eede2c',
'phabricator-form-view-css' => '90eede2c',
'phabricator-header-view-css' => '90eede2c',
'phabricator-jump-nav' => '90eede2c',
'phabricator-filetree-view-css' => '60914b69',
'phabricator-flag-css' => '60914b69',
'phabricator-form-view-css' => '60914b69',
'phabricator-header-view-css' => '60914b69',
'phabricator-jump-nav' => '60914b69',
'phabricator-keyboard-shortcut' => 'bf16b308',
'phabricator-keyboard-shortcut-manager' => 'bf16b308',
'phabricator-main-menu-view' => '90eede2c',
'phabricator-main-menu-view' => '60914b69',
'phabricator-menu-item' => 'bf16b308',
'phabricator-nav-view-css' => '90eede2c',
'phabricator-nav-view-css' => '60914b69',
'phabricator-notification' => 'bf16b308',
'phabricator-notification-css' => '90eede2c',
'phabricator-notification-menu-css' => '90eede2c',
'phabricator-object-item-list-view-css' => '90eede2c',
'phabricator-notification-css' => '60914b69',
'phabricator-notification-menu-css' => '60914b69',
'phabricator-object-item-list-view-css' => '60914b69',
'phabricator-object-selector-css' => '8aaacd1b',
'phabricator-prefab' => 'bf16b308',
'phabricator-project-tag-css' => '6b1fccc6',
'phabricator-remarkup-css' => '90eede2c',
'phabricator-remarkup-css' => '60914b69',
'phabricator-shaped-request' => 'e96b08f8',
'phabricator-side-menu-view-css' => '90eede2c',
'phabricator-standard-page-view' => '90eede2c',
'phabricator-side-menu-view-css' => '60914b69',
'phabricator-standard-page-view' => '60914b69',
'phabricator-textareautils' => 'bf16b308',
'phabricator-tooltip' => 'bf16b308',
'phabricator-transaction-view-css' => '90eede2c',
'phabricator-zindex-css' => '90eede2c',
'sprite-apps-large-css' => '90eede2c',
'sprite-gradient-css' => '90eede2c',
'sprite-icon-css' => '90eede2c',
'sprite-menu-css' => '90eede2c',
'syntax-highlighting-css' => '90eede2c',
'phabricator-transaction-view-css' => '60914b69',
'phabricator-zindex-css' => '60914b69',
'sprite-apps-large-css' => '60914b69',
'sprite-gradient-css' => '60914b69',
'sprite-icon-css' => '60914b69',
'sprite-menu-css' => '60914b69',
'syntax-highlighting-css' => '60914b69',
),
));

View file

@ -335,12 +335,14 @@ final class ManiphestTaskDetailController extends ManiphestController {
$user, $task->getPHID());
$object_name = 'T'.$task->getID();
$actions = $this->buildActionView($task);
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addCrumb(
id(new PhabricatorCrumbView())
->setName($object_name)
->setHref('/'.$object_name))
->setActionList($actions)
->addAction(
id(new PhabricatorMenuItemView())
->setHref($this->getApplicationURI('/task/create/'))
@ -348,7 +350,6 @@ final class ManiphestTaskDetailController extends ManiphestController {
->setIcon('create'));
$header = $this->buildHeaderView($task);
$actions = $this->buildActionView($task);
$properties = $this->buildPropertyView($task, $aux_fields, $edges, $engine);
return $this->buildApplicationPage(

View file

@ -4,6 +4,7 @@ final class PhabricatorActionListView extends AphrontView {
private $actions = array();
private $object;
private $id = null;
public function setObject(PhabricatorLiskDAO $object) {
$this->object = $object;
@ -15,6 +16,11 @@ final class PhabricatorActionListView extends AphrontView {
return $this;
}
public function setID($id) {
$this->id = $id;
return $this;
}
public function render() {
if (!$this->user) {
throw new Exception(pht("Call setUser() before render()!"));
@ -41,6 +47,7 @@ final class PhabricatorActionListView extends AphrontView {
'ul',
array(
'class' => 'phabricator-action-list-view',
'id' => $this->id
),
$actions);
}

View file

@ -4,6 +4,7 @@ final class PhabricatorCrumbsView extends AphrontView {
private $crumbs = array();
private $actions = array();
private $actionListID = null;
protected function canAppendChild() {
return false;
@ -14,10 +15,14 @@ final class PhabricatorCrumbsView extends AphrontView {
return $this;
}
public function addAction(PhabricatorMenuItemView $action) {
$this->actions[] = $action;
return $this;
}
public function setActionList(PhabricatorActionListView $list) {
$this->actionListID = celerity_generate_unique_node_id();
$list->setId($this->actionListID);
return $this;
}
@ -44,6 +49,7 @@ final class PhabricatorCrumbsView extends AphrontView {
),
$action->getName()
);
$actions[] = javelin_tag(
'a',
array(
@ -57,6 +63,42 @@ final class PhabricatorCrumbsView extends AphrontView {
));
}
if ($this->actionListID) {
$icon_id = celerity_generate_unique_node_id();
$icon = phutil_tag(
'span',
array(
'class' => 'sprite-icon action-action-menu'
),
'');
$name = phutil_tag(
'span',
array(
'class' => 'phabricator-crumbs-action-name'
),
pht('Actions'));
$actions[] = javelin_tag(
'a',
array(
'href' => '#',
'class' =>
'phabricator-crumbs-action phabricator-crumbs-action-menu',
'sigil' => 'jx-toggle-class',
'id' => $icon_id,
'meta' => array(
'map' => array(
$this->actionListID => 'phabricator-action-list-toggle',
$icon_id => 'phabricator-crumbs-action-menu-open'
),
),
),
array(
$icon,
$name,
));
}
$action_view = phutil_tag(
'div',
array(

View file

@ -29,11 +29,18 @@
}
.device .phabricator-action-list-view {
background: #f3f3f3;
border-top: 1px solid #dcdcdc;
padding: .5em 0;
}
.device .phabricator-action-list-view {
display: none;
}
.device .phabricator-action-list-view.phabricator-action-list-toggle {
display: block;
}
.phabricator-action-view {
padding: 1px 0;
position: relative;

View file

@ -25,6 +25,18 @@
text-shadow: 0 1px 2px rgba(255, 255, 255, 0.9);
}
.phabricator-crumbs-action.phabricator-crumbs-action-menu {
display: none;
}
.device .phabricator-crumbs-action.phabricator-crumbs-action-menu {
display: inline-block;
}
.device .phabricator-crumbs-action-menu-open {
background: rgba(0,0,0,.1);
}
.phabricator-crumbs-view + .phabricator-header-shell {
border-top: none;
}

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB