From svnnotify ＠ sourceforge.jp Mon Feb 2 16:40:48 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 02 Feb 2009 16:40:48 +0900 Subject: [Slashdotjp-dev 1458] [989] Fix to change discussion dkid for "journal-story" submissions/ stories/journals. Message-ID: <1233560448.424369.3703.nullmailer@users.sourceforge.jp> Revision: 989 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=989 Author: tach Date: 2009-02-02 16:40:48 +0900 (Mon, 02 Feb 2009) Log Message: ----------- Fix to change discussion dkid for "journal-story" submissions/stories/journals. Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-01-30 12:34:58 UTC (rev 988) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-02 07:40:48 UTC (rev 989) @@ -7771,7 +7771,8 @@ $story->{discussion} = $item->{discussion}; } - } elsif ($story->{subid}) { + } + if ($story->{subid}) { if ($self->sqlSelect('id', 'journal_transfer', 'subid=' . $self->sqlQuote($story->{subid}) )) { Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-01-30 12:34:58 UTC (rev 988) +++ slashjp/trunk/debian/changelog 2009-02-02 07:40:48 UTC (rev 989) @@ -1,3 +1,10 @@ +slash (2.5.0.233-5) unstable; urgency=low + + * Fix to change discussion dkid for "journal-story" + submissions/stories/journals. + + -- Taku YASUI Mon, 2 Feb 2009 07:39:35 +0000 + slash (2.5.0.233-4) unstable; urgency=low * Add regen-all command to re-generate all story shtml files From svnnotify ＠ sourceforge.jp Fri Feb 6 13:40:09 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 13:40:09 +0900 Subject: [Slashdotjp-dev 1459] [990] * Remove "Index" topic on topic list at story editing from submission Message-ID: <1233895209.666196.18802.nullmailer@users.sourceforge.jp> Revision: 990 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=990 Author: tach Date: 2009-02-06 13:40:09 +0900 (Fri, 06 Feb 2009) Log Message: ----------- * Remove "Index" topic on topic list at story editing from submission using constants "submission_remove_mainpage_nexus_tid" Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Admin/admin.pl slashjp/trunk/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-02 07:40:48 UTC (rev 989) +++ slashjp/trunk/debian/changelog 2009-02-06 04:40:09 UTC (rev 990) @@ -2,8 +2,10 @@ * Fix to change discussion dkid for "journal-story" submissions/stories/journals. + * Remove "Index" topic on topic list at story editing from submission + using constants "submission_remove_mainpage_nexus_tid" - -- Taku YASUI Mon, 2 Feb 2009 07:39:35 +0000 + -- Taku YASUI Fri, 6 Feb 2009 04:39:49 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2009-02-02 07:40:48 UTC (rev 989) +++ slashjp/trunk/plugins/Admin/admin.pl 2009-02-06 04:40:09 UTC (rev 990) @@ -1625,6 +1625,8 @@ push @topics, $nexus if $nexus; } for my $tid (@topics) { + # remove "Index" from topic list from submission for slashdot.jp (2009-02-06, tach) + next if ($constants->{submission_remove_mainpage_nexus_tid} && $tid == $constants->{mainpage_nexus_tid}); $chosen_hr->{$tid} = $tid == $constants->{mainpage_nexus_tid} ? 30 @@ -1662,6 +1664,9 @@ $chosenc_hr = $chosen{stc}; } } +use Data::Dumper; +print STDERR Dumper($chosen_hr); +print STDERR Dumper($chosenc_hr); # save the user's topic popup settings if (exists $form->{st_saved_tree} || exists $form->{st_tree_pref}) { Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2009-02-02 07:40:48 UTC (rev 989) +++ slashjp/trunk/sql/mysql/defaults.sql 2009-02-06 04:40:09 UTC (rev 990) @@ -1164,6 +1164,7 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('mod_limit_not_m2able_reasons', '0', 'Enable moderation limit for not m2able reasons when it is not eligible'); INSERT IGNORE INTO vars (name, value, description) VALUES ('d2_default', '', 'Default discussion2 module name'); INSERT IGNORE INTO vars (name, value, description) VALUES ('firehose_tagged_by_uid', '0', 'Use as tagged_by_uid instead of uid for FireHose filter "user:username"'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('submission_remove_mainpage_nexus_tid', '0', 'Remove "Index" topic on topic list at story editing from submission'); 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 Feb 6 16:08:23 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 16:08:23 +0900 Subject: [Slashdotjp-dev 1460] [991] remove needless debug output Message-ID: <1233904103.125578.17838.nullmailer@users.sourceforge.jp> Revision: 991 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=991 Author: tach Date: 2009-02-06 16:08:23 +0900 (Fri, 06 Feb 2009) Log Message: ----------- remove needless debug output Modified Paths: -------------- slashjp/trunk/plugins/Admin/admin.pl -------------- next part -------------- Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2009-02-06 04:40:09 UTC (rev 990) +++ slashjp/trunk/plugins/Admin/admin.pl 2009-02-06 07:08:23 UTC (rev 991) @@ -1664,9 +1664,6 @@ $chosenc_hr = $chosen{stc}; } } -use Data::Dumper; -print STDERR Dumper($chosen_hr); -print STDERR Dumper($chosenc_hr); # save the user's topic popup settings if (exists $form->{st_saved_tree} || exists $form->{st_tree_pref}) { From svnnotify ＠ sourceforge.jp Fri Feb 6 18:27:46 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 18:27:46 +0900 Subject: [Slashdotjp-dev 1461] [992] Fix SQL to get top journals at journal_update_slashbox.pl Message-ID: <1233912466.854927.22601.nullmailer@users.sourceforge.jp> Revision: 992 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=992 Author: tach Date: 2009-02-06 18:27:46 +0900 (Fri, 06 Feb 2009) Log Message: ----------- Fix SQL to get top journals at journal_update_slashbox.pl Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/journal_update_slashbox.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-06 07:08:23 UTC (rev 991) +++ slashjp/trunk/debian/changelog 2009-02-06 09:27:46 UTC (rev 992) @@ -4,8 +4,9 @@ submissions/stories/journals. * Remove "Index" topic on topic list at story editing from submission using constants "submission_remove_mainpage_nexus_tid" + * Fix SQL to get top journals at journal_update_slashbox.pl - -- Taku YASUI Fri, 6 Feb 2009 04:39:49 +0000 + -- Taku YASUI Fri, 6 Feb 2009 09:27:14 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/Journal/journal_update_slashbox.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2009-02-06 07:08:23 UTC (rev 991) +++ slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2009-02-06 09:27:46 UTC (rev 992) @@ -39,10 +39,10 @@ slashdLog("Start updating block \"$name\"") if (verbosity() >= 3); my $result = $slashdb->sqlSelectAllHashrefArray( - 'nickname AS author,jid,description AS title', - 'users_journal JOIN users USING (uid) JOIN journals on (users_journal.jid=journals.id)', + 'nickname AS author,MAX(id) AS jid,description AS title', + 'journals JOIN users USING (uid)', $where, - "ORDER BY users_journal.date DESC LIMIT $limit", + "GROUP BY uid ORDER BY jid DESC LIMIT $limit", ); map { $_->{'link'} = "$constants->{absolutedir}/~" . strip_paramattr($_->{author}) . "/journal/". $_->{jid} } @$result; From svnnotify ＠ sourceforge.jp Fri Feb 6 19:18:15 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 19:18:15 +0900 Subject: [Slashdotjp-dev 1462] [993] revert r992 Message-ID: <1233915495.923989.14158.nullmailer@users.sourceforge.jp> Revision: 993 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=993 Author: tach Date: 2009-02-06 19:18:15 +0900 (Fri, 06 Feb 2009) Log Message: ----------- revert r992 Modified Paths: -------------- slashjp/trunk/plugins/Journal/journal_update_slashbox.pl -------------- next part -------------- Modified: slashjp/trunk/plugins/Journal/journal_update_slashbox.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2009-02-06 09:27:46 UTC (rev 992) +++ slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2009-02-06 10:18:15 UTC (rev 993) @@ -39,10 +39,10 @@ slashdLog("Start updating block \"$name\"") if (verbosity() >= 3); my $result = $slashdb->sqlSelectAllHashrefArray( - 'nickname AS author,MAX(id) AS jid,description AS title', - 'journals JOIN users USING (uid)', + 'nickname AS author,jid,description AS title', + 'users_journal JOIN users USING (uid) JOIN journals on (users_journal.jid=journals.id)', $where, - "GROUP BY uid ORDER BY jid DESC LIMIT $limit", + "ORDER BY users_journal.date DESC LIMIT $limit", ); map { $_->{'link'} = "$constants->{absolutedir}/~" . strip_paramattr($_->{author}) . "/journal/". $_->{jid} } @$result; From svnnotify ＠ sourceforge.jp Fri Feb 6 20:25:50 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 20:25:50 +0900 Subject: [Slashdotjp-dev 1463] [994] fix journal list bug Message-ID: <1233919550.738222.25053.nullmailer@users.sourceforge.jp> Revision: 994 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=994 Author: tach Date: 2009-02-06 20:25:50 +0900 (Fri, 06 Feb 2009) Log Message: ----------- fix journal list bug Modified Paths: -------------- slashjp/trunk/plugins/Journal/journal_update_slashbox.pl -------------- next part -------------- Modified: slashjp/trunk/plugins/Journal/journal_update_slashbox.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2009-02-06 10:18:15 UTC (rev 993) +++ slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2009-02-06 11:25:50 UTC (rev 994) @@ -36,13 +36,15 @@ my $where = '1=1'; $where .= ' AND tid IN ('.join(',', @$tids).')' if ($skin->{skid} != $constants->{mainpage_skid}); next if ($slashdb->sqlCount('journals', $where . ($force ? '' : " AND date > '$block->{last_update}'")) < 1); + my $ids = $slashdb->sqlSelectColArrayref('MAX(id) AS jid', 'journals', $where, "GROUP BY uid ORDER BY jid DESC LIMIT $limit"); + $ids = join(',', @$ids); slashdLog("Start updating block \"$name\"") if (verbosity() >= 3); my $result = $slashdb->sqlSelectAllHashrefArray( - 'nickname AS author,jid,description AS title', - 'users_journal JOIN users USING (uid) JOIN journals on (users_journal.jid=journals.id)', - $where, - "ORDER BY users_journal.date DESC LIMIT $limit", + 'nickname AS author,id AS jid,description AS title', + 'journals JOIN users USING (uid)', + "id IN ($ids)", + "ORDER BY date DESC", ); map { $_->{'link'} = "$constants->{absolutedir}/~" . strip_paramattr($_->{author}) . "/journal/". $_->{jid} } @$result; From svnnotify ＠ sourceforge.jp Tue Feb 10 20:36:25 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 10 Feb 2009 20:36:25 +0900 Subject: [Slashdotjp-dev 1464] [995] fix firehose design for simple design mode Message-ID: <1234265785.826505.11033.nullmailer@users.sourceforge.jp> Revision: 995 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=995 Author: tach Date: 2009-02-10 20:36:25 +0900 (Tue, 10 Feb 2009) Log Message: ----------- fix firehose design for simple design mode Modified Paths: -------------- images/trunk/css/slashcode_lite.css images/trunk/css/slashcode_lite.css.jp -------------- next part -------------- Modified: images/trunk/css/slashcode_lite.css =================================================================== --- images/trunk/css/slashcode_lite.css 2009-02-06 11:25:50 UTC (rev 994) +++ images/trunk/css/slashcode_lite.css 2009-02-10 11:36:25 UTC (rev 995) @@ -164,6 +164,10 @@ /* Override slashcode_lite.css for slashdot.jp */ -div#firehose div.story div.generaltitle div.title a { - color: #fff !important; +#firehose .article h3, +#firehose .briefarticle h3 { + background: none !important; + border-bottom: solid 1px #000; } + +/* vim: set ft=css: */ Modified: images/trunk/css/slashcode_lite.css.jp =================================================================== --- images/trunk/css/slashcode_lite.css.jp 2009-02-06 11:25:50 UTC (rev 994) +++ images/trunk/css/slashcode_lite.css.jp 2009-02-10 11:36:25 UTC (rev 995) @@ -1,5 +1,9 @@ /* Override slashcode_lite.css for slashdot.jp */ -div#firehose div.story div.generaltitle div.title a { - color: #fff !important; +#firehose .article h3, +#firehose .briefarticle h3 { + background: none !important; + border-bottom: solid 1px #000; } + +/* vim: set ft=css: */ From svnnotify ＠ sourceforge.jp Tue Feb 10 21:19:50 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 10 Feb 2009 21:19:50 +0900 Subject: [Slashdotjp-dev 1465] [996] remove needless padding Message-ID: <1234268390.003239.24762.nullmailer@users.sourceforge.jp> Revision: 996 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=996 Author: tach Date: 2009-02-10 21:19:49 +0900 (Tue, 10 Feb 2009) Log Message: ----------- remove needless padding Modified Paths: -------------- images/trunk/css/comments.css images/trunk/css/comments.css.jp -------------- next part -------------- Modified: images/trunk/css/comments.css =================================================================== --- images/trunk/css/comments.css 2009-02-10 11:36:25 UTC (rev 995) +++ images/trunk/css/comments.css 2009-02-10 12:19:49 UTC (rev 996) @@ -415,6 +415,11 @@ line-height: 1.4; } +/* fix preview space */ +#contents .commentBody p { + padding: 0; +} + /* fix d2 buttons design */ .inline_comment .replyto_buttons { margin: 0; Modified: images/trunk/css/comments.css.jp =================================================================== --- images/trunk/css/comments.css.jp 2009-02-10 11:36:25 UTC (rev 995) +++ images/trunk/css/comments.css.jp 2009-02-10 12:19:49 UTC (rev 996) @@ -21,6 +21,11 @@ line-height: 1.4; } +/* fix preview space */ +#contents .commentBody p { + padding: 0; +} + /* fix d2 buttons design */ .inline_comment .replyto_buttons { margin: 0; From svnnotify ＠ sourceforge.jp Thu Feb 12 13:36:06 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 13:36:06 +0900 Subject: [Slashdotjp-dev 1466] [997] fix css for radiobutton and checkbox Message-ID: <1234413366.749406.3181.nullmailer@users.sourceforge.jp> Revision: 997 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=997 Author: tach Date: 2009-02-12 13:36:06 +0900 (Thu, 12 Feb 2009) Log Message: ----------- fix css for radiobutton and checkbox Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-10 12:19:49 UTC (rev 996) +++ images/trunk/css/slashdotjp.css 2009-02-12 04:36:06 UTC (rev 997) @@ -104,10 +104,17 @@ div.storylinks ul { font-size: 90%; } + input { margin: 3px; } +input[type="radio"], +input[type="checkbox"] { + margin: 0.2em 3px 1px; + vertical-align: bottom; +} + textarea { width: 98%; } From svnnotify ＠ sourceforge.jp Thu Feb 12 14:37:58 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 14:37:58 +0900 Subject: [Slashdotjp-dev 1467] [998] fix to create correct js files Message-ID: <1234417078.499137.28526.nullmailer@users.sourceforge.jp> Revision: 998 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=998 Author: tach Date: 2009-02-12 14:37:58 +0900 (Thu, 12 Feb 2009) Log Message: ----------- fix to create correct js files Modified Paths: -------------- images/trunk/Makefile -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-02-12 04:36:06 UTC (rev 997) +++ images/trunk/Makefile 2009-02-12 05:37:58 UTC (rev 998) @@ -49,7 +49,7 @@ all-minified.js: %: %.orig %.jp %.prefix $(jses): %: %.js $(patsubst %, %.js, $(jses)): %: %.orig - if [ -f $@.prefix ]; then cat $@.prefix > $@; fi + if [ -f $@.prefix ]; then cat $@.prefix > $@; else echo -n > $@; fi cat $@.orig | \ sed -e 's/if(name=="usermode"){/if(name=="firehose_usermode"){/' | \ sed -e 's/ Firehose / アレたま /' | \ From svnnotify ＠ sourceforge.jp Thu Feb 12 14:49:58 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 14:49:58 +0900 Subject: [Slashdotjp-dev 1468] [999] use "posttype" when preview/submit comment using D2 Message-ID: <1234417798.228183.7016.nullmailer@users.sourceforge.jp> Revision: 999 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=999 Author: tach Date: 2009-02-12 14:49:58 +0900 (Thu, 12 Feb 2009) Log Message: ----------- use "posttype" when preview/submit comment using D2 Modified Paths: -------------- images/trunk/Makefile images/trunk/comments.js -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-02-12 05:37:58 UTC (rev 998) +++ images/trunk/Makefile 2009-02-12 05:49:58 UTC (rev 999) @@ -81,6 +81,7 @@ sed -e 's/value="No Thanks"/value="やりません"/' | \ sed -e 's/>(Remember that you can always adjust these controls with the slider widget/>（コメントの--LEFTORTOP--に見えるスライダーで制御できますよ）/' | \ sed -e 's/visible to the --LEFTORTOP-- of the discussion.)> $@ Modified: images/trunk/comments.js =================================================================== --- images/trunk/comments.js 2009-02-12 05:37:58 UTC (rev 998) +++ images/trunk/comments.js 2009-02-12 05:49:58 UTC (rev 999) @@ -1114,6 +1114,7 @@ params['gotmodwarning'] = $dom('gotmodwarning_' + pid).value; params['postersubj'] = $dom('postersubj_' + pid).value; params['postercomment'] = $dom('postercomment_' + pid).value; + params['posttype'] = $dom('posttype_' + pid).value; var hcanswer = $dom('hcanswer_' + pid); if (hcanswer) From svnnotify ＠ sourceforge.jp Thu Feb 12 15:31:25 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 15:31:25 +0900 Subject: [Slashdotjp-dev 1469] [1000] add nobonus setting for D2 Message-ID: <1234420285.828547.15797.nullmailer@users.sourceforge.jp> Revision: 1000 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1000 Author: tach Date: 2009-02-12 15:31:25 +0900 (Thu, 12 Feb 2009) Log Message: ----------- add nobonus setting for D2 Modified Paths: -------------- images/trunk/Makefile images/trunk/comments.js -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-02-12 05:49:58 UTC (rev 999) +++ images/trunk/Makefile 2009-02-12 06:31:25 UTC (rev 1000) @@ -81,7 +81,7 @@ sed -e 's/value="No Thanks"/value="やりません"/' | \ sed -e 's/>(Remember that you can always adjust these controls with the slider widget/>（コメントの--LEFTORTOP--に見えるスライダーで制御できますよ）/' | \ sed -e 's/visible to the --LEFTORTOP-- of the discussion.)> $@ Modified: images/trunk/comments.js =================================================================== --- images/trunk/comments.js 2009-02-12 05:49:58 UTC (rev 999) +++ images/trunk/comments.js 2009-02-12 06:31:25 UTC (rev 1000) @@ -1114,7 +1114,7 @@ params['gotmodwarning'] = $dom('gotmodwarning_' + pid).value; params['postersubj'] = $dom('postersubj_' + pid).value; params['postercomment'] = $dom('postercomment_' + pid).value; - params['posttype'] = $dom('posttype_' + pid).value; + params['posttype'] = $dom('posttype_' + pid).value; var nobonus = $dom('nobonus_' + pid); if (nobonus && nobonus.checked) params['nobonus'] = nobonus.value; params['nobonus_present'] = '1'; var hcanswer = $dom('hcanswer_' + pid); if (hcanswer) From svnnotify ＠ sourceforge.jp Thu Feb 12 16:38:11 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 16:38:11 +0900 Subject: [Slashdotjp-dev 1470] [1001] fix d2 comment form design Message-ID: <1234424291.387009.18753.nullmailer@users.sourceforge.jp> Revision: 1001 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1001 Author: tach Date: 2009-02-12 16:38:11 +0900 (Thu, 12 Feb 2009) Log Message: ----------- fix d2 comment form design Modified Paths: -------------- images/trunk/css/comments.css images/trunk/css/comments.css.jp -------------- next part -------------- Modified: images/trunk/css/comments.css =================================================================== --- images/trunk/css/comments.css 2009-02-12 06:31:25 UTC (rev 1000) +++ images/trunk/css/comments.css 2009-02-12 07:38:11 UTC (rev 1001) @@ -423,7 +423,7 @@ /* fix d2 buttons design */ .inline_comment .replyto_buttons { margin: 0; - padding: 1em; + padding: 0.7em; background: #FFF; } @@ -438,13 +438,27 @@ background: #FFF; } -/* fix d2 comment anon checkbox */ -.generaltitle h3 label { +.inline_comment input[type="text"] { + width: 90%; +} + +.inline_comment label { display: inline; + margin: 0; + padding: 0; font-weight: normal; - font-size: 85%; } +.inline_comment .generalbody { + padding: 0.7em; + line-height: 1.7; +} + +.inline_comment textarea { + margin: 0 0 0.3em; + width: 98%; +} + /* fix d2 slide bar */ .vertical #ccw-abbr-bar, .vertical #ccw-hide-bar { Modified: images/trunk/css/comments.css.jp =================================================================== --- images/trunk/css/comments.css.jp 2009-02-12 06:31:25 UTC (rev 1000) +++ images/trunk/css/comments.css.jp 2009-02-12 07:38:11 UTC (rev 1001) @@ -29,7 +29,7 @@ /* fix d2 buttons design */ .inline_comment .replyto_buttons { margin: 0; - padding: 1em; + padding: 0.7em; background: #FFF; } @@ -39,18 +39,32 @@ border: none; } -/* fix d2 comment background */ +/* fix d2 comment form design */ .inline_comment { background: #FFF; } -/* fix d2 comment anon checkbox */ -.generaltitle h3 label { +.inline_comment input[type="text"] { + width: 90%; +} + +.inline_comment label { display: inline; + margin: 0; + padding: 0; font-weight: normal; - font-size: 85%; } +.inline_comment .generalbody { + padding: 0.7em; + line-height: 1.7; +} + +.inline_comment textarea { + margin: 0 0 0.3em; + width: 98%; +} + /* fix d2 slide bar */ .vertical #ccw-abbr-bar, .vertical #ccw-hide-bar { From svnnotify ＠ sourceforge.jp Thu Feb 12 20:56:12 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 20:56:12 +0900 Subject: [Slashdotjp-dev 1471] [1002] change comment Message-ID: <1234439772.906951.17564.nullmailer@users.sourceforge.jp> Revision: 1002 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1002 Author: tach Date: 2009-02-12 20:56:12 +0900 (Thu, 12 Feb 2009) Log Message: ----------- change comment Modified Paths: -------------- images/trunk/css/comments.css -------------- next part -------------- Modified: images/trunk/css/comments.css =================================================================== --- images/trunk/css/comments.css 2009-02-12 07:38:11 UTC (rev 1001) +++ images/trunk/css/comments.css 2009-02-12 11:56:12 UTC (rev 1002) @@ -433,7 +433,7 @@ border: none; } -/* fix d2 comment background */ +/* fix d2 comment form design */ .inline_comment { background: #FFF; } From svnnotify ＠ sourceforge.jp Thu Feb 12 20:58:09 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 20:58:09 +0900 Subject: [Slashdotjp-dev 1472] [1003] add ad-hoc comments. js changing script and fix js for IE to enable D2 Message-ID: <1234439889.936962.19255.nullmailer@users.sourceforge.jp> Revision: 1003 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1003 Author: tach Date: 2009-02-12 20:58:09 +0900 (Thu, 12 Feb 2009) Log Message: ----------- add ad-hoc comments.js changing script and fix js for IE to enable D2 Modified Paths: -------------- images/trunk/Makefile images/trunk/comments.js Added Paths: ----------- images/trunk/fix-comments.js.pl -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-02-12 11:56:12 UTC (rev 1002) +++ images/trunk/Makefile 2009-02-12 11:58:09 UTC (rev 1003) @@ -84,7 +84,8 @@ sed -e "s/params\['postercomment'\] = \$$dom('postercomment_' + pid).value;/&\n\tparams\['posttype'\] = \$$dom('posttype_' + pid).value; var nobonus = \$$dom('nobonus_' + pid); if (nobonus \&\& nobonus.checked) params\['nobonus'\] = nobonus.value; params\['nobonus_present'\] = '1';/" | \ sed -e "s/'top' : 'left';/'上の' : '左の';/" | \ sed -e 's/hidden comment> $@ + sed -e 's/hidden comments> $@ echo >> $@ if [ -f $@.jp ]; then cat $@.jp >> $@; fi Modified: images/trunk/comments.js =================================================================== --- images/trunk/comments.js 2009-02-12 11:56:12 UTC (rev 1002) +++ images/trunk/comments.js 2009-02-12 11:58:09 UTC (rev 1003) @@ -2271,38 +2271,34 @@ pinToRange: pinToRange }; -Slash.Util.qw.each('\ - abbrev_comments \ - adTimerUrl \ - comment_body_reply \ - comments \ - currents \ - d2_comment_order \ - d2_keybindings_disable \ - d2_keybindings_off \ - d2_reverse_shift \ - d2_seen \ - discussion_id \ - init_hiddens \ - more_comments_num \ - noshow_comments \ - pieces_comments \ - placeholder_no_update \ - base_comment \ - root_comment \ - root_comments \ - root_comments_hash \ - thresh_totals \ - user_d2asp \ - user_highlightthresh \ - user_is_admin \ - user_is_anon \ - user_is_subscriber \ - user_threshold \ - user_uid \ - ', function(){ - packageObj[this] = eval('(function(v){ if (v===undefined) return '+this+'; '+this+'=v;})'); -}); +packageObj['abbrev_comments'] = function(v){if (v===undefined) return abbrev_comments; abbrev_comments = v;} +packageObj['adTimerUrl'] = function(v){if (v===undefined) return adTimerUrl; adTimerUrl = v;} +packageObj['comment_body_reply'] = function(v){if (v===undefined) return comment_body_reply; comment_body_reply = v;} +packageObj['comments'] = function(v){if (v===undefined) return comments; comments = v;} +packageObj['currents'] = function(v){if (v===undefined) return currents; currents = v;} +packageObj['d2_comment_order'] = function(v){if (v===undefined) return d2_comment_order; d2_comment_order = v;} +packageObj['d2_keybindings_disable'] = function(v){if (v===undefined) return d2_keybindings_disable; d2_keybindings_disable = v;} +packageObj['d2_keybindings_off'] = function(v){if (v===undefined) return d2_keybindings_off; d2_keybindings_off = v;} +packageObj['d2_reverse_shift'] = function(v){if (v===undefined) return d2_reverse_shift; d2_reverse_shift = v;} +packageObj['d2_seen'] = function(v){if (v===undefined) return d2_seen; d2_seen = v;} +packageObj['discussion_id'] = function(v){if (v===undefined) return discussion_id; discussion_id = v;} +packageObj['init_hiddens'] = function(v){if (v===undefined) return init_hiddens; init_hiddens = v;} +packageObj['more_comments_num'] = function(v){if (v===undefined) return more_comments_num; more_comments_num = v;} +packageObj['noshow_comments'] = function(v){if (v===undefined) return noshow_comments; noshow_comments = v;} +packageObj['pieces_comments'] = function(v){if (v===undefined) return pieces_comments; pieces_comments = v;} +packageObj['placeholder_no_update'] = function(v){if (v===undefined) return placeholder_no_update; placeholder_no_update = v;} +packageObj['base_comment'] = function(v){if (v===undefined) return base_comment; base_comment = v;} +packageObj['root_comment'] = function(v){if (v===undefined) return root_comment; root_comment = v;} +packageObj['root_comments'] = function(v){if (v===undefined) return root_comments; root_comments = v;} +packageObj['root_comments_hash'] = function(v){if (v===undefined) return root_comments_hash; root_comments_hash = v;} +packageObj['thresh_totals'] = function(v){if (v===undefined) return thresh_totals; thresh_totals = v;} +packageObj['user_d2asp'] = function(v){if (v===undefined) return user_d2asp; user_d2asp = v;} +packageObj['user_highlightthresh'] = function(v){if (v===undefined) return user_highlightthresh; user_highlightthresh = v;} +packageObj['user_is_admin'] = function(v){if (v===undefined) return user_is_admin; user_is_admin = v;} +packageObj['user_is_anon'] = function(v){if (v===undefined) return user_is_anon; user_is_anon = v;} +packageObj['user_is_subscriber'] = function(v){if (v===undefined) return user_is_subscriber; user_is_subscriber = v;} +packageObj['user_threshold'] = function(v){if (v===undefined) return user_threshold; user_threshold = v;} +packageObj['user_uid'] = function(v){if (v===undefined) return user_uid; user_uid = v;} Slash.Util.Package({ named: 'Slash.Discussion', Added: images/trunk/fix-comments.js.pl =================================================================== --- images/trunk/fix-comments.js.pl (rev 0) +++ images/trunk/fix-comments.js.pl 2009-02-12 11:58:09 UTC (rev 1003) @@ -0,0 +1,22 @@ +#!/usr/bin/perl +# +# ad-hoc comments.js fix script for IE + +use strict; +use warnings; + +my $inq = 0; +my $alt = ""; + +while (my $l = <>) { + if (!$inq && $l =~ /^Slash\.Util\.qw\.each\('\\$/) { + $inq = 1; + } elsif ($inq && $l =~ /^\}\);$/) { + $inq = 0; + print $alt; + } elsif ($inq && $l =~ /\t(\w+)\s+\\$/) { + $alt .= "packageObj['$1'] = function(v){if (v===undefined) return $1; $1 = v;}\n"; + } elsif (!$inq) { + print $l; + } +} From svnnotify ＠ sourceforge.jp Thu Feb 12 21:38:25 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 21:38:25 +0900 Subject: [Slashdotjp-dev 1473] [1004] privent to copy .pl file Message-ID: <1234442305.950139.24027.nullmailer@users.sourceforge.jp> Revision: 1004 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1004 Author: tach Date: 2009-02-12 21:38:25 +0900 (Thu, 12 Feb 2009) Log Message: ----------- privent to copy .pl file Modified Paths: -------------- images/trunk/Makefile -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-02-12 11:58:09 UTC (rev 1003) +++ images/trunk/Makefile 2009-02-12 12:38:25 UTC (rev 1004) @@ -11,7 +11,7 @@ update: $(csses) $(sections) $(jses) images install: default - rsync -avHSC --exclude=/hc/ --exclude=Makefile --exclude=\*-stamp --exclude=\*.jp ./ $(DESTDIR) + rsync -avHSC --exclude=/hc/ --exclude=Makefile --exclude=\*-stamp --exclude=\*.jp --exclude=\*.pl ./ $(DESTDIR) images: images-stamp images-stamp: $(patsubst %,css/%.css.orig, $(csses)) $(patsubst %,css/slashdot_%.css.orig, $(sections)) $(aimages) From svnnotify ＠ sourceforge.jp Fri Feb 13 13:23:56 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 13:23:56 +0900 Subject: [Slashdotjp-dev 1474] [1005] Change color to red for "This story will not appear" message at admin.pl Message-ID: <1234499036.418837.5464.nullmailer@users.sourceforge.jp> Revision: 1005 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1005 Author: tach Date: 2009-02-13 13:23:56 +0900 (Fri, 13 Feb 2009) Log Message: ----------- Change color to red for "This story will not appear" message at admin.pl Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Admin/admin.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-12 12:38:25 UTC (rev 1004) +++ slashjp/trunk/debian/changelog 2009-02-13 04:23:56 UTC (rev 1005) @@ -5,8 +5,9 @@ * Remove "Index" topic on topic list at story editing from submission using constants "submission_remove_mainpage_nexus_tid" * Fix SQL to get top journals at journal_update_slashbox.pl + * Change color to red for "This story will not appear" message at admin.pl - -- Taku YASUI Fri, 6 Feb 2009 09:27:14 +0000 + -- Taku YASUI Fri, 13 Feb 2009 04:22:33 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2009-02-12 12:38:25 UTC (rev 1004) +++ slashjp/trunk/plugins/Admin/admin.pl 2009-02-13 04:23:56 UTC (rev 1005) @@ -1708,12 +1708,13 @@ my $desc; if (!@sorted_nexuses) { - $desc = "This story will not appear because "; + $desc = "This story will not appear because "; if (!%$topics_rendered) { $desc .= "no topics are selected."; } else { $desc .= "no topics in any nexuses are selected."; } + $desc .= ""; } else { $desc = "This story "; if ($display) { From svnnotify ＠ sourceforge.jp Fri Feb 13 13:32:22 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 13:32:22 +0900 Subject: [Slashdotjp-dev 1475] [1006] "red" background color for stories will not appear Message-ID: <1234499542.347177.15834.nullmailer@users.sourceforge.jp> Revision: 1006 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1006 Author: tach Date: 2009-02-13 13:32:22 +0900 (Fri, 13 Feb 2009) Log Message: ----------- "red" background color for stories will not appear Modified Paths: -------------- images/trunk/css/admin.css images/trunk/css/admin.css.jp -------------- next part -------------- Modified: images/trunk/css/admin.css =================================================================== --- images/trunk/css/admin.css 2009-02-13 04:23:56 UTC (rev 1005) +++ images/trunk/css/admin.css 2009-02-13 04:32:22 UTC (rev 1006) @@ -352,4 +352,14 @@ padding: 0.1em 0.3em; } +/* stories will not appear */ +.story_nd { + background: #C00; + color: #CCC; +} + +.story_nd a { + color: #FFF; +} + /* vim: set ft=css: */ Modified: images/trunk/css/admin.css.jp =================================================================== --- images/trunk/css/admin.css.jp 2009-02-13 04:23:56 UTC (rev 1005) +++ images/trunk/css/admin.css.jp 2009-02-13 04:32:22 UTC (rev 1006) @@ -66,4 +66,14 @@ padding: 0.1em 0.3em; } +/* stories will not appear */ +.story_nd { + background: #C00; + color: #CCC; +} + +.story_nd a { + color: #FFF; +} + /* vim: set ft=css: */ From svnnotify ＠ sourceforge.jp Fri Feb 13 16:33:35 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 16:33:35 +0900 Subject: [Slashdotjp-dev 1476] [1007] Fix: vanish olderstuff slashbox from top page when moved Message-ID: <1234510415.230151.31820.nullmailer@users.sourceforge.jp> Revision: 1007 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1007 Author: tach Date: 2009-02-13 16:33:35 +0900 (Fri, 13 Feb 2009) Log Message: ----------- Fix: vanish olderstuff slashbox from top page when moved Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-13 04:32:22 UTC (rev 1006) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-13 07:33:35 UTC (rev 1007) @@ -10537,6 +10537,7 @@ } if (exists $hashref->{slashboxes}) { my @slashboxes = grep /^[\w-]+$/, split /,/, $hashref->{slashboxes}; + map { s/olderstuff/mainpage_more/; } @slashboxes; $hashref->{slashboxes} = join ",", @slashboxes; } Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-13 04:32:22 UTC (rev 1006) +++ slashjp/trunk/debian/changelog 2009-02-13 07:33:35 UTC (rev 1007) @@ -6,8 +6,9 @@ using constants "submission_remove_mainpage_nexus_tid" * Fix SQL to get top journals at journal_update_slashbox.pl * Change color to red for "This story will not appear" message at admin.pl + * Fix: vanish olderstuff slashbox from top page when moved - -- Taku YASUI Fri, 13 Feb 2009 04:22:33 +0000 + -- Taku YASUI Fri, 13 Feb 2009 07:32:33 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Fri Feb 13 16:44:36 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 16:44:36 +0900 Subject: [Slashdotjp-dev 1477] [1008] fix regex Message-ID: <1234511076.352040.14648.nullmailer@users.sourceforge.jp> Revision: 1008 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1008 Author: tach Date: 2009-02-13 16:44:36 +0900 (Fri, 13 Feb 2009) Log Message: ----------- fix regex Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-13 07:33:35 UTC (rev 1007) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-13 07:44:36 UTC (rev 1008) @@ -10537,7 +10537,7 @@ } if (exists $hashref->{slashboxes}) { my @slashboxes = grep /^[\w-]+$/, split /,/, $hashref->{slashboxes}; - map { s/olderstuff/mainpage_more/; } @slashboxes; + map { s/^olderstuff$/mainpage_more/; } @slashboxes; $hashref->{slashboxes} = join ",", @slashboxes; } From svnnotify ＠ sourceforge.jp Fri Feb 13 18:26:19 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 18:26:19 +0900 Subject: [Slashdotjp-dev 1478] [1009] Fix: sortable slashboxes is enabled only in toppage Message-ID: <1234517179.174549.12972.nullmailer@users.sourceforge.jp> Revision: 1009 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1009 Author: tach Date: 2009-02-13 18:26:19 +0900 (Fri, 13 Feb 2009) Log Message: ----------- Fix: sortable slashboxes is enabled only in toppage Modified Paths: -------------- images/trunk/Makefile images/trunk/all-minified.js -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-02-13 07:44:36 UTC (rev 1008) +++ images/trunk/Makefile 2009-02-13 09:26:19 UTC (rev 1009) @@ -85,6 +85,7 @@ sed -e "s/'top' : 'left';/'上の' : '左の';/" | \ sed -e 's/hidden comment> $@ echo >> $@ if [ -f $@.jp ]; then cat $@.jp >> $@; fi Modified: images/trunk/all-minified.js =================================================================== --- images/trunk/all-minified.js 2009-02-13 07:44:36 UTC (rev 1008) +++ images/trunk/all-minified.js 2009-02-13 09:26:19 UTC (rev 1009) @@ -1308,7 +1308,7 @@ function jquery_fn(fn){return function(expr){var $list=fn(this);if(expr!==undefined){$list=$list.filter(expr);} return this.pushStack($.unique($list));};} function elem_fn(fn){return function(elem){var $list=fn($(elem));if($list.length){return $list[0];}}}})(Slash.jQuery);;(function($){function save_slashboxes(){ajax_update({op:'page_save_user_boxes',reskey:reskey_static,bids:$('#slashboxes div.title').map(function(){return this.id.slice(0,-6);}).get().join(',')});} -$(function(){$('#slashboxes').sortable({axis:'y',containment:'parent',handle:'.title',opacity:0.8,update:save_slashboxes}).find('> div.block > div.title > h4'). +$(function(){$('.section-mainpage #index #slashboxes').sortable({axis:'y',containment:'parent',handle:'.title',opacity:0.8,update:save_slashboxes}).find('> div.block > div.title > h4'). append('x').find('span.closebox').click(function(){$(this).nearest_parent('div.block').remove();save_slashboxes();});});})(Slash.jQuery);;var context_triggers,well_known_tags;function animate_wiggle($selector){$selector.animate({left:'-=3px'},20).animate({left:'+=6px'},20).animate({left:'-=6px'},20).animate({left:'+=6px'},20).animate({left:'-=3px'},20).queue(function(){$(this).css({left:''}).dequeue();});} var tag_server_fns={broadcast_tag_lists:function(broadcasts,options){var tuples=(''+broadcasts).split(/\n?<([\w:]*)>/).slice(1);if(tuples&&tuples.length>=2){var $listeners=$('.ready[context]',this);while(tuples.length>=2){var data=tuples.pop();var context=tuples.pop();var context_name=context.split(':')[0];$listeners.filter('[context*='+context_name+']').each(function(){if(this.receive_broadcast){this.receive_broadcast(data,context,options);}});} recompute_css_classes(this,$listeners);} From svnnotify ＠ sourceforge.jp Fri Feb 13 18:43:38 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 18:43:38 +0900 Subject: [Slashdotjp-dev 1479] [1010] Fix: dupliicate slashboxes Message-ID: <1234518218.657009.31717.nullmailer@users.sourceforge.jp> Revision: 1010 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1010 Author: tach Date: 2009-02-13 18:43:38 +0900 (Fri, 13 Feb 2009) Log Message: ----------- Fix: dupliicate slashboxes Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-13 09:26:19 UTC (rev 1009) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-13 09:43:38 UTC (rev 1010) @@ -10536,7 +10536,8 @@ delete($hashref->{people}); } if (exists $hashref->{slashboxes}) { - my @slashboxes = grep /^[\w-]+$/, split /,/, $hashref->{slashboxes}; + my %seen_boxes; + my @slashboxes = grep { /^[\w-]+$/; ++$seen_boxes{$_} < 2; } split /,/, $hashref->{slashboxes}; map { s/^olderstuff$/mainpage_more/; } @slashboxes; $hashref->{slashboxes} = join ",", @slashboxes; } Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-13 09:26:19 UTC (rev 1009) +++ slashjp/trunk/debian/changelog 2009-02-13 09:43:38 UTC (rev 1010) @@ -7,8 +7,9 @@ * Fix SQL to get top journals at journal_update_slashbox.pl * Change color to red for "This story will not appear" message at admin.pl * Fix: vanish olderstuff slashbox from top page when moved + * Fix: dupliicate slashboxes - -- Taku YASUI Fri, 13 Feb 2009 07:32:33 +0000 + -- Taku YASUI Fri, 13 Feb 2009 09:43:12 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Wed Feb 18 11:55:43 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 18 Feb 2009 11:55:43 +0900 Subject: [Slashdotjp-dev 1480] [1011] add ads-text css Message-ID: <1234925743.281179.18895.nullmailer@users.sourceforge.jp> Revision: 1011 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1011 Author: tach Date: 2009-02-18 11:55:43 +0900 (Wed, 18 Feb 2009) Log Message: ----------- add ads-text css Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-13 09:43:38 UTC (rev 1010) +++ images/trunk/css/slashdotjp.css 2009-02-18 02:55:43 UTC (rev 1011) @@ -656,6 +656,28 @@ margin: 1em 0; } +/* text ads */ +.ads-text { + border: 1px solid #CCC; + padding: 0.3em 0.5em; + margin-bottom: 0.5em; + font-size: 85%; + color: #999; +} + +.ads-text #ads-text-1 { + margin-bottom: 0.3em; +} + +.ads-text a { + color: #055; + text-decoration: none; +} + +.ads-text a:hover { + text-decoration: underline; +} + /* for osdnnavbar: width=0 */ #top_parent { border: 0px solid transparent; From svnnotify ＠ sourceforge.jp Wed Feb 18 18:33:09 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 18 Feb 2009 18:33:09 +0900 Subject: [Slashdotjp-dev 1481] [1012] add lower-contents css Message-ID: <1234949589.505148.8373.nullmailer@users.sourceforge.jp> Revision: 1012 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1012 Author: tach Date: 2009-02-18 18:33:09 +0900 (Wed, 18 Feb 2009) Log Message: ----------- add lower-contents css Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-18 02:55:43 UTC (rev 1011) +++ images/trunk/css/slashdotjp.css 2009-02-18 09:33:09 UTC (rev 1012) @@ -357,6 +357,28 @@ margin: 0.8em 0; } +/* lower contents for whole site */ +#lower-contents { + margin-top: 1em; + white-space: nowrap; +} + +/* story widget at the bottom of contents */ +#lower-contents .story-widget { + margin-top: 1em; + background: #E8E8E8; +} + +#lower-contents .story-widget ol { + margin: 0 0 0 2em !important; + padding: 0.5em 0.7em; + line-height: 1.7; +} + +#lower-contents .story-widget ol li a.comments { + font-size: 90%; +} + /* FAQ page navigation */ #wikicontents .pagenavi { background: #666 url(//images.slashdot.jp/block-title-bg.png) repeat-x; From svnnotify ＠ sourceforge.jp Wed Feb 18 22:22:53 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 18 Feb 2009 22:22:53 +0900 Subject: [Slashdotjp-dev 1482] [1013] add css for printCommentsSuffix Message-ID: <1234963373.499329.23672.nullmailer@users.sourceforge.jp> Revision: 1013 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1013 Author: tach Date: 2009-02-18 22:22:53 +0900 (Wed, 18 Feb 2009) Log Message: ----------- add css for printCommentsSuffix Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-18 09:33:09 UTC (rev 1012) +++ images/trunk/css/slashdotjp.css 2009-02-18 13:22:53 UTC (rev 1013) @@ -241,6 +241,37 @@ word-break: break-all; } +/* comments suffix (printCommentsSuffix) */ +#discussion_buttons { + margin-bottom: 1em; +} + +.comments-suffix-prev-next { + margin-bottom: 1em; + padding: 0.5em; + background: #EEE; + border: 4px solid #CCC; + border-radius: 10px; + -moz-border-radius: 10px; +} + +.comments-suffix-prev-next .suffix-prev { + float: left; + text-align: left; + font-weight: bold; +} + +.comments-suffix-prev-next .suffix-next { + float: right; + text-align: right; + font-weight: bold; +} + +.comments-suffix-prev-next .suffix-up { + text-align: center; + font-weight: bold; +} + /* zoo icon position fix */ .zooicon img { vertical-align: bottom; From svnnotify ＠ sourceforge.jp Wed Feb 18 22:45:55 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 18 Feb 2009 22:45:55 +0900 Subject: [Slashdotjp-dev 1483] [1014] Add printCommentsSuffix() to show comments suffix (e.g. Message-ID: <1234964755.024379.14114.nullmailer@users.sourceforge.jp> Revision: 1014 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1014 Author: tach Date: 2009-02-18 22:45:54 +0900 (Wed, 18 Feb 2009) Log Message: ----------- Add printCommentsSuffix() to show comments suffix (e.g. navigation) Modified Paths: -------------- slashjp/trunk/Slash/Utility/Comments/Comments.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-18 13:22:53 UTC (rev 1013) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-18 13:45:54 UTC (rev 1014) @@ -1209,6 +1209,7 @@ #slashProfEnd(); print $comment_html; + printCommentsSuffix($discussion); } #======================================================================== @@ -2631,7 +2632,33 @@ ? $user->{discussion2} : 0; } +######################################################## +# comments suffix +sub printCommentsSuffix { + my ($discussion, $options) = @_; + my $constants = getCurrentStatic(); + my $reader = getObject('Slash::DB', { db_type => 'reader' }); + my $stories = {}; + my $ret = ''; + return $ret if (!$discussion || ref($discussion) ne "HASH"); + + my $sid = $reader->getStorySidFromDiscussion($discussion->{id}); + if ($sid) { + my $story = $reader->getStory($sid); + if ($constants->{use_prev_next_link}) { + $stories->{prev} = $reader->getStoryByTime('<', $story); + $stories->{next} = $reader->getStoryByTime('>', $story) unless $story->{is_future}; + } + } + + $ret = slashDisplay('printCommentsSuffix', { + stories => $stories, + }, { Return => $options->{return} }); + + return $ret; +} + 1; __END__ Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-18 13:22:53 UTC (rev 1013) +++ slashjp/trunk/debian/changelog 2009-02-18 13:45:54 UTC (rev 1014) @@ -8,8 +8,9 @@ * Change color to red for "This story will not appear" message at admin.pl * Fix: vanish olderstuff slashbox from top page when moved * Fix: dupliicate slashboxes + * Add printCommentsSuffix() to show comments suffix (e.g. navigation) - -- Taku YASUI Fri, 13 Feb 2009 09:43:12 +0000 + -- Taku YASUI Wed, 18 Feb 2009 13:45:06 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Thu Feb 19 14:22:56 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 19 Feb 2009 14:22:56 +0900 Subject: [Slashdotjp-dev 1484] [1015] fix html title for edituser page Message-ID: <1235020976.718909.12514.nullmailer@users.sourceforge.jp> Revision: 1015 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1015 Author: tach Date: 2009-02-19 14:22:56 +0900 (Thu, 19 Feb 2009) Log Message: ----------- fix html title for edituser page Modified Paths: -------------- slashjp/trunk/themes/slashcode/htdocs/users.pl -------------- next part -------------- Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/users.pl 2009-02-18 13:45:54 UTC (rev 1014) +++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2009-02-19 05:22:56 UTC (rev 1015) @@ -413,7 +413,12 @@ adminmenu => $ops->{$op}{adminmenu} || 'admin', tab_selected => $ops->{$op}{tab_selected}, }; - header(getMessage('user_header'), '', $data) or return; + + if ($op =~ /^edit\w+$/) { + header(getMessage('useredit_header', { op => $op }), '', $data) or return; + } else { + header(getMessage('user_header'), '', $data) or return; + } # This is a hardcoded position, bad idea and should be fixed -Brian # Yeah, we should pull this into a template somewhere... print getMessage('note', { note => $errornote }) if defined $errornote; From svnnotify ＠ sourceforge.jp Thu Feb 19 14:37:35 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 19 Feb 2009 14:37:35 +0900 Subject: [Slashdotjp-dev 1485] [1016] fix html title for edituser page (cont.) Message-ID: <1235021855.063078.4850.nullmailer@users.sourceforge.jp> Revision: 1016 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1016 Author: tach Date: 2009-02-19 14:37:35 +0900 (Thu, 19 Feb 2009) Log Message: ----------- fix html title for edituser page (cont.) Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/themes/slashcode/htdocs/users.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-19 05:22:56 UTC (rev 1015) +++ slashjp/trunk/debian/changelog 2009-02-19 05:37:35 UTC (rev 1016) @@ -9,8 +9,9 @@ * Fix: vanish olderstuff slashbox from top page when moved * Fix: dupliicate slashboxes * Add printCommentsSuffix() to show comments suffix (e.g. navigation) + * Fix: HTML title for edituser page - -- Taku YASUI Wed, 18 Feb 2009 13:45:06 +0000 + -- Taku YASUI Thu, 19 Feb 2009 05:36:36 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/users.pl 2009-02-19 05:22:56 UTC (rev 1015) +++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2009-02-19 05:37:35 UTC (rev 1016) @@ -414,7 +414,7 @@ tab_selected => $ops->{$op}{tab_selected}, }; - if ($op =~ /^edit\w+$/) { + if ($op =~ /^(?:edit|save)\w+$/) { header(getMessage('useredit_header', { op => $op }), '', $data) or return; } else { header(getMessage('user_header'), '', $data) or return; From svnnotify ＠ sourceforge.jp Thu Feb 19 18:12:47 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 19 Feb 2009 18:12:47 +0900 Subject: [Slashdotjp-dev 1486] [1017] Fix: add fhid for submission to submission_param table Message-ID: <1235034767.675623.3734.nullmailer@users.sourceforge.jp> Revision: 1017 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1017 Author: tach Date: 2009-02-19 18:12:47 +0900 (Thu, 19 Feb 2009) Log Message: ----------- Fix: add fhid for submission to submission_param table Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-19 05:37:35 UTC (rev 1016) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-19 09:12:47 UTC (rev 1017) @@ -1227,6 +1227,7 @@ discussion => $discussion_id, }); } + $self->setSubmission($subid, { fhid => $firehose_id }); } } Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-19 05:37:35 UTC (rev 1016) +++ slashjp/trunk/debian/changelog 2009-02-19 09:12:47 UTC (rev 1017) @@ -10,8 +10,9 @@ * Fix: dupliicate slashboxes * Add printCommentsSuffix() to show comments suffix (e.g. navigation) * Fix: HTML title for edituser page + * Fix: add fhid for submission to submission_param table - -- Taku YASUI Thu, 19 Feb 2009 05:36:36 +0000 + -- Taku YASUI Thu, 19 Feb 2009 09:12:14 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Thu Feb 19 18:58:14 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 19 Feb 2009 18:58:14 +0900 Subject: [Slashdotjp-dev 1487] [1018] fix submission layout Message-ID: <1235037494.470119.29402.nullmailer@users.sourceforge.jp> Revision: 1018 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1018 Author: tach Date: 2009-02-19 18:58:14 +0900 (Thu, 19 Feb 2009) Log Message: ----------- fix submission layout Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-19 09:12:47 UTC (rev 1017) +++ images/trunk/css/slashdotjp.css 2009-02-19 09:58:14 UTC (rev 1018) @@ -58,10 +58,36 @@ } #index #slashboxes, -#firehose #slashboxes { +#firehose #slashboxes, +#submit #slashboxes { width: 300px; } +/* Fix normal ul and ol */ +div.general_contents ul, div.general_contents ol, +div#wikicontents ul, div#wikicontents ol, +div#search div.sectiontitle table td ul, div#search div.sectiontitle table td ol, +div#search div.search-help ul, div#search div.search-help ol, +div#polls div.generalbody ul, div#polls div.generalbody ol, +div#submit div.generalbody ul, div#submit div.generalbody ol, +div#commentBody ul, div#commentBody ul, +div#metamod #metamod-intro ul, div#metamod #metamod-intro ol, +div#bookmark ul, div#bookmark ol, +div#topics .generalbody ul, div#topics .generalbody ol, +.error ul, .error ol, +.err ul, .err ol, +.warning ul, .warning ol, +.warn ul, .warn ol, +.info ul, .info ol, +.journaltext ul, .journaltext ol, +form#createuserform ul, form#createuserform ol { + margin: 1em 0pt 1em 2em !important; +} + +div#bookmark ul.menu { + margin: 0 !important; +} + /* fix firehose right margin */ #firehoselist, #firehose #message, @@ -74,9 +100,11 @@ min-height: 80px; } +/* fix slashbox buttons */ div#slashboxes div.block img.map { float: right; } + .map { background: transparent; padding: 0; @@ -89,6 +117,28 @@ cursor: pointer; } +/* fix slashboxes internal layout */ +div#slashboxes div.block div.content ul { + margin: 0; + padding: 0; +} + +div#slashboxes div.block div.content ul li { + margin: 0; + padding: 0.1em 0.4em 0.3em; + border-top: none; + border-bottom: 1px solid #DDD; +} + +.generalbody div#slashboxes { + margin-top: 0.5em; +} + +.generalbody div#slashboxes div.block div.content ul { + margin: 0 !important; +} + +/* fix edit link */ .edit a { float: none; margin-top: 0; @@ -449,6 +499,12 @@ padding-right: 12px; } +/* submit.pl layout */ +#submit form { + clear: right; +} + + /* slashdot.jp announce area */ div#slashdotjp-site-announce { background: #FFC; @@ -459,31 +515,6 @@ font-size: 82%; } -/* Fix normal ul and ol */ -div.general_contents ul, div.general_contents ol, -div#wikicontents ul, div#wikicontents ol, -div#search div.sectiontitle table td ul, div#search div.sectiontitle table td ol, -div#search div.search-help ul, div#search div.search-help ol, -div#polls div.generalbody ul, div#polls div.generalbody ol, -div#submit div.generalbody ul, div#submit div.generalbody ol, -div#commentBody ul, div#commentBody ul, -div#metamod #metamod-intro ul, div#metamod #metamod-intro ol, -div#bookmark ul, div#bookmark ol, -div#topics .generalbody ul, div#topics .generalbody ol, -.error ul, .error ol, -.err ul, .err ol, -.warning ul, .warning ol, -.warn ul, .warn ol, -.info ul, .info ol, -.journaltext ul, .journaltext ol, -form#createuserform ul, form#createuserform ol { - margin: 1em 0pt 1em 2em !important; -} - -div#bookmark ul.menu { - margin: 0 !important; -} - /* firehose tablist */ div#firehose div.firemenu div.submenu ul#fhtablist { padding-right: 40px; From svnnotify ＠ sourceforge.jp Thu Feb 19 19:24:48 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 19 Feb 2009 19:24:48 +0900 Subject: [Slashdotjp-dev 1488] [1019] Make to fetch fhid on getSubmissionsByUID() Message-ID: <1235039088.718272.29801.nullmailer@users.sourceforge.jp> Revision: 1019 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1019 Author: tach Date: 2009-02-19 19:24:48 +0900 (Thu, 19 Feb 2009) Log Message: ----------- Make to fetch fhid on getSubmissionsByUID() Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-19 09:58:14 UTC (rev 1018) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-19 10:24:48 UTC (rev 1019) @@ -6687,6 +6687,10 @@ "ORDER BY time DESC $limit"); for my $sub (@$subs) { + $sub->{fhid} = $self->sqlSelect( + 'value', + 'submission_param', + "subid=" . $self->sqlQuote($sub->{subid}) . " AND name='fhid'"); $sub->{sid} = $self->sqlSelect( 'value', 'submission_param', Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-19 09:58:14 UTC (rev 1018) +++ slashjp/trunk/debian/changelog 2009-02-19 10:24:48 UTC (rev 1019) @@ -11,8 +11,9 @@ * Add printCommentsSuffix() to show comments suffix (e.g. navigation) * Fix: HTML title for edituser page * Fix: add fhid for submission to submission_param table + * Make to fetch fhid on getSubmissionsByUID() - -- Taku YASUI Thu, 19 Feb 2009 09:12:14 +0000 + -- Taku YASUI Thu, 19 Feb 2009 10:24:11 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Thu Feb 19 19:25:49 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 19 Feb 2009 19:25:49 +0900 Subject: [Slashdotjp-dev 1489] [1020] Fix: yourPendingSubs system Message-ID: <1235039149.340800.31593.nullmailer@users.sourceforge.jp> Revision: 1020 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1020 Author: tach Date: 2009-02-19 19:25:49 +0900 (Thu, 19 Feb 2009) Log Message: ----------- Fix: yourPendingSubs system Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Submit/submit.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-19 10:24:48 UTC (rev 1019) +++ slashjp/trunk/debian/changelog 2009-02-19 10:25:49 UTC (rev 1020) @@ -12,8 +12,9 @@ * Fix: HTML title for edituser page * Fix: add fhid for submission to submission_param table * Make to fetch fhid on getSubmissionsByUID() + * Fix: yourPendingSubs system - -- Taku YASUI Thu, 19 Feb 2009 10:24:11 +0000 + -- Taku YASUI Thu, 19 Feb 2009 10:25:10 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/Submit/submit.pl =================================================================== --- slashjp/trunk/plugins/Submit/submit.pl 2009-02-19 10:24:48 UTC (rev 1019) +++ slashjp/trunk/plugins/Submit/submit.pl 2009-02-19 10:25:49 UTC (rev 1020) @@ -134,7 +134,7 @@ my($constants, $slashdb, $user, $form) = @_; print getData('submit_body_open'); slashProf("pendingsubs"); - yourPendingSubmissions($constants, $slashdb, $user, $form, { skip_submit_body => 1 }); + #yourPendingSubmissions($constants, $slashdb, $user, $form, { skip_submit_body => 1 }); slashProf("","pendingsubs"); my $reskey = getObject('Slash::ResKey'); @@ -173,15 +173,18 @@ sub yourPendingSubmissions { my($constants, $slashdb, $user, $form, $options) = @_; $options ||= {}; - return if $user->{is_anon}; - print getData("submit_body_open") unless $options->{skip_submit_body}; + my $str = ''; + return '' if $user->{is_anon}; + $str .= getData("submit_body_open") unless $options->{skip_submit_body}; if (my $submissions = $slashdb->getSubmissionsByUID($user->{uid}, "", { limit_days => 365 })) { - slashDisplay('yourPendingSubs', { + $str .= slashDisplay('yourPendingSubs', { submissions => $submissions, width => '100%', - }); + }, { Return => 1 }); } - print getData("submit_body_close") unless $options->{skip_submit_body}; + $str .= getData("submit_body_close") unless $options->{skip_submit_body}; + return $str if ($options->{return}); + print $str; } ################################################################# @@ -558,6 +561,7 @@ topic_values => $topic_values, skin_values => $skin_values, skins => $skins, + pendingsubs => yourPendingSubmissions($constants, $slashdb, $user, $form, { skip_submit_body => 1, 'return' => 1 }), }); } ################################################################# From svnnotify ＠ sourceforge.jp Fri Feb 20 17:46:50 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 20 Feb 2009 17:46:50 +0900 Subject: [Slashdotjp-dev 1490] [1021] add ul/li css for comments-suffix-prev-next Message-ID: <1235119610.667016.19351.nullmailer@users.sourceforge.jp> Revision: 1021 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1021 Author: tach Date: 2009-02-20 17:46:50 +0900 (Fri, 20 Feb 2009) Log Message: ----------- add ul/li css for comments-suffix-prev-next Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-19 10:25:49 UTC (rev 1020) +++ images/trunk/css/slashdotjp.css 2009-02-20 08:46:50 UTC (rev 1021) @@ -303,6 +303,7 @@ border: 4px solid #CCC; border-radius: 10px; -moz-border-radius: 10px; + text-align: center; } .comments-suffix-prev-next .suffix-prev { @@ -322,6 +323,25 @@ font-weight: bold; } +.comments-suffix-prev-next ul, +.comments-suffix-prev-next ul li { + display: inline; +} + +.comments-suffix-prev-next ul li span { + padding: 0 0.5em 0 0.8em; + font-weight: bold; +} + +.comments-suffix-prev-next ul li:before { + color: #999; + content: "|"; +} + +.comments-suffix-prev-next ul li.start:before { + content: ""; +} + /* zoo icon position fix */ .zooicon img { vertical-align: bottom; From svnnotify ＠ sourceforge.jp Fri Feb 20 18:03:40 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 20 Feb 2009 18:03:40 +0900 Subject: [Slashdotjp-dev 1491] [1022] remove needless definition and change border width for comments-suffix-prev-next Message-ID: <1235120620.209053.2864.nullmailer@users.sourceforge.jp> Revision: 1022 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1022 Author: tach Date: 2009-02-20 18:03:40 +0900 (Fri, 20 Feb 2009) Log Message: ----------- remove needless definition and change border width for comments-suffix-prev-next Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-20 08:46:50 UTC (rev 1021) +++ images/trunk/css/slashdotjp.css 2009-02-20 09:03:40 UTC (rev 1022) @@ -300,29 +300,12 @@ margin-bottom: 1em; padding: 0.5em; background: #EEE; - border: 4px solid #CCC; + border: 1px solid #CCC; border-radius: 10px; -moz-border-radius: 10px; text-align: center; } -.comments-suffix-prev-next .suffix-prev { - float: left; - text-align: left; - font-weight: bold; -} - -.comments-suffix-prev-next .suffix-next { - float: right; - text-align: right; - font-weight: bold; -} - -.comments-suffix-prev-next .suffix-up { - text-align: center; - font-weight: bold; -} - .comments-suffix-prev-next ul, .comments-suffix-prev-next ul li { display: inline; From svnnotify ＠ sourceforge.jp Fri Feb 20 20:23:20 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 20 Feb 2009 20:23:20 +0900 Subject: [Slashdotjp-dev 1492] [1023] Add getJournalByDiscussion() and createJournalUrl() on plugins/ Journal/Journal.pm Message-ID: <1235129000.774947.20742.nullmailer@users.sourceforge.jp> Revision: 1023 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1023 Author: tach Date: 2009-02-20 20:23:20 +0900 (Fri, 20 Feb 2009) Log Message: ----------- Add getJournalByDiscussion() and createJournalUrl() on plugins/Journal/Journal.pm Modified Paths: -------------- slashjp/trunk/Slash/Utility/Comments/Comments.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-20 09:03:40 UTC (rev 1022) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-20 11:23:20 UTC (rev 1023) @@ -2638,19 +2638,37 @@ my ($discussion, $options) = @_; my $constants = getCurrentStatic(); my $reader = getObject('Slash::DB', { db_type => 'reader' }); - my $stories = {}; + my $stories = { 'prev' => {}, 'next' => {} }; my $ret = ''; return $ret if (!$discussion || ref($discussion) ne "HASH"); my $sid = $reader->getStorySidFromDiscussion($discussion->{id}); - if ($sid) { + my $kinds = $reader->getDescriptions('discussion_kinds'); + my $kind = $kinds->{ $discussion->{dkid} }; +print STDERR "kind = $kind\n"; + + if ($kind =~ /story$/ && $sid) { my $story = $reader->getStory($sid); + $stories->{kinds} = "story"; if ($constants->{use_prev_next_link}) { $stories->{prev} = $reader->getStoryByTime('<', $story); $stories->{next} = $reader->getStoryByTime('>', $story) unless $story->{is_future}; } + } elsif ($kind eq "journal") { + my $journal_reader = getObject("Slash::Journal"); + my $journal = $journal_reader->getJournalByDiscussion($discussion->{id}); + if (my $prev = $journal_reader->getJournalByTime('<', [ $journal->{date} ], { uid => $journal->{uid} })) { +use Data::Dumper; print STDERR Dumper($prev); + $stories->{prev}->{title} = $prev->{desctiption}; + $stories->{prev}->{url} = $journal_reader->createJournalUrl($prev); + } + if (my $next = $journal_reader->getJournalByTime('>', [ $journal->{date} ], { uid => $journal->{uid} })) { + $stories->{next}->{title} = $next->{desctiption}; + $stories->{next}->{url} = $journal_reader->createJournalUrl($next); + } } +use Data::Dumper; print STDERR Dumper($stories); $ret = slashDisplay('printCommentsSuffix', { stories => $stories, Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-20 09:03:40 UTC (rev 1022) +++ slashjp/trunk/debian/changelog 2009-02-20 11:23:20 UTC (rev 1023) @@ -13,8 +13,10 @@ * Fix: add fhid for submission to submission_param table * Make to fetch fhid on getSubmissionsByUID() * Fix: yourPendingSubs system + * Add getJournalByDiscussion() and createJournalUrl() on + plugins/Journal/Journal.pm - -- Taku YASUI Thu, 19 Feb 2009 10:25:10 +0000 + -- Taku YASUI Fri, 20 Feb 2009 11:21:53 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Fri Feb 20 20:25:35 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 20 Feb 2009 20:25:35 +0900 Subject: [Slashdotjp-dev 1493] [1024] revert r1023 change Message-ID: <1235129135.044271.22964.nullmailer@users.sourceforge.jp> Revision: 1024 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1024 Author: tach Date: 2009-02-20 20:25:34 +0900 (Fri, 20 Feb 2009) Log Message: ----------- revert r1023 change Modified Paths: -------------- slashjp/trunk/Slash/Utility/Comments/Comments.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-20 11:23:20 UTC (rev 1023) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-20 11:25:34 UTC (rev 1024) @@ -2638,37 +2638,19 @@ my ($discussion, $options) = @_; my $constants = getCurrentStatic(); my $reader = getObject('Slash::DB', { db_type => 'reader' }); - my $stories = { 'prev' => {}, 'next' => {} }; + my $stories = {}; my $ret = ''; return $ret if (!$discussion || ref($discussion) ne "HASH"); my $sid = $reader->getStorySidFromDiscussion($discussion->{id}); - my $kinds = $reader->getDescriptions('discussion_kinds'); - my $kind = $kinds->{ $discussion->{dkid} }; -print STDERR "kind = $kind\n"; - - if ($kind =~ /story$/ && $sid) { + if ($sid) { my $story = $reader->getStory($sid); - $stories->{kinds} = "story"; if ($constants->{use_prev_next_link}) { $stories->{prev} = $reader->getStoryByTime('<', $story); $stories->{next} = $reader->getStoryByTime('>', $story) unless $story->{is_future}; } - } elsif ($kind eq "journal") { - my $journal_reader = getObject("Slash::Journal"); - my $journal = $journal_reader->getJournalByDiscussion($discussion->{id}); - if (my $prev = $journal_reader->getJournalByTime('<', [ $journal->{date} ], { uid => $journal->{uid} })) { -use Data::Dumper; print STDERR Dumper($prev); - $stories->{prev}->{title} = $prev->{desctiption}; - $stories->{prev}->{url} = $journal_reader->createJournalUrl($prev); - } - if (my $next = $journal_reader->getJournalByTime('>', [ $journal->{date} ], { uid => $journal->{uid} })) { - $stories->{next}->{title} = $next->{desctiption}; - $stories->{next}->{url} = $journal_reader->createJournalUrl($next); - } } -use Data::Dumper; print STDERR Dumper($stories); $ret = slashDisplay('printCommentsSuffix', { stories => $stories, From svnnotify ＠ sourceforge.jp Fri Feb 20 20:26:14 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 20 Feb 2009 20:26:14 +0900 Subject: [Slashdotjp-dev 1494] [1025] Add getJournalByDiscussion() and createJournalUrl() on plugins/ Journal/Journal.pm Message-ID: <1235129174.161393.24187.nullmailer@users.sourceforge.jp> Revision: 1025 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1025 Author: tach Date: 2009-02-20 20:26:14 +0900 (Fri, 20 Feb 2009) Log Message: ----------- Add getJournalByDiscussion() and createJournalUrl() on plugins/Journal/Journal.pm Modified Paths: -------------- slashjp/trunk/plugins/Journal/Journal.pm -------------- next part -------------- Modified: slashjp/trunk/plugins/Journal/Journal.pm =================================================================== --- slashjp/trunk/plugins/Journal/Journal.pm 2009-02-20 11:25:34 UTC (rev 1024) +++ slashjp/trunk/plugins/Journal/Journal.pm 2009-02-20 11:26:14 UTC (rev 1025) @@ -803,8 +803,26 @@ return $intro; } } +sub getJournalByDiscussion { + my ($self, $discussion) = @_; + if (ref($discussion) eq "HASH") { + $discussion = $discussion->{dkid}; + } + return $self->get($self->sqlSelect('id', 'journals', "discussion=$discussion")); +} + +sub createJournalUrl { + my ($self, $journal) = @_; + my $ret = getCurrentStatic('rootdir'); + + $ret .= '/~'; + $ret .= $self->getUser($journal->{uid}, 'nickname'); + $ret .= '/journal/' . $journal->{id}; + return $ret; +} + sub DESTROY { my($self) = @_; $self->{_dbh}->disconnect if !$ENV{GATEWAY_INTERFACE} && $self->{_dbh}; From svnnotify ＠ sourceforge.jp Fri Feb 20 20:27:47 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 20 Feb 2009 20:27:47 +0900 Subject: [Slashdotjp-dev 1495] [1026] Fix to return with uid on getJournalByTime() on plugins/Journal/ Journal.pm Message-ID: <1235129267.276215.24849.nullmailer@users.sourceforge.jp> Revision: 1026 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1026 Author: tach Date: 2009-02-20 20:27:47 +0900 (Fri, 20 Feb 2009) Log Message: ----------- Fix to return with uid on getJournalByTime() on plugins/Journal/Journal.pm Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/Journal.pm -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-20 11:26:14 UTC (rev 1025) +++ slashjp/trunk/debian/changelog 2009-02-20 11:27:47 UTC (rev 1026) @@ -15,8 +15,9 @@ * Fix: yourPendingSubs system * Add getJournalByDiscussion() and createJournalUrl() on plugins/Journal/Journal.pm + * Fix to return with uid on getJournalByTime() on plugins/Journal/Journal.pm - -- Taku YASUI Fri, 20 Feb 2009 11:21:53 +0000 + -- Taku YASUI Fri, 20 Feb 2009 11:26:39 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/Journal/Journal.pm =================================================================== --- slashjp/trunk/plugins/Journal/Journal.pm 2009-02-20 11:26:14 UTC (rev 1025) +++ slashjp/trunk/plugins/Journal/Journal.pm 2009-02-20 11:27:47 UTC (rev 1026) @@ -750,7 +750,7 @@ } my $returnable = $self->sqlSelectHashref( - 'date, article, description, id, posttype, tid, discussion', + 'date, article, description, id, posttype, tid, discussion, uid', 'journals JOIN journals_text USING (id)', "date $sign '$journal->[0]' AND date <= NOW() From svnnotify ＠ sourceforge.jp Mon Feb 23 13:56:02 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 13:56:02 +0900 Subject: [Slashdotjp-dev 1496] [1027] fix URL escape Message-ID: <1235364962.668020.11179.nullmailer@users.sourceforge.jp> Revision: 1027 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1027 Author: tach Date: 2009-02-23 13:56:02 +0900 (Mon, 23 Feb 2009) Log Message: ----------- fix URL escape Modified Paths: -------------- slashjp/trunk/plugins/Journal/Journal.pm -------------- next part -------------- Modified: slashjp/trunk/plugins/Journal/Journal.pm =================================================================== --- slashjp/trunk/plugins/Journal/Journal.pm 2009-02-20 11:27:47 UTC (rev 1026) +++ slashjp/trunk/plugins/Journal/Journal.pm 2009-02-23 04:56:02 UTC (rev 1027) @@ -818,8 +818,9 @@ my $ret = getCurrentStatic('rootdir'); $ret .= '/~'; - $ret .= $self->getUser($journal->{uid}, 'nickname'); - $ret .= '/journal/' . $journal->{id}; + $ret .= fixparam($self->getUser($journal->{uid}, 'nickname')); + $ret .= '/journal/'; + $ret .= $journal->{id} if ($journal->{id}); return $ret; } From svnnotify ＠ sourceforge.jp Mon Feb 23 15:13:31 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 15:13:31 +0900 Subject: [Slashdotjp-dev 1497] [1028] add multi-line comments-suffix-prev-next css Message-ID: <1235369611.080355.12253.nullmailer@users.sourceforge.jp> Revision: 1028 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1028 Author: tach Date: 2009-02-23 15:13:31 +0900 (Mon, 23 Feb 2009) Log Message: ----------- add multi-line comments-suffix-prev-next css Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-23 04:56:02 UTC (rev 1027) +++ images/trunk/css/slashdotjp.css 2009-02-23 06:13:31 UTC (rev 1028) @@ -306,6 +306,18 @@ text-align: center; } +.comments-suffix-prev-next div { + margin-top: 0.5em; + padding-top: 0.5em; + border-top: 1px solid #CCC; +} + +.comments-suffix-prev-next div.first { + margin-top: 0; + padding-top: 0; + border-top: 0 none; +} + .comments-suffix-prev-next ul, .comments-suffix-prev-next ul li { display: inline; From svnnotify ＠ sourceforge.jp Mon Feb 23 15:26:14 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 15:26:14 +0900 Subject: [Slashdotjp-dev 1498] [1029] Change printCommentsSuffix() internal Message-ID: <1235370374.493724.27030.nullmailer@users.sourceforge.jp> Revision: 1029 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1029 Author: tach Date: 2009-02-23 15:26:14 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Change printCommentsSuffix() internal Modified Paths: -------------- slashjp/trunk/Slash/Utility/Comments/Comments.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 06:13:31 UTC (rev 1028) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 06:26:14 UTC (rev 1029) @@ -2637,21 +2637,64 @@ sub printCommentsSuffix { my ($discussion, $options) = @_; my $constants = getCurrentStatic(); + my $currentPage = getCurrentUser('currentPage'); my $reader = getObject('Slash::DB', { db_type => 'reader' }); - my $stories = {}; + my $stories = []; my $ret = ''; return $ret if (!$discussion || ref($discussion) ne "HASH"); my $sid = $reader->getStorySidFromDiscussion($discussion->{id}); - if ($sid) { + my $kinds = $reader->getDescriptions('discussion_kinds'); + my $kind = $kinds->{ $discussion->{dkid} }; +#print STDERR "kind = $kind\n"; +#print STDERR "currentPage = $currentPage\n"; + + # story + if ($kind =~ /story$/ && $currentPage =~ /^(?:article|comments)$/ && $sid) { my $story = $reader->getStory($sid); if ($constants->{use_prev_next_link}) { - $stories->{prev} = $reader->getStoryByTime('<', $story); - $stories->{next} = $reader->getStoryByTime('>', $story) unless $story->{is_future}; + my $item = { 'prev' => {}, 'next' => {}, 'up' => {} }; + if (my $prev = $reader->getStoryByTime('<', $story)) { + $prev = linkStory($prev); + $item->{prev} = { url => $prev->[0], title => $prev->[1] } + } + if (!$story->{is_future} && (my $next = $reader->getStoryByTime('>', $story))) { + $next = linkStory($next); + $item->{next} = { url => $next->[0], title => $next->[1] } + } + my $skin = $reader->getSkin($story->{primaryskid}); + $item->{up}->{title} = $skin->{title}; + $item->{up}->{url} = $skin->{url}; + push(@$stories, $item); } } + # journal + if ($kind =~ /^journal/ && $currentPage =~ /^(?:journal|comments)$/) { + my $journal_reader = getObject("Slash::Journal"); + my $journal = $journal_reader->getJournalByDiscussion($discussion->{id}); + my $item = { 'prev' => {}, 'next' => {}, 'up' => {} }; + if (my $prev = $journal_reader->getJournalByTime('<', [ $journal->{date} ], { uid => $journal->{uid} })) { + $item->{prev} = { url => $journal_reader->createJournalUrl($prev), title => $prev->{description} }; + } + if (my $next = $journal_reader->getJournalByTime('>', [ $journal->{date} ], { uid => $journal->{uid} })) { + $item->{next} = { url => $journal_reader->createJournalUrl($next), title => $next->{description} }; + } + $item->{up}->{title} = Slash::getData('s_journal', { nickname => $reader->getUser($journal->{uid}, 'nickname') }, 'misc'); + $item->{up}->{url} = $journal_reader->createJournalUrl({ uid => $journal->{uid} }); + push(@$stories, $item); + } +#use Data::Dumper; print STDERR Dumper($stories); + + # poll + + # feed + + # submission + + # project + $ret = slashDisplay('printCommentsSuffix', { stories => $stories, }, { Return => $options->{return} }); Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 06:13:31 UTC (rev 1028) +++ slashjp/trunk/debian/changelog 2009-02-23 06:26:14 UTC (rev 1029) @@ -17,7 +17,7 @@ plugins/Journal/Journal.pm * Fix to return with uid on getJournalByTime() on plugins/Journal/Journal.pm - -- Taku YASUI Fri, 20 Feb 2009 11:26:39 +0000 + -- Taku YASUI Mon, 23 Feb 2009 06:25:30 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Mon Feb 23 15:46:55 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 15:46:55 +0900 Subject: [Slashdotjp-dev 1499] [1030] Print comments on the page of submission preview for Admin Message-ID: <1235371615.496441.19294.nullmailer@users.sourceforge.jp> Revision: 1030 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1030 Author: tach Date: 2009-02-23 15:46:55 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Print comments on the page of submission preview for Admin Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Submit/submit.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 06:26:14 UTC (rev 1029) +++ slashjp/trunk/debian/changelog 2009-02-23 06:46:55 UTC (rev 1030) @@ -16,8 +16,9 @@ * Add getJournalByDiscussion() and createJournalUrl() on plugins/Journal/Journal.pm * Fix to return with uid on getJournalByTime() on plugins/Journal/Journal.pm + * Print comments on the page of submission preview for Admin - -- Taku YASUI Mon, 23 Feb 2009 06:25:30 +0000 + -- Taku YASUI Mon, 23 Feb 2009 06:45:47 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/Submit/submit.pl =================================================================== --- slashjp/trunk/plugins/Submit/submit.pl 2009-02-23 06:26:14 UTC (rev 1029) +++ slashjp/trunk/plugins/Submit/submit.pl 2009-02-23 06:46:55 UTC (rev 1030) @@ -311,6 +311,17 @@ note_options => getSubmissionSelections($constants), subnotes_ref => $subnotes_ref, }); + + if ($constants->{plugin}{Admin} && $constants->{plugin}{FireHose}) { + my $admin_reader = getObject("Slash::Admin"); + my $fh_reader = getObject("Slash::FireHose"); + my $fhid = $admin_reader->getFireHoseIdBySubid($sub->{subid}); + if ($fhid && (my $fh_item = $fh_reader->getFireHose($fhid))) { + if ($fh_item->{discussion}) { + printComments($reader->getDiscussion($fh_item->{discussion}) ); + } + } + } } ################################################################# From svnnotify ＠ sourceforge.jp Mon Feb 23 17:35:49 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 17:35:49 +0900 Subject: [Slashdotjp-dev 1500] [1031] * Add getDiscussionByTime() to Slash/DB/MySQL/MySQL.pm to get next /prev discussions Message-ID: <1235378149.729552.642.nullmailer@users.sourceforge.jp> Revision: 1031 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1031 Author: tach Date: 2009-02-23 17:35:49 +0900 (Mon, 23 Feb 2009) Log Message: ----------- * Add getDiscussionByTime() to Slash/DB/MySQL/MySQL.pm to get next/prev discussions * Change printCommentSuffix() to add suffix for submission comments Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/Slash/Utility/Comments/Comments.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-23 06:46:55 UTC (rev 1030) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-02-23 08:35:49 UTC (rev 1031) @@ -12936,6 +12936,37 @@ } +sub getDiscussionByTime { + my ($self, $sign, $discussion, $options) = @_; + my $constants = getCurrentStatic(); + $options = {} if !$options || ref($options) ne 'HASH'; + my $uid = int($options->{uid}) || undef; + my $dkid = int($options->{dkid}) || undef; + my $where = ''; + my $order = $sign eq '<' ? 'DESC' : 'ASC'; + + if (ref($discussion) ne 'HASH') { + $discussion = $self->getDiscussion(int($discussion)); + } + + if ($uid) { + $where .= " AND uid=$uid"; + } + + if ($dkid) { + $where .= " AND dkid=$dkid"; + } + + return $self->sqlSelectHashref( + '*', + 'discussions', + "ts $sign '$discussion->{ts}' + AND ts <= NOW() + $where", + "ORDER BY ts $order LIMIT 1" + ); +} + ######################################################## sub DESTROY { my($self) = @_; Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 06:46:55 UTC (rev 1030) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 08:35:49 UTC (rev 1031) @@ -2685,14 +2685,27 @@ $item->{up}->{url} = $journal_reader->createJournalUrl({ uid => $journal->{uid} }); push(@$stories, $item); } + + # submission + if ($kind eq "submission" && $constants->{plugin}{FireHose}) { + my $item = { 'prev' => {}, 'next' => {}, 'up' => {} }; + if (my $prev = $reader->getDiscussionByTime('<', $discussion, { dkid => $discussion->{dkid} })) { + $item->{prev} = { url => $prev->{url}, title => $prev->{title} }; + } + if (my $next = $reader->getDiscussionByTime('>', $discussion, { dkid => $discussion->{dkid} })) { + $item->{next} = { url => $next->{url}, title => $next->{title} }; + } + $item->{up}->{title} = Slash::getData('submissions', {}, 'misc'); + $item->{up}->{url} = "$constants->{rootdir}/firehose.pl?fhfilter=submission"; + push(@$stories, $item); + } + #use Data::Dumper; print STDERR Dumper($stories); # poll # feed - # submission - # project $ret = slashDisplay('printCommentsSuffix', { Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 06:46:55 UTC (rev 1030) +++ slashjp/trunk/debian/changelog 2009-02-23 08:35:49 UTC (rev 1031) @@ -17,8 +17,10 @@ plugins/Journal/Journal.pm * Fix to return with uid on getJournalByTime() on plugins/Journal/Journal.pm * Print comments on the page of submission preview for Admin + * Add getDiscussionByTime() to Slash/DB/MySQL/MySQL.pm to get next/prev + discussions - -- Taku YASUI Mon, 23 Feb 2009 06:45:47 +0000 + -- Taku YASUI Mon, 23 Feb 2009 08:33:46 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Mon Feb 23 17:59:25 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 17:59:25 +0900 Subject: [Slashdotjp-dev 1501] [1032] Fix poll URL in discussions table Message-ID: <1235379565.228746.28083.nullmailer@users.sourceforge.jp> Revision: 1032 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1032 Author: tach Date: 2009-02-23 17:59:25 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Fix poll URL in discussions table Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/PollBooth/pollBooth.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 08:35:49 UTC (rev 1031) +++ slashjp/trunk/debian/changelog 2009-02-23 08:59:25 UTC (rev 1032) @@ -19,8 +19,9 @@ * Print comments on the page of submission preview for Admin * Add getDiscussionByTime() to Slash/DB/MySQL/MySQL.pm to get next/prev discussions + * Fix poll URL in discussions table - -- Taku YASUI Mon, 23 Feb 2009 08:33:46 +0000 + -- Taku YASUI Mon, 23 Feb 2009 08:58:48 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/PollBooth/pollBooth.pl =================================================================== --- slashjp/trunk/plugins/PollBooth/pollBooth.pl 2009-02-23 08:35:49 UTC (rev 1031) +++ slashjp/trunk/plugins/PollBooth/pollBooth.pl 2009-02-23 08:59:25 UTC (rev 1032) @@ -411,7 +411,7 @@ title => $form->{question}, topic => $form->{topic}, approved => 1, # Story discussions are always approved -Brian - url => "$gSkin->{rootdir}/pollBooth.pl?qid=$qid&aid=-1", + url => "$gSkin->{rootdir}/polls/$qid?aid=-1", }); } elsif ($poll->{discussion}) { # Yep, this is lazy -Brian From svnnotify ＠ sourceforge.jp Mon Feb 23 18:57:28 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 18:57:28 +0900 Subject: [Slashdotjp-dev 1502] [1033] add fix-discussion-url command to fix url column in discussions table Message-ID: <1235383048.343736.16224.nullmailer@users.sourceforge.jp> Revision: 1033 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1033 Author: tach Date: 2009-02-23 18:57:28 +0900 (Mon, 23 Feb 2009) Log Message: ----------- add fix-discussion-url command to fix url column in discussions table Added Paths: ----------- slashjp/trunk/bin/fix-discussion-url -------------- next part -------------- Added: slashjp/trunk/bin/fix-discussion-url =================================================================== --- slashjp/trunk/bin/fix-discussion-url (rev 0) +++ slashjp/trunk/bin/fix-discussion-url 2009-02-23 09:57:28 UTC (rev 1033) @@ -0,0 +1,51 @@ +#!/usr/bin/perl +# +# (slash-)fix-discussion-url - fix discussions.url field for slash +# + +use Slash; +use Slash::Utility; +use Slash::DB; + +# debug +use Data::Dumper; + +my %opts; +$opts{'u'} ||= 'slash'; + +createEnvironment($opts{'u'}); + +my $slashdb = getCurrentDB(); +my $constants = getCurrentStatic(); +my $gSkin = $slashdb->getSkin($constants->{mainpage_skid}); + +my $where = ''; +my $other = ''; + +$discussions = $slashdb->sqlSelectAllHashrefArray( + "id,discussion_kinds.name AS kind,url", + "discussions JOIN discussion_kinds USING (dkid)", + $where, + $other); + +foreach my $discussion (@$discussions) { + my $url; + if ($discussion->{kind} eq "journal") { + next unless ($discussion->{url} =~ m!/journal\.pl\?op=display&id=(\d+?)&uid=(\d+?)!); + my ($id, $uid) = ($1, $2); + my $nickname = fixparam($slashdb->getUser($uid, 'nickname')); + $url = "$gSkin->{rootdir}/~$nickname/journal/$id"; + } elsif ($discussion->{kind} eq "poll") { + next unless ($discussion->{url} =~ m!/\bqid=(\d+?)\b!); + my $qid = $1; + $url = "$gSkin->{rootdir}/polls/$qid?aid=-1"; + } else { + next; + } + + if ($url) { + $slashdb->sqlUpdate('discussions', { url => $url }, "id=$discussion->{id}"); + } + print "BEFORE: $discussion->{url}\n"; + print "AFTER : $url\n\n"; +} Property changes on: slashjp/trunk/bin/fix-discussion-url ___________________________________________________________________ Added: svn:executable + * From svnnotify ＠ sourceforge.jp Mon Feb 23 18:57:59 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 18:57:59 +0900 Subject: [Slashdotjp-dev 1503] [1034] update debian/changelog Message-ID: <1235383079.992164.16815.nullmailer@users.sourceforge.jp> Revision: 1034 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1034 Author: tach Date: 2009-02-23 18:57:59 +0900 (Mon, 23 Feb 2009) Log Message: ----------- update debian/changelog Modified Paths: -------------- slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 09:57:28 UTC (rev 1033) +++ slashjp/trunk/debian/changelog 2009-02-23 09:57:59 UTC (rev 1034) @@ -20,8 +20,9 @@ * Add getDiscussionByTime() to Slash/DB/MySQL/MySQL.pm to get next/prev discussions * Fix poll URL in discussions table + * Add fix-discussion-url command to fix url column in discussions table - -- Taku YASUI Mon, 23 Feb 2009 08:58:48 +0000 + -- Taku YASUI Mon, 23 Feb 2009 09:57:40 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Mon Feb 23 19:15:41 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 19:15:41 +0900 Subject: [Slashdotjp-dev 1504] [1035] Fix poll discussion kind definition Message-ID: <1235384141.775638.12241.nullmailer@users.sourceforge.jp> Revision: 1035 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1035 Author: tach Date: 2009-02-23 19:15:41 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Fix poll discussion kind definition Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/PollBooth/pollBooth.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 09:57:59 UTC (rev 1034) +++ slashjp/trunk/debian/changelog 2009-02-23 10:15:41 UTC (rev 1035) @@ -21,8 +21,9 @@ discussions * Fix poll URL in discussions table * Add fix-discussion-url command to fix url column in discussions table + * Fix poll discussion kind definition - -- Taku YASUI Mon, 23 Feb 2009 09:57:40 +0000 + -- Taku YASUI Mon, 23 Feb 2009 10:14:46 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/PollBooth/pollBooth.pl =================================================================== --- slashjp/trunk/plugins/PollBooth/pollBooth.pl 2009-02-23 09:57:59 UTC (rev 1034) +++ slashjp/trunk/plugins/PollBooth/pollBooth.pl 2009-02-23 10:15:41 UTC (rev 1035) @@ -407,7 +407,7 @@ ); } elsif (!$poll->{discussion}) { $discussion = $slashdb->createDiscussion({ - kind => 'pollbooth', + kind => 'poll', title => $form->{question}, topic => $form->{topic}, approved => 1, # Story discussions are always approved -Brian From svnnotify ＠ sourceforge.jp Mon Feb 23 19:47:48 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 19:47:48 +0900 Subject: [Slashdotjp-dev 1505] [1036] Add fix-poll-discussions - fix discussions. dkid for poll discussion item Message-ID: <1235386068.682740.20917.nullmailer@users.sourceforge.jp> Revision: 1036 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1036 Author: tach Date: 2009-02-23 19:47:48 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Add fix-poll-discussions - fix discussions.dkid for poll discussion item Modified Paths: -------------- slashjp/trunk/debian/changelog Added Paths: ----------- slashjp/trunk/bin/fix-poll-discussions -------------- next part -------------- Added: slashjp/trunk/bin/fix-poll-discussions =================================================================== --- slashjp/trunk/bin/fix-poll-discussions (rev 0) +++ slashjp/trunk/bin/fix-poll-discussions 2009-02-23 10:47:48 UTC (rev 1036) @@ -0,0 +1,32 @@ +#!/usr/bin/perl +# +# (slash-)fix-poll-discussions - fix discussions.dkid for poll discussion item +# + +use Slash; +use Slash::Utility; +use Slash::DB; +use strict; + +my %opts; +$opts{'u'} ||= 'slash'; + +createEnvironment($opts{'u'}); + +my $slashdb = getCurrentDB(); +my $dkid = $slashdb->sqlSelect('dkid', 'discussion_kinds', "name='poll'"); + +my $where = "polltype='section' AND dkid != $dkid"; +my $other = ''; + +my $ids = $slashdb->sqlSelectAll( + "id", + "discussions JOIN pollquestions ON (pollquestions.discussion=discussions.id)", + $where, + $other +); + +foreach my $id (@$ids) { + print STDERR "Fix discussion: $id->[0]\n"; + $slashdb->sqlUpdate('discussions', { dkid => $dkid }, "id=$id->[0]"); +} Property changes on: slashjp/trunk/bin/fix-poll-discussions ___________________________________________________________________ Added: svn:executable + * Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 10:15:41 UTC (rev 1035) +++ slashjp/trunk/debian/changelog 2009-02-23 10:47:48 UTC (rev 1036) @@ -22,8 +22,9 @@ * Fix poll URL in discussions table * Add fix-discussion-url command to fix url column in discussions table * Fix poll discussion kind definition + * Add fix-poll-discussions - fix discussions.dkid for poll discussion item - -- Taku YASUI Mon, 23 Feb 2009 10:14:46 +0000 + -- Taku YASUI Mon, 23 Feb 2009 10:46:34 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Mon Feb 23 20:02:26 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 20:02:26 +0900 Subject: [Slashdotjp-dev 1506] [1037] Fix for polls discussion on fix-discussion-url Message-ID: <1235386946.938903.11228.nullmailer@users.sourceforge.jp> Revision: 1037 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1037 Author: tach Date: 2009-02-23 20:02:26 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Fix for polls discussion on fix-discussion-url Modified Paths: -------------- slashjp/trunk/bin/fix-discussion-url -------------- next part -------------- Modified: slashjp/trunk/bin/fix-discussion-url =================================================================== --- slashjp/trunk/bin/fix-discussion-url 2009-02-23 10:47:48 UTC (rev 1036) +++ slashjp/trunk/bin/fix-discussion-url 2009-02-23 11:02:26 UTC (rev 1037) @@ -36,16 +36,16 @@ my $nickname = fixparam($slashdb->getUser($uid, 'nickname')); $url = "$gSkin->{rootdir}/~$nickname/journal/$id"; } elsif ($discussion->{kind} eq "poll") { - next unless ($discussion->{url} =~ m!/\bqid=(\d+?)\b!); - my $qid = $1; - $url = "$gSkin->{rootdir}/polls/$qid?aid=-1"; + if (my $qid = $slashdb->sqlSelect('qid', 'pollquestions', "discussion=$discussion->{id}")) { + $url = "$gSkin->{rootdir}/polls/$qid?aid=-1"; + } } else { next; } - if ($url) { + if ($url && $url ne $discussion->{url}) { + print STDERR "BEFORE: $discussion->{url}\n"; + print STDERR "AFTER : $url\n\n"; $slashdb->sqlUpdate('discussions', { url => $url }, "id=$discussion->{id}"); } - print "BEFORE: $discussion->{url}\n"; - print "AFTER : $url\n\n"; } From svnnotify ＠ sourceforge.jp Mon Feb 23 21:16:37 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 21:16:37 +0900 Subject: [Slashdotjp-dev 1507] [1038] Add poll discussion prev/next link Message-ID: <1235391397.653752.8515.nullmailer@users.sourceforge.jp> Revision: 1038 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1038 Author: tach Date: 2009-02-23 21:16:37 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Add poll discussion prev/next link Modified Paths: -------------- slashjp/trunk/Slash/Utility/Comments/Comments.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 11:02:26 UTC (rev 1037) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 12:16:37 UTC (rev 1038) @@ -2700,6 +2700,20 @@ push(@$stories, $item); } + # poll + if ($kind eq "poll") { + my $item = { 'prev' => {}, 'next' => {}, 'up' => {} }; + if (my $prev = $reader->getDiscussionByTime('<', $discussion, { dkid => $discussion->{dkid} })) { + $item->{prev} = { url => $prev->{url}, title => $prev->{title} }; + } + if (my $next = $reader->getDiscussionByTime('>', $discussion, { dkid => $discussion->{dkid} })) { + $item->{next} = { url => $next->{url}, title => $next->{title} }; + } + $item->{up}->{title} = Slash::getData('polls', {}, 'misc'); + $item->{up}->{url} = "$constants->{rootdir}/polls/"; + push(@$stories, $item); + } + #use Data::Dumper; print STDERR Dumper($stories); # poll From svnnotify ＠ sourceforge.jp Mon Feb 23 21:23:34 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 21:23:34 +0900 Subject: [Slashdotjp-dev 1508] [1039] Add feed discussion prev/next link Message-ID: <1235391814.246361.16285.nullmailer@users.sourceforge.jp> Revision: 1039 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1039 Author: tach Date: 2009-02-23 21:23:34 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Add feed discussion prev/next link Modified Paths: -------------- slashjp/trunk/Slash/Utility/Comments/Comments.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 12:16:37 UTC (rev 1038) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-23 12:23:34 UTC (rev 1039) @@ -2714,14 +2714,20 @@ push(@$stories, $item); } -#use Data::Dumper; print STDERR Dumper($stories); - - # poll - # feed + if ($kind eq "feed") { + my $item = { 'prev' => {}, 'next' => {}, 'up' => {} }; + if (my $prev = $reader->getDiscussionByTime('<', $discussion, { dkid => $discussion->{dkid} })) { + $item->{prev} = { url => $prev->{url}, title => $prev->{title} }; + } + if (my $next = $reader->getDiscussionByTime('>', $discussion, { dkid => $discussion->{dkid} })) { + $item->{next} = { url => $next->{url}, title => $next->{title} }; + } + $item->{up}->{title} = Slash::getData('feeds', {}, 'misc'); + $item->{up}->{url} = "$constants->{rootdir}/firehose.pl?fhfilter=feed&color=violet"; + push(@$stories, $item); + } - # project - $ret = slashDisplay('printCommentsSuffix', { stories => $stories, }, { Return => $options->{return} }); From svnnotify ＠ sourceforge.jp Mon Feb 23 22:13:52 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 22:13:52 +0900 Subject: [Slashdotjp-dev 1509] [1040] Disable discussion2 when mobile mode Message-ID: <1235394832.534657.17079.nullmailer@users.sourceforge.jp> Revision: 1040 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1040 Author: tach Date: 2009-02-23 22:13:52 +0900 (Mon, 23 Feb 2009) Log Message: ----------- Disable discussion2 when mobile mode Modified Paths: -------------- slashjp/trunk/Slash/Utility/Environment/Environment.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Environment/Environment.pm =================================================================== --- slashjp/trunk/Slash/Utility/Environment/Environment.pm 2009-02-23 12:23:34 UTC (rev 1039) +++ slashjp/trunk/Slash/Utility/Environment/Environment.pm 2009-02-23 13:13:52 UTC (rev 1040) @@ -1648,6 +1648,7 @@ $user->{mode} = $constants->{mobile_commentmode} || 'flat'; # show flat $user->{commentsort} = $constants->{mobile_commentsort} || 4; # sorted by date asc $user->{commentlimit} = $constants->{mobile_commentlimit} || 5; # comments per page + $user->{discussion2} = $constants->{mobile_discussion2} || ''; # discussion2 } } Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-23 12:23:34 UTC (rev 1039) +++ slashjp/trunk/debian/changelog 2009-02-23 13:13:52 UTC (rev 1040) @@ -23,8 +23,9 @@ * Add fix-discussion-url command to fix url column in discussions table * Fix poll discussion kind definition * Add fix-poll-discussions - fix discussions.dkid for poll discussion item + * Disable discussion2 when mobile mode - -- Taku YASUI Mon, 23 Feb 2009 10:46:34 +0000 + -- Taku YASUI Mon, 23 Feb 2009 13:13:34 +0000 slash (2.5.0.233-4) unstable; urgency=low From svnnotify ＠ sourceforge.jp Mon Feb 23 22:43:44 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 23 Feb 2009 22:43:44 +0900 Subject: [Slashdotjp-dev 1510] [1041] fix link color in commentControlBox (#15194) Message-ID: <1235396624.059487.17674.nullmailer@users.sourceforge.jp> Revision: 1041 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1041 Author: tach Date: 2009-02-23 22:43:44 +0900 (Mon, 23 Feb 2009) Log Message: ----------- fix link color in commentControlBox (#15194) Ticket Links: :----------- http://sourceforge.jp/projects/slashdotjp/tracker/detail/15194 Modified Paths: -------------- images/trunk/css/comments.css images/trunk/css/comments.css.jp -------------- next part -------------- Modified: images/trunk/css/comments.css =================================================================== --- images/trunk/css/comments.css 2009-02-23 13:13:52 UTC (rev 1040) +++ images/trunk/css/comments.css 2009-02-23 13:43:44 UTC (rev 1041) @@ -415,6 +415,11 @@ line-height: 1.4; } +/* fix link color in commentControlBox */ +.commentBoxForm .commentBox a { + color: #222; +} + /* fix preview space */ #contents .commentBody p { padding: 0; Modified: images/trunk/css/comments.css.jp =================================================================== --- images/trunk/css/comments.css.jp 2009-02-23 13:13:52 UTC (rev 1040) +++ images/trunk/css/comments.css.jp 2009-02-23 13:43:44 UTC (rev 1041) @@ -21,6 +21,11 @@ line-height: 1.4; } +/* fix link color in commentControlBox */ +.commentBoxForm .commentBox a { + color: #222; +} + /* fix preview space */ #contents .commentBody p { padding: 0; From svnnotify ＠ sourceforge.jp Tue Feb 24 17:50:43 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 24 Feb 2009 17:50:43 +0900 Subject: [Slashdotjp-dev 1511] [1042] make "score" display more small Message-ID: <1235465443.767582.6731.nullmailer@users.sourceforge.jp> Revision: 1042 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1042 Author: tach Date: 2009-02-24 17:50:43 +0900 (Tue, 24 Feb 2009) Log Message: ----------- make "score" display more small Modified Paths: -------------- images/trunk/css/comments.css images/trunk/css/comments.css.jp -------------- next part -------------- Modified: images/trunk/css/comments.css =================================================================== --- images/trunk/css/comments.css 2009-02-23 13:43:44 UTC (rev 1041) +++ images/trunk/css/comments.css 2009-02-24 08:50:43 UTC (rev 1042) @@ -471,6 +471,11 @@ background: url(/images/d2_button_horizonal_v2_jp.png) no-repeat; } +/* fix score display */ +.comment .title .score { + font-size: 90%; +} + /* fix comment button color */ .nbutton { background-color: #CCC; Modified: images/trunk/css/comments.css.jp =================================================================== --- images/trunk/css/comments.css.jp 2009-02-23 13:43:44 UTC (rev 1041) +++ images/trunk/css/comments.css.jp 2009-02-24 08:50:43 UTC (rev 1042) @@ -77,6 +77,11 @@ background: url(/images/d2_button_horizonal_v2_jp.png) no-repeat; } +/* fix score display */ +.comment .title .score { + font-size: 90%; +} + /* fix comment button color */ .nbutton { background-color: #CCC; From svnnotify ＠ sourceforge.jp Thu Feb 26 19:22:50 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 26 Feb 2009 19:22:50 +0900 Subject: [Slashdotjp-dev 1512] [1043] * Add variable "messages_send_journal_story_comments" to select sending Message-ID: <1235643770.616164.28582.nullmailer@users.sourceforge.jp> Revision: 1043 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1043 Author: tach Date: 2009-02-26 19:22:50 +0900 (Thu, 26 Feb 2009) Log Message: ----------- * Add variable "messages_send_journal_story_comments" to select sending messages for "journal-story" comments Fix: http://sourceforge.jp/ticket/browse.php?group_id=4&tid=15038 (#15038) Ticket Links: :----------- http://sourceforge.jp/projects/slashdotjp/tracker/detail/15038 Modified Paths: -------------- slashjp/trunk/Slash/Utility/Comments/Comments.pm slashjp/trunk/debian/changelog slashjp/trunk/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Comments/Comments.pm =================================================================== --- slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-24 08:50:43 UTC (rev 1042) +++ slashjp/trunk/Slash/Utility/Comments/Comments.pm 2009-02-26 10:22:50 UTC (rev 1043) @@ -1747,7 +1747,7 @@ } # reply to journal - if ($messages && $kinds->{ $discussion->{dkid} } =~ /^journal/) { + if ($messages && ($kinds->{ $discussion->{dkid} } eq "journal" || $kinds->{ $discussion->{dkid} } =~ /^journal/ && $constants->{messages_send_journal_story_comments})) { my $users = $messages->checkMessageCodes(MSG_CODE_JOURNAL_REPLY, [$discussion->{uid}]); if (_send_comment_msg($users->[0], \%users, $pts, $clean_comment)) { my $data = { Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-24 08:50:43 UTC (rev 1042) +++ slashjp/trunk/debian/changelog 2009-02-26 10:22:50 UTC (rev 1043) @@ -24,8 +24,10 @@ * Fix poll discussion kind definition * Add fix-poll-discussions - fix discussions.dkid for poll discussion item * Disable discussion2 when mobile mode + * Add variable "messages_send_journal_story_comments" to select sending + messages for "journal-story" comments - -- Taku YASUI Mon, 23 Feb 2009 13:13:34 +0000 + -- Taku YASUI Thu, 26 Feb 2009 10:21:37 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2009-02-24 08:50:43 UTC (rev 1042) +++ slashjp/trunk/sql/mysql/defaults.sql 2009-02-26 10:22:50 UTC (rev 1043) @@ -1165,6 +1165,7 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('d2_default', '', 'Default discussion2 module name'); INSERT IGNORE INTO vars (name, value, description) VALUES ('firehose_tagged_by_uid', '0', 'Use as tagged_by_uid instead of uid for FireHose filter "user:username"'); INSERT IGNORE INTO vars (name, value, description) VALUES ('submission_remove_mainpage_nexus_tid', '0', 'Remove "Index" topic on topic list at story editing from submission'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('messages_send_journal_story_comments', '0', 'Send "MSG_CODE_JOURNAL_REPLY" messages when the discussion is "journal-story"'); 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 Thu Feb 26 20:24:31 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 26 Feb 2009 20:24:31 +0900 Subject: [Slashdotjp-dev 1513] [1044] * Fix: userInfo comment link from "journal" to "story" when kinds are Message-ID: <1235647471.970394.31452.nullmailer@users.sourceforge.jp> Revision: 1044 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1044 Author: tach Date: 2009-02-26 20:24:31 +0900 (Thu, 26 Feb 2009) Log Message: ----------- * Fix: userInfo comment link from "journal" to "story" when kinds are "journal-story" http://sourceforge.jp/ticket/browse.php?group_id=4&tid=15282 (#15282) Ticket Links: :----------- http://sourceforge.jp/projects/slashdotjp/tracker/detail/15282 Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/themes/slashcode/htdocs/users.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-26 10:22:50 UTC (rev 1043) +++ slashjp/trunk/debian/changelog 2009-02-26 11:24:31 UTC (rev 1044) @@ -26,8 +26,10 @@ * Disable discussion2 when mobile mode * Add variable "messages_send_journal_story_comments" to select sending messages for "journal-story" comments + * Fix: userInfo comment link from "journal" to "story" when kinds are + "journal-story" - -- Taku YASUI Thu, 26 Feb 2009 10:21:37 +0000 + -- Taku YASUI Thu, 26 Feb 2009 11:23:07 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/users.pl 2009-02-26 10:22:50 UTC (rev 1043) +++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2009-02-26 11:24:31 UTC (rev 1044) @@ -1231,7 +1231,7 @@ # A comment with no accompanying discussion; # basically we pretend it doesn't exist. next; - } elsif ($kinds->{ $discussion->{dkid} } =~ /^journal(?:-story)?$/) { + } elsif ($kinds->{ $discussion->{dkid} } eq 'journal') { $type = 'journal'; } elsif ($kinds->{ $discussion->{dkid} } eq 'poll') { $type = 'poll'; From svnnotify ＠ sourceforge.jp Fri Feb 27 15:34:59 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 27 Feb 2009 15:34:59 +0900 Subject: [Slashdotjp-dev 1514] [1045] setCurrentForm('ssi', 1) when creating slashfoot.inc Message-ID: <1235716499.569947.14638.nullmailer@users.sourceforge.jp> Revision: 1045 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1045 Author: tach Date: 2009-02-27 15:34:59 +0900 (Fri, 27 Feb 2009) Log Message: ----------- setCurrentForm('ssi', 1) when creating slashfoot.inc Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/themes/slashcode/tasks/new_headfoot.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-02-26 11:24:31 UTC (rev 1044) +++ slashjp/trunk/debian/changelog 2009-02-27 06:34:59 UTC (rev 1045) @@ -28,8 +28,9 @@ messages for "journal-story" comments * Fix: userInfo comment link from "journal" to "story" when kinds are "journal-story" + * setCurrentForm('ssi', 1) when creating "slashfoot.inc" - -- Taku YASUI Thu, 26 Feb 2009 11:23:07 +0000 + -- Taku YASUI Fri, 27 Feb 2009 06:34:17 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/themes/slashcode/tasks/new_headfoot.pl =================================================================== --- slashjp/trunk/themes/slashcode/tasks/new_headfoot.pl 2009-02-26 11:24:31 UTC (rev 1044) +++ slashjp/trunk/themes/slashcode/tasks/new_headfoot.pl 2009-02-27 06:34:59 UTC (rev 1045) @@ -104,7 +104,7 @@ close $fh; } - setCurrentForm('ssi', 0); + setCurrentForm('ssi', 1); my $foot_pages = $slashdb->getHeadFootPages($skinname, 'footer'); foreach (@$foot_pages) { From svnnotify ＠ sourceforge.jp Fri Feb 27 15:45:13 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 27 Feb 2009 15:45:13 +0900 Subject: [Slashdotjp-dev 1515] [1046] fix footer-navigation css Message-ID: <1235717113.578480.31358.nullmailer@users.sourceforge.jp> Revision: 1046 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1046 Author: tach Date: 2009-02-27 15:45:13 +0900 (Fri, 27 Feb 2009) Log Message: ----------- fix footer-navigation css Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-02-27 06:34:59 UTC (rev 1045) +++ images/trunk/css/slashdotjp.css 2009-02-27 06:45:13 UTC (rev 1046) @@ -453,28 +453,27 @@ margin: 0.8em 0; } -/* lower contents for whole site */ -#lower-contents { +/* footer navigation for whole site */ +#footer-navigation { margin-top: 1em; - white-space: nowrap; + clear: right; } -/* story widget at the bottom of contents */ -#lower-contents .story-widget { - margin-top: 1em; - background: #E8E8E8; +#footer-navigation table.ads-footer-navigation { + margin: 0; + padding: 0; + border: 0; + border-collapse: collapse; } -#lower-contents .story-widget ol { - margin: 0 0 0 2em !important; - padding: 0.5em 0.7em; - line-height: 1.7; +#footer-navigation table.ads-footer-navigation tbody, +#footer-navigation table.ads-footer-navigation tr, +#footer-navigation table.ads-footer-navigation td { + margin: 0; + padding: 0; + border: 0; } -#lower-contents .story-widget ol li a.comments { - font-size: 90%; -} - /* FAQ page navigation */ #wikicontents .pagenavi { background: #666 url(//images.slashdot.jp/block-title-bg.png) repeat-x;