diff options
| -rw-r--r-- | images/friendika.jpg (renamed from images/3ring150.jpg) | bin | 16982 -> 16982 bytes | |||
| -rw-r--r-- | images/friendika48.gif (renamed from images/friendika.gif) | bin | 2138 -> 2138 bytes | |||
| -rw-r--r-- | images/friendika48.ico (renamed from images/friendika.ico) | bin | 9662 -> 9662 bytes | |||
| -rw-r--r-- | include/main.js | 16 | ||||
| -rw-r--r-- | mod/display.php | 10 | ||||
| -rw-r--r-- | mod/home.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 1 |
7 files changed, 27 insertions, 2 deletions
diff --git a/images/3ring150.jpg b/images/friendika.jpg Binary files differindex a5bbc1bf2..a5bbc1bf2 100644 --- a/images/3ring150.jpg +++ b/images/friendika.jpg diff --git a/images/friendika.gif b/images/friendika48.gif Binary files differindex d38646617..d38646617 100644 --- a/images/friendika.gif +++ b/images/friendika48.gif diff --git a/images/friendika.ico b/images/friendika48.ico Binary files differindex 8428d28dc..8428d28dc 100644 --- a/images/friendika.ico +++ b/images/friendika48.ico diff --git a/include/main.js b/include/main.js index f0cb8571b..1b5553161 100644 --- a/include/main.js +++ b/include/main.js @@ -16,7 +16,7 @@ document.getElementById(theID).style.display = "none" } - + var src = null; var prev = null; var livetime = null; @@ -24,6 +24,7 @@ var stopped = false; var timer = null; var pr = 0; + var liking = 0; $(document).ready(function() { $.ajaxSetup({cache: false}); @@ -49,6 +50,18 @@ if($('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-profile').length) { src = 'profile'; liveUpdate(); } + if($('#live-display').length) { + if(liking) { + liking = 0; + window.location.href=window.location.href + } + } + if($('#live-photos').length) { + if(liking) { + liking = 0; + window.location.href=window.location.href + } + } if(! stopped) { $.get("ping",function(data) { @@ -135,6 +148,7 @@ $.get('like/' + ident.toString() + '?verb=' + verb ); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,3000); + liking = 1; } function getPosition(e) { diff --git a/mod/display.php b/mod/display.php index 2e35cd6ac..b451d6930 100644 --- a/mod/display.php +++ b/mod/display.php @@ -3,6 +3,8 @@ function display_content(&$a) { + $o = '<div id="live-display"></div>' . "\r\n"; + require_once('mod/profile.php'); profile_init($a); @@ -100,6 +102,7 @@ function display_content(&$a) { ); + $cmnt_tpl = load_view_file('view/comment_item.tpl'); $like_tpl = load_view_file('view/like.tpl'); $tpl = load_view_file('view/wall_item.tpl'); @@ -112,6 +115,13 @@ function display_content(&$a) { if(count($r)) { + if((local_user()) && (local_user() == $a->profile['uid'])) { + q("UPDATE `item` SET `unseen` = 0 + WHERE `parent` = %d AND `unseen` = 1", + intval($r[0]['parent']) + ); + } + foreach($r as $item) { like_puller($a,$item,$alike,'like'); like_puller($a,$item,$dlike,'dislike'); diff --git a/mod/home.php b/mod/home.php index 9239f1d17..13b6d56c4 100644 --- a/mod/home.php +++ b/mod/home.php @@ -16,7 +16,7 @@ function home_content(&$a) { $o = ''; if(! (x($a->page,'footer'))) $a->page['footer'] = ''; - $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" name=\"mistpark\" >friendika</a></div>"; + $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>"; $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>'; if(file_exists('home.html')) $o .= file_get_contents('home.html'); diff --git a/mod/photos.php b/mod/photos.php index 63300ebee..8d2805fde 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -665,6 +665,7 @@ function photos_content(&$a) { require_once('security.php'); require_once('bbcode.php'); + $o = '<div id="live-display"></div>' . "\r\n"; // fetch image, item containing image, then comments $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' |
