GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of /var/www/trunk

This commit is contained in:
Robin Millette 2009-01-22 20:49:45 +00:00
parent 0c7176b603 4f58dbf557
commit e33d80fe9d
7 changed files with 222 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/showstream.php
View File

@ -388,6 +388,8 @@ class ShowstreamAction extends Action
$this->showSubscribers();
$this->showGroups();
$this->showStatistics();
$cloud = new PersonalTagCloudSection($this, $this->user);
$cloud->show();
}
function showSubscriptions()

86
lib/personaltagcloudsection.php Normal file
View File

@ -0,0 +1,86 @@
<?php
/**
* Laconica, the distributed open-source microblogging tool
*
* Personal tag cloud section
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Widget
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @copyright 2009 Control Yourself, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
*/
if (!defined('LACONICA')) {
exit(1);
}
/**
* Personal tag cloud section
*
* @category Widget
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
*/
class PersonalTagCloudSection extends TagCloudSection
{
var $user = null;
function __construct($out=null, $user=null)
{
parent::__construct($out);
$this->user = $user;
}
function title()
{
return sprintf(_('Tags in %s\'s notices'), $this->user->nickname);
}
function getTags()
{
$qry = 'SELECT notice_tag.tag, '.
'sum(exp(-(now() - notice_tag.created)/%s)) as weight ' .
'FROM notice_tag JOIN notice ' .
'ON notice_tag.notice_id = notice.id ' .
'WHERE notice.profile_id = %d ' .
'GROUP BY notice_tag.tag ' .
'ORDER BY weight DESC ';
$limit = TAGS_PER_SECTION;
$offset = 0;
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
$tag = Memcached_DataObject::cachedQuery('Notice_tag',
sprintf($qry,
common_config('tag', 'dropoff'),
$this->user->id),
3600);
return $tag;
}
}

8
lib/profilesection.php
View File

@ -58,13 +58,13 @@ class ProfileSection extends Section
$cnt = 0;
$this->out->elementStart('ul', 'entities users xoxo');
$this->out->elementStart('table');
$this->out->elementStart('tbody');
while ($profiles->fetch() && ++$cnt <= PROFILES_PER_SECTION) {
$this->showProfile($profiles);
}
$this->out->elementEnd('ul');
$this->out->elementEnd('tbody');
$this->out->elementEnd('table');
return ($cnt > PROFILES_PER_SECTION);
}

113
lib/tagcloudsection.php Normal file
View File

@ -0,0 +1,113 @@
<?php
/**
* Laconica, the distributed open-source microblogging tool
*
* Base class for sections showing tag clouds
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Widget
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @copyright 2009 Control Yourself, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
*/
if (!defined('LACONICA')) {
exit(1);
}
define('TAGS_PER_SECTION', 20);
/**
* Base class for sections
*
* These are the widgets that show interesting data about a person
* group, or site.
*
* @category Widget
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
*/
class TagCloudSection extends Section
{
function showContent()
{
$tags = $this->getTags();
if (!$tags) {
return false;
}
$cnt = 0;
$tw = array();
$sum = 0;
while ($tags->fetch() && ++$cnt <= TAGS_PER_SECTION) {
$tw[$tags->tag] = $tags->weight;
$sum += $tags->weight;
}
ksort($tw);
$this->out->elementStart('ul', 'tags xoxo tag-cloud');
foreach ($tw as $tag => $weight) {
$this->showTag($tag, $weight, $weight/$sum);
}
$this->out->elementEnd('ul');
return ($cnt > TAGS_PER_SECTION);
}
function getTags()
{
return null;
}
function showTag($tag, $weight, $relative)
{
if ($relative > 0.1) {
$rel = 'tag-cloud-7';
} else if ($relative > 0.05) {
$rel = 'tag-cloud-6';
} else if ($relative > 0.02) {
$rel = 'tag-cloud-5';
} else if ($relative > 0.01) {
$rel = 'tag-cloud-4';
} else if ($relative > 0.005) {
$rel = 'tag-cloud-3';
} else if ($relative > 0.002) {
$rel = 'tag-cloud-2';
} else {
$rel = 'tag-cloud-1';
}
$this->out->elementStart('li', $rel);
$this->out->element('a', array('href' => $this->tagUrl($tag)),
$tag);
$this->out->elementEnd('li');
}
function tagUrl($tag)
{
return common_local_url('tag', array('tag' => $tag));
}
}

11
lib/topposterssection.php
View File

@ -71,7 +71,9 @@ class TopPostersSection extends ProfileSection
function showProfile($profile)
{
$this->out->elementStart('li', 'vcard');
$this->out->elementStart('tr');
$this->out->elementStart('td');
$this->out->elementStart('span', 'vcard');
$this->out->elementStart('a', array('title' => ($profile->fullname) ?
$profile->fullname :
$profile->nickname,
@ -87,11 +89,14 @@ class TopPostersSection extends ProfileSection
$profile->fullname :
$profile->nickname));
$this->out->element('span', 'fn nickname', $profile->nickname);
$this->out->elementEnd('span');
$this->out->elementEnd('a');
$this->out->elementEnd('td');
if ($profile->value) {
$this->out->element('span', 'value', $profile->value);
$this->out->element('td', 'value', $profile->value);
}
$this->out->elementEnd('li');
$this->out->elementEnd('tr');
}
function title()

15
theme/base/css/display.css
View File

@ -1057,28 +1057,27 @@ background-color:#fff;
/*END: LOAD ALONG WITH JS*/
/* TOP_POSTERS */
#top-posters caption {
#top_posters caption {
text-align:left;
text-transform:uppercase;
}
#top-posters thead {
#top_posters thead {
display:none;
}
#top-poster_user {
#top_poster_user {
width:199px;
}
#top-poster_number-of-notices {
#top_poster_number-of-notices {
width:123px;
}
#top-posters tbody td {
#top_posters tbody td {
padding-right:11px;
padding-bottom:4px;
}
#top-posters img {
#top_posters img {
margin-right:7px;
height:24px;
width:24px;
margin-bottom:0;
}
/* tagcloud */

4
theme/identica/css/display.css
View File

@ -214,8 +214,8 @@ background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-re
background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
}
div.entry-content,
div.notice-options {
.notices div.entry-content,
.notices div.notice-options {
opacity:0.3;
}
.notices li.hover div.entry-content,