From c7a7574f0c8edfa7b9ce3daaa3cd340a56b25fe0 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Wed, 28 May 2014 11:18:28 -0700
Subject: [PATCH] Remove oneline feed story

Summary: People seem confused and it is a little inconsistent. Also added other app icon types.

Test Plan: Viewed a number of feed stories.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9320
---
 src/view/phui/PHUIFeedStoryView.php | 48 +++++++++++------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php
index c1b4df9cb2..5fc8745474 100644
--- a/src/view/phui/PHUIFeedStoryView.php
+++ b/src/view/phui/PHUIFeedStoryView.php
@@ -142,7 +142,6 @@ final class PHUIFeedStoryView extends AphrontView {
 
     require_celerity_resource('phui-feed-story-css');
     Javelin::initBehavior('phabricator-hovercards');
-    $oneline = !$this->hasChildren();
 
     $body = null;
     $foot = null;
@@ -186,18 +185,6 @@ final class PHUIFeedStoryView extends AphrontView {
       $icon->setSpriteSheet(PHUIIconView::SPRITE_APPS);
     }
 
-    $ol_foot = null;
-    if ($oneline) {
-      $ol_foot = phutil_tag(
-        'div',
-          array(
-            'class' => 'phui-feed-story-oneline-foot'
-          ),
-          array(
-            $icon,
-            $foot));
-    }
-
     $action_list = array();
     $icons = null;
     foreach ($this->actions as $action) {
@@ -223,10 +210,9 @@ final class PHUIFeedStoryView extends AphrontView {
         'class' => 'phui-feed-story-head',
       ),
       array(
-        (!$oneline ? $actor : null),
+        $actor,
         nonempty($this->title, pht('Untitled Story')),
         $icons,
-        $ol_foot
       ));
 
     if (!empty($this->tokenBar)) {
@@ -249,23 +235,16 @@ final class PHUIFeedStoryView extends AphrontView {
         $body_content);
     }
 
-    if ($oneline) {
-      $foot = null;
-    } else {
-      $foot = phutil_tag(
-        'div',
-        array(
-          'class' => 'phui-feed-story-foot',
-        ),
-        array(
-          $icon,
-          $foot));
-    }
+    $foot = phutil_tag(
+      'div',
+      array(
+        'class' => 'phui-feed-story-foot',
+      ),
+      array(
+        $icon,
+        $foot));
 
     $classes = array('phui-feed-story');
-    if ($oneline) {
-      $classes[] = 'phui-feed-story-oneline';
-    }
 
     return id(new PHUIBoxView())
       ->addClass(implode(' ', $classes))
@@ -282,6 +261,15 @@ final class PHUIFeedStoryView extends AphrontView {
       case PhabricatorMacroPHIDTypeMacro::TYPECONST:
         $this->setAppIcon("macro-dark");
         break;
+      case ManiphestPHIDTypeTask::TYPECONST:
+        $this->setAppIcon('maniphest-dark');
+        break;
+      case DifferentialPHIDTypeRevision::TYPECONST:
+        $this->setAppIcon('differential-dark');
+        break;
+      case PhabricatorCalendarPHIDTypeEvent::TYPECONST:
+        $this->setAppIcon('calendar-dark');
+        break;
     }
   }
 }