Remove PHUIDocumentView · recaptime.dev/phorge@679fbad

+4 -4

resources/celerity/map.php

··· 41 41 'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4', 42 42 'rsrc/css/application/config/config-options.css' => '0ede4c9b', 43 43 'rsrc/css/application/config/config-template.css' => '8e6c6fcd', 44 - 'rsrc/css/application/config/config-welcome.css' => '6abd79be', 44 + 'rsrc/css/application/config/config-welcome.css' => '035aa483', 45 45 'rsrc/css/application/config/setup-issue.css' => 'db7e9c40', 46 46 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', 47 47 'rsrc/css/application/conpherence/durable-column.css' => '86396117', ··· 131 131 'rsrc/css/phui/phui-curtain-view.css' => '7148ae25', 132 132 'rsrc/css/phui/phui-document-pro.css' => 'dc3d46ed', 133 133 'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf', 134 - 'rsrc/css/phui/phui-document.css' => '715aedfb', 134 + 'rsrc/css/phui/phui-document.css' => 'c32e8dec', 135 135 'rsrc/css/phui/phui-feed-story.css' => 'aa49845d', 136 136 'rsrc/css/phui/phui-fontkit.css' => '9cda225e', 137 137 'rsrc/css/phui/phui-form-view.css' => 'fab0a10f', ··· 546 546 'changeset-view-manager' => 'a2828756', 547 547 'conduit-api-css' => '7bc725c4', 548 548 'config-options-css' => '0ede4c9b', 549 - 'config-welcome-css' => '6abd79be', 549 + 'config-welcome-css' => '035aa483', 550 550 'conpherence-durable-column-view' => '86396117', 551 551 'conpherence-menu-css' => 'f99fee4c', 552 552 'conpherence-message-pane-css' => '5897d3ac', ··· 835 835 'phui-crumbs-view-css' => '9dac418c', 836 836 'phui-curtain-view-css' => '7148ae25', 837 837 'phui-document-summary-view-css' => '9ca48bdf', 838 - 'phui-document-view-css' => '715aedfb', 838 + 'phui-document-view-css' => 'c32e8dec', 839 839 'phui-document-view-pro-css' => 'dc3d46ed', 840 840 'phui-feed-story-css' => 'aa49845d', 841 841 'phui-font-icon-base-css' => '6449bce8',

-4

src/__phutil_library_map__.php

··· 1622 1622 'PHUIDiffTableOfContentsItemView' => 'infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php', 1623 1623 'PHUIDiffTableOfContentsListView' => 'infrastructure/diff/view/PHUIDiffTableOfContentsListView.php', 1624 1624 'PHUIDiffTwoUpInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php', 1625 - 'PHUIDocumentExample' => 'applications/uiexample/examples/PHUIDocumentExample.php', 1626 1625 'PHUIDocumentSummaryView' => 'view/phui/PHUIDocumentSummaryView.php', 1627 - 'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php', 1628 1626 'PHUIDocumentViewPro' => 'view/phui/PHUIDocumentViewPro.php', 1629 1627 'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php', 1630 1628 'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php', ··· 6270 6268 'PHUIDiffTableOfContentsItemView' => 'AphrontView', 6271 6269 'PHUIDiffTableOfContentsListView' => 'AphrontView', 6272 6270 'PHUIDiffTwoUpInlineCommentRowScaffold' => 'PHUIDiffInlineCommentRowScaffold', 6273 - 'PHUIDocumentExample' => 'PhabricatorUIExample', 6274 6271 'PHUIDocumentSummaryView' => 'AphrontTagView', 6275 - 'PHUIDocumentView' => 'AphrontTagView', 6276 6272 'PHUIDocumentViewPro' => 'AphrontTagView', 6277 6273 'PHUIFeedStoryExample' => 'PhabricatorUIExample', 6278 6274 'PHUIFeedStoryView' => 'AphrontView',

+6 -1

src/applications/config/controller/PhabricatorConfigWelcomeController.php

··· 358 358 $quick_header = new PHUIRemarkupView( 359 359 $viewer, pht('=Quick Start Guide')); 360 360 361 - return id(new PHUIDocumentView()) 361 + $document = id(new PHUIDocumentViewPro()) 362 362 ->setHeader($header) 363 363 ->setFluid(true) 364 364 ->appendChild($setup_header) ··· 367 367 ->appendChild($explore) 368 368 ->appendChild($quick_header) 369 369 ->appendChild($quick); 370 + 371 + return id(new PHUIBoxView()) 372 + ->setBorder(true) 373 + ->appendChild($document) 374 + ->addClass('mlb'); 370 375 } 371 376 372 377 private function newItem(AphrontRequest $request, $icon, $content) {

-199

src/applications/uiexample/examples/PHUIDocumentExample.php

··· 1 - <?php 2 - 3 - final class PHUIDocumentExample extends PhabricatorUIExample { 4 - 5 - public function getName() { 6 - return pht('Document View'); 7 - } 8 - 9 - public function getDescription() { 10 - return pht('Useful for areas of large content navigation'); 11 - } 12 - 13 - public function renderExample() { 14 - $request = $this->getRequest(); 15 - $user = $request->getUser(); 16 - 17 - $action = id(new PHUIListItemView()) 18 - ->setName(pht('Actions')) 19 - ->setType(PHUIListItemView::TYPE_LABEL); 20 - 21 - $action1 = id(new PHUIListItemView()) 22 - ->setName(pht('Edit Document')) 23 - ->setHref('#') 24 - ->setIcon('fa-edit') 25 - ->setType(PHUIListItemView::TYPE_LINK); 26 - 27 - $action2 = id(new PHUIListItemView()) 28 - ->setName(pht('Move Document')) 29 - ->setHref('#') 30 - ->setIcon('fa-arrows') 31 - ->setType(PHUIListItemView::TYPE_LINK); 32 - 33 - $action3 = id(new PHUIListItemView()) 34 - ->setName(pht('Delete Document')) 35 - ->setHref('#') 36 - ->setIcon('fa-times') 37 - ->setType(PHUIListItemView::TYPE_LINK); 38 - 39 - $action4 = id(new PHUIListItemView()) 40 - ->setName(pht('View History')) 41 - ->setHref('#') 42 - ->setIcon('fa-list') 43 - ->setType(PHUIListItemView::TYPE_LINK); 44 - 45 - $action5 = id(new PHUIListItemView()) 46 - ->setName(pht('Subscribe')) 47 - ->setHref('#') 48 - ->setIcon('fa-plus-circle') 49 - ->setType(PHUIListItemView::TYPE_LINK); 50 - 51 - $divider = id(new PHUIListItemView()) 52 - ->setType(PHUIListItemView::TYPE_DIVIDER); 53 - 54 - $header = id(new PHUIHeaderView()) 55 - ->setHeader(pht('Installation')); 56 - 57 - $label1 = id(new PHUIListItemView()) 58 - ->setName(pht('Getting Started')) 59 - ->setType(PHUIListItemView::TYPE_LABEL); 60 - 61 - $label2 = id(new PHUIListItemView()) 62 - ->setName(pht('Documentation')) 63 - ->setType(PHUIListItemView::TYPE_LABEL); 64 - 65 - $item1 = id(new PHUIListItemView()) 66 - ->setName(pht('Installation')) 67 - ->setHref('#') 68 - ->setType(PHUIListItemView::TYPE_LINK); 69 - 70 - $item2 = id(new PHUIListItemView()) 71 - ->setName(pht('Webserver Config')) 72 - ->setHref('#') 73 - ->setType(PHUIListItemView::TYPE_LINK); 74 - 75 - $item3 = id(new PHUIListItemView()) 76 - ->setName(pht('Adding Users')) 77 - ->setHref('#') 78 - ->setType(PHUIListItemView::TYPE_LINK); 79 - 80 - $item4 = id(new PHUIListItemView()) 81 - ->setName(pht('Debugging')) 82 - ->setHref('#') 83 - ->setType(PHUIListItemView::TYPE_LINK); 84 - 85 - $sidenav = id(new PHUIListView()) 86 - ->setType(PHUIListView::SIDENAV_LIST) 87 - ->addMenuItem($action) 88 - ->addMenuItem($action1) 89 - ->addMenuItem($action2) 90 - ->addMenuItem($action3) 91 - ->addMenuItem($action4) 92 - ->addMenuItem($action5) 93 - ->addMenuItem($divider) 94 - ->addMenuItem($label1) 95 - ->addMenuItem($item1) 96 - ->addMenuItem($item2) 97 - ->addMenuItem($item3) 98 - ->addMenuItem($item4) 99 - ->addMenuItem($label2) 100 - ->addMenuItem($item2) 101 - ->addMenuItem($item3) 102 - ->addMenuItem($item4) 103 - ->addMenuItem($item1); 104 - 105 - $home = id(new PHUIListItemView()) 106 - ->setIcon('fa-home') 107 - ->setHref('#') 108 - ->setType(PHUIListItemView::TYPE_ICON); 109 - 110 - $item1 = id(new PHUIListItemView()) 111 - ->setName(pht('Installation')) 112 - ->setHref('#') 113 - ->setSelected(true) 114 - ->setType(PHUIListItemView::TYPE_LINK); 115 - 116 - $item2 = id(new PHUIListItemView()) 117 - ->setName(pht('Webserver Config')) 118 - ->setHref('#') 119 - ->setType(PHUIListItemView::TYPE_LINK); 120 - 121 - $item3 = id(new PHUIListItemView()) 122 - ->setName(pht('Adding Users')) 123 - ->setHref('#') 124 - ->setType(PHUIListItemView::TYPE_LINK); 125 - 126 - $item4 = id(new PHUIListItemView()) 127 - ->setName(pht('Debugging')) 128 - ->setHref('#') 129 - ->setType(PHUIListItemView::TYPE_LINK); 130 - 131 - $topnav = id(new PHUIListView()) 132 - ->setType(PHUIListView::NAVBAR_LIST) 133 - ->addMenuItem($home) 134 - ->addMenuItem($item1) 135 - ->addMenuItem($item2) 136 - ->addMenuItem($item3) 137 - ->addMenuItem($item4); 138 - 139 - $document = hsprintf( 140 - 'Lorem ipsum dolor sit amet, consectetur adipisicing, '. 141 - 'sed do eiusmod tempor incididunt ut labore et dolore magna '. 142 - 'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '. 143 - 'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '. 144 - 'aute irure dolor in reprehenderit in voluptate velit esse cillum '. 145 - 'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '. 146 - 'cupidatat non proident, sunt in culpa qui officia deserunt '. 147 - 'mollit anim id est laborum.'. 148 - 'Lorem ipsum dolor sit amet, consectetur, '. 149 - 'sed do eiusmod tempor incididunt ut labore et dolore magna '. 150 - 'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '. 151 - 'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '. 152 - 'aute irure dolor in reprehenderit in voluptate velit esse cillum '. 153 - 'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '. 154 - 'cupidatat non proident, sunt in culpa qui officia deserunt '. 155 - 'mollit anim id est laborum.'. 156 - 'Lorem ipsum dolor sit amet, consectetur, '. 157 - 'sed do eiusmod tempor incididunt ut labore et dolore magna '. 158 - 'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '. 159 - 'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '. 160 - 'aute irure dolor in reprehenderit in voluptate velit esse cillum '. 161 - 'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '. 162 - 'cupidatat non proident, sunt in culpa qui officia deserunt '. 163 - 'mollit anim id est laborum.'. 164 - 'Lorem ipsum dolor sit amet, consectetur, '. 165 - 'sed do eiusmod tempor incididunt ut labore et dolore magna '. 166 - 'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '. 167 - 'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '. 168 - 'aute irure dolor in reprehenderit in voluptate velit esse cillum '. 169 - 'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '. 170 - 'cupidatat non proident, sunt in culpa qui officia deserunt '. 171 - 'mollit anim id est laborum.'. 172 - 'Lorem ipsum dolor sit amet, consectetur, '. 173 - 'sed do eiusmod tempor incididunt ut labore et dolore magna '. 174 - 'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '. 175 - 'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '. 176 - 'aute irure dolor in reprehenderit in voluptate velit esse cillum '. 177 - 'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '. 178 - 'cupidatat non proident, sunt in culpa qui officia deserunt '. 179 - 'mollit anim id est laborum.'. 180 - 'Lorem ipsum dolor sit amet, consectetur, '. 181 - 'sed do eiusmod tempor incididunt ut labore et dolore magna '. 182 - 'aliqua. Ut enim ad minim veniam, quis nostrud exercitation '. 183 - 'ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis '. 184 - 'aute irure dolor in reprehenderit in voluptate velit esse cillum '. 185 - 'dolore eu fugiat nulla pariatur. Excepteur sint occaecat '. 186 - 'cupidatat non proident, sunt in culpa qui officia deserunt '. 187 - 'mollit anim id est laborum.'); 188 - 189 - $content = new PHUIDocumentView(); 190 - $content->setBook(pht('Book or Project Name'), pht('Article')); 191 - $content->setHeader($header); 192 - $content->setFluid(true); 193 - $content->setTopNav($topnav); 194 - $content->setSidenav($sidenav); 195 - $content->appendChild($document); 196 - 197 - return $content; 198 - } 199 - }

-162

src/view/phui/PHUIDocumentView.php

··· 1 - <?php 2 - 3 - final class PHUIDocumentView extends AphrontTagView { 4 - 5 - /* For mobile displays, where do you want the sidebar */ 6 - const NAV_BOTTOM = 'nav_bottom'; 7 - const NAV_TOP = 'nav_top'; 8 - 9 - private $offset; 10 - private $header; 11 - private $sidenav; 12 - private $topnav; 13 - private $crumbs; 14 - private $bookname; 15 - private $bookdescription; 16 - private $mobileview; 17 - private $fluid; 18 - 19 - public function setOffset($offset) { 20 - $this->offset = $offset; 21 - return $this; 22 - } 23 - 24 - public function setHeader(PHUIHeaderView $header) { 25 - $header->setTall(true); 26 - $this->header = $header; 27 - return $this; 28 - } 29 - 30 - public function setSideNav(PHUIListView $list, $display = self::NAV_BOTTOM) { 31 - $list->setType(PHUIListView::SIDENAV_LIST); 32 - $this->sidenav = $list; 33 - $this->mobileview = $display; 34 - return $this; 35 - } 36 - 37 - public function setTopNav(PHUIListView $list) { 38 - $list->setType(PHUIListView::NAVBAR_LIST); 39 - $this->topnav = $list; 40 - return $this; 41 - } 42 - 43 - public function setCrumbs(PHUIListView $list) { 44 - $this->crumbs = $list; 45 - return $this; 46 - } 47 - 48 - public function setBook($name, $description) { 49 - $this->bookname = $name; 50 - $this->bookdescription = $description; 51 - return $this; 52 - } 53 - 54 - public function setFluid($fluid) { 55 - $this->fluid = $fluid; 56 - return $this; 57 - } 58 - 59 - protected function getTagAttributes() { 60 - $classes = array(); 61 - 62 - if ($this->offset) { 63 - $classes[] = 'phui-document-offset'; 64 - } 65 - 66 - if ($this->fluid) { 67 - $classes[] = 'phui-document-fluid'; 68 - } 69 - 70 - return array( 71 - 'class' => $classes, 72 - ); 73 - } 74 - 75 - protected function getTagContent() { 76 - require_celerity_resource('phui-document-view-css'); 77 - 78 - $classes = array(); 79 - $classes[] = 'phui-document-view'; 80 - if ($this->offset) { 81 - $classes[] = 'phui-offset-view'; 82 - } 83 - if ($this->sidenav) { 84 - $classes[] = 'phui-sidenav-view'; 85 - } 86 - 87 - $sidenav = null; 88 - if ($this->sidenav) { 89 - $sidenav = phutil_tag( 90 - 'div', 91 - array( 92 - 'class' => 'phui-document-sidenav', 93 - ), 94 - $this->sidenav); 95 - } 96 - 97 - $book = null; 98 - if ($this->bookname) { 99 - $book = pht('%s (%s)', $this->bookname, $this->bookdescription); 100 - } 101 - 102 - $topnav = null; 103 - if ($this->topnav) { 104 - $topnav = phutil_tag( 105 - 'div', 106 - array( 107 - 'class' => 'phui-document-topnav', 108 - ), 109 - $this->topnav); 110 - } 111 - 112 - $crumbs = null; 113 - if ($this->crumbs) { 114 - $crumbs = phutil_tag( 115 - 'div', 116 - array( 117 - 'class' => 'phui-document-crumbs', 118 - ), 119 - $this->bookName); 120 - } 121 - 122 - $main_content = $this->renderChildren(); 123 - 124 - if ($book) { 125 - $this->header->setSubheader($book); 126 - } 127 - $content_inner = phutil_tag( 128 - 'div', 129 - array( 130 - 'class' => 'phui-document-inner', 131 - ), 132 - array( 133 - $this->header, 134 - $topnav, 135 - $main_content, 136 - $crumbs, 137 - )); 138 - 139 - if ($this->mobileview == self::NAV_BOTTOM) { 140 - $order = array($content_inner, $sidenav); 141 - } else { 142 - $order = array($sidenav, $content_inner); 143 - } 144 - 145 - $content = phutil_tag( 146 - 'div', 147 - array( 148 - 'class' => 'phui-document-content', 149 - ), 150 - $order); 151 - 152 - $view = phutil_tag( 153 - 'div', 154 - array( 155 - 'class' => implode(' ', $classes), 156 - ), 157 - $content); 158 - 159 - return $view; 160 - } 161 - 162 - }

+6 -1

webroot/rsrc/css/application/config/config-welcome.css

··· 19 19 width: 32px; 20 20 float: left; 21 21 text-align: center; 22 - margin-left: 16px; 23 22 } 23 + 24 + .phui-document-view-pro .phui-document-content .config-welcome-box 25 + .phabricator-remarkup { 26 + margin: 0; 27 + padding: 0; 28 + }

-55

webroot/rsrc/css/phui/phui-document.css

··· 8 8 position: relative; 9 9 } 10 10 11 - .phui-document-view .phui-header-shell { 12 - padding: 16px; 13 - background-color: {$bluebackground}; 14 - } 15 - 16 - .phui-document-content { 17 - border-radius: 3px; 18 - } 19 - 20 11 .device-desktop .phui-document-view { 21 12 border: 1px solid {$lightblueborder}; 22 13 max-width: 960px; ··· 33 24 margin: 16px; 34 25 } 35 26 36 - .phui-crumbs-view + .phui-document-fluid .phui-document-view { 37 - margin-top: 0; 38 - } 39 - 40 - .device-desktop .phui-document-view.phui-offset-view { 41 - max-width: 800px; 42 - } 43 - 44 27 /* Fix so that Phriction Document preview is the same width as the document */ 45 28 .device-desktop .phui-remarkup-preview .phui-document-view { 46 29 width: 800px; 47 30 } 48 31 49 - .phui-document-sidenav { 50 - position:absolute; 51 - width: 200px; 52 - text-overflow: ellipsis; 53 - top: 0; 54 - right: 0; 55 - } 56 - 57 - .device-phone .phui-document-sidenav { 58 - position: static; 59 - width: auto; 60 - border-top: 1px solid {$thinblueborder}; 61 - border-bottom: 1px solid {$thinblueborder}; 62 - } 63 - 64 - .device-phone .phui-sidenav-view .phui-document-inner { 65 - margin: 0; 66 - } 67 - 68 - .phui-sidenav-view .phui-document-inner { 69 - margin-right: 200px; 70 - border-right: 1px solid {$thinblueborder}; 71 - background: #fff; 72 - } 73 - 74 32 .phui-document-content .phui-header-shell { 75 33 border-top: none; 76 34 border-bottom: 1px solid {$lightblueborder}; ··· 88 46 padding: 8px 0 4px; 89 47 } 90 48 91 - .phui-document-content .phui-property-list-container { 92 - border-bottom: 1px solid {$thinblueborder}; 93 - background-color: {$lightgreybackground}; 94 - } 95 - 96 49 .legalpad .phui-document-content .phui-property-list-view { 97 50 border: none; 98 51 box-shadow: none; ··· 127 80 margin: 16px 0; 128 81 } 129 82 130 - .device-desktop .phui-document-offset { 131 - padding-right: 120px; 132 - } 133 - 134 83 .phui-document-view .phui-info-severity-nodata { 135 84 background-color: {$lightgreybackground}; 136 - } 137 - 138 - body .phui-document-view .phui-header-shell.phui-bleed-header { 139 - padding: 0; 140 85 } 141 86 142 87 .phui-document-view .phui-property-list-section-header {

Configure Feed

Configure Feed