If you'd like to, view or edit your
-friends and
-foes.
+friends and
+foes.
[% ELSE %]
Modified: slashjp/branches/upstream/current/plugins/Search/templates/journalsearch;search;default
===================================================================
--- slashjp/branches/upstream/current/plugins/Search/templates/journalsearch;search;default 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/plugins/Search/templates/journalsearch;search;default 2008-12-05 05:46:15 UTC (rev 864)
@@ -16,7 +16,7 @@
[% FOREACH journal=entries %]
Modified: slashjp/branches/upstream/current/plugins/Zoo/templates/data;zoo;default
===================================================================
--- slashjp/branches/upstream/current/plugins/Zoo/templates/data;zoo;default 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/plugins/Zoo/templates/data;zoo;default 2008-12-05 05:46:15 UTC (rev 864)
@@ -22,28 +22,28 @@
[% constants.sitename %] Friend/Foe System
[% CASE 'confirm' %]
- Your Relationship with [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Your Relationship with [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'nofriends' %]
- [% nickname | strip_literal %] ([% uid %]) is all alone in the world.
+ [% nickname | strip_literal %] ([% uid %]) is all alone in the world.
[% CASE 'nofans' %]
- [% nickname | strip_literal %] ([% uid %]) is either loved by all, or just invisible.
+ [% nickname | strip_literal %] ([% uid %]) is either loved by all, or just invisible.
[% CASE 'nofreaks' %]
- [% nickname | strip_literal %] ([% uid %]) is hated by no one.
+ [% nickname | strip_literal %] ([% uid %]) is hated by no one.
[% CASE 'nofoes' %]
- [% nickname | strip_literal %] ([% uid %]) loves everyone or plays their cards very close to their chest.
+ [% nickname | strip_literal %] ([% uid %]) loves everyone or plays their cards very close to their chest.
[% CASE 'nofriendsoffriends' %]
- The friends of [% nickname | strip_literal %] ([% uid %]) have no friends; they need better friends.
+ The friends of [% nickname | strip_literal %] ([% uid %]) have no friends; they need better friends.
[% CASE 'nofriendsenemies' %]
- The friends of [% nickname | strip_literal %] ([% uid %]) have no foes.
+ The friends of [% nickname | strip_literal %] ([% uid %]) have no foes.
[% CASE 'noall' %]
- [% nickname | strip_literal %] ([% uid %]) is unknown to the world.
+ [% nickname | strip_literal %] ([% uid %]) is unknown to the world.
[% CASE 'yournofriends' %]
[% returnme.data_constant = 1 %]
@@ -78,25 +78,25 @@
No one knows you exist.
[% CASE 'friendshead' %]
- Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'foeshead' %]
- Foes of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Foes of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'fanshead' %]
- Fans of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Fans of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'freakshead' %]
- Freaks of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Freaks of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'friendsenemieshead' %]
- Foes of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Foes of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'friendsoffriendshead' %]
- Friends of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Friends of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'allhead' %]
- Relationships of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Relationships of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'yourfriendshead' %]
[% returnme.data_constant = 1 %]
Modified: slashjp/branches/upstream/current/plugins/Zoo/templates/plainlist;zoo;default
===================================================================
--- slashjp/branches/upstream/current/plugins/Zoo/templates/plainlist;zoo;default 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/plugins/Zoo/templates/plainlist;zoo;default 2008-12-05 05:46:15 UTC (rev 864)
@@ -20,17 +20,17 @@
[% FOREACH somebody = people %]
[% END %]
[% END; END %]
Modified: slashjp/branches/upstream/current/sql/mysql/defaults.sql
===================================================================
--- slashjp/branches/upstream/current/sql/mysql/defaults.sql 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/sql/mysql/defaults.sql 2008-12-05 05:46:15 UTC (rev 864)
@@ -840,7 +840,7 @@
INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_lastid', '0', 'accesslogid to start searching at');
INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_weeks', '8', 'number of weeks back to compare current stats to');
INSERT INTO vars (name, value, description) VALUES ('currentqid',1,'The Current Question on the homepage pollbooth');
-INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_231','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records');
+INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_233','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records');
INSERT INTO vars (name, value, description) VALUES ('datadir','/usr/local/slash/www.example.com','What is the root of the install for Slash');
INSERT INTO vars (name, value, description) VALUES ('db_auto_increment_increment','1','If your master DB uses auto_increment_increment, i.e. multiple master replication, echo its value into this var');
INSERT INTO vars (name, value, description) VALUES ('dbsparklines_disp','0','Display dbsparklines in the currentAdminUsers box?');
Modified: slashjp/branches/upstream/current/sql/mysql/upgrades
===================================================================
--- slashjp/branches/upstream/current/sql/mysql/upgrades 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/sql/mysql/upgrades 2008-12-05 05:46:15 UTC (rev 864)
@@ -5695,6 +5695,25 @@
update firehose, firehose_deletedjournal set firehose.public='no' where firehose.id=firehose_deletedjournal.id;
drop table firehose_deletedjournal;
+# For plugins/FireHose
+UPDATE firehose_view SET mode="fulltitle" where viewname="usertag";
+
+# For plugins/Users2
+ALTER TABLE shill_ids ADD COLUMN extra VARCHAR(40) DEFAULT '' NOT NULL;
+
+# 2008-11-25
+UPDATE vars SET value = 'T_2_5_0_232' WHERE name = 'cvs_tag_currentcode';
+
# SLASHDOT LAST UPDATED HERE
+# for plugins/FireHose
+ALTER TABLE firehose ADD INDEX uid (uid);
+UPDATE menus SET value=REPLACE(value, '/~', '[% constants.real_rootdir %]/~') WHERE menu='users' AND value REGEXP '^/~';
+
+# For plugins/Users2
+ALTER TABLE shill_ids ADD COLUMN skid SMALLINT DEFAULT '0' NOT NULL;
+
+# 2008-11-26
+UPDATE vars SET value = 'T_2_5_0_233' WHERE name = 'cvs_tag_currentcode';
+
Modified: slashjp/branches/upstream/current/tagboxes/CommentScoreReason/CommentScoreReason.pm
===================================================================
--- slashjp/branches/upstream/current/tagboxes/CommentScoreReason/CommentScoreReason.pm 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/tagboxes/CommentScoreReason/CommentScoreReason.pm 2008-12-05 05:46:15 UTC (rev 864)
@@ -166,9 +166,12 @@
$top_entry_score = $firehose->getEntryPopularityForColorLevel(1);
}
$neediness *= $top_entry_score/$base_neediness;
- # If we are only doing a certain percentage of neediness here,
- # this would be the place to hash the comment cid with salt and
- # drop its score to -50 unless it randomly qualified.
+
+ # Only a certain percentage of comments are allowed to be needy.
+ my $percent = $constants->{tagbox_csr_needinesspercent} || 5;
+ my $hex_percent = int(hex(substr(md5_hex($cid), -4)) * 100 / 65536);
+ $neediness = -50 if $hex_percent >= $percent;
+
# Minimum neediness is -50.
$neediness = -50 if $neediness < -50;
@@ -207,14 +210,14 @@
$cid, $new_score, $reasons->{$current_reason_mode}{name}, ($karma_bonus eq 'yes' ? 1 : 0), $new_karma_bonus, $neediness);
if ($firehose) {
- # If it's already in the hose, don't try to re-create it --
- # that may cause unnecessary score recalculations.
my $fhid = $firehose->getFireHoseIdFromGlobjid($affected_id);
- if (!$fhid) {
- $fhid = $self->addCommentToHoseIfAppropriate($firehose,
- $affected_id, $cid, $neediness, $new_score);
+ if ($fhid) {
+ $firehose->setFireHose($fhid, { neediness => $neediness });
+ } else {
+ # For now, this tagbox is no longer responsible for adding
+ # needy comments to the hose; we assume they're already
+ # there, and if not, we ignore.
}
- $firehose->setFireHose($fhid, { neediness => $neediness }) if $fhid;
}
$self->sqlUpdate('comments', {
@@ -226,26 +229,26 @@
# XXX hex_percent should be a library function, it's used by FHEditorPop too
-sub addCommentToHoseIfAppropriate {
- my($self, $firehose, $globjid, $cid, $neediness, $score) = @_;
- my $constants = getCurrentStatic();
+#sub addCommentToHoseIfAppropriate {
+# my($self, $firehose, $globjid, $cid, $neediness, $score) = @_;
+# my $constants = getCurrentStatic();
+#
+# my $fhid = 0;
+#
+# # If neediness exceeds a threshold, the comment has a chance of appearing.
+# my $min = $constants->{tagbox_csr_minneediness} || 138;
+# return 0 if $neediness < $min;
+#
+# # Hash its cid; if the last 4 hex digits interpreted as a fraction are
+# # within the range determined, add it to the hose.
+# my $percent = $constants->{tagbox_csr_needinesspercent} || 5;
+# my $hex_percent = int(hex(substr(md5_hex($cid), -4)) * 100 / 65536);
+# return 0 if $hex_percent >= $percent;
+#
+# $fhid = $firehose->createUpdateItemFromComment($cid);
+#
+# return $fhid;
+#}
- my $fhid = 0;
-
- # If neediness exceeds a threshold, the comment has a chance of appearing.
- my $min = $constants->{tagbox_csr_minneediness} || 138;
- return 0 if $neediness < $min;
-
- # Hash its cid; if the last 4 hex digits interpreted as a fraction are
- # within the range determined, add it to the hose.
- my $percent = $constants->{tagbox_csr_needinesspercent} || 5;
- my $hex_percent = int(hex(substr(md5_hex($cid), -4)) * 100 / 65536);
- return 0 if $hex_percent >= $percent;
-
- $fhid = $firehose->createItemFromComment($cid);
-
- return $fhid;
-}
-
1;
Modified: slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm
===================================================================
--- slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm 2008-12-05 05:46:15 UTC (rev 864)
@@ -135,12 +135,16 @@
$color_level = $this_color_level if $this_color_level < $color_level;
}
} elsif ($type eq "comments") {
- my $comment = $self->getComment($target_id);
- my $score = Slash::Utility::Comments::constrain_score($comment->{points} + $comment->{tweak});
- if ($score >= 3) { $color_level = 4 }
- elsif ($score >= 2) { $color_level = 5 }
- elsif ($score >= 1) { $color_level = 6 }
- else { $color_level = 7 }
+ if (0) {
+ my $comment = $self->getComment($target_id);
+ my $score = Slash::Utility::Comments::constrain_score($comment->{points} + $comment->{tweak});
+ if ($score >= 3) { $color_level = 4 }
+ elsif ($score >= 2) { $color_level = 5 }
+ elsif ($score >= 1) { $color_level = 6 }
+ else { $color_level = 7 }
+ } else {
+ $color_level = 8;
+ }
}
$popularity = $firehose->getEntryPopularityForColorLevel($color_level) + $extra_pop;
@@ -194,6 +198,10 @@
}
}
+ # If color level was set to black, none of the nods matter, it just never
+ # shows up.
+ $popularity = -50 if $color_level == 8;
+
# If this is a comment, it normally only shows up for an editor if
# it's one of a select few.
if ($fhitem->{type} eq 'comment'
Modified: slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm
===================================================================
--- slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm 2008-12-05 05:46:15 UTC (rev 864)
@@ -194,6 +194,10 @@
$popularity += $extra_pop;
}
+ # If color level was set to black, none of the nods matter, it just never
+ # shows up.
+ $popularity = -50 if $color_level == 8;
+
# If this is spam, or contains a spam URL, its score goes way down.
if ($fhitem->{is_spam} eq 'yes' || $firehose_db->itemHasSpamURL($fhitem)) {
my $max = defined($constants->{firehose_spam_score})
@@ -254,14 +258,19 @@
$color_level = $this_color_level if $this_color_level < $color_level;
}
} elsif ($type eq "comments") {
- my $comment = $self->getComment($target_id);
- my $score = constrain_score($comment->{points} + $comment->{tweak});
- if ($score >= 5) {
- $color_level = 5;
- } elsif ($score >= 2) {
- $color_level = 6
+ if (0) {
+ my $comment = $self->getComment($target_id);
+ my $score = constrain_score($comment->{points} + $comment->{tweak});
+ if ($score >= 5) {
+ $color_level = 5;
+ } elsif ($score >= 2) {
+ $color_level = 6
+ } else {
+ $color_level = 7;
+ }
} else {
- $color_level = 7;
+ # temporary measure
+ $color_level = 8;
}
}
return($color_level, $extra_pop);
Modified: slashjp/branches/upstream/current/themes/slashcode/htdocs/users2.pl
===================================================================
--- slashjp/branches/upstream/current/themes/slashcode/htdocs/users2.pl 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/themes/slashcode/htdocs/users2.pl 2008-12-05 05:46:15 UTC (rev 864)
@@ -384,6 +384,10 @@
}
# Figure out what the op really is.
+ if ($gSkin->{skid} == 36 && (! $form->{op} && ! ($form->{uid} || $form->{nick}))) {
+ # Default to ThinkGeek user if we're in the ThinkGeek skin
+ $form->{uid} = 1387321;
+ }
$op = 'userinfo' if (! $form->{op} && ($form->{uid} || $form->{nick}));
$op ||= $user->{is_anon} ? 'userlogin' : 'userinfo';
if ($user->{is_anon} && ( ($ops->{$op}{seclev} > 0) || ($op =~ /^newuserform|mailpasswdform|displayform$/) )) {
@@ -1068,8 +1072,13 @@
# showInfo's header information is delayed until here, because
# the target user's info is not available until here.
vislenify($requested_user);
+ $requested_user->{shill_info} = $reader->getShillInfo($requested_user->{shill_id});
my $msg = getMessage('user_header', { useredit => $requested_user, fieldkey => $fieldkey });
- header($msg, '', { shill_id => $requested_user->{shill_id}, U2 => 1 }) or return;
+ header($msg, '', {
+ shill_id => $requested_user->{shill_id},
+ shill_info => $requested_user->{shill_info},
+ U2 => 1
+ }) or return;
# This is a hardcoded position, bad idea and should be fixed -Brian
# Yeah, we should pull this into a template somewhere...
print getMessage('note', { note => $hr->{note} }) if defined $hr->{note};
@@ -1359,6 +1368,18 @@
my $tagshist;
if ($tags_reader) {
$tagshist = $tags_reader->getGroupedTagsFromUser($requested_user->{uid}, { orderby => 'created_at', orderdir => 'DESC', include_private => 1, limit => 100 });
+ # This prevents the slashbox from being populated with only private tags,
+ # which leaves it visible but empty for non-admins.
+ my $all_private = 1;
+ if ($tagshist && !$user->{is_admin}) {
+ foreach my $tag (keys %$tagshist) {
+ if (!$tagshist->{$tag}->[0]->{private}) {
+ $all_private = 0;
+ last;
+ }
+ }
+ $tagshist = '' if ($all_private);
+ }
}
# Comments slashbox
@@ -1414,13 +1435,9 @@
$not_fhid = $users2->getMarqueeFireHoseId($marquee);
}
- if ($form->{dp} eq 'firehose' || $form->{dp} =~ /^journal/ || $form->{dp} eq 'submissions' || $form->{dp} eq 'bookmarks' || $form->{dp} eq 'usertag') {
+ if ($main_view || $form->{dp} eq 'firehose' || $form->{dp} =~ /^journal/ || $form->{dp} eq 'submissions' || $form->{dp} eq 'bookmarks' || $form->{dp} eq 'usertag') {
$form->{listonly} = 1;
- $form->{mode} = "full";
- $form->{color} = "black";
- $form->{orderby} = "createtime";
- $form->{orderdir} = "DESC";
$form->{skipmenu} = 1;
}
Modified: slashjp/branches/upstream/current/themes/slashcode/templates/currentAdminUsers;misc;default
===================================================================
--- slashjp/branches/upstream/current/themes/slashcode/templates/currentAdminUsers;misc;default 2008-12-04 10:59:09 UTC (rev 863)
+++ slashjp/branches/upstream/current/themes/slashcode/templates/currentAdminUsers;misc;default 2008-12-05 05:46:15 UTC (rev 864)
@@ -28,7 +28,7 @@
%]
If you'd like to, view or edit your
-friends and
-foes.
+friends and
+foes.
[% ELSE %]
Modified: slashjp/trunk/plugins/Search/templates/journalsearch;search;default
===================================================================
--- slashjp/trunk/plugins/Search/templates/journalsearch;search;default 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/plugins/Search/templates/journalsearch;search;default 2008-12-05 05:50:48 UTC (rev 866)
@@ -16,7 +16,7 @@
[% FOREACH journal=entries %]
Modified: slashjp/trunk/plugins/Zoo/templates/data;zoo;default
===================================================================
--- slashjp/trunk/plugins/Zoo/templates/data;zoo;default 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/plugins/Zoo/templates/data;zoo;default 2008-12-05 05:50:48 UTC (rev 866)
@@ -22,28 +22,28 @@
[% constants.sitename %] Friend/Foe System
[% CASE 'confirm' %]
- Your Relationship with [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Your Relationship with [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'nofriends' %]
- [% nickname | strip_literal %] ([% uid %]) is all alone in the world.
+ [% nickname | strip_literal %] ([% uid %]) is all alone in the world.
[% CASE 'nofans' %]
- [% nickname | strip_literal %] ([% uid %]) is either loved by all, or just invisible.
+ [% nickname | strip_literal %] ([% uid %]) is either loved by all, or just invisible.
[% CASE 'nofreaks' %]
- [% nickname | strip_literal %] ([% uid %]) is hated by no one.
+ [% nickname | strip_literal %] ([% uid %]) is hated by no one.
[% CASE 'nofoes' %]
- [% nickname | strip_literal %] ([% uid %]) loves everyone or plays their cards very close to their chest.
+ [% nickname | strip_literal %] ([% uid %]) loves everyone or plays their cards very close to their chest.
[% CASE 'nofriendsoffriends' %]
- The friends of [% nickname | strip_literal %] ([% uid %]) have no friends; they need better friends.
+ The friends of [% nickname | strip_literal %] ([% uid %]) have no friends; they need better friends.
[% CASE 'nofriendsenemies' %]
- The friends of [% nickname | strip_literal %] ([% uid %]) have no foes.
+ The friends of [% nickname | strip_literal %] ([% uid %]) have no foes.
[% CASE 'noall' %]
- [% nickname | strip_literal %] ([% uid %]) is unknown to the world.
+ [% nickname | strip_literal %] ([% uid %]) is unknown to the world.
[% CASE 'yournofriends' %]
[% returnme.data_constant = 1 %]
@@ -78,25 +78,25 @@
No one knows you exist.
[% CASE 'friendshead' %]
- Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'foeshead' %]
- Foes of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Foes of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'fanshead' %]
- Fans of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Fans of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'freakshead' %]
- Freaks of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Freaks of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'friendsenemieshead' %]
- Foes of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Foes of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'friendsoffriendshead' %]
- Friends of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Friends of the Friends of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'allhead' %]
- Relationships of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
+ Relationships of [% nickname | strip_literal %] ([% uid %]) [% PROCESS zoo_icons person=uid implied="" %]
[% CASE 'yourfriendshead' %]
[% returnme.data_constant = 1 %]
Modified: slashjp/trunk/plugins/Zoo/templates/plainlist;zoo;default
===================================================================
--- slashjp/trunk/plugins/Zoo/templates/plainlist;zoo;default 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/plugins/Zoo/templates/plainlist;zoo;default 2008-12-05 05:50:48 UTC (rev 866)
@@ -20,17 +20,17 @@
[% FOREACH somebody = people %]
[% END %]
[% END; END %]
Modified: slashjp/trunk/sql/mysql/defaults.sql
===================================================================
--- slashjp/trunk/sql/mysql/defaults.sql 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/sql/mysql/defaults.sql 2008-12-05 05:50:48 UTC (rev 866)
@@ -841,7 +841,7 @@
INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_lastid', '0', 'accesslogid to start searching at');
INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_weeks', '8', 'number of weeks back to compare current stats to');
INSERT INTO vars (name, value, description) VALUES ('currentqid',1,'The Current Question on the homepage pollbooth');
-INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_231','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records');
+INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_233','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records');
INSERT INTO vars (name, value, description) VALUES ('datadir','/usr/local/slash/www.example.com','What is the root of the install for Slash');
INSERT INTO vars (name, value, description) VALUES ('db_auto_increment_increment','1','If your master DB uses auto_increment_increment, i.e. multiple master replication, echo its value into this var');
INSERT INTO vars (name, value, description) VALUES ('dbsparklines_disp','0','Display dbsparklines in the currentAdminUsers box?');
Modified: slashjp/trunk/sql/mysql/upgrades
===================================================================
--- slashjp/trunk/sql/mysql/upgrades 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/sql/mysql/upgrades 2008-12-05 05:50:48 UTC (rev 866)
@@ -5695,6 +5695,25 @@
update firehose, firehose_deletedjournal set firehose.public='no' where firehose.id=firehose_deletedjournal.id;
drop table firehose_deletedjournal;
+# For plugins/FireHose
+UPDATE firehose_view SET mode="fulltitle" where viewname="usertag";
+
+# For plugins/Users2
+ALTER TABLE shill_ids ADD COLUMN extra VARCHAR(40) DEFAULT '' NOT NULL;
+
+# 2008-11-25
+UPDATE vars SET value = 'T_2_5_0_232' WHERE name = 'cvs_tag_currentcode';
+
# SLASHDOT LAST UPDATED HERE
+# for plugins/FireHose
+ALTER TABLE firehose ADD INDEX uid (uid);
+UPDATE menus SET value=REPLACE(value, '/~', '[% constants.real_rootdir %]/~') WHERE menu='users' AND value REGEXP '^/~';
+
+# For plugins/Users2
+ALTER TABLE shill_ids ADD COLUMN skid SMALLINT DEFAULT '0' NOT NULL;
+
+# 2008-11-26
+UPDATE vars SET value = 'T_2_5_0_233' WHERE name = 'cvs_tag_currentcode';
+
Modified: slashjp/trunk/tagboxes/CommentScoreReason/CommentScoreReason.pm
===================================================================
--- slashjp/trunk/tagboxes/CommentScoreReason/CommentScoreReason.pm 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/tagboxes/CommentScoreReason/CommentScoreReason.pm 2008-12-05 05:50:48 UTC (rev 866)
@@ -166,9 +166,12 @@
$top_entry_score = $firehose->getEntryPopularityForColorLevel(1);
}
$neediness *= $top_entry_score/$base_neediness;
- # If we are only doing a certain percentage of neediness here,
- # this would be the place to hash the comment cid with salt and
- # drop its score to -50 unless it randomly qualified.
+
+ # Only a certain percentage of comments are allowed to be needy.
+ my $percent = $constants->{tagbox_csr_needinesspercent} || 5;
+ my $hex_percent = int(hex(substr(md5_hex($cid), -4)) * 100 / 65536);
+ $neediness = -50 if $hex_percent >= $percent;
+
# Minimum neediness is -50.
$neediness = -50 if $neediness < -50;
@@ -207,14 +210,14 @@
$cid, $new_score, $reasons->{$current_reason_mode}{name}, ($karma_bonus eq 'yes' ? 1 : 0), $new_karma_bonus, $neediness);
if ($firehose) {
- # If it's already in the hose, don't try to re-create it --
- # that may cause unnecessary score recalculations.
my $fhid = $firehose->getFireHoseIdFromGlobjid($affected_id);
- if (!$fhid) {
- $fhid = $self->addCommentToHoseIfAppropriate($firehose,
- $affected_id, $cid, $neediness, $new_score);
+ if ($fhid) {
+ $firehose->setFireHose($fhid, { neediness => $neediness });
+ } else {
+ # For now, this tagbox is no longer responsible for adding
+ # needy comments to the hose; we assume they're already
+ # there, and if not, we ignore.
}
- $firehose->setFireHose($fhid, { neediness => $neediness }) if $fhid;
}
$self->sqlUpdate('comments', {
@@ -226,26 +229,26 @@
# XXX hex_percent should be a library function, it's used by FHEditorPop too
-sub addCommentToHoseIfAppropriate {
- my($self, $firehose, $globjid, $cid, $neediness, $score) = @_;
- my $constants = getCurrentStatic();
+#sub addCommentToHoseIfAppropriate {
+# my($self, $firehose, $globjid, $cid, $neediness, $score) = @_;
+# my $constants = getCurrentStatic();
+#
+# my $fhid = 0;
+#
+# # If neediness exceeds a threshold, the comment has a chance of appearing.
+# my $min = $constants->{tagbox_csr_minneediness} || 138;
+# return 0 if $neediness < $min;
+#
+# # Hash its cid; if the last 4 hex digits interpreted as a fraction are
+# # within the range determined, add it to the hose.
+# my $percent = $constants->{tagbox_csr_needinesspercent} || 5;
+# my $hex_percent = int(hex(substr(md5_hex($cid), -4)) * 100 / 65536);
+# return 0 if $hex_percent >= $percent;
+#
+# $fhid = $firehose->createUpdateItemFromComment($cid);
+#
+# return $fhid;
+#}
- my $fhid = 0;
-
- # If neediness exceeds a threshold, the comment has a chance of appearing.
- my $min = $constants->{tagbox_csr_minneediness} || 138;
- return 0 if $neediness < $min;
-
- # Hash its cid; if the last 4 hex digits interpreted as a fraction are
- # within the range determined, add it to the hose.
- my $percent = $constants->{tagbox_csr_needinesspercent} || 5;
- my $hex_percent = int(hex(substr(md5_hex($cid), -4)) * 100 / 65536);
- return 0 if $hex_percent >= $percent;
-
- $fhid = $firehose->createItemFromComment($cid);
-
- return $fhid;
-}
-
1;
Modified: slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm
===================================================================
--- slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm 2008-12-05 05:50:48 UTC (rev 866)
@@ -135,12 +135,16 @@
$color_level = $this_color_level if $this_color_level < $color_level;
}
} elsif ($type eq "comments") {
- my $comment = $self->getComment($target_id);
- my $score = Slash::Utility::Comments::constrain_score($comment->{points} + $comment->{tweak});
- if ($score >= 3) { $color_level = 4 }
- elsif ($score >= 2) { $color_level = 5 }
- elsif ($score >= 1) { $color_level = 6 }
- else { $color_level = 7 }
+ if (0) {
+ my $comment = $self->getComment($target_id);
+ my $score = Slash::Utility::Comments::constrain_score($comment->{points} + $comment->{tweak});
+ if ($score >= 3) { $color_level = 4 }
+ elsif ($score >= 2) { $color_level = 5 }
+ elsif ($score >= 1) { $color_level = 6 }
+ else { $color_level = 7 }
+ } else {
+ $color_level = 8;
+ }
}
$popularity = $firehose->getEntryPopularityForColorLevel($color_level) + $extra_pop;
@@ -194,6 +198,10 @@
}
}
+ # If color level was set to black, none of the nods matter, it just never
+ # shows up.
+ $popularity = -50 if $color_level == 8;
+
# If this is a comment, it normally only shows up for an editor if
# it's one of a select few.
if ($fhitem->{type} eq 'comment'
Modified: slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm
===================================================================
--- slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm 2008-12-05 05:50:48 UTC (rev 866)
@@ -194,6 +194,10 @@
$popularity += $extra_pop;
}
+ # If color level was set to black, none of the nods matter, it just never
+ # shows up.
+ $popularity = -50 if $color_level == 8;
+
# If this is spam, or contains a spam URL, its score goes way down.
if ($fhitem->{is_spam} eq 'yes' || $firehose_db->itemHasSpamURL($fhitem)) {
my $max = defined($constants->{firehose_spam_score})
@@ -254,14 +258,19 @@
$color_level = $this_color_level if $this_color_level < $color_level;
}
} elsif ($type eq "comments") {
- my $comment = $self->getComment($target_id);
- my $score = constrain_score($comment->{points} + $comment->{tweak});
- if ($score >= 5) {
- $color_level = 5;
- } elsif ($score >= 2) {
- $color_level = 6
+ if (0) {
+ my $comment = $self->getComment($target_id);
+ my $score = constrain_score($comment->{points} + $comment->{tweak});
+ if ($score >= 5) {
+ $color_level = 5;
+ } elsif ($score >= 2) {
+ $color_level = 6
+ } else {
+ $color_level = 7;
+ }
} else {
- $color_level = 7;
+ # temporary measure
+ $color_level = 8;
}
}
return($color_level, $extra_pop);
Modified: slashjp/trunk/themes/slashcode/htdocs/users2.pl
===================================================================
--- slashjp/trunk/themes/slashcode/htdocs/users2.pl 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/themes/slashcode/htdocs/users2.pl 2008-12-05 05:50:48 UTC (rev 866)
@@ -384,6 +384,10 @@
}
# Figure out what the op really is.
+ if ($gSkin->{skid} == 36 && (! $form->{op} && ! ($form->{uid} || $form->{nick}))) {
+ # Default to ThinkGeek user if we're in the ThinkGeek skin
+ $form->{uid} = 1387321;
+ }
$op = 'userinfo' if (! $form->{op} && ($form->{uid} || $form->{nick}));
$op ||= $user->{is_anon} ? 'userlogin' : 'userinfo';
if ($user->{is_anon} && ( ($ops->{$op}{seclev} > 0) || ($op =~ /^newuserform|mailpasswdform|displayform$/) )) {
@@ -1068,8 +1072,13 @@
# showInfo's header information is delayed until here, because
# the target user's info is not available until here.
vislenify($requested_user);
+ $requested_user->{shill_info} = $reader->getShillInfo($requested_user->{shill_id});
my $msg = getMessage('user_header', { useredit => $requested_user, fieldkey => $fieldkey });
- header($msg, '', { shill_id => $requested_user->{shill_id}, U2 => 1 }) or return;
+ header($msg, '', {
+ shill_id => $requested_user->{shill_id},
+ shill_info => $requested_user->{shill_info},
+ U2 => 1
+ }) or return;
# This is a hardcoded position, bad idea and should be fixed -Brian
# Yeah, we should pull this into a template somewhere...
print getMessage('note', { note => $hr->{note} }) if defined $hr->{note};
@@ -1359,6 +1368,18 @@
my $tagshist;
if ($tags_reader) {
$tagshist = $tags_reader->getGroupedTagsFromUser($requested_user->{uid}, { orderby => 'created_at', orderdir => 'DESC', include_private => 1, limit => 100 });
+ # This prevents the slashbox from being populated with only private tags,
+ # which leaves it visible but empty for non-admins.
+ my $all_private = 1;
+ if ($tagshist && !$user->{is_admin}) {
+ foreach my $tag (keys %$tagshist) {
+ if (!$tagshist->{$tag}->[0]->{private}) {
+ $all_private = 0;
+ last;
+ }
+ }
+ $tagshist = '' if ($all_private);
+ }
}
# Comments slashbox
@@ -1414,13 +1435,9 @@
$not_fhid = $users2->getMarqueeFireHoseId($marquee);
}
- if ($form->{dp} eq 'firehose' || $form->{dp} =~ /^journal/ || $form->{dp} eq 'submissions' || $form->{dp} eq 'bookmarks' || $form->{dp} eq 'usertag') {
+ if ($main_view || $form->{dp} eq 'firehose' || $form->{dp} =~ /^journal/ || $form->{dp} eq 'submissions' || $form->{dp} eq 'bookmarks' || $form->{dp} eq 'usertag') {
$form->{listonly} = 1;
- $form->{mode} = "full";
- $form->{color} = "black";
- $form->{orderby} = "createtime";
- $form->{orderdir} = "DESC";
$form->{skipmenu} = 1;
}
Modified: slashjp/trunk/themes/slashcode/templates/currentAdminUsers;misc;default
===================================================================
--- slashjp/trunk/themes/slashcode/templates/currentAdminUsers;misc;default 2008-12-05 05:46:32 UTC (rev 865)
+++ slashjp/trunk/themes/slashcode/templates/currentAdminUsers;misc;default 2008-12-05 05:50:48 UTC (rev 866)
@@ -28,7 +28,7 @@
%]
");
+ }
+
if (name == "color" || name == "tab" || name == "pause" || name == "startdate" || name == "duration" || name == "issue" || name == "pagesize") {
params[name] = value;
if (name == "startdate") {
@@ -952,6 +957,9 @@
var saved_selection = new $.TextSelection(gFocusedText);
var $menu = $('.ac_results:visible');
+ var add_behind_scenes = $("#firehoselist .loading_msg").length;
+ if (add_behind_scenes) { $('.busy').show(); }
+
if (firehose_updates.length > 0) {
var el = firehose_updates.pop();
var fh = 'firehose-' + el[1];
@@ -968,7 +976,14 @@
need_animate = 0;
}
} else if (firehose_after[el[1]] && $('#firehose-' + firehose_after[el[1]]).size()) {
- $('#firehose-' + firehose_after[el[1]]).before(el[2]);
+
+ // don't insert a new article between the floating slashbox ad and its article
+ var $landmark = $('#firehose-' + firehose_after[el[1]]), $prev = $landmark.prev();
+ if ( $prev.is('#floating-slashbox-ad') ) {
+ $landmark = $prev;
+ }
+
+ $landmark.before(el[2]);
if (!isInWindow($dom('title-'+ firehose_after[el[1]]))) {
need_animate = 0;
}
@@ -981,6 +996,10 @@
$('#firehoselist').prepend(el[2]);
}
+ if (add_behind_scenes) {
+ need_animate = 0;
+ }
+
var toheight = 50;
if (fh_view_mode == "full") {
toheight = 200;
@@ -1055,7 +1074,7 @@
need_animate = 0;
}
- if ((firehose_removals < 10 ) || !need_animate) {
+ if ((firehose_removals < 10 ) && !add_behind_scenes ) {
myAnim.onComplete.subscribe(function() {
var elem = this.getEl();
if (elem && elem.parentNode) {
@@ -1073,12 +1092,23 @@
}
}
}
- if(!need_animate) {
- wait_interval = 10;
+ if(!need_animate || add_behind_scenes) {
+ wait_interval = 0;
}
+
+ //console.log("Wait: " + wait_interval);
setTimeout(firehose_handle_update, wait_interval);
} else {
firehose_reorder();
+ if (add_behind_scenes) {
+ $('#firehoselist .loading_msg').each(function() { if(this && this.parentNode) { this.parentNode.removeChild(this);} });
+ if (elem && elem.parentNode) {
+ elem.parentNode.removeChild(elem);
+ }
+ $('#firehoselist').show('slow');
+ $('.busy').hide();
+
+ }
firehose_get_next_updates();
}
@@ -1189,6 +1219,10 @@
firehose_updates_size = firehose_updates.length;
firehose_removed_first = 0;
processed = processed + 1;
+ if ($('#firehoselist .loading_msg').length) {
+ $('#firehoselist').hide();
+ $('#firehoselist .loading_msg').show();
+ }
firehose_handle_update();
}
}
@@ -1885,7 +1919,7 @@
return 0;
if ($article)
- $article = Slash.Firehose.at_or_below_ad_space($article);
+ $article = Slash.Firehose.ready_ad_space($article);
else
$article = Slash.Firehose.choose_article_for_next_ad();
@@ -1931,171 +1965,149 @@
//
-var AD_HEIGHT = 300, AD_WIDTH = 300, FOOTER_PADDING = 5,
+var AD_HEIGHT = 300, AD_WIDTH = 300,
- current_mode = { has_content: false },
$ad_position, // 300x300 div that holds the current (if any) ad
- $current_article, // the article to which that ad is attached
- $slashboxes, // the container in which the ad floats
- $footer;
+ ad_target_article, // the article to which that ad is attached
+ $ad_offset_parent, // the container in which the ad _position_ floats (between articles)
+ $slashboxes, // the container (sort of) in which the ad content actually appears (though not as a child)
+ $footer,
+ is_ad_locked; // ad must be shown for at least 30 seconds
+
$(function(){
+ is_ad_locked = false;
+ $ad_position = $([]);
+ ad_target_article = null;
+
$footer = $('#ft');
- $slashboxes = $('#slashboxes, #userboxes').
- eq(0).
- append('');
- $ad_position = $slashboxes.find('#floating-slashbox-ad');
+ $slashboxes = $('#slashboxes, #userboxes').eq(0);
- $(window).scroll(fix_ad_position);
$('#firehoselist').
bind('articlesMoved', fix_ad_position).
bind('beforeArticleRemoved', notice_article_removed);
-
- $ad_position.
- bind('adArticleRemoved', function(){
- set_current_ad($current_article.next(':visible'));
- });
});
function notice_article_removed( event, removed_article ){
- if ( current_mode.has_content && $current_article[0]===removed_article ) {
- $ad_position.trigger('adArticleRemoved');
+ if ( ad_target_article === removed_article ) {
+ remove_ad();
}
}
-function if_same_mode( a, b ){
- return (!a.has_content && !b.has_content) ||
- (
- (a.has_content == b.has_content) &&
- (a.is_in_window == b.is_in_window) &&
- (a.pinned == b.pinned)
- );
-}
+function remove_ad(){
+ ad_target_article = null;
-function set_mode( next ){
- var cur = current_mode;
+ if ( is_ad_locked ) {
+ return false;
+ }
- // if it's actually a change...
- if ( ! if_same_mode(cur, next) ) {
- if ( ! next.has_content ) {
- $ad_position.hide();
- } else if ( cur.pinned != next.pinned ) {
- $ad_position.hide();
+ $ad_position.remove();
+ $ad_position = $([]);
+ return true;
+}
- var next_class = next.pinned || '';
- if ( next.pinned == 'Article' ) {
- $current_article.
- prepend($ad_position).
- css('overflow', 'visible');
- } else if ( next.pinned == 'Bottom' ) {
- $slashboxes.after($ad_position);
- next_class += ' yui_b';
- } else {
- $slashboxes.append($ad_position);
- }
+function insert_ad( $article, ad ){
+ if ( !ad || !$article || $article.length != 1 || !remove_ad() ) {
+ return;
+ }
- $ad_position.setClass(next_class);
+ ad_target_article = $article[0];
+ $ad_position = $article.
+ before('').
+ prev().
+ append(ad);
- if ( !cur.has_content ) {
- $ad_position.fadeIn('fast');
- } else {
- $ad_position.show();
- }
+ setTimeout(function(){
+ is_ad_locked = false;
+ if ( ! ad_target_article ) {
+ remove_ad();
}
+ }, 30000);
+ is_ad_locked = true;
- var event_name;
- if ( cur.has_content != next.has_content ) {
- event_name = next.has_content ? 'adInserted' : 'adRemoved';
- } else if ( cur.pinned != next.pinned ) {
- event_name = 'adPinnedTo' + next.pinned;
- } else if ( cur.is_in_window != next.is_in_window ) {
- event_name = next.is_in_window ? 'adMovedIntoWindow' : 'adMovedOutOfWindow';
- } else if ( cur.top != next.top ) {
- event_name = 'adMoved';
- }
+ if ( ! $ad_offset_parent ) {
+ $ad_offset_parent = $article.offsetParent();
+ }
- current_mode = next;
-
- if ( event_name ) {
- $ad_position.trigger(event_name);
- }
- }
+ fix_ad_position();
+ $ad_position.fadeIn('fast');
}
-function set_current_ad( $new_article, new_ad ){
- var have_new_article = $new_article && $new_article.length,
- clear_all = !have_new_article && !new_ad;
+function nearest_article_edge(){
+ // Why not just ask for the offset of $ad_position?
+ // ...because $ad_position may be absolutely positioned already
- if ( !current_mode.has_content && !new_ad ) {
- return;
+ var $article = $ad_position.next();
+ var pos = $article.offset();
+ if ( pos !== undefined ) {
+ return pos.top;
}
- if ( clear_all || new_ad ) {
- set_mode({ has_content: false });
- $ad_position.empty();
+ $article = $ad_position.prev();
+ pos = $other.offset();
+ if ( pos !== undefined ) {
+ return pos.top + $article.height();
}
- if ( !clear_all ) {
- if ( new_ad ) {
- current_mode.will_have_content = true;
- $ad_position.append(new_ad);
- }
- if ( have_new_article ) {
- $current_article = $new_article.eq(0);
- }
- fix_ad_position();
- } else {
- $current_article = null;
- }
+ return 0;
}
+function pin( lo, n, hi ){
+ // return n', the nearest value to n such that lo<=n'<=hi
+
+ if ( hi < lo ) return { value: undefined, description: 'Empty' }; // pin-range is empty, there is no n' such that lo<=n'<=hi
+ if ( n <= lo ) return { value: lo, description: 'Min' };
+ if ( n <= hi ) return { value: n, description: 'No' };
+ return { value: hi, description: 'Max' };
+}
+
function fix_ad_position(){
- if ( current_mode.has_content || current_mode.will_have_content ) {
+ if ( $ad_position.length ) {
var footer = $footer.offset(),
- slashboxes = $slashboxes.offset(),
- article = $current_article.offset();
+ slashboxes = $slashboxes.offset();
- if ( ! footer || ! slashboxes || ! article ) {
+ if ( ! footer || ! slashboxes ) {
return;
}
- var space_top = slashboxes.top + $slashboxes.height(),
- space_bottom = footer.top - FOOTER_PADDING,
- window_top = window.pageYOffset,
- window_bottom = window_top + window.innerHeight,
- ad_top = Math.max(space_top, Math.min(article.top, space_bottom-AD_HEIGHT)),
- next_mode = { has_content: true,
- is_in_window: !( ad_top > window_bottom || ad_top + AD_HEIGHT < window_top ),
- top: ad_top - slashboxes.top
- };
+ var min_top = slashboxes.top + $slashboxes.height(),
+ max_top = footer.top - AD_HEIGHT,
+ pinned_top = pin(min_top, nearest_article_edge(), max_top),
- if ( space_bottom - space_top < AD_HEIGHT ) {
- next_mode.pinned = 'SqueezedOut';
- } else if ( ad_top == article.top ) {
- next_mode.pinned = 'Article';
- } else if ( ad_top < article.top ) {
- next_mode.pinned = 'Bottom';
- } else if ( ad_top > (article.top + $current_article.height()) ) {
- next_mode.pinned = 'TopDisconnected';
- } else {
- next_mode.pinned = 'Top';
+ prev_top = $ad_position.offset().top,
+ prev_class = $ad_position.attr('className'),
+ prev_pinned = prev_class !== 'No',
+
+ next_top = pinned_top.value,
+ next_class = pinned_top.description,
+ next_pinned = next_class !== 'No',
+ next_css = {};
+
+ if ( prev_pinned > next_pinned ) {
+ // if we're un-pinning the ad, clear our explicit 'top' setting
+ next_css.top = '';
+ } else if ( next_pinned && (!prev_pinned || prev_top!=next_top) ) {
+ // else if we're becoming pinned or are already pinned, but need a different top
+ next_css.top = '' + (next_top - $ad_offset_parent.offset().top) + 'px';
}
- set_mode(next_mode);
+ if ( next_css.top !== undefined ) {
+ $ad_position.css(next_css);
+ }
+
+ if ( prev_class != next_class ) {
+ $ad_position.setClass(next_class);
+ }
}
}
Slash.Util.Package({ named: 'Slash.Firehose.floating_slashbox_ad',
api: {
- is_visible: function(){ return current_mode.has_content && current_mode.is_in_window; },
- remove: function(){ set_current_ad() },
- current_article: function(){ return $current_article; },
- is_pinned_to: function(){ return current_mode.pinned; },
- bind: function(){ return $ad_position.bind.apply($ad_position, arguments); },
- unbind: function(){ return $ad_position.unbind.apply($ad_position, arguments); }
+ is_visible: function(){ return isInWindow($ad_position.children().get(0)); },
+ remove: function(){ remove_ad() },
},
- stem_function: set_current_ad
+ stem_function: insert_ad
});
Slash.Firehose.articles_on_screen = function(){
@@ -2146,21 +2158,26 @@
}
}
-Slash.Firehose.at_or_below_ad_space = function( $articles ){
+// filter $articles to only those adjacent to available space for an ad
+// return empty list if none, or if not enough time has yet passed to place a new ad
+Slash.Firehose.ready_ad_space = function( $articles ){
+ var $result = $([]);
try {
- var min_top = Math.max(window.pageYOffset, $slashboxes.offset().top + $slashboxes.height());
- return $articles.filter(function(){
- return $(this).offset().top >= min_top;
- });
+ if ( !is_ad_locked ) {
+ var min_top = Math.max(window.pageYOffset, $slashboxes.offset().top + $slashboxes.height());
+ $result = $articles.filter(function(){
+ return $(this).offset().top >= min_top;
+ });
+ }
} catch ( e ) {
// don't throw
}
// just tell the caller no articles supplied are at or below ad-space
- return $([]);
+ return $result;
}
Slash.Firehose.choose_article_for_next_ad = function(){
- var Fh=Slash.Firehose, $articles=Fh.at_or_below_ad_space(Fh.articles_on_screen());
+ var Fh=Slash.Firehose, $articles=Fh.ready_ad_space(Fh.articles_on_screen());
return $articles.eq( Math.floor(Math.random()*$articles.length) );
}
Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/jquery/jquery.autocomplete.css
===================================================================
--- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/jquery/jquery.autocomplete.css 2008-12-15 09:15:10 UTC (rev 883)
+++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/jquery/jquery.autocomplete.css 2008-12-16 03:30:11 UTC (rev 884)
@@ -31,6 +31,7 @@
in relative units scroll will be broken in firefox
*/
line-height: 16px;
+ text-align: left;
overflow: hidden;
}
Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/tag-ui.css
===================================================================
--- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/tag-ui.css 2008-12-15 09:15:10 UTC (rev 883)
+++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/tag-ui.css 2008-12-16 03:30:11 UTC (rev 884)
@@ -138,11 +138,12 @@
/* no mouse over highlight for datatypes */
.tag-display li.d:hover span.tag {
color: inherit;
- background-color: inherit;
+ background-color: inherit !important;
}
div.tag-display,
-div.tag-display > h1.legend {
+div.tag-display > h1.legend,
+div.tag-display > ul {
width: auto !important;
}
@@ -314,9 +315,10 @@
div.tag-display-stub,
div.tag-display {
- display: inline !important;
+ display: inline;
position: relative;
margin-left: 0 !important;
+ overflow: hidden;
/* border:1px dotted #000; *//* troubleshooting safari */
}
@@ -539,3 +541,14 @@
/*
div.tag-display ul, div.tag-display li {display: inline-block;}
*/
+
+
+/*Opera tag bugs*/
+div.tag-widget.opera div.tag-display li {/*ensures the damn pop up things stay with its parents and don't "run away"*/
+display: inline-block
+}
+
+div.tag-widget.opera {/*fixing spacing between this widget and article*/
+padding-top:18px;
+margin-top:-16px;
+}
Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/tag-ui.js
===================================================================
--- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/tag-ui.js 2008-12-15 09:15:10 UTC (rev 883)
+++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/tag-ui.js 2008-12-16 03:30:11 UTC (rev 884)
@@ -571,68 +571,8 @@
}
-function $position_context_display( $display ){
- if ( ! $related_trigger || ! $related_trigger.length ) {
- return $display;
- }
-
- var RIGHT_PADDING = 18;
-
- var $entry = $display.nearest_parent('[tag-server]');
- var left_edge = $entry.offset().left;
- var right_edge = left_edge + $entry.width() - RIGHT_PADDING;
-
- var global_align = $related_trigger.offset().left;
- global_align = Math.max(left_edge, global_align);
-
- var need_minimal_fix = true;
- if ( $display.is(':visible') ) {
- try {
- var display_width = $display.children('ul:first').width();
- $display.css({
- right: ''
- });
-
- global_align = Math.max(
- left_edge,
- Math.min(right_edge-display_width, global_align) );
- var distance = global_align - $display.offset().left;
- if ( distance ) {
- $display.animate({left: '+='+distance});
- }
-
- need_minimal_fix = false;
- } catch (e0) {
- }
- }
-
- if ( need_minimal_fix ) {
- try {
- var BROKEN_NEGATIVE_MARGIN_CALCULATION = -10;
-
- // we may not be visible, so can't trust offsetParent() on ourself
- // better get it from our parent
- var x_adjust = -$display.parent().offsetParent().offset().left;
- $display.css({
- left: global_align + x_adjust + BROKEN_NEGATIVE_MARGIN_CALCULATION,
- right: right_edge + x_adjust
- });
- } catch (e1) {
- }
- }
-
- return $display;
-}
-
-function $queue_reposition( $display, if_only_width ){
- return $display.queue(function(){
- $position_context_display($display, if_only_width);
- $(this).dequeue();
- });
-}
-
var gFocusedText;
-var $previous_context_trigger = $().filter();
+var $previous_context_trigger = $([]);
var tag_widget_fns = {
@@ -684,11 +624,13 @@
set_context: function( context, force ){
var widget = this;
+ var new_trigger = !$previous_context_trigger.length || ($previous_context_trigger[0] !== $related_trigger[0]);
+ var new_context = context != this._current_context;
+
if ( context ) {
- if ( context == this._current_context &&
- (!$previous_context_trigger.length ||
- $related_trigger[0] === $previous_context_trigger[0]) && !force ) {
+ if ( !new_context && !new_trigger && !force ) {
context = '';
+ new_context = true;
} else {
if ( !(context in suggestions_for_context) && context in context_triggers ) {
context = (this._current_context != 'default') ? 'default' : '';
@@ -703,52 +645,65 @@
this._context_timeout = null;
}
- // only have to set_tags on the display if the context really is changing
- if ( context != this._current_context ) {
+ // only have to set_tags on the display if the something really changed
+ if ( new_context || new_trigger ) {
var context_tags = [];
if ( context && context in suggestions_for_context ) {
context_tags = list_as_array(suggestions_for_context[context]);
}
- var has_tags = context_tags.length !== 0;
-
$('.ready[context=related]', this)
.each(function(){
var display = this;
var $display = $(display);
- var had_tags = $display.find('span.tag').length !== 0;
-
- // animations are automatically queued...
- if ( had_tags < has_tags ) {
- $display.css('display', 'none');
- } else if ( had_tags > has_tags ) {
+ if ( $display.find('span.tag').length ) {
$display.slideUp(400);
}
- // ...when regular code needs to synchronize with animation
- $display.queue(function(){
- // I have to queue that code up myself
- display.set_tags(context_tags, { classes: 'suggestion' });
- if ( has_tags && widget.modify_context ) {
- widget.modify_context(display, context);
- }
- $display.dequeue();
- });
- if ( has_tags ) {
- $queue_reposition($display);
- if ( !had_tags ) {
- $queue_reposition($display.slideDown(400));
- }
+
+
+
+ if ( context_tags.length ) {
+ var $parent = $display.parent(),
+ global_left = $related_trigger.offset().left,
+ parent_left = $parent.offset().left,
+ best_left = global_left - parent_left;
+
+ $display.queue(function(){
+ // ...when regular code needs to synchronize with animation
+ // I have to queue that code up myself
+
+ // if display had no tags before, $display.hide() would silently fail, because it's already hidden
+ // so hide the widget itself while we make the changes
+ $parent.hide();
+ display.set_tags(context_tags, { classes: 'suggestion' });
+ if ( widget.modify_context ) {
+ widget.modify_context(display, context);
+ }
+
+ // now hide() will work, so hide the display (child) instead of the widget (parent)
+ // but we can't _really_ hide it, because we need to ask its width
+ $display.show().css('height', '0');
+ $parent.show();
+ try {
+ var max_left = $parent.width() - $display.find('ul').width();
+ best_left = Math.min(best_left, max_left);
+ } catch ( e0 ) {
+ }
+
+ $display.hide();
+ $display.css({
+ height: '',
+ left: best_left
+ });
+
+ $display.slideDown(400);
+ $display.dequeue();
+ });
}
});
this._current_context = context;
- } else if ( context &&
- $related_trigger.length &&
- $previous_context_trigger.length &&
- $previous_context_trigger[0] !== $related_trigger[0] ) {
-
- $position_context_display($('.ready[context=related]', this));
}
$previous_context_trigger = $related_trigger;
@@ -1076,10 +1031,14 @@
update_class_map(well_known_tags, 't2', YAHOO.slashdot.topicTags);
update_class_map(well_known_tags, 'y p', ['nod', 'metanod']);
update_class_map(well_known_tags, 'x p', ['nix', 'metanix']);
+ update_class_map(well_known_tags, 'p', ['mainpage']); // Rob requests 'mainpage' never show its face
update_class_map(well_known_tags, 'd', data_types);
if ( fh_is_admin ) {
update_class_map(well_known_tags, 'w p', ['signed', 'unsigned', 'signoff']);
+ update_class_map(well_known_tags, 'd', ['unknown']); // Tags.pm debugging
+ } else {
+ update_class_map(well_known_tags, 'd p', ['unknown']); // Tags.pm debugging, non-admins don't get to see
}
});
Modified: slashjp/branches/upstream/current/plugins/Ajax/templates/tag_ui_widget;misc;default
===================================================================
--- slashjp/branches/upstream/current/plugins/Ajax/templates/tag_ui_widget;misc;default 2008-12-15 09:15:10 UTC (rev 883)
+++ slashjp/branches/upstream/current/plugins/Ajax/templates/tag_ui_widget;misc;default 2008-12-16 03:30:11 UTC (rev 884)
@@ -17,9 +17,17 @@
__seclev__
10000
__template__
-[% IF user.tags_canread_stories %]
-[% tags_reader = Slash.getObject('Slash::Tags'); tags = tags_reader.setGetCombinedTags(key, key_type); %]
-[%# the tag-widget itself %]
+[% IF user.tags_canread_stories -%]
+[% tags_reader = Slash.getObject('Slash::Tags'); tag_info = tags_reader.setGetCombinedTags(key, key_type); -%]
+[% IF tag_info.datatype == 'story' -%]
+[% IF key_type == 'stoid' -%]
+[% tag_info.stoid = key -%]
+[% ELSE -%]
+[% tag_info.stoid = item.srcid -%]
+[% END -%]
+[% END -%]
+
+[%# the tag-widget itself -%]
[%# the disclosure triangle %]
@@ -31,31 +39,31 @@
- [% IF user.tags_canwrite_stories %]
- [%# the tag input field %]
+ [% IF user.tags_canwrite_stories -%]
+ [%# the tag input field -%]
- [% END %]
+ [% END -%]
- [%# the tag 'bars' %]
- [% IF user.tags_canwrite_stories %]
+ [%# the tag 'bars' -%]
+ [% IF user.tags_canwrite_stories -%]
[% END %]
-
[% END %]
Modified: slashjp/branches/upstream/current/themes/slashcode/templates/u2Menu;users;default
===================================================================
--- slashjp/branches/upstream/current/themes/slashcode/templates/u2Menu;users;default 2008-12-15 09:15:10 UTC (rev 883)
+++ slashjp/branches/upstream/current/themes/slashcode/templates/u2Menu;users;default 2008-12-16 03:30:11 UTC (rev 884)
@@ -15,14 +15,14 @@
[% tilde = '^'; IF constants.u2; tilde = '~'; END; %]
-[% nickname | strip_literal %]
-Firehose
+[% nickname | strip_literal %][% IF active; PROCESS u2_rsslink useredit=useredit name="firehose"; END %]
+Firehose[% IF active; PROCESS u2_rsslink useredit=useredit name="firehose"; END;%]
[% IF comments_size != 0 %]Comments[% END %]
-[% IF journals_size != 0 %]Journals[% END %]
-[% IF submissions_size != 0 %]Submissions[% END %]
-[% IF bookmarks_size != 0 %]Bookmarks[% END %]
+[% IF journals_size != 0 %]Journals [% IF active; PROCESS u2_rsslink useredit=useredit name="journal"; END; %][% END %]
+[% IF submissions_size != 0 %]Submissions[% IF active; PROCESS u2_rsslink useredit=useredit name="submissions"; END %][% END %]
+[% IF bookmarks_size != 0 %]Bookmarks[% IF active; PROCESS u2_rsslink useredit=useredit name="bookmarks"; END %][% END %]
Friends
-[% IF tagshist_size > 2 || data_pane == "usertag" %]Tags[% END %]
+[% IF tagshist_size > 2 || data_pane == "usertag" %]Tags[% IF data_pane == 'usertag'; PROCESS u2_rsslink useredit=useredit name="usertag"; END; %][% END %]
[% IF is_admin %]Admin[% END %]
![RSS for [% alt %]]([% constants.imagedir %]/feed.png)
");ajax_update({op:'firehose_get_media',id:id},'modal_box_content');}
+function firehose_get_media_popup(id){$('#preference_title').html('Media');show_modal_box();$('#modal_box_content').html("