From svnnotify ¡÷ sourceforge.jp Tue Jul 1 14:58:10 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 01 Jul 2008 14:58:10 +0900 Subject: [Slashdotjp-dev 1154] [681] Add journal page margin Message-ID: <1214891890.379795.2128.nullmailer@users.sourceforge.jp> Revision: 681 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=681 Author: tach Date: 2008-07-01 14:58:10 +0900 (Tue, 01 Jul 2008) Log Message: ----------- Add journal page margin Modified Paths: -------------- images/css/m.css -------------- next part -------------- Modified: images/css/m.css =================================================================== --- images/css/m.css 2008-06-27 17:22:53 UTC (rev 680) +++ images/css/m.css 2008-07-01 05:58:10 UTC (rev 681) @@ -35,6 +35,7 @@ div#sitename, div#index, div#article, +div#journal, div#comments { margin: 0 0.2em; } From svnnotify ¡÷ sourceforge.jp Tue Jul 1 15:36:20 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 01 Jul 2008 15:36:20 +0900 Subject: [Slashdotjp-dev 1155] [682] simplify robots.txt rule Message-ID: <1214894180.355878.29349.nullmailer@users.sourceforge.jp> Revision: 682 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=682 Author: tach Date: 2008-07-01 15:36:20 +0900 (Tue, 01 Jul 2008) Log Message: ----------- simplify robots.txt rule Modified Paths: -------------- images/robots.txt -------------- next part -------------- Modified: images/robots.txt =================================================================== --- images/robots.txt 2008-07-01 05:58:10 UTC (rev 681) +++ images/robots.txt 2008-07-01 06:36:20 UTC (rev 682) @@ -7,79 +7,24 @@ User-agent: Mediapartners-Google Disallow: -User-agent: Googlebot -Crawl-delay: 100 -Disallow: /firehose.pl -Disallow: /submit.pl -Disallow: /users.pl -Disallow: /zoo.pl -Disallow: firehose.pl -Disallow: submit.pl -Disallow: users.pl -Disallow: zoo.pl - -User-agent: Slurp -Crawl-delay: 100 -Disallow: /firehose.pl -Disallow: /submit.pl -Disallow: /users.pl -Disallow: /zoo.pl -Disallow: firehose.pl -Disallow: submit.pl -Disallow: users.pl -Disallow: zoo.pl - -User-agent: Yahoo-NewsCrawler -Disallow: /firehose.pl -Disallow: /submit.pl -Disallow: /users.pl -Disallow: /zoo.pl -Disallow: firehose.pl -Disallow: submit.pl -Disallow: users.pl -Disallow: zoo.pl - -User-Agent: msnbot -Crawl-delay: 100 -Disallow: /firehose.pl -Disallow: /submit.pl -Disallow: /users.pl -Disallow: /zoo.pl -Disallow: firehose.pl -Disallow: submit.pl -Disallow: users.pl -Disallow: zoo.pl - User-agent: * -Crawl-delay: 100 -Disallow: /authors.pl -Disallow: /index.pl -Disallow: /article.pl -Disallow: /comments.pl +Crawl-delay: 5 +Disallow: /404.pl +Disallow: /admin.pl +Disallow: /ajax.pl +Disallow: /blob.pl +Disallow: /bookmark.pl +Disallow: /fileadmin.pl Disallow: /firehose.pl -Disallow: /journal.pl +Disallow: /hof.pl +Disallow: /login.pl Disallow: /messages.pl Disallow: /metamod.pl -Disallow: /users.pl -Disallow: /search.pl -Disallow: /submit.pl -Disallow: /pollBooth.pl Disallow: /pubkey.pl -Disallow: /topics.pl +Disallow: /relocate.pl +Disallow: /slashdot-it.pl +Disallow: /stats.pl +Disallow: /submit.pl +Disallow: /tags.pl +Disallow: /users.pl Disallow: /zoo.pl -Disallow: authors.pl -Disallow: index.pl -Disallow: article.pl -Disallow: comments.pl -Disallow: firehose.pl -Disallow: journal.pl -Disallow: messages.pl -Disallow: metamod.pl -Disallow: users.pl -Disallow: search.pl -Disallow: submit.pl -Disallow: pollBooth.pl -Disallow: pubkey.pl -Disallow: topics.pl -Disallow: zoo.pl -Disallow: /i From svnnotify ¡÷ sourceforge.jp Sat Jul 5 13:13:03 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 05 Jul 2008 13:13:03 +0900 Subject: [Slashdotjp-dev 1156] [683] * Add vars "modreasons_disabled" to insert "disabled => 1" for getReasons() Message-ID: <1215231183.483316.2301.nullmailer@users.sourceforge.jp> Revision: 683 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=683 Author: tach Date: 2008-07-05 13:13:03 +0900 (Sat, 05 Jul 2008) Log Message: ----------- * Add vars "modreasons_disabled" to insert "disabled => 1" for getReasons() Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm slashjp/branches/2.5.0.192/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-01 06:36:20 UTC (rev 682) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-05 04:13:03 UTC (rev 683) @@ -1,3 +1,9 @@ +slash (2.5.0.192-15) unstable; urgency=low + + * Add vars "modreasons_disabled" to insert "disabled => 1" for getReasons() + + -- Taku YASUI Sat, 5 Jul 2008 04:11:24 +0000 + slash (2.5.0.192-14) unstable; urgency=low * Fix to change commentsort for mobile mode from 5 to 4 Modified: slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm =================================================================== --- slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm 2008-07-01 06:36:20 UTC (rev 682) +++ slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm 2008-07-05 04:13:03 UTC (rev 683) @@ -41,9 +41,16 @@ sub getReasons { my($self) = @_; my $table_cache = "_reasons_cache"; - $self->{$table_cache} ||= $self->sqlSelectAllHashref( + return {( %{$self->{$table_cache}} )} if ($self->{$table_cache}); + + $self->{$table_cache} = $self->sqlSelectAllHashref( "id", "*", "modreasons" ); + my $mrd = getCurrentStatic('modreasons_disabled') || ''; + foreach my $d (split(/,/, $mrd)) { + $d = int($d); + $self->{$table_cache}{$d}{disabled} = 1; + } return {( %{$self->{$table_cache}} )}; } Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql =================================================================== --- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-01 06:36:20 UTC (rev 682) +++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-05 04:13:03 UTC (rev 683) @@ -1153,6 +1153,7 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('mobile_commentmode','flat','comment mode for mobile mode'); INSERT IGNORE INTO vars (name, value, description) VALUES ('enable_template_evalperl','0','Add "EVAL_PERL" to Template option to be able to use "PERL" and "RAWPERL" directives'); INSERT IGNORE INTO vars (name, value, description) VALUES ('related_cid_disabled','0','If set, then disable inserting cid to related story list'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('modreasons_disabled','','Comma separated "modreasons.id"s disable to select when moderation'); UPDATE vars SET value='text/html; charset=UTF-8' WHERE name='content_type_webpage'; UPDATE vars SET value='0' WHERE name='draconian_charset'; UPDATE vars SET value='UTF-8' WHERE name='rdfencoding'; From svnnotify ¡÷ sourceforge.jp Sat Jul 5 21:32:18 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 05 Jul 2008 21:32:18 +0900 Subject: [Slashdotjp-dev 1157] [684] * Change varname from "modreasons_disabled" to " modreasons_select_disabled". Message-ID: <1215261138.261327.27432.nullmailer@users.sourceforge.jp> Revision: 684 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=684 Author: tach Date: 2008-07-05 21:32:18 +0900 (Sat, 05 Jul 2008) Log Message: ----------- * Change varname from "modreasons_disabled" to "modreasons_select_disabled". * Disable to show when the key "select_disabled" is true at Slash.createSelect(). Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm slashjp/branches/2.5.0.192/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm 2008-07-05 04:13:03 UTC (rev 683) +++ slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm 2008-07-05 12:32:18 UTC (rev 684) @@ -188,6 +188,7 @@ if ($all_name) { $hashref = { map { ($_, $hashref->{$_}{name}) } + grep { !$hashref->{$_}{select_disabled} } keys %$hashref }; } Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-05 04:13:03 UTC (rev 683) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-05 12:32:18 UTC (rev 684) @@ -1,8 +1,8 @@ slash (2.5.0.192-15) unstable; urgency=low - * Add vars "modreasons_disabled" to insert "disabled => 1" for getReasons() + * Add vars "modreasons_select_disabled" to insert "disabled => 1" for getReasons() - -- Taku YASUI Sat, 5 Jul 2008 04:11:24 +0000 + -- Taku YASUI Sat, 5 Jul 2008 12:30:25 +0000 slash (2.5.0.192-14) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm =================================================================== --- slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm 2008-07-05 04:13:03 UTC (rev 683) +++ slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm 2008-07-05 12:32:18 UTC (rev 684) @@ -46,10 +46,10 @@ $self->{$table_cache} = $self->sqlSelectAllHashref( "id", "*", "modreasons" ); - my $mrd = getCurrentStatic('modreasons_disabled') || ''; + my $mrd = getCurrentStatic('modreasons_select_disabled') || ''; foreach my $d (split(/,/, $mrd)) { $d = int($d); - $self->{$table_cache}{$d}{disabled} = 1; + $self->{$table_cache}{$d}{select_disabled} = 1; } return {( %{$self->{$table_cache}} )}; } Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql =================================================================== --- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-05 04:13:03 UTC (rev 683) +++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-05 12:32:18 UTC (rev 684) @@ -1153,7 +1153,7 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('mobile_commentmode','flat','comment mode for mobile mode'); INSERT IGNORE INTO vars (name, value, description) VALUES ('enable_template_evalperl','0','Add "EVAL_PERL" to Template option to be able to use "PERL" and "RAWPERL" directives'); INSERT IGNORE INTO vars (name, value, description) VALUES ('related_cid_disabled','0','If set, then disable inserting cid to related story list'); -INSERT IGNORE INTO vars (name, value, description) VALUES ('modreasons_disabled','','Comma separated "modreasons.id"s disable to select when moderation'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('modreasons_select_disabled','','Comma separated "modreasons.id"s disable to select when moderation'); UPDATE vars SET value='text/html; charset=UTF-8' WHERE name='content_type_webpage'; UPDATE vars SET value='0' WHERE name='draconian_charset'; UPDATE vars SET value='UTF-8' WHERE name='rdfencoding'; From svnnotify ¡÷ sourceforge.jp Sat Jul 5 21:48:04 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 05 Jul 2008 21:48:04 +0900 Subject: [Slashdotjp-dev 1158] [685] add "select_disabled" value at constants.reasons values Message-ID: <1215262084.177035.5960.nullmailer@users.sourceforge.jp> Revision: 685 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=685 Author: tach Date: 2008-07-05 21:48:04 +0900 (Sat, 05 Jul 2008) Log Message: ----------- add "select_disabled" value at constants.reasons values Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm 2008-07-05 12:32:18 UTC (rev 684) +++ slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm 2008-07-05 12:48:04 UTC (rev 685) @@ -8068,6 +8068,9 @@ $conf{reasons} = $self->sqlSelectAllHashref( "id", "*", "modreasons" ); + foreach my $d (split(/,/, $conf{modreasons_select_disabled} || '')) { + $conf{reasons}{int($d)}{select_disabled} = 1; + } } $conf{rootdir} ||= "//$conf{basedomain}"; From svnnotify ¡÷ sourceforge.jp Sat Jul 5 22:59:11 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 05 Jul 2008 22:59:11 +0900 Subject: [Slashdotjp-dev 1159] [686] [svn-buildpackage] Tagging slash (2.5.0.192-15) Message-ID: <1215266351.067611.32529.nullmailer@users.sourceforge.jp> Revision: 686 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=686 Author: tach Date: 2008-07-05 22:59:10 +0900 (Sat, 05 Jul 2008) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.192-15) Added Paths: ----------- slashjp/tags/2.5.0.192-15/ -------------- next part -------------- Copied: slashjp/tags/2.5.0.192-15 (from rev 685, slashjp/branches/2.5.0.192) From svnnotify ¡÷ sourceforge.jp Mon Jul 7 19:39:29 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 19:39:29 +0900 Subject: [Slashdotjp-dev 1160] [687] * Fix for reason_modifier setting for users.pl Message-ID: <1215427169.883015.17080.nullmailer@users.sourceforge.jp> Revision: 687 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=687 Author: tach Date: 2008-07-07 19:39:29 +0900 (Mon, 07 Jul 2008) Log Message: ----------- * Fix for reason_modifier setting for users.pl * Use reason_id as key instead of name Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-05 13:59:10 UTC (rev 686) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-07 10:39:29 UTC (rev 687) @@ -1,3 +1,10 @@ +slash (2.5.0.192-16) unstable; urgency=low + + * Fix for reason_modifier setting for users.pl + * Use reason_id as key instead of name + + -- Taku YASUI Mon, 7 Jul 2008 10:38:26 +0000 + slash (2.5.0.192-15) unstable; urgency=low * Add vars "modreasons_select_disabled" to insert "disabled => 1" for getReasons() Modified: slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl 2008-07-05 13:59:10 UTC (rev 686) +++ slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl 2008-07-07 10:39:29 UTC (rev 687) @@ -2155,6 +2155,8 @@ my @reasons = ( ); my %reason_select = ( ); + my $reasons_plus = {}; + my $reasons_minus = {}; if ($constants->{m1}) { my $mod_reader = getObject("Slash::$constants->{m1_pluginname}", { db_type => 'reader' }); my $reasons = $mod_reader->getReasons(); @@ -2162,12 +2164,20 @@ push @reasons, $reasons->{$id}{name}; } # Reason modifiers - for my $reason_name (@reasons) { - my $key = "reason_alter_$reason_name"; - $reason_select{$reason_name} = createSelect( + for my $id (sort { $a <=> $b } keys %$reasons) { + next unless ($reasons->{$id}{listable}); + my $key = "reason_alter_$id"; + $reasons->{$id}{reason_select} = createSelect( $key, \@range, $user_edit->{$key} || 0, 1, 1 ); + if ($reasons->{$id}{val} > 0) { + $reasons_plus->{$id} = $reasons->{$id}; + } elsif ($reasons->{$id}{val} < 0) { + $reasons_minus->{$id} = $reasons->{$id}; + } else { + next; + } } } @@ -2273,6 +2283,8 @@ range => \@range, reasons => \@reasons, reason_select => \%reason_select, + reasons_minus => $reasons_minus, + reasons_plus => $reasons_plus, people => \@people, people_select => \%people_select, new_user_percent_select => $new_user_percent_select, @@ -2819,9 +2831,9 @@ push @reasons, $reasons->{$id}{name}; } - for my $reason_id (%$reasons) { - next unless $reasons->{$reason_id}{listable}; - my $key = "reason_alter_$reason_id"; + for my $id (sort { $a <=> $b } keys %$reasons) { + next unless $reasons->{$id}{listable}; + my $key = "reason_alter_$id"; my $answer = $form->{$key} || 0; $answer = 0 if !$answer || $answer !~ /^[\-+]?\d+$/; $user_edits_table->{$key} = ($answer == 0) ? '' : $answer; From svnnotify ¡÷ sourceforge.jp Mon Jul 7 19:40:03 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 19:40:03 +0900 Subject: [Slashdotjp-dev 1161] [688] add reason_modifier table css Message-ID: <1215427203.499436.17952.nullmailer@users.sourceforge.jp> Revision: 688 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=688 Author: tach Date: 2008-07-07 19:40:03 +0900 (Mon, 07 Jul 2008) Log Message: ----------- add reason_modifier table css Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-07-07 10:39:29 UTC (rev 687) +++ images/css/slashdotjp.css 2008-07-07 10:40:03 UTC (rev 688) @@ -212,6 +212,18 @@ font-weight: bold; } +/* users.pl modifiers */ +div#users table#reason_modifiers table.reason_modifiers { + padding-left: 1.5em; +} +div#users table#reason_modifiers td { + vertical-align: top; +} +div#users table#reasons_plus td, +div#users table#reasons_minus td { + vertical-align: middle; +} + /* code.shtml rss link */ a.feed { background: url(//images.slashdot.jp/feed-14x14.png) left no-repeat; From svnnotify ¡÷ sourceforge.jp Mon Jul 7 20:16:49 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 20:16:49 +0900 Subject: [Slashdotjp-dev 1162] [689] Add workaround for unicode WAVE DASH problem Message-ID: <1215429409.886162.17803.nullmailer@users.sourceforge.jp> Revision: 689 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=689 Author: tach Date: 2008-07-07 20:16:49 +0900 (Mon, 07 Jul 2008) Log Message: ----------- Add workaround for unicode WAVE DASH problem Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Utility/System/System.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Utility/System/System.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Utility/System/System.pm 2008-07-07 10:40:03 UTC (rev 688) +++ slashjp/branches/2.5.0.192/Slash/Utility/System/System.pm 2008-07-07 11:16:49 UTC (rev 689) @@ -122,6 +122,12 @@ return 0; } + # workaround for unicode WAVE DASH problem... + if ($constants->{tweak_japanese}) { + $content =~ tr/\x{ff5e}/\x{301c}/; + $subject =~ tr/\x{ff5e}/\x{301c}/; + } + # Character Code Conversion; target encoding must be valid name # Characters not representable in the destination character set # and encoding will be replaced with \x{HHHH} place-holders Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-07 10:40:03 UTC (rev 688) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-07 11:16:49 UTC (rev 689) @@ -1,9 +1,10 @@ slash (2.5.0.192-16) unstable; urgency=low * Fix for reason_modifier setting for users.pl - * Use reason_id as key instead of name + - Use reason_id as key instead of name + * Add workaround for unicode WAVE DASH problem - -- Taku YASUI Mon, 7 Jul 2008 10:38:26 +0000 + -- Taku YASUI Mon, 7 Jul 2008 11:16:23 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Jul 9 16:54:35 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 09 Jul 2008 16:54:35 +0900 Subject: [Slashdotjp-dev 1163] [690] * Add "dc:source" and "dc:relation" to RSS output Message-ID: <1215590075.969968.5116.nullmailer@users.sourceforge.jp> Revision: 690 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=690 Author: tach Date: 2008-07-09 16:54:35 +0900 (Wed, 09 Jul 2008) Log Message: ----------- * Add "dc:source" and "dc:relation" to RSS output Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-07 11:16:49 UTC (rev 689) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-09 07:54:35 UTC (rev 690) @@ -324,6 +324,10 @@ if $item->{'time'}; $encoded_item->{dc}{creator} = $self->encode($item->{creator}) if $item->{creator}; + $encoded_item->{dc}{source} = $item->{source} + if $item->{source}; + $encoded_item->{dc}{relation} = $item->{relation} + if $item->{relation}; } for my $key (keys %$item) { Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-07 11:16:49 UTC (rev 689) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 07:54:35 UTC (rev 690) @@ -3,8 +3,9 @@ * Fix for reason_modifier setting for users.pl - Use reason_id as key instead of name * Add workaround for unicode WAVE DASH problem + * Add "dc:source" and "dc:relation" to RSS output - -- Taku YASUI Mon, 7 Jul 2008 11:16:23 +0000 + -- Taku YASUI Wed, 9 Jul 2008 07:53:55 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Jul 9 18:34:48 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 09 Jul 2008 18:34:48 +0900 Subject: [Slashdotjp-dev 1164] [691] * Change "sitename.(rss|ref|xml|atom)" to including all stories even if Message-ID: <1215596088.430092.20626.nullmailer@users.sourceforge.jp> Revision: 691 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=691 Author: tach Date: 2008-07-09 18:34:48 +0900 (Wed, 09 Jul 2008) Log Message: ----------- * Change "sitename.(rss|ref|xml|atom)" to including all stories even if section local Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm 2008-07-09 07:54:35 UTC (rev 690) +++ slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm 2008-07-09 09:34:48 UTC (rev 691) @@ -83,7 +83,7 @@ my $constants = getCurrentStatic(); my $limit = $options->{limit} || 10; - my $topic = $options->{topic} || getCurrentStatic('mainpage_nexus_tid'); + my $topic = $options->{topic}; my $select = "stories.stoid AS stoid, sid, title, stories.tid AS tid, primaryskid, time, dept, stories.uid AS uid, commentcount, hitparade, introtext, bodytext, stories.qid as qid"; @@ -92,10 +92,12 @@ my $where = "stories.stoid = story_text.stoid AND time < NOW() AND in_trash = 'no' - AND stories.stoid = story_topics_rendered.stoid - AND story_topics_rendered.tid=$topic"; + AND stories.stoid = story_topics_rendered.stoid"; + if ($topic) { + $where .= " AND story_topics_rendered.tid=$topic"; + } - my $other = "ORDER BY time DESC LIMIT $limit"; + my $other = "GROUP BY sid ORDER BY time DESC LIMIT $limit"; my $returnable = $self->sqlSelectAllHashrefArray($select, $from, $where, $other); Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 07:54:35 UTC (rev 690) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 09:34:48 UTC (rev 691) @@ -4,8 +4,10 @@ - Use reason_id as key instead of name * Add workaround for unicode WAVE DASH problem * Add "dc:source" and "dc:relation" to RSS output + * Change "sitename.(rss|ref|xml|atom)" to including all stories even if + section local - -- Taku YASUI Wed, 9 Jul 2008 07:53:55 +0000 + -- Taku YASUI Wed, 9 Jul 2008 09:33:04 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Thu Jul 10 01:43:48 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 01:43:48 +0900 Subject: [Slashdotjp-dev 1165] [692] * Change journal top rss including html description and change URL adding Message-ID: <1215621828.994647.4351.nullmailer@users.sourceforge.jp> Revision: 692 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=692 Author: tach Date: 2008-07-10 01:43:48 +0900 (Thu, 10 Jul 2008) Log Message: ----------- * Change journal top rss including html description and change URL adding journal id Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm slashjp/branches/2.5.0.192/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-09 09:34:48 UTC (rev 691) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-09 16:43:48 UTC (rev 692) @@ -324,11 +324,11 @@ if $item->{'time'}; $encoded_item->{dc}{creator} = $self->encode($item->{creator}) if $item->{creator}; - $encoded_item->{dc}{source} = $item->{source} - if $item->{source}; - $encoded_item->{dc}{relation} = $item->{relation} - if $item->{relation}; } + $encoded_item->{dc}{source} = $item->{source} + if $item->{source}; + $encoded_item->{dc}{relation} = $item->{relation} + if $item->{relation}; for my $key (keys %$item) { if ($key eq 'description') { Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 09:34:48 UTC (rev 691) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 16:43:48 UTC (rev 692) @@ -6,8 +6,10 @@ * Add "dc:source" and "dc:relation" to RSS output * Change "sitename.(rss|ref|xml|atom)" to including all stories even if section local + * Change journal top rss including html description and change URL adding + journal id - -- Taku YASUI Wed, 9 Jul 2008 09:33:04 +0000 + -- Taku YASUI Wed, 9 Jul 2008 16:42:42 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm =================================================================== --- slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-07-09 09:34:48 UTC (rev 691) +++ slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-07-09 16:43:48 UTC (rev 692) @@ -330,7 +330,7 @@ $self->sqlConnect; my $sql = <[0] == 1 && ($type eq 'count' || $type eq 'friends'); push @items, { + story => { + 'time' => $entry->[3], + uid => $entry->[2], + }, title => $title, - link => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/", + link => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/$entry->[4]", + 'content:encoded' => balanceTags(strip_mode($entry->[6], $entry->[7]), { deep_nesting => 1 }), description => strip_notags($entry->[6]), + relation => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/", }; } @@ -339,7 +345,8 @@ 'link' => "$gSkin->{absolutedir}/journal.pl?op=top", }, image => 1, - items => \@items + items => \@items, + rdfitemdesc => $constants->{journal_rdfitemdesc}, }); } From svnnotify ¡÷ sourceforge.jp Thu Jul 10 02:00:52 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 02:00:52 +0900 Subject: [Slashdotjp-dev 1166] [693] * add tid for journal top RSS item Message-ID: <1215622852.497665.19955.nullmailer@users.sourceforge.jp> Revision: 693 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=693 Author: tach Date: 2008-07-10 02:00:52 +0900 (Thu, 10 Jul 2008) Log Message: ----------- * add tid for journal top RSS item * fix topCount data for journal top Modified Paths: -------------- slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm slashjp/branches/2.5.0.192/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm =================================================================== --- slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-07-09 16:43:48 UTC (rev 692) +++ slashjp/branches/2.5.0.192/plugins/Journal/Journal.pm 2008-07-09 17:00:52 UTC (rev 693) @@ -301,25 +301,17 @@ $self->sqlConnect; my $sql = <{_dbh}->selectall_arrayref($sql); + return [ ] if !$losers || !@$losers; - my $sql2 = sprintf <[4] } @$losers); -SELECT id, description -FROM journals -WHERE id IN (%s) -EOT - my $losers2 = $self->{_dbh}->selectall_hashref($sql2, 'id'); - - for (@$losers) { - $_->[5] = $losers2->{$_->[4]}{description}; - } - return $losers; } @@ -330,7 +322,7 @@ $self->sqlConnect; my $sql = < { 'time' => $entry->[3], uid => $entry->[2], + tid => $entry->[8], }, title => $title, link => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/$entry->[4]", From svnnotify ¡÷ sourceforge.jp Thu Jul 10 13:08:45 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 13:08:45 +0900 Subject: [Slashdotjp-dev 1167] [694] * Add new journal top rss url: "/journals/top/rss" and Message-ID: <1215662925.826462.23722.nullmailer@users.sourceforge.jp> Revision: 694 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=694 Author: tach Date: 2008-07-10 13:08:45 +0900 (Thu, 10 Jul 2008) Log Message: ----------- * Add new journal top rss url: "/journals/top/rss" and "/journals/top/recent/rss" Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-09 17:00:52 UTC (rev 693) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-10 04:08:45 UTC (rev 694) @@ -597,6 +597,10 @@ my($word, $query) = ($1, $2); my @args = ($query); $word =~ s{/}{_}g; + if ($word =~ /^(.+)_rss$/) { + $word = $1; + push @args, "content_type=rss"; + } push @args, "op=$word" if ($word); $r->args(join('&', @args)); $r->uri('/journal.pl'); Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 17:00:52 UTC (rev 693) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-10 04:08:45 UTC (rev 694) @@ -8,8 +8,10 @@ section local * Change journal top rss including html description and change URL adding journal id + * Add new journal top rss url: "/journals/top/rss" and + "/journals/top/recent/rss" - -- Taku YASUI Wed, 9 Jul 2008 16:42:42 +0000 + -- Taku YASUI Thu, 10 Jul 2008 04:07:53 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/Journal/journal.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-09 17:00:52 UTC (rev 693) +++ slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-10 04:08:45 UTC (rev 694) @@ -100,7 +100,7 @@ # hijack feeds if ($form->{content_type} && $form->{content_type} =~ $constants->{feed_types}) { - if ($op eq 'top' && $top_ok) { + if ($op =~ /^top/ && $top_ok) { displayTopRSS($journal, $constants, $user, $form, $journal_reader, $gSkin); } else { displayRSS($journal, $constants, $user, $form, $journal_reader, $gSkin); From svnnotify ¡÷ sourceforge.jp Thu Jul 10 13:53:22 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 13:53:22 +0900 Subject: [Slashdotjp-dev 1168] [695] * Add "readmore" link for journal top rss Message-ID: <1215665602.863231.24248.nullmailer@users.sourceforge.jp> Revision: 695 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=695 Author: tach Date: 2008-07-10 13:53:22 +0900 (Thu, 10 Jul 2008) Log Message: ----------- * Add "readmore" link for journal top rss Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-10 04:08:45 UTC (rev 694) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-10 04:53:22 UTC (rev 695) @@ -10,8 +10,9 @@ journal id * Add new journal top rss url: "/journals/top/rss" and "/journals/top/recent/rss" + * Add "readmore" link for journal top rss - -- Taku YASUI Thu, 10 Jul 2008 04:07:53 +0000 + -- Taku YASUI Thu, 10 Jul 2008 04:52:56 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/Journal/journal.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-10 04:08:45 UTC (rev 694) +++ slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-10 04:53:22 UTC (rev 695) @@ -325,25 +325,34 @@ $title =~ s/s$// if $entry->[0] == 1 && ($type eq 'count' || $type eq 'friends'); + my $link = "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/$entry->[4]"; + my $journalurl = "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/"; + my $text = strip_mode($entry->[6], $entry->[7]); + $text .= getData('rss_readmore', { + link => $link, + journalurl => $journalurl, + nickname => $entry->[1], + }); + push @items, { story => { 'time' => $entry->[3], uid => $entry->[2], tid => $entry->[8], }, - title => $title, - link => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/$entry->[4]", - 'content:encoded' => balanceTags(strip_mode($entry->[6], $entry->[7]), { deep_nesting => 1 }), - description => strip_notags($entry->[6]), - relation => "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/", + title => $title, + link => $link, + 'content:encoded' => balanceTags($text, { deep_nesting => 1 }), + description => strip_notags($entry->[6]), + relation => $journalurl, }; } xmlDisplay($form->{content_type} => { channel => { - title => "$constants->{sitename} Journals", - description => "Top $constants->{journal_top} Journals", - 'link' => "$gSkin->{absolutedir}/journal.pl?op=top", + title => getData('rss_top_recent_title'), + description => getData('rss_top_recent_desc'), + 'link' => "$gSkin->{absolutedir}/journals/top/", }, image => 1, items => \@items, From svnnotify ¡÷ sourceforge.jp Thu Jul 10 15:53:20 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 15:53:20 +0900 Subject: [Slashdotjp-dev 1169] [696] * Add "readmore" link for journal rss Message-ID: <1215672800.774155.21240.nullmailer@users.sourceforge.jp> Revision: 696 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=696 Author: tach Date: 2008-07-10 15:53:20 +0900 (Thu, 10 Jul 2008) Log Message: ----------- * Add "readmore" link for journal rss Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-10 04:53:22 UTC (rev 695) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-10 06:53:20 UTC (rev 696) @@ -10,9 +10,9 @@ journal id * Add new journal top rss url: "/journals/top/rss" and "/journals/top/recent/rss" - * Add "readmore" link for journal top rss + * Add "readmore" link for journal top rss and journal rss - -- Taku YASUI Thu, 10 Jul 2008 04:52:56 +0000 + -- Taku YASUI Thu, 10 Jul 2008 06:52:57 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/Journal/journal.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-10 04:53:22 UTC (rev 695) +++ slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-10 06:53:20 UTC (rev 696) @@ -252,6 +252,15 @@ $juid = $juser->{uid}; } + my $link = "$gSkin->{absolutedir}/~" . fixparam($nickname) . "/journal/$article->[3]"; + my $journalurl = "$gSkin->{absolutedir}/~" . fixparam($nickname) . "/journal/"; + my $text = strip_mode($article->[1], $article->[4]); + $text .= getData('rss_readmore', { + link => $link, + journalurl => $journalurl, + nickname => $nickname, + }); + push @items, { story => { 'time' => $article->[0], @@ -260,8 +269,9 @@ }, title => $article->[2], description => strip_notags($article->[1]), - 'content:encoded' => balanceTags(strip_mode($article->[1], $article->[4]), { deep_nesting => 1 }), + 'content:encoded' => balanceTags($text, { deep_nesting => 1 }), 'link' => root2abs() . '/~' . fixparam($nickname) . "/journal/$article->[3]", + relation => $journalurl, }; } From svnnotify ¡÷ sourceforge.jp Mon Jul 14 20:53:56 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 14 Jul 2008 20:53:56 +0900 Subject: [Slashdotjp-dev 1170] [697] * use $constants->{sitepublisher} when $constants-> {rdfpublisher} does not Message-ID: <1216036436.519947.18480.nullmailer@users.sourceforge.jp> Revision: 697 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=697 Author: tach Date: 2008-07-14 20:53:56 +0900 (Mon, 14 Jul 2008) Log Message: ----------- * use $constants->{sitepublisher} when $constants->{rdfpublisher} does not exist on creating RSS Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-10 06:53:20 UTC (rev 696) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-14 11:53:56 UTC (rev 697) @@ -191,7 +191,7 @@ subject => $constants->{rdfsubject}, language => $constants->{rdflanguage}, creator => $constants->{adminmail}, - publisher => $constants->{rdfpublisher}, + publisher => $constants->{rdfpublisher} || $constants->{sitepublisher}, rights => $constants->{rdfrights}, # syn Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-10 06:53:20 UTC (rev 696) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-14 11:53:56 UTC (rev 697) @@ -11,8 +11,10 @@ * Add new journal top rss url: "/journals/top/rss" and "/journals/top/recent/rss" * Add "readmore" link for journal top rss and journal rss + * use $constants->{sitepublisher} when $constants->{rdfpublisher} does not + exist on creating RSS - -- Taku YASUI Thu, 10 Jul 2008 06:52:57 +0000 + -- Taku YASUI Mon, 14 Jul 2008 11:53:09 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Jul 15 22:04:51 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 15 Jul 2008 22:04:51 +0900 Subject: [Slashdotjp-dev 1171] [698] Add content:encoded for story main rss Message-ID: <1216127091.328007.29508.nullmailer@users.sourceforge.jp> Revision: 698 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=698 Author: tach Date: 2008-07-15 22:04:50 +0900 (Tue, 15 Jul 2008) Log Message: ----------- Add content:encoded for story main rss Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm 2008-07-14 11:53:56 UTC (rev 697) +++ slashjp/branches/2.5.0.192/Slash/DB/Static/MySQL/MySQL.pm 2008-07-15 13:04:50 UTC (rev 698) @@ -86,7 +86,7 @@ my $topic = $options->{topic}; my $select = "stories.stoid AS stoid, sid, title, stories.tid AS tid, primaryskid, time, - dept, stories.uid AS uid, commentcount, hitparade, introtext, bodytext, stories.qid as qid"; + dept, stories.uid AS uid, commentcount, hitparade, introtext, bodytext, stories.qid as qid, discussion"; my $from = "stories, story_text, story_topics_rendered"; Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-14 11:53:56 UTC (rev 697) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-15 13:04:50 UTC (rev 698) @@ -457,6 +457,10 @@ if ($version >= 1.0) { my $desc = $self->rss_item_description($item->{description} || $story->{introtext}); + $item->{'content:encoded'} = ($item->{description} || $story->{introtext}) . getData('rss_story_readmore', { + link => $encoded_item->{link}, + discussion => $story->{discussion}, + }, 'index'); if ($desc) { $encoded_item->{description} = slashDisplay("rss_item_description", { desc => $desc, Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-14 11:53:56 UTC (rev 697) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-15 13:04:50 UTC (rev 698) @@ -13,8 +13,9 @@ * Add "readmore" link for journal top rss and journal rss * use $constants->{sitepublisher} when $constants->{rdfpublisher} does not exist on creating RSS + * Add content:encoded for story main rss - -- Taku YASUI Mon, 14 Jul 2008 11:53:09 +0000 + -- Taku YASUI Tue, 15 Jul 2008 13:04:00 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Jul 16 13:27:55 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 16 Jul 2008 13:27:55 +0900 Subject: [Slashdotjp-dev 1172] [699] Fix story postfix inserting Message-ID: <1216182475.338990.28328.nullmailer@users.sourceforge.jp> Revision: 699 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=699 Author: tach Date: 2008-07-16 13:27:55 +0900 (Wed, 16 Jul 2008) Log Message: ----------- Fix story postfix inserting Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-15 13:04:50 UTC (rev 698) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 04:27:55 UTC (rev 699) @@ -457,18 +457,19 @@ if ($version >= 1.0) { my $desc = $self->rss_item_description($item->{description} || $story->{introtext}); - $item->{'content:encoded'} = ($item->{description} || $story->{introtext}) . getData('rss_story_readmore', { - link => $encoded_item->{link}, - discussion => $story->{discussion}, - }, 'index'); if ($desc) { - $encoded_item->{description} = slashDisplay("rss_item_description", { - desc => $desc, - more => $story->{bodytext}, - link => $action, - }, { Return => 1, Nocomm => 1 }); + $encoded_item->{description} = $desc . getData('rss_story_readmore', { + 'link' => $encoded_item->{link}, + discussion => $story->{discussion}, + }, 'index'); # add poll if any $encoded_item->{description} .= pollbooth($story->{qid},1, 0, 1) if $story->{qid}; + + # add content:encoded for slashdot.jp + $item->{'content:encoded'} = ($item->{description} || $story->{introtext}) . getData('rss_story_readmore', { + 'link' => $encoded_item->{link}, + discussion => $story->{discussion}, + }, 'index'); } } From svnnotify ¡÷ sourceforge.jp Wed Jul 16 13:31:26 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 16 Jul 2008 13:31:26 +0900 Subject: [Slashdotjp-dev 1173] [700] Add "mainpage" title to "index.rss" Message-ID: <1216182686.746098.32219.nullmailer@users.sourceforge.jp> Revision: 700 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=700 Author: tach Date: 2008-07-16 13:31:26 +0900 (Wed, 16 Jul 2008) Log Message: ----------- Add "mainpage" title to "index.rss" Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-16 04:27:55 UTC (rev 699) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-16 04:31:26 UTC (rev 700) @@ -14,8 +14,9 @@ * use $constants->{sitepublisher} when $constants->{rdfpublisher} does not exist on creating RSS * Add content:encoded for story main rss + * Add "mainpage" title to "index.rss" - -- Taku YASUI Tue, 15 Jul 2008 13:04:00 +0000 + -- Taku YASUI Wed, 16 Jul 2008 04:30:46 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl =================================================================== --- slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl 2008-07-16 04:27:55 UTC (rev 699) +++ slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl 2008-07-16 04:31:26 UTC (rev 700) @@ -67,7 +67,7 @@ my $link = ($skin->{url} || $gSkin->{absolutedir}) . '/'; my $title = $constants->{sitename}; $title = "$title: $skin->{title}" - if $skin->{skid} && $skin->{skid} != $constants->{mainpage_skid} && $skin->{title}; + if $skin->{skid} && $skin->{title}; my $description = $constants->{slogan}; From svnnotify ¡÷ sourceforge.jp Wed Jul 16 18:10:20 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 16 Jul 2008 18:10:20 +0900 Subject: [Slashdotjp-dev 1174] [701] main rss fix continue Message-ID: <1216199420.896664.18974.nullmailer@users.sourceforge.jp> Revision: 701 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=701 Author: tach Date: 2008-07-16 18:10:20 +0900 (Wed, 16 Jul 2008) Log Message: ----------- main rss fix continue Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 04:31:26 UTC (rev 700) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 09:10:20 UTC (rev 701) @@ -285,8 +285,8 @@ if ($param->{textinput}) { # set defaults my %textinput = ( - title => 'Search ' . $constants->{sitename}, - description => 'Search ' . $constants->{sitename} . ' stories', + title => getData('search_header_title', {}, 'search'), + description => getData('search_header_descr', { section => $param->{skin} ? $param->{skin}{title} : undef }, 'search'), name => 'query', 'link' => $channel{'link'} . 'search.pl', ); Modified: slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl =================================================================== --- slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl 2008-07-16 04:31:26 UTC (rev 700) +++ slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl 2008-07-16 09:10:20 UTC (rev 701) @@ -65,6 +65,7 @@ my $skin = { }; $skin = $slashdb->getSkin($name) if $name; my $link = ($skin->{url} || $gSkin->{absolutedir}) . '/'; + $link =~ s!/+$!/!; my $title = $constants->{sitename}; $title = "$title: $skin->{title}" if $skin->{skid} && $skin->{title}; @@ -119,6 +120,7 @@ version => $version, textinput => 1, image => 1, + skin => $skin, items => \@items, }, 1); From svnnotify ¡÷ sourceforge.jp Wed Jul 16 22:13:30 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 16 Jul 2008 22:13:30 +0900 Subject: [Slashdotjp-dev 1175] [702] Fix content:encoded inserting condition Message-ID: <1216214010.423297.23049.nullmailer@users.sourceforge.jp> Revision: 702 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=702 Author: tach Date: 2008-07-16 22:13:30 +0900 (Wed, 16 Jul 2008) Log Message: ----------- Fix content:encoded inserting condition Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 09:10:20 UTC (rev 701) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 13:13:30 UTC (rev 702) @@ -466,7 +466,7 @@ $encoded_item->{description} .= pollbooth($story->{qid},1, 0, 1) if $story->{qid}; # add content:encoded for slashdot.jp - $item->{'content:encoded'} = ($item->{description} || $story->{introtext}) . getData('rss_story_readmore', { + $item->{'content:encoded'} ||= ($item->{description} || $story->{introtext}) . getData('rss_story_readmore', { 'link' => $encoded_item->{link}, discussion => $story->{discussion}, }, 'index'); From svnnotify ¡÷ sourceforge.jp Wed Jul 16 22:27:31 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 16 Jul 2008 22:27:31 +0900 Subject: [Slashdotjp-dev 1176] [703] Fix RSS "textinput" handling on Slash/XML/RSS/RSS.pm Message-ID: <1216214851.127397.7629.nullmailer@users.sourceforge.jp> Revision: 703 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=703 Author: tach Date: 2008-07-16 22:27:31 +0900 (Wed, 16 Jul 2008) Log Message: ----------- Fix RSS "textinput" handling on Slash/XML/RSS/RSS.pm Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 13:13:30 UTC (rev 702) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 13:27:31 UTC (rev 703) @@ -287,12 +287,12 @@ my %textinput = ( title => getData('search_header_title', {}, 'search'), description => getData('search_header_descr', { section => $param->{skin} ? $param->{skin}{title} : undef }, 'search'), - name => 'query', + name => 'q', 'link' => $channel{'link'} . 'search.pl', ); # let $param->{textinput} override - if (ref($param->{image}) eq 'HASH') { + if (ref($param->{textinput}) eq 'HASH') { for (keys %textinput) { my $value = defined $param->{textinput}{$_} ? $param->{textinput}{$_} Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-16 13:13:30 UTC (rev 702) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-16 13:27:31 UTC (rev 703) @@ -15,8 +15,9 @@ exist on creating RSS * Add content:encoded for story main rss * Add "mainpage" title to "index.rss" + * Fix RSS "textinput" handling on Slash/XML/RSS/RSS.pm - -- Taku YASUI Wed, 16 Jul 2008 04:30:46 +0000 + -- Taku YASUI Wed, 16 Jul 2008 13:26:14 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Jul 16 22:30:22 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 16 Jul 2008 22:30:22 +0900 Subject: [Slashdotjp-dev 1177] [704] * Add simple pollBooth URL Message-ID: <1216215022.527141.10222.nullmailer@users.sourceforge.jp> Revision: 704 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=704 Author: tach Date: 2008-07-16 22:30:22 +0900 (Wed, 16 Jul 2008) Log Message: ----------- * Add simple pollBooth URL - "/polls" and "/polls/{qid}" * Add feature: display pollBooth RSS on "/polls/rss" Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-16 13:27:31 UTC (rev 703) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-16 13:30:22 UTC (rev 704) @@ -577,7 +577,7 @@ } # URIs like /tags and /tags/foo and /tags/foo?type=bar are special cases. - if ($uri =~ m[^/tags (?: /([^?]*) | /? ) (?: \?(.*) )? $]x) { + if ($uri =~ m!^/tags (?: /([^?]*) | /? ) (?: \?(.*) )? $!x) { my($word, $query) = ($1, $2); my @args = ( ); if ($word =~ /^(active|recent|all)$/) { @@ -593,7 +593,7 @@ } # journals for slashdot.jp - if ($uri =~ m[^/journals (?: /([^?]*) | /? ) (?: \?(.*) )? $]x) { + if ($uri =~ m!^/journals (?: /([^?]*) | /? ) (?: \?(.*) )? $!x) { my($word, $query) = ($1, $2); my @args = ($query); $word =~ s{/}{_}g; @@ -608,6 +608,23 @@ return OK; } + # polls for slashdot.jp + if ($uri =~ m!^/polls (?: /([^?]*) | /? ) (?: \?(.*) )? $!x) { + my($word, $query) = ($1, $2); + my @args = ($query); + if ($word =~ /^rss$/) { + push @args, "content_type=rss"; + } elsif ($word =~ /^(\d+)$/) { + push @args, "qid=$1"; + } + push @args, "op=$word" if ($word); + $r->args(join('&', @args)); + $r->uri('/pollBooth.pl'); + $r->filename($constants->{basedir} . '/pollBooth.pl'); + return OK; + } + + # for self-references (/~/ and /my/) if (($saveuri =~ m[^/(?:%7[eE]|~)] && $uri =~ m[^/~ (?: /(.*) | /? ) $]x) # /my/ or /my can match, but not /mything Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-16 13:27:31 UTC (rev 703) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-16 13:30:22 UTC (rev 704) @@ -16,8 +16,11 @@ * Add content:encoded for story main rss * Add "mainpage" title to "index.rss" * Fix RSS "textinput" handling on Slash/XML/RSS/RSS.pm + * Add simple pollBooth URL + - "/polls" and "/polls/{qid}" + * Add feature: display pollBooth RSS on "/polls/rss" - -- Taku YASUI Wed, 16 Jul 2008 13:26:14 +0000 + -- Taku YASUI Wed, 16 Jul 2008 13:28:06 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-16 13:27:31 UTC (rev 703) +++ slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-16 13:30:22 UTC (rev 704) @@ -8,6 +8,7 @@ use Slash; use Slash::Display; use Slash::Utility; +use Slash::XML; ################################################################# sub main { @@ -28,6 +29,12 @@ linkstory => \&link_story_to_poll ); + # hijack feeds + if ($form->{content_type} && $form->{content_type} =~ $constants->{feed_types}) { + listpollsRSS($form, $slashdb, $constants); + return; + } + my $op = $form->{op} && $ops{$form->{op}} ? $form->{op} : 'default'; if (defined $form->{aid}) { @@ -512,6 +519,58 @@ } ################################################################# +sub listpollsRSS { + my ($form, $slashdb, $constants) = @_; + my $polls = getObject('Slash::PollBooth', { db_type => 'reader' }); + my $offset = 0; + my $limit = 10; + my $gSkin = getCurrentSkin(); + my $user = getCurrentUser(); + + my $columns = "*"; + my $tables = "pollquestions"; + my $where = ""; + my $other = "ORDER BY date DESC LIMIT $offset, $limit"; + + my $questions = $polls->sqlSelectAllHashrefArray($columns, $tables, $where, $other); + + my $items = []; + + foreach my $entry (@$questions) { + my $poll = $polls->getPoll($entry->{qid}); + my $pollbooth = getData('rss_pollbooth', { poll => $poll }); + my $readmore = getData('rss_readmore', { poll => $poll }); + push(@$items, { + story => { + uid => $entry->{uid}, + 'time' => $entry->{date}, + }, + 'link' => "$gSkin->{absolutedir}/polls/$entry->{qid}", + title => $entry->{question}, + 'time' => $entry->{date}, + description => $entry->{question} . $readmore, + 'content:encoded' => $pollbooth . $readmore, + }); + } + + xmlDisplay($form->{content_type} => { + channel => { + title => getData('rss_title'), + description => getData('rss_descr'), + 'link' => "$gSkin->{absolutedir}/polls/", + }, + image => 1, + textinput => { + title => getData('search_header_title', { op => getData('polls', {}, 'search') }, 'search'), + 'link' => "$gSkin->{absolutedir}/search.pl?op=polls", + }, + items => $items, + rdfitemdesc => $constants->{dfitemdesc}, + rdfitemdesc_html => $constants->{dfitemdesc_html} || 1, + }); +} + +################################################################# createEnvironment(); main(); From svnnotify ¡÷ sourceforge.jp Thu Jul 17 16:04:45 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 17 Jul 2008 16:04:45 +0900 Subject: [Slashdotjp-dev 1178] [705] * Improve article.pl performance when non-user access Message-ID: <1216278285.506567.10979.nullmailer@users.sourceforge.jp> Revision: 705 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=705 Author: tach Date: 2008-07-17 16:04:45 +0900 (Thu, 17 Jul 2008) Log Message: ----------- * Improve article.pl performance when non-user access - redirect to shtml internally Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-16 13:30:22 UTC (rev 704) +++ slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-17 07:04:45 UTC (rev 705) @@ -450,6 +450,30 @@ return OK; } + # return shtml internally when AC + # for slashdot.jp (2008-07-17) + if ($uri =~ m!^/(\w+/)?article\.pl$! && !$is_user) { + my $section = $1 || 'articles'; + my $the_request = $r->the_request; + my $qs = {$the_request =~ m!\b(sid|threshold|mode|commentsort|lowbandwidth|simpledesign|light)=([-\w/]+)!g}; + + if ((defined($qs->{sid}) && $qs->{sid} =~ m|^\d{2}/\d{2}/\d{2}/\d{6,}$|) && + (!defined($qs->{threshold}) || $qs->{threshold} == 1) && + (!defined($qs->{mode}) || $qs->{mode} eq 'thread' ) && + (!defined($qs->{commentsort}) || $qs->{commentsort} == 3) && + !$qs->{lowbandwidth} && + !$qs->{simpledesign} && + !$qs->{light}) { + my $file = "$constants->{basedir}/$section/$qs->{sid}.shtml"; + if (-r $file) { + $r->uri("/$section/$qs->{sid}.shtml"); + $r->filename("$constants->{basedir}/$section/$qs->{sid}.shtml"); + writeLog('shtml'); + return OK; + } + } + } + # redirect to static if # * not a user, nor a daypass holder, # and Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-16 13:30:22 UTC (rev 704) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-17 07:04:45 UTC (rev 705) @@ -19,8 +19,10 @@ * Add simple pollBooth URL - "/polls" and "/polls/{qid}" * Add feature: display pollBooth RSS on "/polls/rss" + * Improve article.pl performance when non-user access + - redirect to shtml internally - -- Taku YASUI Wed, 16 Jul 2008 13:28:06 +0000 + -- Taku YASUI Thu, 17 Jul 2008 07:03:47 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Thu Jul 17 20:31:24 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 17 Jul 2008 20:31:24 +0900 Subject: [Slashdotjp-dev 1179] [706] * Add feature to change query string form name for search.pl Message-ID: <1216294284.309105.29883.nullmailer@users.sourceforge.jp> Revision: 706 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=706 Author: tach Date: 2008-07-17 20:31:23 +0900 (Thu, 17 Jul 2008) Log Message: ----------- * Add feature to change query string form name for search.pl - Use variable "search_query_name" Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-17 07:04:45 UTC (rev 705) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-17 11:31:23 UTC (rev 706) @@ -287,7 +287,7 @@ my %textinput = ( title => getData('search_header_title', {}, 'search'), description => getData('search_header_descr', { section => $param->{skin} ? $param->{skin}{title} : undef }, 'search'), - name => 'q', + name => $constants->{search_query_name} || 'query', 'link' => $channel{'link'} . 'search.pl', ); Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-17 07:04:45 UTC (rev 705) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-17 11:31:23 UTC (rev 706) @@ -21,8 +21,10 @@ * Add feature: display pollBooth RSS on "/polls/rss" * Improve article.pl performance when non-user access - redirect to shtml internally + * Add feature to change query string form name for search.pl + - Use variable "search_query_name" - -- Taku YASUI Thu, 17 Jul 2008 07:03:47 +0000 + -- Taku YASUI Thu, 17 Jul 2008 11:29:47 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql =================================================================== --- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-17 07:04:45 UTC (rev 705) +++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-17 11:31:23 UTC (rev 706) @@ -1154,6 +1154,7 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('enable_template_evalperl','0','Add "EVAL_PERL" to Template option to be able to use "PERL" and "RAWPERL" directives'); INSERT IGNORE INTO vars (name, value, description) VALUES ('related_cid_disabled','0','If set, then disable inserting cid to related story list'); INSERT IGNORE INTO vars (name, value, description) VALUES ('modreasons_select_disabled','','Comma separated "modreasons.id"s disable to select when moderation'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('search_query_name','query','alternative query string form name for search.pl'); UPDATE vars SET value='text/html; charset=UTF-8' WHERE name='content_type_webpage'; UPDATE vars SET value='0' WHERE name='draconian_charset'; UPDATE vars SET value='UTF-8' WHERE name='rdfencoding'; From svnnotify ¡÷ sourceforge.jp Fri Jul 18 12:11:18 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 18 Jul 2008 12:11:18 +0900 Subject: [Slashdotjp-dev 1180] [707] Fix: use $constants instead of $gSkin when using slashd Message-ID: <1216350678.585156.27554.nullmailer@users.sourceforge.jp> Revision: 707 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=707 Author: tach Date: 2008-07-18 12:11:18 +0900 (Fri, 18 Jul 2008) Log Message: ----------- Fix: use $constants instead of $gSkin when using slashd Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-17 11:31:23 UTC (rev 706) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-18 03:11:18 UTC (rev 707) @@ -173,10 +173,10 @@ ); my $dynamic = 0; - my $absolutedir = $gSkin->{absolutedir}; + my $absolutedir = $gSkin->{absolutedir} || $constants->{absolutedir}; if (defined &Slash::Apache::ConnectionIsSSL) { $dynamic = 1; - $absolutedir = $gSkin->{absolutedir_secure} if Slash::Apache::ConnectionIsSSL(); + $absolutedir = ($gSkin->{absolutedir_secure} || $constants->{absolutedir_secure}) if Slash::Apache::ConnectionIsSSL(); } # set defaults From svnnotify ¡÷ sourceforge.jp Fri Jul 18 12:12:03 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 18 Jul 2008 12:12:03 +0900 Subject: [Slashdotjp-dev 1181] [708] Fix: use $constants instead of $gSkin when using slashd Message-ID: <1216350723.826325.28733.nullmailer@users.sourceforge.jp> Revision: 708 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=708 Author: tach Date: 2008-07-18 12:12:03 +0900 (Fri, 18 Jul 2008) Log Message: ----------- Fix: use $constants instead of $gSkin when using slashd Modified Paths: -------------- slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-18 03:11:18 UTC (rev 707) +++ slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-18 03:12:03 UTC (rev 708) @@ -524,18 +524,14 @@ my $polls = getObject('Slash::PollBooth', { db_type => 'reader' }); my $offset = 0; my $limit = 10; - my $gSkin = getCurrentSkin(); - my $user = getCurrentUser(); my $columns = "*"; my $tables = "pollquestions"; my $where = ""; my $other = "ORDER BY date DESC LIMIT $offset, $limit"; - my $questions = $polls->sqlSelectAllHashrefArray($columns, $tables, $where, $other); my $items = []; - foreach my $entry (@$questions) { my $poll = $polls->getPoll($entry->{qid}); my $pollbooth = getData('rss_pollbooth', { poll => $poll }); @@ -545,7 +541,7 @@ uid => $entry->{uid}, 'time' => $entry->{date}, }, - 'link' => "$gSkin->{absolutedir}/polls/$entry->{qid}", + 'link' => "$constants->{absolutedir}/polls/$entry->{qid}", title => $entry->{question}, 'time' => $entry->{date}, description => $entry->{question} . $readmore, @@ -553,21 +549,22 @@ }); } - xmlDisplay($form->{content_type} => { + my $ret = xmlDisplay($form->{content_type} => { channel => { title => getData('rss_title'), description => getData('rss_descr'), - 'link' => "$gSkin->{absolutedir}/polls/", + 'link' => "$constants->{absolutedir}/polls/", }, image => 1, textinput => { title => getData('search_header_title', { op => getData('polls', {}, 'search') }, 'search'), - 'link' => "$gSkin->{absolutedir}/search.pl?op=polls", + 'link' => "$constants->{absolutedir}/search.pl?op=polls", }, items => $items, rdfitemdesc => $constants->{dfitemdesc}, rdfitemdesc_html => $constants->{dfitemdesc_html} || 1, - }); + }, $form->{ssi}); + print "$ret\n" if ($form->{ssi}); } ################################################################# From svnnotify ¡÷ sourceforge.jp Fri Jul 18 13:18:25 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 18 Jul 2008 13:18:25 +0900 Subject: [Slashdotjp-dev 1182] [709] * Improve "polls/rss" performance using rss cache Message-ID: <1216354705.388881.499.nullmailer@users.sourceforge.jp> Revision: 709 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=709 Author: tach Date: 2008-07-18 13:18:25 +0900 (Fri, 18 Jul 2008) Log Message: ----------- * Improve "polls/rss" performance using rss cache - Use variable "rss_cachedir" - cache creating task is not included in slash distribution Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-18 03:12:03 UTC (rev 708) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-18 04:18:25 UTC (rev 709) @@ -614,6 +614,10 @@ my @args = ($query); if ($word =~ /^rss$/) { push @args, "content_type=rss"; + if ($constants->{rss_cachedir} && -r "$constants->{rss_cachedir}/pollBooth.rss") { + $r->filename("$constants->{rss_cachedir}/pollBooth.rss"); + return OK; + } } elsif ($word =~ /^(\d+)$/) { push @args, "qid=$1"; } Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-18 03:12:03 UTC (rev 708) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-18 04:18:25 UTC (rev 709) @@ -23,8 +23,11 @@ - redirect to shtml internally * Add feature to change query string form name for search.pl - Use variable "search_query_name" + * Improve "polls/rss" performance using rss cache + - Use variable "rss_cachedir" + - cache creating task is not included in slash distribution - -- Taku YASUI Thu, 17 Jul 2008 11:29:47 +0000 + -- Taku YASUI Fri, 18 Jul 2008 04:16:34 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-18 03:12:03 UTC (rev 708) +++ slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-18 04:18:25 UTC (rev 709) @@ -563,7 +563,7 @@ items => $items, rdfitemdesc => $constants->{dfitemdesc}, rdfitemdesc_html => $constants->{dfitemdesc_html} || 1, - }, $form->{ssi}); + }, $form->{ssi} ? 1 : 0); print "$ret\n" if ($form->{ssi}); } From svnnotify ¡÷ sourceforge.jp Fri Jul 18 16:21:27 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 18 Jul 2008 16:21:27 +0900 Subject: [Slashdotjp-dev 1183] [710] Fix: performance improvement for mobile mode Message-ID: <1216365687.690673.28669.nullmailer@users.sourceforge.jp> Revision: 710 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=710 Author: tach Date: 2008-07-18 16:21:27 +0900 (Fri, 18 Jul 2008) Log Message: ----------- Fix: performance improvement for mobile mode Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-18 04:18:25 UTC (rev 709) +++ slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-18 07:21:27 UTC (rev 710) @@ -354,10 +354,35 @@ # $uri =~ s/^\Q$path//; #} - # DECLINED if the skin does not exist - if ($uri =~ m|^/\w+/\w+\.pl$| && - determineCurrentSkin() == getCurrentStatic('mainpage_skid')) { - return DECLINED; + # return shtml internally when AC + # for slashdot.jp (2008-07-17) + if ($uri =~ m!^/(\w+/)?article\.pl$! && !$is_user) { + my $section = $1 || 'articles'; + my $the_request = $r->the_request; + my $qs = {$the_request =~ m!\b(sid|threshold|mode|commentsort|lowbandwidth|simpledesign|light)=([-\w/]+)!g}; + + if ((defined($qs->{sid}) && $qs->{sid} =~ m|^\d{2}/\d{2}/\d{2}/\d{6,}$|) && + (!defined($qs->{threshold}) || $qs->{threshold} == 1) && + (!defined($qs->{mode}) || $qs->{mode} eq 'thread' ) && + (!defined($qs->{commentsort}) || $qs->{commentsort} == 3) && + !$qs->{lowbandwidth} && + !$qs->{simpledesign} && + !$qs->{light}) { + my $file = "$constants->{basedir}/$section/$qs->{sid}.shtml"; + if ($constants->{mobile_enabled} && + ($constants->{mobile_useragent_regex} && + $r->header_in('user-agent') =~ $constants->{mobile_useragent_regex}) || + $r->args() =~ m{\bm=[1-9a-zA-Z]}) { + $section = $constants->{mobile_urlpath}; + $file = "$constants->{basedir}/$section/$qs->{sid}.shtml"; + } + if (-r $file) { + $r->uri("/$section/$qs->{sid}.shtml"); + $r->filename($file); + writeLog('shtml'); + return OK; + } + } } # REDIRECT article page shtml for mobile mode @@ -374,6 +399,12 @@ } } + # DECLINED if the skin does not exist + if ($uri =~ m|^/\w+/\w+\.pl$| && + determineCurrentSkin() == getCurrentStatic('mainpage_skid')) { + return DECLINED; + } + # Comment this in if you want to try having this do the right # thing dynamically # my $slashdb = getCurrentDB(); @@ -450,30 +481,6 @@ return OK; } - # return shtml internally when AC - # for slashdot.jp (2008-07-17) - if ($uri =~ m!^/(\w+/)?article\.pl$! && !$is_user) { - my $section = $1 || 'articles'; - my $the_request = $r->the_request; - my $qs = {$the_request =~ m!\b(sid|threshold|mode|commentsort|lowbandwidth|simpledesign|light)=([-\w/]+)!g}; - - if ((defined($qs->{sid}) && $qs->{sid} =~ m|^\d{2}/\d{2}/\d{2}/\d{6,}$|) && - (!defined($qs->{threshold}) || $qs->{threshold} == 1) && - (!defined($qs->{mode}) || $qs->{mode} eq 'thread' ) && - (!defined($qs->{commentsort}) || $qs->{commentsort} == 3) && - !$qs->{lowbandwidth} && - !$qs->{simpledesign} && - !$qs->{light}) { - my $file = "$constants->{basedir}/$section/$qs->{sid}.shtml"; - if (-r $file) { - $r->uri("/$section/$qs->{sid}.shtml"); - $r->filename("$constants->{basedir}/$section/$qs->{sid}.shtml"); - writeLog('shtml'); - return OK; - } - } - } - # redirect to static if # * not a user, nor a daypass holder, # and From svnnotify ¡÷ sourceforge.jp Mon Jul 21 23:22:23 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 21 Jul 2008 23:22:23 +0900 Subject: [Slashdotjp-dev 1184] [711] add login ads css Message-ID: <1216650143.220660.4148.nullmailer@users.sourceforge.jp> Revision: 711 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=711 Author: tach Date: 2008-07-21 23:22:22 +0900 (Mon, 21 Jul 2008) Log Message: ----------- add login ads css Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-07-18 07:21:27 UTC (rev 710) +++ images/css/slashdotjp.css 2008-07-21 14:22:22 UTC (rev 711) @@ -237,6 +237,12 @@ width: 99%; } +.generalbody #ads-login-336x280 { + float: right; + background: #EEE; + margin-left: 1em; +} + /* for osdnnavbar: width=0 */ #top_parent { border: 0px solid transparent; From svnnotify ¡÷ sourceforge.jp Tue Jul 22 16:04:15 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 22 Jul 2008 16:04:15 +0900 Subject: [Slashdotjp-dev 1185] [712] Allow firehose.pl for AC when the "id" is specified Message-ID: <1216710255.962055.12070.nullmailer@users.sourceforge.jp> Revision: 712 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=712 Author: tach Date: 2008-07-22 16:04:15 +0900 (Tue, 22 Jul 2008) Log Message: ----------- Allow firehose.pl for AC when the "id" is specified Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-21 14:22:22 UTC (rev 711) +++ slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-22 07:04:15 UTC (rev 712) @@ -456,7 +456,7 @@ } if ($uri eq '/firehose.pl') { - $r->uri($is_user ? '/firehose.pl' : '/firehose.shtml'); + $r->uri($is_user || $r->the_request =~ /\bid=\d+\b/ ? '/firehose.pl' : '/firehose.shtml'); return OK; } Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-21 14:22:22 UTC (rev 711) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-22 07:04:15 UTC (rev 712) @@ -26,8 +26,9 @@ * Improve "polls/rss" performance using rss cache - Use variable "rss_cachedir" - cache creating task is not included in slash distribution + * Allow firehose.pl for AC when the "id" is specified - -- Taku YASUI Fri, 18 Jul 2008 04:16:34 +0000 + -- Taku YASUI Tue, 22 Jul 2008 07:03:37 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Jul 22 16:27:49 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 22 Jul 2008 16:27:49 +0900 Subject: [Slashdotjp-dev 1186] [713] fix pollbooth for ads Message-ID: <1216711669.353177.7681.nullmailer@users.sourceforge.jp> Revision: 713 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=713 Author: tach Date: 2008-07-22 16:27:49 +0900 (Tue, 22 Jul 2008) Log Message: ----------- fix pollbooth for ads Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-07-22 07:04:15 UTC (rev 712) +++ images/css/slashdotjp.css 2008-07-22 07:27:49 UTC (rev 713) @@ -52,6 +52,7 @@ #firehose #itemsreturned, #firehose .firemenu, #firehose .paginate, +#pollBooth #wide, div#users-blocks { margin-right: 212px; } @@ -142,6 +143,30 @@ work-break: break-all; } +/* Fix pollBooth graph */ +#pollBooth .generalbody table { + margin: 0; + width: 100%; +} +#pollBooth .generalbody caption { + margin-left: 0; +} +#pollBooth .totalVotes { + display: block; + margin: 0.2em 0; + text-align: right; + float: none; +} +#pollBooth #resultgraph { + margin: 0 1em; +} +#pollBooth .polllinks { + margin: 1em 0; +} +#pollBooth #listpolls li { + margin-bottom: 0.4em; +} + /* slashdot.jp announce area */ div#slashdotjp-site-announce { background: #FFC; From svnnotify ¡÷ sourceforge.jp Tue Jul 22 16:48:06 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 22 Jul 2008 16:48:06 +0900 Subject: [Slashdotjp-dev 1187] [714] move createMenu() into hierarchy and listTopics templates Message-ID: <1216712886.136793.3671.nullmailer@users.sourceforge.jp> Revision: 714 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=714 Author: tach Date: 2008-07-22 16:48:05 +0900 (Tue, 22 Jul 2008) Log Message: ----------- move createMenu() into hierarchy and listTopics templates Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-22 07:27:49 UTC (rev 713) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-22 07:48:05 UTC (rev 714) @@ -27,8 +27,9 @@ - Use variable "rss_cachedir" - cache creating task is not included in slash distribution * Allow firehose.pl for AC when the "id" is specified + * move createMenu() into hierarchy and listTopics templates - -- Taku YASUI Tue, 22 Jul 2008 07:03:37 +0000 + -- Taku YASUI Tue, 22 Jul 2008 07:47:47 +0000 slash (2.5.0.192-15) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl =================================================================== --- slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl 2008-07-22 07:27:49 UTC (rev 713) +++ slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl 2008-07-22 07:48:05 UTC (rev 714) @@ -20,7 +20,8 @@ : { }; header(getData('head'), $form->{section}, $data) or return; - print createMenu('topics'); + # move createMenu() into hierarchy and listTopics templates for slashdot.jp (2008-07-22) + #print createMenu('topics'); if ($hierarchy_op) { hierarchy(); From svnnotify ¡÷ sourceforge.jp Tue Jul 22 16:50:05 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 22 Jul 2008 16:50:05 +0900 Subject: [Slashdotjp-dev 1188] [715] Message-ID: <1216713005.138282.5491.nullmailer@users.sourceforge.jp> Revision: 715 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=715 Author: tach Date: 2008-07-22 16:50:05 +0900 (Tue, 22 Jul 2008) Log Message: ----------- Modified Paths: -------------- slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl =================================================================== --- slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl 2008-07-22 07:48:05 UTC (rev 714) +++ slashjp/branches/2.5.0.192/themes/slashcode/htdocs/topics.pl 2008-07-22 07:50:05 UTC (rev 715) @@ -16,7 +16,7 @@ my $hierarchy_op = $form->{op} && $form->{op} eq 'hierarchy'; my $data = $hierarchy_op - ? { admin => 1, adminmenu => 'info', tab_selected => 'hierarchy' } + ? { tab_selected => 'hierarchy' } : { }; header(getData('head'), $form->{section}, $data) or return; From svnnotify ¡÷ sourceforge.jp Tue Jul 22 16:58:07 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 22 Jul 2008 16:58:07 +0900 Subject: [Slashdotjp-dev 1189] [716] Redirect topics.pl to topics.shtml internally when when AC access Message-ID: <1216713487.976899.10643.nullmailer@users.sourceforge.jp> Revision: 716 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=716 Author: tach Date: 2008-07-22 16:58:07 +0900 (Tue, 22 Jul 2008) Log Message: ----------- Redirect topics.pl to topics.shtml internally when when AC access Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-22 07:50:05 UTC (rev 715) +++ slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-22 07:58:07 UTC (rev 716) @@ -481,6 +481,15 @@ return OK; } + if ($uri eq '/topics.pl') { + if (!$is_user && $r->the_request !~ /\bop=\w+\b/) { + $r->uri('/topics.shtml'); + $r->filename("$constants->{basedir}/topics.shtml"); + writeLog('shtml'); + return OK; + } + } + # redirect to static if # * not a user, nor a daypass holder, # and Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-22 07:50:05 UTC (rev 715) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-22 07:58:07 UTC (rev 716) @@ -28,8 +28,9 @@ - cache creating task is not included in slash distribution * Allow firehose.pl for AC when the "id" is specified * move createMenu() into hierarchy and listTopics templates + * Redirect topics.pl to topics.shtml internally when when AC access - -- Taku YASUI Tue, 22 Jul 2008 07:47:47 +0000 + -- Taku YASUI Tue, 22 Jul 2008 07:57:22 +0000 slash (2.5.0.192-15) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Jul 23 20:23:04 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 23 Jul 2008 20:23:04 +0900 Subject: [Slashdotjp-dev 1190] [717] [svn-buildpackage] Tagging slash (2.5.0.192-16) Message-ID: <1216812184.086223.14512.nullmailer@users.sourceforge.jp> Revision: 717 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=717 Author: tach Date: 2008-07-23 20:23:03 +0900 (Wed, 23 Jul 2008) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.192-16) Added Paths: ----------- slashjp/tags/2.5.0.192-16/ -------------- next part -------------- Copied: slashjp/tags/2.5.0.192-16 (from rev 716, slashjp/branches/2.5.0.192) From svnnotify ¡÷ sourceforge.jp Wed Jul 23 20:51:45 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 23 Jul 2008 20:51:45 +0900 Subject: [Slashdotjp-dev 1191] [718] fix Message-ID: <1216813905.977222.4381.nullmailer@users.sourceforge.jp> Revision: 718 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=718 Author: tach Date: 2008-07-23 20:51:45 +0900 (Wed, 23 Jul 2008) Log Message: ----------- fix Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-23 11:23:03 UTC (rev 717) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-23 11:51:45 UTC (rev 718) @@ -597,6 +597,11 @@ my($word, $query) = ($1, $2); my @args = ($query); $word =~ s{/}{_}g; + if ($word =~ /^(recent|friends|posters)/) { + $word = "top_$word"; + } elsif ($word eq "rss") { + $word = "top_recent_rss"; + } if ($word =~ /^(.+)_rss$/) { $word = $1; push @args, "content_type=rss"; Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-23 11:23:03 UTC (rev 717) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-23 11:51:45 UTC (rev 718) @@ -324,6 +324,10 @@ if $item->{'time'}; $encoded_item->{dc}{creator} = $self->encode($item->{creator}) if $item->{creator}; + $encoded_item->{dc}{source} = $self->encode($item->{source}) + if $item->{source}; + $encoded_item->{dc}{relation} = $self->encode($item->{relation}) + if $item->{relation}; } $encoded_item->{dc}{source} = $item->{source} if $item->{source}; From svnnotify ¡÷ sourceforge.jp Wed Jul 23 20:53:45 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 23 Jul 2008 20:53:45 +0900 Subject: [Slashdotjp-dev 1192] [719] revert to PREVIOUS (fix wrong commit) Message-ID: <1216814025.339598.5838.nullmailer@users.sourceforge.jp> Revision: 719 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=719 Author: tach Date: 2008-07-23 20:53:45 +0900 (Wed, 23 Jul 2008) Log Message: ----------- revert to PREVIOUS (fix wrong commit) Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-23 11:51:45 UTC (rev 718) +++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-23 11:53:45 UTC (rev 719) @@ -324,10 +324,6 @@ if $item->{'time'}; $encoded_item->{dc}{creator} = $self->encode($item->{creator}) if $item->{creator}; - $encoded_item->{dc}{source} = $self->encode($item->{source}) - if $item->{source}; - $encoded_item->{dc}{relation} = $self->encode($item->{relation}) - if $item->{relation}; } $encoded_item->{dc}{source} = $item->{source} if $item->{source}; From svnnotify ¡÷ sourceforge.jp Wed Jul 23 21:09:42 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 23 Jul 2008 21:09:42 +0900 Subject: [Slashdotjp-dev 1193] [720] * Fix journals URL (remove "top") Message-ID: <1216814982.140245.18851.nullmailer@users.sourceforge.jp> Revision: 720 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=720 Author: tach Date: 2008-07-23 21:09:41 +0900 (Wed, 23 Jul 2008) Log Message: ----------- * Fix journals URL (remove "top") - top recent: /journals/top/recent -> /journals/recent - top posters: /journals/top/posters -> /journals/posters - you can access old URL Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-23 11:53:45 UTC (rev 719) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-23 12:09:41 UTC (rev 720) @@ -596,11 +596,14 @@ if ($uri =~ m!^/journals (?: /([^?]*) | /? ) (?: \?(.*) )? $!x) { my($word, $query) = ($1, $2); my @args = ($query); + $word =~ s!/+$!!; $word =~ s{/}{_}g; if ($word =~ /^(recent|friends|posters)/) { $word = "top_$word"; } elsif ($word eq "rss") { $word = "top_recent_rss"; + } elsif ($word eq "") { + $word = "top"; } if ($word =~ /^(.+)_rss$/) { $word = $1; Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-23 11:53:45 UTC (rev 719) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-23 12:09:41 UTC (rev 720) @@ -1,3 +1,12 @@ +slash (2.5.0.192-17) unstable; urgency=low + + * Fix journals URL (remove "top") + - top recent: /journals/top/recent -> /journals/recent + - top posters: /journals/top/posters -> /journals/posters + - you can access old URL + + -- Taku YASUI Wed, 23 Jul 2008 12:07:54 +0000 + slash (2.5.0.192-16) unstable; urgency=low * Fix for reason_modifier setting for users.pl From svnnotify ¡÷ sourceforge.jp Wed Jul 23 21:16:26 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 23 Jul 2008 21:16:26 +0900 Subject: [Slashdotjp-dev 1194] [721] journals URL fix cont. Message-ID: <1216815386.370821.25379.nullmailer@users.sourceforge.jp> Revision: 721 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=721 Author: tach Date: 2008-07-23 21:16:26 +0900 (Wed, 23 Jul 2008) Log Message: ----------- journals URL fix cont. Modified Paths: -------------- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/plugins/Journal/journal.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-23 12:09:41 UTC (rev 720) +++ slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-23 12:16:26 UTC (rev 721) @@ -362,7 +362,7 @@ channel => { title => getData('rss_top_recent_title'), description => getData('rss_top_recent_desc'), - 'link' => "$gSkin->{absolutedir}/journals/top/", + 'link' => "$gSkin->{absolutedir}/journals/", }, image => 1, items => \@items, From svnnotify ¡÷ sourceforge.jp Fri Jul 25 13:16:00 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 25 Jul 2008 13:16:00 +0900 Subject: [Slashdotjp-dev 1195] [722] Fix journals URL cont. Message-ID: <1216959360.547760.27974.nullmailer@users.sourceforge.jp> Revision: 722 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=722 Author: tach Date: 2008-07-25 13:16:00 +0900 (Fri, 25 Jul 2008) Log Message: ----------- Fix journals URL cont. Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-23 12:16:26 UTC (rev 721) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-25 04:16:00 UTC (rev 722) @@ -598,9 +598,9 @@ my @args = ($query); $word =~ s!/+$!!; $word =~ s{/}{_}g; - if ($word =~ /^(recent|friends|posters)/) { - $word = "top_$word"; - } elsif ($word eq "rss") { + $word =~ s/^top(recent|friends|posters)(.*)$/top_$1$2/; + $word =~ s/^topcount(.*)$/top_posters$1/; + if ($word eq "rss") { $word = "top_recent_rss"; } elsif ($word eq "") { $word = "top"; From svnnotify ¡÷ sourceforge.jp Fri Jul 25 23:38:18 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 25 Jul 2008 23:38:18 +0900 Subject: [Slashdotjp-dev 1196] [723] * Add /faq/ internal redirection at Slash/Apache/User.pm Message-ID: <1216996698.503258.8329.nullmailer@users.sourceforge.jp> Revision: 723 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=723 Author: tach Date: 2008-07-25 23:38:18 +0900 (Fri, 25 Jul 2008) Log Message: ----------- * Add /faq/ internal redirection at Slash/Apache/User.pm Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-25 04:16:00 UTC (rev 722) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-25 14:38:18 UTC (rev 723) @@ -636,6 +636,31 @@ return OK; } + # faq for slashdot.jp + if ($uri =~ m!^/faq (?: /([^?]*) | /? ) (?: \?(.*) )? $!x) { + my($word, $query) = ($1, $2); + my @args = ($query); + if ($word) { + $word = "-$word"; + } + $word = "faq$word"; + my $fpath = "/$constants->{sfjp_wikicontents_path}/$word.shtml"; + my $file = "$constants->{basedir}$fpath"; + unless (-r $file) { + return NOT_FOUND; + } + if ($r->header_in('Cookie') =~ $USER_MATCH) { + push @args, "name=$word"; + $r->args(join('&', @args)); + $r->uri('/wikicontents.pl'); + $r->filename($constants->{basedir} . '/wikicontents.pl'); + return OK; + } else { + $r->uri($fpath); + $r->filename($file); + return OK; + } + } # for self-references (/~/ and /my/) if (($saveuri =~ m[^/(?:%7[eE]|~)] && $uri =~ m[^/~ (?: /(.*) | /? ) $]x) Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-25 04:16:00 UTC (rev 722) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-25 14:38:18 UTC (rev 723) @@ -4,8 +4,9 @@ - top recent: /journals/top/recent -> /journals/recent - top posters: /journals/top/posters -> /journals/posters - you can access old URL + * Add /faq/ internal redirection at Slash/Apache/User.pm - -- Taku YASUI Wed, 23 Jul 2008 12:07:54 +0000 + -- Taku YASUI Fri, 25 Jul 2008 14:36:41 +0000 slash (2.5.0.192-16) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Sat Jul 26 02:29:30 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 26 Jul 2008 02:29:30 +0900 Subject: [Slashdotjp-dev 1197] [724] fix for correct url Message-ID: <1217006970.372226.493.nullmailer@users.sourceforge.jp> Revision: 724 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=724 Author: tach Date: 2008-07-26 02:29:30 +0900 (Sat, 26 Jul 2008) Log Message: ----------- fix for correct url Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-25 14:38:18 UTC (rev 723) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-25 17:29:30 UTC (rev 724) @@ -637,8 +637,9 @@ } # faq for slashdot.jp - if ($uri =~ m!^/faq (?: /([^?]*) | /? ) (?: \?(.*) )? $!x) { + if ($uri =~ m!^/faq (?: (/[^?]*) | /? ) (?: \?(.*) )? $!x) { my($word, $query) = ($1, $2); + $word ? $word =~ s!^/!! : redirect("$constants->{absolutedir}/faq/"); my @args = ($query); if ($word) { $word = "-$word"; From svnnotify ¡÷ sourceforge.jp Sat Jul 26 14:42:47 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 26 Jul 2008 14:42:47 +0900 Subject: [Slashdotjp-dev 1198] [725] Move "faq" handler to Apache.pm because cannot rewrite to "shtml" file on userdir_handler by unknown reason Message-ID: <1217050967.547655.19114.nullmailer@users.sourceforge.jp> Revision: 725 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=725 Author: tach Date: 2008-07-26 14:42:47 +0900 (Sat, 26 Jul 2008) Log Message: ----------- Move "faq" handler to Apache.pm because cannot rewrite to "shtml" file on userdir_handler by unknown reason Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-25 17:29:30 UTC (rev 724) +++ slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-26 05:42:47 UTC (rev 725) @@ -490,6 +490,33 @@ } } + # faq for slashdot.jp + if ($uri =~ m!^/faq (?: (/[^?]*) | /? ) (?: \?(.*) )? $!x) { + my($word, $query) = ($1, $2); + $word ? $word =~ s!^/!! : redirect("$constants->{absolutedir}/faq/"); + my @args = ($query); + if ($word) { + $word = "-$word"; + } + $word = "faq$word"; + my $fpath = "/$constants->{sfjp_wikicontents_path}/$word.shtml"; + my $file = "$constants->{basedir}$fpath"; + unless (-r $file) { + return NOT_FOUND; + } + if ($is_user) { + push @args, "name=$word"; + $r->args(join('&', @args)); + $r->uri('/wikicontents.pl'); + $r->filename($constants->{basedir} . '/wikicontents.pl'); + return OK; + } else { + $r->uri($fpath); + $r->filename($file); + return OK; + } + } + # redirect to static if # * not a user, nor a daypass holder, # and @@ -567,3 +594,4 @@ Slash(3). =cut + Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-25 17:29:30 UTC (rev 724) +++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-26 05:42:47 UTC (rev 725) @@ -636,33 +636,6 @@ return OK; } - # faq for slashdot.jp - if ($uri =~ m!^/faq (?: (/[^?]*) | /? ) (?: \?(.*) )? $!x) { - my($word, $query) = ($1, $2); - $word ? $word =~ s!^/!! : redirect("$constants->{absolutedir}/faq/"); - my @args = ($query); - if ($word) { - $word = "-$word"; - } - $word = "faq$word"; - my $fpath = "/$constants->{sfjp_wikicontents_path}/$word.shtml"; - my $file = "$constants->{basedir}$fpath"; - unless (-r $file) { - return NOT_FOUND; - } - if ($r->header_in('Cookie') =~ $USER_MATCH) { - push @args, "name=$word"; - $r->args(join('&', @args)); - $r->uri('/wikicontents.pl'); - $r->filename($constants->{basedir} . '/wikicontents.pl'); - return OK; - } else { - $r->uri($fpath); - $r->filename($file); - return OK; - } - } - # for self-references (/~/ and /my/) if (($saveuri =~ m[^/(?:%7[eE]|~)] && $uri =~ m[^/~ (?: /(.*) | /? ) $]x) # /my/ or /my can match, but not /mything From svnnotify ¡÷ sourceforge.jp Mon Jul 28 17:20:34 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 28 Jul 2008 17:20:34 +0900 Subject: [Slashdotjp-dev 1199] [726] add favicon.gif Message-ID: <1217233234.914888.16998.nullmailer@users.sourceforge.jp> Revision: 726 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=726 Author: tach Date: 2008-07-28 17:20:34 +0900 (Mon, 28 Jul 2008) Log Message: ----------- add favicon.gif Modified Paths: -------------- images/css/slashdotjp.css Added Paths: ----------- images/favicon.gif -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-07-26 05:42:47 UTC (rev 725) +++ images/css/slashdotjp.css 2008-07-28 08:20:34 UTC (rev 726) @@ -187,6 +187,7 @@ div#commentBody ul, div#metamod ul, div#bookmark ul, +div#topics .generalbody ul, form#createuserform ul { margin: 1em 0pt 1em 2em !important; } Added: images/favicon.gif =================================================================== (Binary files differ) Property changes on: images/favicon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svnnotify ¡÷ sourceforge.jp Mon Jul 28 21:19:53 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 28 Jul 2008 21:19:53 +0900 Subject: [Slashdotjp-dev 1200] [727] Add pagenavi icon for faq and update for pagenavi css Message-ID: <1217247593.278799.11056.nullmailer@users.sourceforge.jp> Revision: 727 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=727 Author: tach Date: 2008-07-28 21:19:53 +0900 (Mon, 28 Jul 2008) Log Message: ----------- Add pagenavi icon for faq and update for pagenavi css Modified Paths: -------------- images/css/slashdotjp.css Added Paths: ----------- images/pagenavi_left.gif images/pagenavi_right.gif images/pagenavi_up.gif -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-07-28 08:20:34 UTC (rev 726) +++ images/css/slashdotjp.css 2008-07-28 12:19:53 UTC (rev 727) @@ -167,6 +167,44 @@ margin-bottom: 0.4em; } +/* FAQ page navigation */ +#wikicontents .pagenavi { + background: #666 url(//images.slashdot.jp/block-title-bg.png) repeat-x; + margin-bottom: 0.6em; + padding: 2px 4px; + font-size: 85%; + color: #fff; +} +#wikicontents .pagenavi .prev { + float: left; +} +#wikicontents .pagenavi .next { + text-align: right; +} +#wikicontents .pagenavi .label { + display: none; +} +#wikicontents .pagenavi a { + color: #fff; + font-weight: bold; + text-decoration: none; +} +#wikicontents .pagenavi a:hover { + text-decoration: underline; +} +#wikicontents .pagenavi .up a { + background: transparent url(//images.sd-test.osdn.jp/pagenavi_up.gif) no-repeat scroll left center; + padding-left: 12px; +} +#wikicontents .pagenavi .prev a { + background: transparent url(//images.sd-test.osdn.jp/pagenavi_left.gif) no-repeat scroll left center; + padding-left: 12px; +} +#wikicontents .pagenavi .next a { + background: transparent url(//images.sd-test.osdn.jp/pagenavi_right.gif) no-repeat scroll right center; + padding-right: 12px; +} + /* slashdot.jp announce area */ div#slashdotjp-site-announce { background: #FFC; @@ -179,7 +217,7 @@ /* Fix normal ul */ div.general_contents ul, -div.faq ul, +div#wikicontents ul, div#search div.sectiontitle table td ul, div#search div.search-help ul, div#polls div.generalbody ul, Added: images/pagenavi_left.gif =================================================================== (Binary files differ) Property changes on: images/pagenavi_left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: images/pagenavi_right.gif =================================================================== (Binary files differ) Property changes on: images/pagenavi_right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: images/pagenavi_up.gif =================================================================== (Binary files differ) Property changes on: images/pagenavi_up.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svnnotify ¡÷ sourceforge.jp Wed Jul 30 16:28:14 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 30 Jul 2008 16:28:14 +0900 Subject: [Slashdotjp-dev 1201] [728] quick hack to fix pagenavi height Message-ID: <1217402894.158185.16379.nullmailer@users.sourceforge.jp> Revision: 728 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=728 Author: tach Date: 2008-07-30 16:28:13 +0900 (Wed, 30 Jul 2008) Log Message: ----------- quick hack to fix pagenavi height Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-07-28 12:19:53 UTC (rev 727) +++ images/css/slashdotjp.css 2008-07-30 07:28:13 UTC (rev 728) @@ -180,6 +180,7 @@ } #wikicontents .pagenavi .next { text-align: right; + height: 1.3em; } #wikicontents .pagenavi .label { display: none; From svnnotify ¡÷ sourceforge.jp Wed Jul 30 17:54:13 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 30 Jul 2008 17:54:13 +0900 Subject: [Slashdotjp-dev 1202] [729] add redirect code for old .shtml faq Message-ID: <1217408053.970842.26218.nullmailer@users.sourceforge.jp> Revision: 729 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=729 Author: tach Date: 2008-07-30 17:54:13 +0900 (Wed, 30 Jul 2008) Log Message: ----------- add redirect code for old .shtml faq Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-30 07:28:13 UTC (rev 728) +++ slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-07-30 08:54:13 UTC (rev 729) @@ -493,6 +493,7 @@ # faq for slashdot.jp if ($uri =~ m!^/faq (?: (/[^?]*) | /? ) (?: \?(.*) )? $!x) { my($word, $query) = ($1, $2); + $word =~ m!^/(.+)\.shtml$! && redirect("$constants->{absolutedir}/faq/$1"); $word ? $word =~ s!^/!! : redirect("$constants->{absolutedir}/faq/"); my @args = ($query); if ($word) { From svnnotify ¡÷ sourceforge.jp Wed Jul 30 17:56:43 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 30 Jul 2008 17:56:43 +0900 Subject: [Slashdotjp-dev 1203] [730] fix remained "sd-test" Message-ID: <1217408203.932509.28180.nullmailer@users.sourceforge.jp> Revision: 730 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=730 Author: tach Date: 2008-07-30 17:56:43 +0900 (Wed, 30 Jul 2008) Log Message: ----------- fix remained "sd-test" Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-07-30 08:54:13 UTC (rev 729) +++ images/css/slashdotjp.css 2008-07-30 08:56:43 UTC (rev 730) @@ -194,15 +194,15 @@ text-decoration: underline; } #wikicontents .pagenavi .up a { - background: transparent url(//images.sd-test.osdn.jp/pagenavi_up.gif) no-repeat scroll left center; + background: transparent url(//images.slashdot.jp/pagenavi_up.gif) no-repeat scroll left center; padding-left: 12px; } #wikicontents .pagenavi .prev a { - background: transparent url(//images.sd-test.osdn.jp/pagenavi_left.gif) no-repeat scroll left center; + background: transparent url(//images.slashdot.jp/pagenavi_left.gif) no-repeat scroll left center; padding-left: 12px; } #wikicontents .pagenavi .next a { - background: transparent url(//images.sd-test.osdn.jp/pagenavi_right.gif) no-repeat scroll right center; + background: transparent url(//images.slashdot.jp/pagenavi_right.gif) no-repeat scroll right center; padding-right: 12px; } From svnnotify ¡÷ sourceforge.jp Wed Jul 30 18:22:05 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 30 Jul 2008 18:22:05 +0900 Subject: [Slashdotjp-dev 1204] [731] Fix debian/changelog to correct information Message-ID: <1217409725.426216.17773.nullmailer@users.sourceforge.jp> Revision: 731 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=731 Author: tach Date: 2008-07-30 18:22:05 +0900 (Wed, 30 Jul 2008) Log Message: ----------- Fix debian/changelog to correct information Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-07-30 08:56:43 UTC (rev 730) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-30 09:22:05 UTC (rev 731) @@ -4,7 +4,8 @@ - top recent: /journals/top/recent -> /journals/recent - top posters: /journals/top/posters -> /journals/posters - you can access old URL - * Add /faq/ internal redirection at Slash/Apache/User.pm + * Add /faq/ internal redirection at Slash/Apache/Apache.pm + - This code is for slash-plugin-wikicontents -- Taku YASUI Fri, 25 Jul 2008 14:36:41 +0000 From svnnotify ¡÷ sourceforge.jp Wed Jul 30 18:44:13 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 30 Jul 2008 18:44:13 +0900 Subject: [Slashdotjp-dev 1205] [732] [svn-buildpackage] Tagging slash (2.5.0.192-17) Message-ID: <1217411053.105303.836.nullmailer@users.sourceforge.jp> Revision: 732 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=732 Author: tach Date: 2008-07-30 18:44:13 +0900 (Wed, 30 Jul 2008) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.192-17) Added Paths: ----------- slashjp/tags/2.5.0.192-17/ -------------- next part -------------- Copied: slashjp/tags/2.5.0.192-17 (from rev 731, slashjp/branches/2.5.0.192)