Skip to content

Commit e8cebb7

Browse files
author
epriestley
committed
Add support for aural-only and visual-only elements
Summary: Ref T4843. This adds support to `javelin_tag()` for an `aural` attribute. When specified, `true` values mean "this content is aural-only", while `false` values mean "this content is not aural". - I've attempted to find the best modern approaches for marking this content, but the `aural` attribute should let us change the mechanism later. - Make the "beta" markers on application navigation visual only (see T4843). This information is of very low importance, the application navigation is accessed frequently, and the information is available on the application list. - Partially convert the main navigation. This is mostly to test things, since I want to get more concrete feedback about approaches here. - Add a `?__aural__=1` attribute, which renders the page with aural-only elements visible and visual-only elements colored. Test Plan: {F146476} Reviewers: btrahan, scp, chad Reviewed By: chad Subscribers: aklapper, qgil, epriestley Maniphest Tasks: T4843 Differential Revision: https://secure.phabricator.com/D8830
1 parent 3fde020 commit e8cebb7

File tree

15 files changed

+171
-20
lines changed

15 files changed

+171
-20
lines changed

resources/celerity/map.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
return array(
88
'names' =>
99
array(
10-
'core.pkg.css' => 'b7ba02ba',
10+
'core.pkg.css' => 'cc50ddf5',
1111
'core.pkg.js' => '417722ff',
1212
'darkconsole.pkg.js' => 'ca8671ce',
1313
'differential.pkg.css' => '8a064eb7',
@@ -105,10 +105,10 @@
105105
'rsrc/css/application/subscriptions/subscribers-list.css' => '5bb30c78',
106106
'rsrc/css/application/tokens/tokens.css' => '5f7bca25',
107107
'rsrc/css/application/uiexample/example.css' => '528b19de',
108-
'rsrc/css/core/core.css' => 'da26ddb2',
108+
'rsrc/css/core/core.css' => '7dff07c3',
109109
'rsrc/css/core/remarkup.css' => '98a7627b',
110110
'rsrc/css/core/syntax.css' => '3c18c1cb',
111-
'rsrc/css/core/z-index.css' => '0d89d53c',
111+
'rsrc/css/core/z-index.css' => '7e4989ed',
112112
'rsrc/css/diviner/diviner-shared.css' => '38813222',
113113
'rsrc/css/font/font-awesome.css' => '62bc244d',
114114
'rsrc/css/font/font-glyphicons-halflings.css' => 'c4c1c6b6',
@@ -686,7 +686,7 @@
686686
'phabricator-busy' => '6453c869',
687687
'phabricator-chatlog-css' => '852140ff',
688688
'phabricator-content-source-view-css' => '4b8b05d4',
689-
'phabricator-core-css' => 'da26ddb2',
689+
'phabricator-core-css' => '7dff07c3',
690690
'phabricator-countdown-css' => '86b7b0a0',
691691
'phabricator-crumbs-view-css' => '0222cbe0',
692692
'phabricator-drag-and-drop-file-upload' => 'ae6abfba',
@@ -735,7 +735,7 @@
735735
'phabricator-uiexample-reactor-select' => '189e4fe3',
736736
'phabricator-uiexample-reactor-sendclass' => 'bf97561d',
737737
'phabricator-uiexample-reactor-sendproperties' => '551add57',
738-
'phabricator-zindex-css' => '0d89d53c',
738+
'phabricator-zindex-css' => '7e4989ed',
739739
'phame-css' => '19ecc703',
740740
'pholio-css' => '2fa97dbe',
741741
'pholio-edit-css' => 'b9e59b6d',

src/applications/auth/application/PhabricatorApplicationAuth.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public function buildMainMenuItems(
4040
->setWorkflow(true)
4141
->setHref('/logout/')
4242
->setSelected(($controller instanceof PhabricatorLogoutController))
43+
->setAural(pht('Log Out'))
4344
->setOrder(900);
4445
$items[] = $item;
4546
} else {
@@ -53,6 +54,7 @@ public function buildMainMenuItems(
5354
// TODO: Login icon?
5455
->setIcon('power')
5556
->setHref('/auth/start/')
57+
->setAural(pht('Log In'))
5658
->setOrder(900);
5759
$items[] = $item;
5860
}

src/applications/help/application/PhabricatorApplicationHelp.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ public function buildMainMenuItems(
3131
}
3232

3333
if ($application && $application->getHelpURI()) {
34+
$help_name = pht('%s Help', $application->getName());
35+
3436
$item = id(new PHUIListItemView())
35-
->setName(pht('%s Help', $application->getName()))
37+
->setName($help_name)
3638
->addClass('core-menu-item')
3739
->setIcon('info-sm')
40+
->setAural($help_name)
3841
->setOrder(200)
3942
->setHref($application->getHelpURI());
4043
$items[] = $item;

src/applications/home/application/PhabricatorApplicationHome.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public function buildMainMenuItems(
6060
->setHref('/home/create/')
6161
->addSigil('quick-create-menu')
6262
->setID($create_id)
63+
->setAural(pht('Quick Create'))
6364
->setOrder(300);
6465
$items[] = $item;
6566
}

src/applications/home/controller/PhabricatorHomeController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function buildNav() {
167167
}
168168
}
169169

170-
$nav->addFilter(
170+
$nav->addFilter(
171171
'',
172172
pht('Customize Applications...'),
173173
'/settings/panel/home/');

src/applications/meta/view/PhabricatorApplicationLaunchView.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ public function render() {
3939
$application->getName());
4040

4141
if ($application->isBeta()) {
42-
$content[] = phutil_tag(
42+
$content[] = javelin_tag(
4343
'span',
4444
array(
45+
'aural' => false,
4546
'class' => 'phabricator-application-beta',
4647
),
4748
"\xCE\xB2");

src/applications/people/application/PhabricatorApplicationPeople.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public function buildMainMenuItems(
120120
->setName($user->getUsername())
121121
->setHref('/p/'.$user->getUsername().'/')
122122
->addClass('core-menu-item')
123+
->setAural(pht('Profile'))
123124
->setOrder(100);
124125

125126
$classes = array(

src/applications/settings/application/PhabricatorApplicationSettings.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public function buildMainMenuItems(
4646
->addClass('core-menu-item')
4747
->setSelected($selected)
4848
->setHref('/settings/')
49+
->setAural(pht('Settings'))
4950
->setOrder(400);
5051
$items[] = $item;
5152
}

src/infrastructure/javelin/markup.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@ function javelin_tag(
3636
}
3737
}
3838

39+
if (isset($attributes['aural'])) {
40+
if ($attributes['aural']) {
41+
$class = idx($attributes, 'class', '');
42+
$class = rtrim('aural-only '.$class);
43+
$attributes['class'] = $class;
44+
} else {
45+
$class = idx($attributes, 'class', '');
46+
$class = rtrim('visual-only '.$class);
47+
$attributes['class'] = $class;
48+
$attributes['aria-hidden'] = 'true';
49+
}
50+
unset($attributes['aural']);
51+
}
52+
3953
return phutil_tag($tag, $attributes, $content);
4054
}
4155

src/view/form/control/PhabricatorRemarkupControl.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,22 @@ protected function renderInput() {
133133
$target = '_blank';
134134
}
135135

136+
$content = null;
137+
136138
$tip = idx($spec, 'tip');
137139
if ($tip) {
138140
$meta['tip'] = $tip;
141+
$content = phutil_tag(
142+
'span',
143+
array(
144+
'class' => 'aural-only',
145+
),
146+
$tip);
139147
}
140148

141149
require_celerity_resource('sprite-icons-css');
142150

151+
143152
$buttons[] = javelin_tag(
144153
'a',
145154
array(
@@ -156,7 +165,7 @@ protected function renderInput() {
156165
array(
157166
'class' => 'remarkup-assist sprite-icons remarkup-assist-'.$action,
158167
),
159-
''));
168+
$content));
160169
}
161170

162171
$buttons = phutil_tag(

0 commit comments

Comments
 (0)