From 905d0f43b10cbc07622a3238180d6cc576d19487 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Thu, 3 Dec 2015 13:54:08 -0800 Subject: [PATCH] Misc Phame Updates Summary: Color nodata as nodata, fix picture redirect, give hints when items aren't set on blogs. Ref T9897 Test Plan: Tested each of these items. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T9897 Differential Revision: https://secure.phabricator.com/D14657 --- .../blog/PhameBlogManageController.php | 17 +++++++++++------ .../blog/PhameBlogProfilePictureController.php | 2 +- .../phame/view/PhamePostListView.php | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/applications/phame/controller/blog/PhameBlogManageController.php b/src/applications/phame/controller/blog/PhameBlogManageController.php index bad4533638..42aec0223c 100644 --- a/src/applications/phame/controller/blog/PhameBlogManageController.php +++ b/src/applications/phame/controller/blog/PhameBlogManageController.php @@ -80,13 +80,18 @@ final class PhameBlogManageController extends PhameBlogController { ->setObject($blog) ->setActionList($actions); - $properties->addProperty( - pht('Skin'), - $blog->getSkin()); + $skin = $blog->getSkin(); + if (!$skin) { + $skin = pht('(No external skin)'); + } - $properties->addProperty( - pht('Domain'), - $blog->getDomain()); + $domain = $blog->getDomain(); + if (!$domain) { + $domain = pht('(No external domain)'); + } + + $properties->addProperty(pht('Skin'), $skin); + $properties->addProperty(pht('Domain'), $domain); $feed_uri = PhabricatorEnv::getProductionURI( $this->getApplicationURI('blog/feed/'.$blog->getID().'/')); diff --git a/src/applications/phame/controller/blog/PhameBlogProfilePictureController.php b/src/applications/phame/controller/blog/PhameBlogProfilePictureController.php index 33eec9f478..b41e7a5187 100644 --- a/src/applications/phame/controller/blog/PhameBlogProfilePictureController.php +++ b/src/applications/phame/controller/blog/PhameBlogProfilePictureController.php @@ -25,7 +25,7 @@ final class PhameBlogProfilePictureController return new Aphront404Response(); } - $blog_uri = '/phame/blog/view/'.$id; + $blog_uri = '/phame/blog/manage/'.$id; $supported_formats = PhabricatorFile::getTransformableImageFormats(); $e_file = true; diff --git a/src/applications/phame/view/PhamePostListView.php b/src/applications/phame/view/PhamePostListView.php index b493dcc3e6..e8272d81bf 100644 --- a/src/applications/phame/view/PhamePostListView.php +++ b/src/applications/phame/view/PhamePostListView.php @@ -57,7 +57,7 @@ final class PhamePostListView extends AphrontTagView { $phame_post = PhabricatorMarkupEngine::summarize($post->getBody()); $phame_post = new PHUIRemarkupView($viewer, $phame_post); } else { - $phame_post = phutil_tag('em', array(), pht('Empty Post')); + $phame_post = phutil_tag('em', array(), pht('(Empty Post)')); } $blogger = phutil_tag('strong', array(), $blogger); @@ -101,6 +101,7 @@ final class PhamePostListView extends AphrontTagView { if (empty($list)) { $list = id(new PHUIInfoView()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA) ->appendChild($nodata); }