ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-02 22:45:02 +03:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/livestreet/livestreet

Browse source 
Conflicts:
	templates/skin/developer/actions/ActionStream/events.tpl
	templates/skin/synio/actions/ActionStream/events.tpl
This commit is contained in:
Denis Shakhov 2012-07-28 01:32:16 +07:00
parent 112c7bd93d f3c5654d98
commit 0f063fc4f5
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
templates/skin/developer/actions/ActionStream/events.tpl
View file

@ -14,6 +14,12 @@
</li>
{/if}
<li class="stream-item stream-item-type-{$oStreamEvent->getEventType()}">
<a href="{$oStreamEvent->getUser()->getUserWebPath()}"><img src="{$oStreamEvent->getUser()->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<span class="date" title="{date_format date=$oStreamEvent->getDateAdded()}">{date_format date=$oStreamEvent->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</span>
@ -57,7 +63,7 @@
<script type="text/javascript">
jQuery(document).ready(function($){
ls.stream.dateLast = '{$sDateLast}';
ls.stream.dateLast = {json var=$sDateLast};
});
</script>
{/if}

2
templates/skin/synio/actions/ActionStream/events.tpl
View file

@ -70,7 +70,7 @@
<script type="text/javascript">
jQuery(document).ready(function($){
ls.stream.dateLast = '{$sDateLast}';
ls.stream.dateLast = {json var=$sDateLast};
});
</script>
{/if}