Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15337612
D19617.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
10 KB
Referenced Files
None
Subscribers
None
D19617.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
@@ -9,7 +9,7 @@
'names' => array(
'conpherence.pkg.css' => 'e68cf1fa',
'conpherence.pkg.js' => '15191c65',
- 'core.pkg.css' => 'fc4839c8',
+ 'core.pkg.css' => 'badf3f16',
'core.pkg.js' => 'b5a949ca',
'differential.pkg.css' => '06dc617c',
'differential.pkg.js' => 'c1cfa143',
@@ -146,15 +146,15 @@
'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa',
'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
- 'rsrc/css/phui/phui-document-pro.css' => '8af7ea27',
+ 'rsrc/css/phui/phui-document-pro.css' => '0e41dd91',
'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
- 'rsrc/css/phui/phui-document.css' => '878c2f52',
+ 'rsrc/css/phui/phui-document.css' => '552493fa',
'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
'rsrc/css/phui/phui-fontkit.css' => '1320ed01',
'rsrc/css/phui/phui-form-view.css' => 'f808e5be',
'rsrc/css/phui/phui-form.css' => '7aaa04e3',
'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
- 'rsrc/css/phui/phui-header-view.css' => 'edeb9252',
+ 'rsrc/css/phui/phui-header-view.css' => '1ba8b707',
'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
'rsrc/css/phui/phui-icon.css' => 'cf24ceec',
@@ -813,15 +813,15 @@
'phui-crumbs-view-css' => '10728aaa',
'phui-curtain-view-css' => '2bdaf026',
'phui-document-summary-view-css' => '9ca48bdf',
- 'phui-document-view-css' => '878c2f52',
- 'phui-document-view-pro-css' => '8af7ea27',
+ 'phui-document-view-css' => '552493fa',
+ 'phui-document-view-pro-css' => '0e41dd91',
'phui-feed-story-css' => '44a9c8e9',
'phui-font-icon-base-css' => '870a7360',
'phui-fontkit-css' => '1320ed01',
'phui-form-css' => '7aaa04e3',
'phui-form-view-css' => 'f808e5be',
'phui-head-thing-view-css' => 'fd311e5f',
- 'phui-header-view-css' => 'edeb9252',
+ 'phui-header-view-css' => '1ba8b707',
'phui-hovercard' => '1bd28176',
'phui-hovercard-view-css' => 'f0592bcf',
'phui-icon-set-selector-css' => '87db8fee',
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -201,7 +201,10 @@
$children = $this->renderDocumentChildren($slug);
- $actions = $this->buildActionView($viewer, $document);
+ $curtain = null;
+ if ($document->getID()) {
+ $curtain = $this->buildCurtain($document);
+ }
$crumbs = $this->buildApplicationCrumbs();
$crumbs->setBorder(true);
@@ -213,8 +216,7 @@
$header = id(new PHUIHeaderView())
->setUser($viewer)
->setPolicyObject($document)
- ->setHeader($page_title)
- ->setActionList($actions);
+ ->setHeader($page_title);
if ($content) {
$header->setEpoch($content->getDateCreated());
@@ -237,6 +239,10 @@
$core_content,
));
+ if ($curtain) {
+ $page_content->setCurtain($curtain);
+ }
+
return $this->newPage()
->setTitle($page_title)
->setCrumbs($crumbs)
@@ -258,8 +264,7 @@
$viewer = $this->getViewer();
$view = id(new PHUIPropertyListView())
- ->setUser($viewer)
- ->setObject($document);
+ ->setUser($viewer);
$view->addProperty(
pht('Last Author'),
@@ -272,9 +277,9 @@
return $view;
}
- private function buildActionView(
- PhabricatorUser $viewer,
- PhrictionDocument $document) {
+ private function buildCurtain(PhrictionDocument $document) {
+ $viewer = $this->getViewer();
+
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
$document,
@@ -282,19 +287,9 @@
$slug = PhabricatorSlug::normalize($this->slug);
- $action_view = id(new PhabricatorActionListView())
- ->setUser($viewer)
- ->setObject($document);
+ $curtain = $this->newCurtainView($document);
- if (!$document->getID()) {
- return $action_view->addAction(
- id(new PhabricatorActionView())
- ->setName(pht('Create This Document'))
- ->setIcon('fa-plus-square')
- ->setHref('/phriction/edit/?slug='.$slug));
- }
-
- $action_view->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('Edit Document'))
->setDisabled(!$can_edit)
@@ -302,7 +297,7 @@
->setHref('/phriction/edit/'.$document->getID().'/'));
if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
- $action_view->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('Move Document'))
->setDisabled(!$can_edit)
@@ -310,7 +305,7 @@
->setHref('/phriction/move/'.$document->getID().'/')
->setWorkflow(true));
- $action_view->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('Delete Document'))
->setDisabled(!$can_edit)
@@ -319,7 +314,7 @@
->setWorkflow(true));
}
- $action_view->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('View History'))
->setIcon('fa-list')
@@ -327,15 +322,14 @@
$print_uri = PhrictionDocument::getSlugURI($slug).'?__print__=1';
- $action_view->addAction(
+ $curtain->addAction(
id(new PhabricatorActionView())
->setName(pht('Printable Page'))
->setIcon('fa-print')
->setOpenInNewWindow(true)
->setHref($print_uri));
- return $action_view;
-
+ return $curtain;
}
private function renderDocumentChildren($slug) {
diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php
--- a/src/view/phui/PHUIDocumentView.php
+++ b/src/view/phui/PHUIDocumentView.php
@@ -8,6 +8,7 @@
private $fluid;
private $toc;
private $foot;
+ private $curtain;
public function setHeader(PHUIHeaderView $header) {
$header->setTall(true);
@@ -36,6 +37,15 @@
return $this;
}
+ public function setCurtain(PHUICurtainView $curtain) {
+ $this->curtain = $curtain;
+ return $this;
+ }
+
+ public function getCurtain() {
+ return $this->curtain;
+ }
+
protected function getTagAttributes() {
$classes = array();
@@ -61,6 +71,17 @@
$classes[] = 'phui-document-view';
$classes[] = 'phui-document-view-pro';
+ if ($this->curtain) {
+ $classes[] = 'has-curtain';
+ } else {
+ $classes[] = 'has-no-curtain';
+ }
+
+ if ($this->curtain) {
+ $action_list = $this->curtain->getActionList();
+ $this->header->setActionListID($action_list->getID());
+ }
+
$book = null;
if ($this->bookname) {
$book = pht('%s (%s)', $this->bookname, $this->bookdescription);
@@ -114,32 +135,51 @@
$this->foot);
}
- $content_inner = phutil_tag(
+ $curtain = null;
+ if ($this->curtain) {
+ $curtain = phutil_tag(
'div',
array(
- 'class' => 'phui-document-inner',
+ 'class' => 'phui-document-curtain',
),
- array(
- $table_of_contents,
- $this->header,
- $main_content,
- $foot_content,
- ));
+ $this->curtain);
+ }
- $content = phutil_tag(
- 'div',
+ $main_content = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-document-content-view',
+ ),
+ $main_content);
+
+ $content_inner = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-document-inner',
+ ),
+ array(
+ $table_of_contents,
+ $this->header,
array(
- 'class' => 'phui-document-content',
+ $curtain,
+ $main_content,
),
- $content_inner);
-
- return phutil_tag(
- 'div',
- array(
- 'class' => implode(' ', $classes),
- ),
- $content);
+ $foot_content,
+ ));
+ $content = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-document-content',
+ ),
+ $content_inner);
+
+ return phutil_tag(
+ 'div',
+ array(
+ 'class' => implode(' ', $classes),
+ ),
+ $content);
}
}
diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css
--- a/webroot/rsrc/css/phui/phui-document-pro.css
+++ b/webroot/rsrc/css/phui/phui-document-pro.css
@@ -8,6 +8,35 @@
margin: 0 auto;
}
+.phui-document-view.phui-document-view-pro.has-curtain {
+ max-width: 1132px;
+}
+
+.printable .phui-document-view.phui-document-view-pro.has-curtain {
+ max-width: none;
+}
+
+.device-desktop .phui-document-inner {
+ overflow: hidden;
+}
+
+.device-desktop .has-curtain .phui-document-content-view {
+ padding-right: 332px;
+}
+
+.printable .phui-document-content-view {
+ padding-right: 0;
+}
+
+.device-desktop .phui-document-curtain {
+ float: right;
+ width: 300px;
+}
+
+.printable .phui-document-curtain {
+ display: none;
+}
+
.phui-document-container {
background-color: {$page.content};
position: relative;
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -63,7 +63,8 @@
font-size: 14px;
}
-.phui-document-view .phui-header-action-links .phui-mobile-menu {
+.phui-document-view.has-no-curtain
+ .phui-header-action-links .phui-mobile-menu {
display: block;
}
@@ -71,10 +72,6 @@
padding: 8px;
}
-.device-desktop .phui-document-content .phabricator-action-list-view {
- display: none;
-}
-
.phui-document-content .phabricator-remarkup .remarkup-code-block {
clear: both;
margin: 16px 0;
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -259,7 +259,6 @@
color: {$lightgreytext};
}
-
.phui-header-action-links .phui-mobile-menu {
display: none;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mar 10 2025, 6:42 AM (6 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7409531
Default Alt Text
D19617.diff (10 KB)
Attached To
Mode
D19617: Allow DocumentView to render with a curtain, and make Phriction use a curtain
Attached
Detach File
Event Timeline
Log In to Comment