[MediaWiki-commits] [Gerrit] corrects position of owner image on Sprint Card - change (phabricator...Sprint)

[Christopher Johnson (WMDE) (Code Review)]

Christopher Johnson (WMDE) has submitted this change and it was merged.

Change subject: corrects position of owner image on Sprint Card
......................................................................


corrects position of owner image on Sprint Card

Change-Id: I31d473493044cbbf5c9a7306408e2e2c345b2ba6
---
M src/util/SprintBoardCardToken.php
M src/view/SprintBoardTaskCard.php
2 files changed, 29 insertions(+), 30 deletions(-)

Approvals:
  Christopher Johnson (WMDE): Verified; Looks good to me, approved



diff --git a/src/util/SprintBoardCardToken.php 
b/src/util/SprintBoardCardToken.php
index b74c434..0e8a886 100644
--- a/src/util/SprintBoardCardToken.php
+++ b/src/util/SprintBoardCardToken.php
@@ -81,4 +81,4 @@
     }
     return $list;
   }
-}
\ No newline at end of file
+}
diff --git a/src/view/SprintBoardTaskCard.php b/src/view/SprintBoardTaskCard.php
index 2156c9b..a6eb2b4 100644
--- a/src/view/SprintBoardTaskCard.php
+++ b/src/view/SprintBoardTaskCard.php
@@ -55,26 +55,6 @@
     return $this->canEdit;
   }
 
-  private function getUserImage() {
-    $ownername = $this->owner->getName();
-    $ownerlink = '/p/'.$ownername.'/';
-    $image_uri = $this->owner->getImageURI();
-
-    $sigil = 'has-tooltip';
-    $meta  = array(
-        'tip' => pht($ownername),
-        'size' => 200,
-        'align' => 'E',);
-    $image = id(new PHUIIconView())
-        ->addSigil($sigil)
-        ->setMetadata($meta)
-        ->setHref($ownerlink)
-        ->setImage($image_uri)
-        ->setHeadSize(PHUIIconView::HEAD_SMALL);
-
-  return $image;
-  }
-
   private function getCardAttributes() {
       $tokens = id(new SprintBoardCardToken())
         ->setViewer($this->viewer)
@@ -113,17 +93,10 @@
         ->setProject($this->project)
         ->setViewer($this->viewer);
     $task = $this->getTask();
-    $owner = $this->getOwner();
-    if ($owner) {
-      $ownerimage = $this->getUserImage();
-    } else {
-      $ownerimage = null;
-    }
-
     $task_phid = $task->getPHID();
-    $can_edit = $this->getCanEdit();
     $this->points = $query->getStoryPointsForTask($task_phid);
 
+    $can_edit = $this->getCanEdit();
 
     $color_map = ManiphestTaskPriority::getColorMap();
     $bar_color = idx($color_map, $task->getPriority(), 'grey');
@@ -149,9 +122,35 @@
                 ->setHref('/project/sprint/board/task/edit/'.$task->getID()
                     .'/'))
       ->setBarColor($bar_color)
-      ->setImageIcon($ownerimage)
       ->addAttribute($this->getCardAttributes());
+
+    if (!(is_null($this->owner))) {
+      $label = $this->owner->getName();
+      $ownerimage = $this->renderHandleIcon($this->owner, $label);
+    } else {
+      $ownerimage = null;
+    }
+    $card->setImageIcon($ownerimage);
+
     return $card;
   }
 
+  private function renderHandleIcon(PhabricatorObjectHandle $handle, $label) {
+    Javelin::initBehavior('phabricator-tooltips');
+
+    $options = array(
+        'class' => 'phui-object-item-handle-icon',
+        'style' => 'background-image: url('.$handle->getImageURI().')',
+    );
+
+    if (strlen($label)) {
+      $options['sigil'] = 'has-tooltip';
+      $options['meta']  = array('tip' => $label);
+    }
+
+    return javelin_tag(
+        'span',
+        $options,
+        '');
+  }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/190749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I31d473493044cbbf5c9a7306408e2e2c345b2ba6
Gerrit-PatchSet: 3
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
Gerrit-Reviewer: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits