mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Small changes at activities and notifications (#67 and #58)

Browse Source
This commit is contained in:
Andy Strobel 2014-05-17 20:04:30 +02:00
parent 8d22c5f410
commit 8bdd0ec5b4
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
protected/modules_core/activity/resources/activies.js
View File

@ -39,7 +39,7 @@ $(document).ready(function () {
if (activityLastEntryReached == false) {
// load more activities
loadMore();
loadMoreActivities();
}
}
@ -49,7 +49,7 @@ $(document).ready(function () {
/**
* load new activities
*/
function loadMore() {
function loadMoreActivities() {
// save url for activity reloads
var _url = activityReloadUrl.replace('lastEntryId', activityLastLoadedEntryId);
@ -92,7 +92,7 @@ $(document).ready(function () {
}
// load the first activities
loadMore();
loadMoreActivities();
});

26
protected/modules_core/notification/views/list/index.php
View File

@ -1,26 +0,0 @@
<?php
$count_max = count($notifications);
$count_current = 1;
$class = "";
?>
<?php if ($count_max == 0) { ?>
<li class="placeholder">There are no notifications yet.</li>
<?php } else { ?>
<ul class="media-list">
<?php
foreach ($notifications as $notification) {
?>
<?php echo $notification->getOut(); ?>
<?php
$count_current++;
}
?>
</ul>
<?php } ?>
<script type="text/javascript">
$('span.time').timeago();
</script>