Page MenuHomePhabricator
Files F18786285

D13755.id33229.diff
No OneTemporary
Actions

D13755.id33229.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'af140e11',
+ 'core.pkg.css' => '11d41499',
'core.pkg.js' => 'a590b451',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '9451634c',
@@ -83,7 +83,7 @@
'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
'rsrc/css/application/paste/paste.css' => '1898e534',
'rsrc/css/application/people/people-profile.css' => '25970776',
- 'rsrc/css/application/phame/phame.css' => '3259b53d',
+ 'rsrc/css/application/phame/phame.css' => 'bb147387',
'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee',
'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49',
'rsrc/css/application/pholio/pholio.css' => '95174bdd',
@@ -131,7 +131,7 @@
'rsrc/css/phui/phui-button.css' => '16020a60',
'rsrc/css/phui/phui-crumbs-view.css' => 'd842f867',
'rsrc/css/phui/phui-document.css' => '0267054b',
- 'rsrc/css/phui/phui-feed-story.css' => 'c7d8113a',
+ 'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
'rsrc/css/phui/phui-fontkit.css' => 'cb8ae7ad',
'rsrc/css/phui/phui-form-view.css' => '621b21c5',
'rsrc/css/phui/phui-form.css' => 'afdb2c6e',
@@ -765,7 +765,7 @@
'phabricator-uiexample-reactor-sendclass' => '1def2711',
'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
'phabricator-zindex-css' => '57ddcaa2',
- 'phame-css' => '3259b53d',
+ 'phame-css' => 'bb147387',
'pholio-css' => '95174bdd',
'pholio-edit-css' => '3ad9d1ee',
'pholio-inline-comments-css' => '8e545e49',
@@ -784,7 +784,7 @@
'phui-calendar-month-css' => '476be7e0',
'phui-crumbs-view-css' => 'd842f867',
'phui-document-view-css' => '0267054b',
- 'phui-feed-story-css' => 'c7d8113a',
+ 'phui-feed-story-css' => 'b7b26d23',
'phui-font-icon-base-css' => '3dad2ae3',
'phui-fontkit-css' => 'cb8ae7ad',
'phui-form-css' => 'afdb2c6e',
diff --git a/src/applications/phame/controller/PhameController.php b/src/applications/phame/controller/PhameController.php
--- a/src/applications/phame/controller/PhameController.php
+++ b/src/applications/phame/controller/PhameController.php
@@ -9,14 +9,10 @@
$nav = new AphrontSideNavFilterView();
$nav->setBaseURI($base_uri);
- $nav->addLabel(pht('Create'));
- $nav->addFilter('post/new', pht('New Post'));
- $nav->addFilter('blog/new', pht('New Blog'));
-
$nav->addLabel(pht('Posts'));
+ $nav->addFilter('post/all', pht('Latest Posts'));
$nav->addFilter('post/draft', pht('My Drafts'));
$nav->addFilter('post', pht('My Posts'));
- $nav->addFilter('post/all', pht('All Posts'));
$nav->addLabel(pht('Blogs'));
$nav->addFilter('blog/user', pht('Joinable Blogs'));
diff --git a/src/applications/phame/controller/blog/PhameBlogEditController.php b/src/applications/phame/controller/blog/PhameBlogEditController.php
--- a/src/applications/phame/controller/blog/PhameBlogEditController.php
+++ b/src/applications/phame/controller/blog/PhameBlogEditController.php
@@ -192,18 +192,14 @@
->setForm($form);
$crumbs = $this->buildApplicationCrumbs();
+ $crumbs->addTextCrumb(pht('Blogs'), $this->getApplicationURI('blog/'));
$crumbs->addTextCrumb($page_title, $this->getApplicationURI('blog/new'));
- $nav = $this->renderSideNavFilterView();
- $nav->selectFilter($id ? null : 'blog/new');
- $nav->appendChild(
+ return $this->buildApplicationPage(
array(
$crumbs,
$form_box,
- ));
-
- return $this->buildApplicationPage(
- $nav,
+ ),
array(
'title' => $page_title,
));
diff --git a/src/applications/phame/controller/blog/PhameBlogListController.php b/src/applications/phame/controller/blog/PhameBlogListController.php
--- a/src/applications/phame/controller/blog/PhameBlogListController.php
+++ b/src/applications/phame/controller/blog/PhameBlogListController.php
@@ -60,18 +60,23 @@
private function renderBlogList(
array $blogs,
- PhabricatorUser $user,
+ PhabricatorUser $viewer,
$nodata) {
$view = new PHUIObjectItemListView();
$view->setNoDataString($nodata);
- $view->setUser($user);
+ $view->setUser($viewer);
foreach ($blogs as $blog) {
+ $id = $blog->getID();
$item = id(new PHUIObjectItemView())
+ ->setUser($viewer)
+ ->setObject($blog)
->setHeader($blog->getName())
- ->setHref($this->getApplicationURI('blog/view/'.$blog->getID().'/'))
- ->setObject($blog);
+ ->setStatusIcon('fa-star')
+ ->setHref($this->getApplicationURI("/blog/view/{$id}/"))
+ ->addAttribute($blog->getSkin())
+ ->addAttribute($blog->getDomain());
$view->addItem($item);
}
diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
@@ -22,8 +22,6 @@
->withBlogPHIDs(array($blog->getPHID()))
->executeWithCursorPager($pager);
- $nav = $this->renderSideNavFilterView(null);
-
$header = id(new PHUIHeaderView())
->setHeader($blog->getName())
->setUser($user)
@@ -36,29 +34,24 @@
$user,
pht('This blog has no visible posts.'));
- require_celerity_resource('phame-css');
- $post_list = id(new PHUIBoxView())
- ->addPadding(PHUI::PADDING_LARGE)
- ->addClass('phame-post-list')
+ $post_list = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Latest Posts'))
->appendChild($post_list);
-
$crumbs = $this->buildApplicationCrumbs();
+ $crumbs->addTextCrumb(pht('Blogs'), $this->getApplicationURI('blog/'));
$crumbs->addTextCrumb($blog->getName(), $this->getApplicationURI());
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addPropertyList($properties);
- $nav->appendChild(
+ return $this->buildApplicationPage(
array(
$crumbs,
$object_box,
$post_list,
- ));
-
- return $this->buildApplicationPage(
- $nav,
+ ),
array(
'title' => $blog->getName(),
));
diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php
--- a/src/applications/phame/controller/post/PhamePostEditController.php
+++ b/src/applications/phame/controller/post/PhamePostEditController.php
@@ -169,7 +169,6 @@
phutil_tag('div', array('id' => 'post-preview'), $loading),
));
- require_celerity_resource('phame-css');
Javelin::initBehavior(
'phame-post-preview',
array(
@@ -190,16 +189,12 @@
$page_title,
$this->getApplicationURI('/post/view/'.$id.'/'));
- $nav = $this->renderSideNavFilterView(null);
- $nav->appendChild(
+ return $this->buildApplicationPage(
array(
$crumbs,
$form_box,
$preview_panel,
- ));
-
- return $this->buildApplicationPage(
- $nav,
+ ),
array(
'title' => $page_title,
));
diff --git a/src/applications/phame/controller/post/PhamePostListController.php b/src/applications/phame/controller/post/PhamePostListController.php
--- a/src/applications/phame/controller/post/PhamePostListController.php
+++ b/src/applications/phame/controller/post/PhamePostListController.php
@@ -21,12 +21,6 @@
$title = pht('Unpublished Drafts');
$nav->selectFilter('post/draft');
break;
- case 'all':
- $nodata = pht('There are no visible posts.');
- $title = pht('Posts');
- $nav->selectFilter('post/all');
- break;
- default:
case 'blogger':
if ($bloggername) {
$blogger = id(new PhabricatorUser())->loadOneWhere(
@@ -48,6 +42,12 @@
}
$title = pht('Posts by %s', $blogger);
break;
+ default:
+ case 'all':
+ $nodata = pht('There are no visible posts.');
+ $title = pht('Posts');
+ $nav->selectFilter('post/all');
+ break;
}
$pager = id(new AphrontCursorPagerView())
@@ -55,7 +55,6 @@
$posts = $query->executeWithCursorPager($pager);
- require_celerity_resource('phame-css');
$post_list = $this->renderPostList($posts, $viewer, $nodata);
$post_list = id(new PHUIObjectBoxView())
->setHeaderText($title)
diff --git a/src/applications/phame/controller/post/PhamePostNewController.php b/src/applications/phame/controller/post/PhamePostNewController.php
--- a/src/applications/phame/controller/post/PhamePostNewController.php
+++ b/src/applications/phame/controller/post/PhamePostNewController.php
@@ -56,12 +56,10 @@
))
->execute();
- $nav = $this->renderSideNavFilterView();
- $nav->selectFilter('post/new');
-
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($title, $view_uri);
- $nav->appendChild($crumbs);
+ $display = array();
+ $display[] = $crumbs;
if (!$blogs) {
$notification = id(new PHUIInfoView())
@@ -70,7 +68,7 @@
pht('You do not have permission to join any blogs. Create a blog '.
'first, then you can post to it.'));
- $nav->appendChild($notification);
+ $display[] = $notification;
} else {
$options = mpull($blogs, 'getName', 'getID');
asort($options);
@@ -109,11 +107,11 @@
->setHeaderText($title)
->setForm($form);
- $nav->appendChild($form_box);
+ $display[] = $form_box;
}
return $this->buildApplicationPage(
- $nav,
+ $display,
array(
'title' => $title,
));
diff --git a/src/applications/phame/query/PhamePostSearchEngine.php b/src/applications/phame/query/PhamePostSearchEngine.php
--- a/src/applications/phame/query/PhamePostSearchEngine.php
+++ b/src/applications/phame/query/PhamePostSearchEngine.php
@@ -102,7 +102,7 @@
$result = new PhabricatorApplicationSearchResultView();
$result->setObjectList($list);
- $result->setNoDataString(pht('No blogs found.'));
+ $result->setNoDataString(pht('No blogs posts found.'));
return $result;
}
diff --git a/src/applications/phame/view/PhamePostView.php b/src/applications/phame/view/PhamePostView.php
--- a/src/applications/phame/view/PhamePostView.php
+++ b/src/applications/phame/view/PhamePostView.php
@@ -173,6 +173,7 @@
$uri = $this->getSkin()->getURI('post/'.$this->getPost()->getPhameTitle());
+ require_celerity_resource('phame-css');
$fb_comments = phutil_tag('div',
array(
'class' => 'fb-comments',
diff --git a/webroot/rsrc/css/application/phame/phame.css b/webroot/rsrc/css/application/phame/phame.css
--- a/webroot/rsrc/css/application/phame/phame.css
+++ b/webroot/rsrc/css/application/phame/phame.css
@@ -2,120 +2,6 @@
* @provides phame-css
*/
-.notice {
- background: #F3F3FF;
- border: 1px solid #008;
- margin: 16px 16px 4px 26px;
-}
-.notice h3 {
- background: #E3E3FF;
- padding: 8px;
-}
-
-.notice h4 {
- font-weight: normal;
- padding: 8px;
-}
-
-.phame-post-preview-header {
- margin: 0px 0px 16px 0px;
-}
-
-.device-desktop .phame-post-list {
- max-width: 600px;
-}
-
-.phame-post-list .phui-info-view {
- margin: 0;
-}
-
-.phame-post-list .phui-icon-view:hover {
- text-decoration: none;
-}
-
-.blog-post-list {
- clear: left;
- float: left;
- width: 70%;
- margin: 16px 0px 16px 16px;
- padding: 0px 8px 12px 8px;
-}
-
-.device .blog-post-list {
- float: none;
- width: 90%;
- margin: 16px auto;
-}
-
-.blog-post-list-full {
- clear: left;
- float: left;
- margin: 16px 0px 0px 0px;
- padding: 0px 16px 0px 16px;
-}
-
-.device .blog-post-list-full {
- float: none;
- margin: 16px auto;
-}
-
-.blog-detail {
- float: right;
- clear: right;
- width: 20%;
- margin: 16px 16px 16px 0px;
-}
-
-.device .blog-detail {
- float: none;
- margin: 16px auto;
- width: 90%;
-}
-
-.blog-detail .description {
- margin: 16px 0px 16px 0px;
-}
-
-.blog-detail .bloggers {
- font-size: {$smallerfontsize};
-}
-
-.blog-post,
-.blog-detail {
- border: 1px solid #DBDBDB;
- background: #F9F9F9;
- padding: 20px;
-}
-
-.blog-post {
- margin: 0px 0px 20px 0px;
-}
-
-.blog-post .header {
- padding: 0px 0px 16px 0px;
-}
-
-.blog-post .header h1 {
- clear: none;
-}
-
-.blog-post .header .last-updated {
- color: {$greytext};
- clear: none;
- font-size: {$smallerfontsize};
-}
-
-.blog-post .header .buttons {
- float: right;
-}
-.blog-post .header .buttons a {
- margin: 0px 0px 0px 12px;
-}
-
-.more-and-comments {
- padding: 12px 0px 12px 0px;
-}
-
.fb-comments,
.fb-comments span,
.fb-comments iframe[style] {
diff --git a/webroot/rsrc/css/phui/phui-feed-story.css b/webroot/rsrc/css/phui/phui-feed-story.css
--- a/webroot/rsrc/css/phui/phui-feed-story.css
+++ b/webroot/rsrc/css/phui/phui-feed-story.css
@@ -61,8 +61,7 @@
}
.phui-feed-story-bigtext-post h3 {
- font-size: 18px;
- font-weight: 200;
+ font-size: {$biggestfontsize};
line-height: 18px;
color: {$darkgreytext};
margin: 0 0 5px 0;

File Metadata

Mime Type
text/plain
Expires
Oct 15 2025, 6:19 PM (13 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8642910
Default Alt Text
D13755.id33229.diff (13 KB)

Event Timeline

Phabricator · Built by Phacility