harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-02-20 14:07:49 -08:00
commit 9bd56202b4
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/channel.php
View File

@ -329,8 +329,11 @@ function channel_content(&$a, $update = 0, $load = false) {
$o .= conversation($a,$items,'channel',$update,'traditional');
}
if((! $update) || ($_COOKIE['jsAvailable'] != 1))
if((! $update) || ($_COOKIE['jsAvailable'] != 1)) {
$o .= alt_pager($a,count($items));
if ($mid && $items[0]['title'])
$a->page['title'] = $items[0]['title'] . " - " . $a->page['title'];
}
if($mid)
$o .= '<div id="content-complete"></div>';

3
mod/display.php
View File

@ -228,6 +228,9 @@ function display_content(&$a, $update = 0, $load = false) {
$o .= conversation($a, $items, 'display', $update, 'client');
} else {
$o .= conversation($a, $items, 'display', $update, 'traditional');
if ($items[0]['title'])
$a->page['title'] = $items[0]['title'] . " - " . $a->page['title'];
}
if($updateable) {

15
mod/siteinfo.php
View File

@ -50,6 +50,18 @@ function siteinfo_init(&$a) {
$site_info = get_config('system','info');
$site_name = get_config('system','sitename');
if(! get_config('system','hidden_version_siteinfo')) {
$version = RED_VERSION;
if(@is_dir('.git') && function_exists('shell_exec')) {
$commit = trim( @shell_exec('git log -1 --format="%h"'));
$tag = trim( @shell_exec('git describe --tags --abbrev=0'));
}
if(! isset($commit) || strlen($commit) > 16)
$commit = '';
}
else {
$version = $commit = '';
}
//Statistics
$channels_total_stat = intval(get_config('system','channels_total_stat'));
@ -59,7 +71,8 @@ function siteinfo_init(&$a) {
$hide_in_statistics = intval(get_config('system','hide_in_statistics'));
$data = Array(
'version' => RED_VERSION,
'version' => $version,
'version_tag' => $tag,
'commit' => $commit,
'url' => z_root(),
'plugins' => $visible_plugins,

11
view/js/main.js
View File

@ -563,10 +563,19 @@ function updateConvItems(mode,data) {
}
prev = ident;
});
if(loadingPage) {
loadingPage = false;
}
if (window.location.search.indexOf("mid=") != -1 || window.location.pathname.indexOf("display") != -1) {
var title = $(".wall-item-title").text();
title.replace(/^\s+/, '');
title.replace(/\s+$/, '');
if (title)
document.title = title + " - " + document.title;
}
}
$('.like-rotator').spin(false);