GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Show permalinks only for local notices 

the "from [site]" already links to the permalink
This commit is contained in:
Mikael Nordfeldth 2014-11-05 19:49:41 +01:00
parent 7ea067a0dc
commit e90a1f44c4
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/noticelistitem.php
View File

@ -308,7 +308,7 @@ class NoticeListItem extends Widget
function showNoticeLink() function showNoticeLink()
{ {
$this->out->elementStart('a', array('rel' => 'bookmark', $this->out->elementStart('a', array('rel' => 'bookmark',
'class' => 'u-url timestamp', 'class' => 'timestamp',
'href' => Conversation::getUrlFromNotice($this->notice))); 'href' => Conversation::getUrlFromNotice($this->notice)));
$this->out->element('time', array('class' => 'dt-published', $this->out->element('time', array('class' => 'dt-published',
'datetime' => common_date_iso8601($this->notice->created), 'datetime' => common_date_iso8601($this->notice->created),
@ -472,11 +472,19 @@ class NoticeListItem extends Widget
*/ */
function showPermalink() function showPermalink()
{ {
$this->out->element('a', $class = 'permalink u-url';
array('href' => $this->notice->getLocalUrl(), if (!$this->notice->isLocal()) {
'class' => 'permalink'), $class .= ' external';
// TRANS: Addition in notice list item for single-notice view. }
_('permalink')); try {
$this->out->element('a',
array('href' => $this->notice->getUrl(),
'class' => $class),
// TRANS: Addition in notice list item for single-notice view.
_('permalink'));
} catch (InvalidUrlException $e) {
// no permalink available
}
} }
/** /**

4
theme/base/css/display.css
View File

@ -991,6 +991,10 @@ content: ":";
content: '['; content: '[';
} }
.notice .permalink.external {
display: none;
}
/* old school conversation style */ /* old school conversation style */
#conversation .notices .notices { #conversation .notices .notices {