revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-09 16:32:39 +01:00
Code Issues Releases Wiki Activity

Further improve various Phame UI things

Browse source 
Summary:
  - Better icons and action order.
  - "Move Post" action.
  - (Bugfix) Allow multiple blogs to be set to not having custom domains.
  - Make "Write Post" skip the "select a blog" step when coming from a blog view.
  - Sort blog list on "Write Post".
  - Show messages when a post is a draft or not on a blog.

Test Plan: Created posts, blogs, moved posts, preview/live'd posts, etc.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T1373

Differential Revision: https://secure.phabricator.com/D3708
This commit is contained in:
epriestley 2012-10-16 09:44:43 -07:00
parent 9b15aa195e
commit 1a63938b33
13 changed files with 192 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/celerity/generate_sprites.php
View file

@ -220,7 +220,10 @@ $action_map = array(
'subscribe-delete' => 'icon/unsubscribe.png',
'new' => 'icon/page_white_put.png',
'world' => 'icon/world.png',
'delete' => 'icon/delete.png',
'delete' => 'icon/page_delete.png',
'move' => 'icon/page_go.png',
'preview' => 'icon/page_world.png',
'unpublish' => 'icon/page_error.png',
);
foreach ($action_map as $icon => $source) {

1
src/applications/phame/application/PhabricatorApplicationPhame.php
View file

@ -59,6 +59,7 @@ final class PhabricatorApplicationPhame extends PhabricatorApplication {
'preview/' => 'PhamePostPreviewController',
'framed/(?P<id>\d+)/' => 'PhamePostFramedController',
'new/' => 'PhamePostNewController',
'move/(?P<id>\d+)/' => 'PhamePostNewController'
),
'blog/' => array(
'(?:(?P<filter>user|all)/)?' => 'PhameBlogListController',

2
src/applications/phame/controller/blog/PhameBlogEditController.php
View file

@ -80,7 +80,7 @@ final class PhameBlogEditController
$blog->setName($name);
$blog->setDescription($description);
$blog->setDomain($custom_domain);
$blog->setDomain(nonempty($custom_domain, null));
$blog->setSkin($skin);
if (!empty($custom_domain)) {

2
src/applications/phame/controller/blog/PhameBlogViewController.php
View file

@ -139,7 +139,7 @@ final class PhameBlogViewController extends PhameController {
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('new')
->setHref($this->getApplicationURI('post/new/?blog='.$blog->getID()))
->setHref($this->getApplicationURI('post/edit/?blog='.$blog->getID()))
->setName(pht('Write Post'))
->setDisabled(!$can_join)
->setWorkflow(!$can_join));

81
src/applications/phame/controller/post/PhamePostNewController.php
View file

@ -21,10 +21,57 @@
*/
final class PhamePostNewController extends PhameController {
private $id;
public function willProcessRequest(array $data) {
$this->id = idx($data, 'id');
}
public function processRequest() {
$request = $this->getRequest();
$user = $request->getUser();
$post = null;
$view_uri = null;
if ($this->id) {
$post = id(new PhamePostQuery())
->setViewer($user)
->withIDs(array($this->id))
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_EDIT,
))
->executeOne();
if (!$post) {
return new Aphront404Response();
}
$view_uri = '/post/view/'.$post->getID().'/';
$view_uri = $this->getApplicationURI($view_uri);
if ($request->isFormPost()) {
$blog = id(new PhameBlogQuery())
->setViewer($user)
->withIDs(array($request->getInt('blog')))
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_JOIN,
))
->executeOne();
if ($blog) {
$post->setBlogPHID($blog->getPHID());
$post->save();
return id(new AphrontRedirectResponse())->setURI($view_uri);
}
}
$title = pht('Move Post');
} else {
$title = pht('Create Post');
}
$blogs = id(new PhameBlogQuery())
->setViewer($user)
->requireCapabilities(
@ -36,8 +83,7 @@ final class PhamePostNewController extends PhameController {
$nav = $this->renderSideNavFilterView();
$nav->selectFilter('post/new');
$nav->appendChild(
id(new PhabricatorHeaderView())->setHeader(
pht('Create Post')));
id(new PhabricatorHeaderView())->setHeader($title));
if (!$blogs) {
$notification = id(new AphrontErrorView())
@ -49,20 +95,37 @@ final class PhamePostNewController extends PhameController {
$nav->appendChild($notification);
} else {
$options = mpull($blogs, 'getName', 'getID');
asort($options);
$selected_value = null;
if ($post && $post->getBlog()) {
$selected_value = $post->getBlog()->getID();
}
$form = id(new AphrontFormView())
->setUser($user)
->setMethod('GET')
->setFlexible(true)
->setAction($this->getApplicationURI('post/edit/'))
->appendChild(
id(new AphrontFormSelectControl())
->setLabel('Blog')
->setName('blog')
->setOptions($options))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Continue'));
->setOptions($options)
->setValue($selected_value));
if ($post) {
$form
->appendChild(
id(new AphrontFormSubmitControl())
->setValue(pht('Move Post'))
->addCancelButton($view_uri));
} else {
$form
->setAction($this->getApplicationURI('post/edit/'))
->setMethod('GET')
->appendChild(
id(new AphrontFormSubmitControl())
->setValue(pht('Continue')));
}
$nav->appendChild($form);
}
@ -70,7 +133,7 @@ final class PhamePostNewController extends PhameController {
return $this->buildApplicationPage(
$nav,
array(
'title' => 'Create Post',
'title' => $title,
'device' => true,
));
}

4
src/applications/phame/controller/post/PhamePostNotLiveController.php
View file

@ -43,8 +43,8 @@ final class PhamePostNotLiveController extends PhameController {
if (!$post->getBlog()) {
$reasons[] =
'<p>'.pht('You can not view the live version of this post because it '.
'is not associated with a blog. Edit the post and choose a blog to '.
'publish it to.').'</p>';
'is not associated with a blog. Move the post to a blog in order to '.
'view it live.').'</p>';
}
if ($post->isDraft()) {

103
src/applications/phame/controller/post/PhamePostViewController.php
View file

@ -40,28 +40,30 @@ final class PhamePostViewController extends PhameController {
return new Aphront404Response();
}
$nav = $this->renderSideNavFilterView();
$nav->appendChild(
id(new PhabricatorHeaderView())
->setHeader($post->getTitle()));
if ($post->isDraft()) {
$notice = array(
'title' => 'You are previewing a draft.',
'body' => 'Only you can see this draft until you publish it. '.
'If you chose a comment widget it will show up when '.
'you publish.'
);
} else if ($request->getExists('saved')) {
$new_link = phutil_render_tag(
'a',
array(
'href' => '/phame/post/new/',
'class' => 'button green',
),
'write another blog post'
);
$notice = array(
'title' => 'Saved post successfully.',
'body' => 'Seek even more phame and '.$new_link.'.'
);
} else {
$notice = array();
$nav->appendChild(
id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
->setTitle(pht('Draft Post'))
->appendChild(
pht('Only you can see this draft until you publish it. '.
'Use "Preview / Publish" to publish this post.')));
}
if (!$post->getBlog()) {
$nav->appendChild(
id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_WARNING)
->setTitle(pht('Not On A Blog'))
->appendChild(
pht('This post is not associated with a blog (the blog may have '.
'been deleted). Use "Move Post" to move it to a new blog.')));
}
$this->loadHandles(
@ -70,16 +72,11 @@ final class PhamePostViewController extends PhameController {
$post->getBloggerPHID(),
));
$nav = $this->renderSideNavFilterView(null);
$header = id(new PhabricatorHeaderView())->setHeader($post->getTitle());
$actions = $this->renderActions($post, $user);
$properties = $this->renderProperties($post, $user);
$nav->appendChild(
array(
$header,
$actions,
$properties,
));
@ -115,6 +112,37 @@ final class PhamePostViewController extends PhameController {
->setDisabled(!$can_edit)
->setWorkflow(!$can_edit));
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('move')
->setHref($this->getApplicationURI('post/move/'.$id.'/'))
->setName('Move Post')
->setDisabled(!$can_edit)
->setWorkflow(!$can_edit));
if ($post->isDraft()) {
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('preview')
->setHref($this->getApplicationURI('post/publish/'.$id.'/'))
->setName(pht('Preview / Publish')));
} else {
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('unpublish')
->setHref($this->getApplicationURI('post/unpublish/'.$id.'/'))
->setName(pht('Unpublish'))
->setWorkflow(true));
}
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('delete')
->setHref($this->getApplicationURI('post/delete/'.$id.'/'))
->setName('Delete Post')
->setDisabled(!$can_edit)
->setWorkflow(true));
$blog = $post->getBlog();
$can_view_live = $blog && !$post->isDraft();
@ -133,29 +161,6 @@ final class PhamePostViewController extends PhameController {
->setDisabled(!$can_view_live)
->setWorkflow(!$can_view_live));
if ($post->isDraft()) {
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('world')
->setHref($this->getApplicationURI('post/publish/'.$id.'/'))
->setName(pht('Preview / Publish')));
} else {
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('delete')
->setHref($this->getApplicationURI('post/unpublish/'.$id.'/'))
->setName(pht('Unpublish'))
->setWorkflow(true));
}
$actions->addAction(
id(new PhabricatorActionView())
->setIcon('delete')
->setHref($this->getApplicationURI('post/delete/'.$id.'/'))
->setName('Delete Post')
->setDisabled(!$can_edit)
->setWorkflow(true));
return $actions;
}

21
src/view/form/AphrontErrorView.php
View file

@ -89,20 +89,19 @@ final class AphrontErrorView extends AphrontView {
$more_classes[] = 'aphront-error-severity-'.$this->severity;
$more_classes = implode(' ', $more_classes);
return
return phutil_render_tag(
'div',
array(
'id' => $this->id,
'class' => 'aphront-error-view '.$more_classes,
),
$title.
phutil_render_tag(
'div',
array(
'id' => $this->id,
'class' => 'aphront-error-view '.$more_classes,
'class' => 'aphront-error-view-body',
),
$title.
phutil_render_tag(
'div',
array(
'class' => 'aphront-error-view-body',
),
$this->renderChildren().
$list));
$this->renderChildren().
$list));
}
}

1
webroot/rsrc/css/aphront/error-view.css
View file

@ -66,3 +66,4 @@
.aphront-error-severity-nodata .aphront-error-view-head {
background: #e3e3e3;
}

30
webroot/rsrc/css/autosprite.css
View file

@ -760,38 +760,50 @@
background-position: 0px -7359px;
}
.remarkup-assist-b {
.action-move {
background-position: 0px -7376px;
}
.action-preview {
background-position: 0px -7393px;
}
.action-unpublish {
background-position: 0px -7410px;
}
.remarkup-assist-b {
background-position: 0px -7427px;
}
.remarkup-assist-code {
background-position: 0px -7391px;
background-position: 0px -7442px;
}
.remarkup-assist-i {
background-position: 0px -7406px;
background-position: 0px -7457px;
}
.remarkup-assist-image {
background-position: 0px -7421px;
background-position: 0px -7472px;
}
.remarkup-assist-ol {
background-position: 0px -7436px;
background-position: 0px -7487px;
}
.remarkup-assist-tag {
background-position: 0px -7451px;
background-position: 0px -7502px;
}
.remarkup-assist-tt {
background-position: 0px -7466px;
background-position: 0px -7517px;
}
.remarkup-assist-ul {
background-position: 0px -7481px;
background-position: 0px -7532px;
}
.remarkup-assist-help {
background-position: 0px -7496px;
background-position: 0px -7547px;
}

2
webroot/rsrc/css/layout/phabricator-action-list-view.css
View file

@ -11,7 +11,7 @@
padding: .5em 0;
float: right;
margin-top: -30px;
margin-top: 0px;
margin-right: 1%;
width: 20%;
border-radius: 2px;

24
webroot/rsrc/css/layout/phabricator-property-list-view.css
View file

@ -66,3 +66,27 @@
.phabricator-property-list-text-content {
padding: 12px 18px;
}
/* When we follow an action list view on the Desktop, move down 30px so the
action list can start slightly above the property list. This is an unusual
case where we have something between the header and the action/property
lists and we want to give it space. */
.device-desktop .phabricator-action-list-view +
.phabricator-property-list-view {
clear: left;
margin-top: 30px;
}
/* In the common case where we immediately follow a header, move back up 30px
so we snuggle next to the header. */
.device-desktop .phabricator-header-view
+ .phabricator-action-list-view {
margin-top: -30px;
}
.device-desktop .phabricator-header-view
+ .phabricator-action-list-view
+ .phabricator-property-list-view {
margin-top: 0px;
}

BIN
webroot/rsrc/image/autosprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 143 KiB