diff options
| author | friendica <info@friendica.com> | 2013-12-23 15:15:56 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-23 15:15:56 -0800 |
| commit | 49d2ada4f893e4de17567b40873b31e5a63ec01e (patch) | |
| tree | 82582d27daace801a71c7a69268fe2f357a45a2d /view/tpl | |
| parent | 63a42480c7eb36bdc8b63b31b2a4d222ba5751cd (diff) | |
| parent | f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb (diff) | |
| download | volse-hubzilla-49d2ada4f893e4de17567b40873b31e5a63ec01e.tar.gz volse-hubzilla-49d2ada4f893e4de17567b40873b31e5a63ec01e.tar.bz2 volse-hubzilla-49d2ada4f893e4de17567b40873b31e5a63ec01e.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/page_display.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
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> diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index a01bbea35..9b6b182c8 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -2,7 +2,7 @@ <div class="generic-content-wrapper" id="page-content-wrapper" > <h3 class="page-title">{{$title}}</h3> - <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}{{if $zid}}?zrl={{$zid}}{{/if}}">{{$author}}</a></div> + <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}{{if $zid}}?zid={{$zid}}{{/if}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> <div class="page-body">{{$body}}</div> </div> |