diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -92,7 +92,7 @@ 'rsrc/css/application/policy/policy-edit.css' => '815c66f7', 'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43', 'rsrc/css/application/policy/policy.css' => '957ea14c', - 'rsrc/css/application/ponder/ponder-view.css' => '4486434b', + 'rsrc/css/application/ponder/ponder-view.css' => 'b40dc156', 'rsrc/css/application/project/project-card-view.css' => '9418c97d', 'rsrc/css/application/project/project-view.css' => '83bb6654', 'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733', @@ -855,7 +855,7 @@ 'policy-css' => '957ea14c', 'policy-edit-css' => '815c66f7', 'policy-transaction-detail-css' => '82100a43', - 'ponder-view-css' => '4486434b', + 'ponder-view-css' => 'b40dc156', 'project-card-view-css' => '9418c97d', 'project-view-css' => '83bb6654', 'releeph-core' => '9b3c5733', diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php --- a/src/applications/ponder/controller/PonderQuestionViewController.php +++ b/src/applications/ponder/controller/PonderQuestionViewController.php @@ -44,7 +44,6 @@ $actions = $this->buildActionListView($question); $properties = $this->buildPropertyListView($question, $actions); - $sidebar = $this->buildSidebar($question); $content_id = celerity_generate_unique_node_id(); $timeline = $this->buildTransactionTimeline( @@ -81,20 +80,6 @@ ->addPropertyList($properties) ->appendChild($footer); - if ($viewer->getPHID() == $question->getAuthorPHID()) { - $status = $question->getStatus(); - $answers_list = $question->getAnswers(); - if ($answers_list && ($status == PonderQuestionStatus::STATUS_OPEN)) { - $info_view = id(new PHUIInfoView()) - ->setSeverity(PHUIInfoView::SEVERITY_WARNING) - ->appendChild( - pht( - 'If this question has been resolved, please consider closing - the question and marking the answer as helpful.')); - $object_box->setInfoView($info_view); - } - } - $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); $crumbs->addTextCrumb('Q'.$id, '/Q'.$id); @@ -107,21 +92,14 @@ ->appendChild($answer); } - $ponder_view = id(new PHUITwoColumnView()) - ->setMainColumn(array( - $object_box, - $comment_view, - $answer_wiki, - $answers, - $answer_add_panel, - )) - ->setSideColumn($sidebar) - ->addClass('ponder-question-view'); - return $this->buildApplicationPage( array( $crumbs, - $ponder_view, + $object_box, + $comment_view, + $answer_wiki, + $answers, + $answer_add_panel, ), array( 'title' => 'Q'.$question->getID().' '.$question->getTitle(), @@ -261,48 +239,4 @@ return $view; } - private function buildSidebar(PonderQuestion $question) { - $viewer = $this->getViewer(); - $status = $question->getStatus(); - $id = $question->getID(); - - $questions = id(new PonderQuestionQuery()) - ->setViewer($viewer) - ->withStatuses(array($status)) - ->withEdgeLogicPHIDs( - PhabricatorProjectObjectHasProjectEdgeType::EDGECONST, - PhabricatorQueryConstraint::OPERATOR_OR, - $question->getProjectPHIDs()) - ->setLimit(10) - ->execute(); - - $list = id(new PHUIObjectItemListView()) - ->setUser($viewer) - ->setNoDataString(pht('No similar questions found.')); - - foreach ($questions as $question) { - if ($id == $question->getID()) { - continue; - } - $item = new PHUIObjectItemView(); - $item->setObjectName('Q'.$question->getID()); - $item->setHeader($question->getTitle()); - $item->setHref('/Q'.$question->getID()); - $item->setObject($question); - - $item->addAttribute( - pht( - '%s Answer(s)', - new PhutilNumber($question->getAnswerCount()))); - - $list->addItem($item); - } - - $box = id(new PHUIObjectBoxView()) - ->setHeaderText(pht('Similar Questions')) - ->setObjectList($list); - - return $box; - } - } diff --git a/webroot/rsrc/css/application/ponder/ponder-view.css b/webroot/rsrc/css/application/ponder/ponder-view.css --- a/webroot/rsrc/css/application/ponder/ponder-view.css +++ b/webroot/rsrc/css/application/ponder/ponder-view.css @@ -14,14 +14,6 @@ border-right: 1px solid {$lightblueborder}; } -.ponder-question-view .phui-property-list-properties-wrap { - width: 66%; -} - -.ponder-question-view .phui-property-list-actions { - width: 30%; -} - .ponder-answer-view { margin-top: 16px; }