diff options
| author | friendica <info@friendica.com> | 2013-12-23 14:10:51 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-23 14:10:51 -0800 |
| commit | f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb (patch) | |
| tree | f7cafac2c87a59c94b2d43394e41d2268474206c | |
| parent | 9daa6478556acab40958e61df39c1b7a8fc74d55 (diff) | |
| parent | 84d8fab6f1a049bb502c370c39fc3b44182ef24c (diff) | |
| download | volse-hubzilla-f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb.tar.gz volse-hubzilla-f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb.tar.bz2 volse-hubzilla-f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb.zip | |
Merge pull request #253 from cvogeley/master
Show expire date in post tooltip
| -rw-r--r-- | include/ItemObject.php | 1 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 6088a2c1c..170f013a1 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -217,6 +217,7 @@ class Item extends BaseObject { 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), + 'expiretime' => (($item['expires'] > 0) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, 'verified' => $verified, 'unverified' => $unverified, diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index fb36f5dca..4108108b2 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -39,7 +39,7 @@ <div class="wall-item-author"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> |