From svnnotify ¡÷ sourceforge.jp Mon Nov 10 17:54:22 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 10 Nov 2008 17:54:22 +0900 Subject: [Slashdotjp-dev 1280] [808] add sp symlink Message-ID: <1226307262.493864.19972.nullmailer@users.sourceforge.jp> Revision: 808 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=808 Author: tach Date: 2008-11-10 17:54:22 +0900 (Mon, 10 Nov 2008) Log Message: ----------- add sp symlink Added Paths: ----------- images/sp -------------- next part -------------- Added: images/sp =================================================================== --- images/sp (rev 0) +++ images/sp 2008-11-10 08:54:22 UTC (rev 808) @@ -0,0 +1 @@ +link ../sp \ No newline at end of file Property changes on: images/sp ___________________________________________________________________ Name: svn:special + * From svnnotify ¡÷ sourceforge.jp Tue Nov 11 18:11:41 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 11 Nov 2008 18:11:41 +0900 Subject: [Slashdotjp-dev 1281] [810] add upstream 2.5.0.228 branch Message-ID: <1226394701.778534.18955.nullmailer@users.sourceforge.jp> Revision: 810 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=810 Author: tach Date: 2008-11-11 18:11:41 +0900 (Tue, 11 Nov 2008) Log Message: ----------- add upstream 2.5.0.228 branch Added Paths: ----------- slashjp/branches/upstream/2.5.0.228/ -------------- next part -------------- Copied: slashjp/branches/upstream/2.5.0.228 (from rev 809, slashjp/branches/upstream/current) From svnnotify ¡÷ sourceforge.jp Tue Nov 11 20:43:58 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 11 Nov 2008 20:43:58 +0900 Subject: [Slashdotjp-dev 1282] [811] fix previewSlashbox internal spec Message-ID: <1226403838.562642.10056.nullmailer@users.sourceforge.jp> Revision: 811 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=811 Author: tach Date: 2008-11-11 20:43:58 +0900 (Tue, 11 Nov 2008) Log Message: ----------- fix previewSlashbox internal spec Modified Paths: -------------- slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl 2008-11-11 09:11:41 UTC (rev 810) +++ slashjp/branches/2.5.0.192/themes/slashcode/htdocs/users.pl 2008-11-11 11:43:58 UTC (rev 811) @@ -540,10 +540,8 @@ title => $title, block => $block, is_editable => $is_editable, + previewbox => portalbox($constants->{fancyboxwidth}, $block->{title}, $block->{block}, '', $block->{url}), }); - - print portalbox($constants->{fancyboxwidth}, $block->{title}, - $block->{block}, '', $block->{url}); } ################################################################# From svnnotify ¡÷ sourceforge.jp Tue Nov 11 21:01:37 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 11 Nov 2008 21:01:37 +0900 Subject: [Slashdotjp-dev 1283] [812] add message to debian/changelog Message-ID: <1226404897.798840.24961.nullmailer@users.sourceforge.jp> Revision: 812 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=812 Author: tach Date: 2008-11-11 21:01:37 +0900 (Tue, 11 Nov 2008) Log Message: ----------- add message to debian/changelog Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-11-11 11:43:58 UTC (rev 811) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-11-11 12:01:37 UTC (rev 812) @@ -13,8 +13,9 @@ * Create messages when the journal is submission * Add pollquestions to page title and fix title format * Fix poll voting booth layout to use template "poll;pollBooth;default" + * Fix previewSlashbox layout to use template "previewSlashbox;users;default" - -- Taku YASUI Mon, 27 Oct 2008 09:39:24 +0000 + -- Taku YASUI Tue, 11 Nov 2008 12:00:54 +0000 slash (2.5.0.192-20) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Nov 18 13:48:00 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 13:48:00 +0900 Subject: [Slashdotjp-dev 1284] [813] add some icons to show information Message-ID: <1226983680.485442.28100.nullmailer@users.sourceforge.jp> Revision: 813 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=813 Author: tach Date: 2008-11-18 13:48:00 +0900 (Tue, 18 Nov 2008) Log Message: ----------- add some icons to show information Added Paths: ----------- images/silk/ images/silk/delete.png images/silk/help.png images/silk/information.png -------------- next part -------------- Added: images/silk/delete.png =================================================================== (Binary files differ) Property changes on: images/silk/delete.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: images/silk/help.png =================================================================== (Binary files differ) Property changes on: images/silk/help.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: images/silk/information.png =================================================================== (Binary files differ) Property changes on: images/silk/information.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svnnotify ¡÷ sourceforge.jp Tue Nov 18 14:10:15 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 14:10:15 +0900 Subject: [Slashdotjp-dev 1285] [814] add warning icon Message-ID: <1226985015.433197.21342.nullmailer@users.sourceforge.jp> Revision: 814 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=814 Author: tach Date: 2008-11-18 14:10:15 +0900 (Tue, 18 Nov 2008) Log Message: ----------- add warning icon Added Paths: ----------- images/icon_warning.gif -------------- next part -------------- Added: images/icon_warning.gif =================================================================== (Binary files differ) Property changes on: images/icon_warning.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svnnotify ¡÷ sourceforge.jp Tue Nov 18 14:36:48 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 14:36:48 +0900 Subject: [Slashdotjp-dev 1286] [815] add info, error, warning class Message-ID: <1226986608.874563.16367.nullmailer@users.sourceforge.jp> Revision: 815 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=815 Author: tach Date: 2008-11-18 14:36:48 +0900 (Tue, 18 Nov 2008) Log Message: ----------- add info, error, warning class Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-18 05:10:15 UTC (rev 814) +++ images/css/slashdotjp.css 2008-11-18 05:36:48 UTC (rev 815) @@ -367,6 +367,30 @@ padding-left: 16px; } +/* usable message classes */ +.info { + background: #def url(//images.slashdot.jp/silk/information.png) no-repeat 10px 3px; + border: 1px solid #9cf; + padding: .2em 40px; + margin: .5em 0 1em 0; +} + +.error, +.err { + background: #fdd url(//images.slashdot.jp/silk/delete.png) no-repeat 10px 3px; + border: 1px solid #fbb; + padding: .2em 40px; + margin: .5em 0 1em 0; +} + +.warning, +.warn { + background: #ffd url(//images.slashdot.jp/icon_warning.gif") no-repeat 10px 3px; + border: 1px solid #fe6; + padding: .2em 40px; + margin: .5em 0 1em 0; +} + /* ads format */ div.article div.bigbanner, div.adsense_468x60 { From svnnotify ¡÷ sourceforge.jp Tue Nov 18 14:55:49 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 14:55:49 +0900 Subject: [Slashdotjp-dev 1287] [816] fix typo Message-ID: <1226987749.786318.2395.nullmailer@users.sourceforge.jp> Revision: 816 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=816 Author: tach Date: 2008-11-18 14:55:49 +0900 (Tue, 18 Nov 2008) Log Message: ----------- fix typo Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-18 05:36:48 UTC (rev 815) +++ images/css/slashdotjp.css 2008-11-18 05:55:49 UTC (rev 816) @@ -385,7 +385,7 @@ .warning, .warn { - background: #ffd url(//images.slashdot.jp/icon_warning.gif") no-repeat 10px 3px; + background: #ffd url(//images.slashdot.jp/icon_warning.gif) no-repeat 10px 3px; border: 1px solid #fe6; padding: .2em 40px; margin: .5em 0 1em 0; From svnnotify ¡÷ sourceforge.jp Tue Nov 18 14:58:34 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 14:58:34 +0900 Subject: [Slashdotjp-dev 1288] [817] fix padding Message-ID: <1226987914.934533.5431.nullmailer@users.sourceforge.jp> Revision: 817 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=817 Author: tach Date: 2008-11-18 14:58:34 +0900 (Tue, 18 Nov 2008) Log Message: ----------- fix padding Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-18 05:55:49 UTC (rev 816) +++ images/css/slashdotjp.css 2008-11-18 05:58:34 UTC (rev 817) @@ -371,7 +371,7 @@ .info { background: #def url(//images.slashdot.jp/silk/information.png) no-repeat 10px 3px; border: 1px solid #9cf; - padding: .2em 40px; + padding: 5px 0 5px 40px; margin: .5em 0 1em 0; } @@ -379,7 +379,7 @@ .err { background: #fdd url(//images.slashdot.jp/silk/delete.png) no-repeat 10px 3px; border: 1px solid #fbb; - padding: .2em 40px; + padding: 5px 0 5px 40px; margin: .5em 0 1em 0; } @@ -387,7 +387,7 @@ .warn { background: #ffd url(//images.slashdot.jp/icon_warning.gif) no-repeat 10px 3px; border: 1px solid #fe6; - padding: .2em 40px; + padding: 5px 0 5px 40px; margin: .5em 0 1em 0; } From svnnotify ¡÷ sourceforge.jp Tue Nov 18 14:59:38 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 14:59:38 +0900 Subject: [Slashdotjp-dev 1289] [818] fix padding Message-ID: <1226987978.645803.6140.nullmailer@users.sourceforge.jp> Revision: 818 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=818 Author: tach Date: 2008-11-18 14:59:38 +0900 (Tue, 18 Nov 2008) Log Message: ----------- fix padding Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-18 05:58:34 UTC (rev 817) +++ images/css/slashdotjp.css 2008-11-18 05:59:38 UTC (rev 818) @@ -371,7 +371,7 @@ .info { background: #def url(//images.slashdot.jp/silk/information.png) no-repeat 10px 3px; border: 1px solid #9cf; - padding: 5px 0 5px 40px; + padding: 5px 5px 5px 40px; margin: .5em 0 1em 0; } @@ -379,7 +379,7 @@ .err { background: #fdd url(//images.slashdot.jp/silk/delete.png) no-repeat 10px 3px; border: 1px solid #fbb; - padding: 5px 0 5px 40px; + padding: 5px 5px 5px 40px; margin: .5em 0 1em 0; } @@ -387,7 +387,7 @@ .warn { background: #ffd url(//images.slashdot.jp/icon_warning.gif) no-repeat 10px 3px; border: 1px solid #fe6; - padding: 5px 0 5px 40px; + padding: 5px 5px 5px 40px; margin: .5em 0 1em 0; } From svnnotify ¡÷ sourceforge.jp Tue Nov 18 20:11:27 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 20:11:27 +0900 Subject: [Slashdotjp-dev 1290] [819] loginform for comment submit Message-ID: <1227006687.622780.945.nullmailer@users.sourceforge.jp> Revision: 819 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=819 Author: tach Date: 2008-11-18 20:11:27 +0900 (Tue, 18 Nov 2008) Log Message: ----------- loginform for comment submit Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-18 05:59:38 UTC (rev 818) +++ images/css/slashdotjp.css 2008-11-18 11:11:27 UTC (rev 819) @@ -361,6 +361,16 @@ vertical-align: middle; } +/* comment login form */ +.loginform { + margin: 0.8em 0; +} + +.loginform label { + display: inline; + margin-right: 1.2em; +} + /* code.shtml rss link */ a.feed { background: url(//images.slashdot.jp/feed-14x14.png) left no-repeat; From svnnotify ¡÷ sourceforge.jp Tue Nov 18 20:40:16 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 18 Nov 2008 20:40:16 +0900 Subject: [Slashdotjp-dev 1291] [820] add for error title Message-ID: <1227008416.367483.28417.nullmailer@users.sourceforge.jp> Revision: 820 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=820 Author: tach Date: 2008-11-18 20:40:16 +0900 (Tue, 18 Nov 2008) Log Message: ----------- add for error title Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-18 11:11:27 UTC (rev 819) +++ images/css/slashdotjp.css 2008-11-18 11:40:16 UTC (rev 820) @@ -393,6 +393,11 @@ margin: .5em 0 1em 0; } +.error .title, +.err .title { + font-size: 120%; +} + .warning, .warn { background: #ffd url(//images.slashdot.jp/icon_warning.gif) no-repeat 10px 3px; From svnnotify ¡÷ sourceforge.jp Wed Nov 19 12:36:49 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 19 Nov 2008 12:36:49 +0900 Subject: [Slashdotjp-dev 1292] [821] message area ul hack Message-ID: <1227065809.532307.22489.nullmailer@users.sourceforge.jp> Revision: 821 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=821 Author: tach Date: 2008-11-19 12:36:49 +0900 (Wed, 19 Nov 2008) Log Message: ----------- message area ul hack Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-18 11:40:16 UTC (rev 820) +++ images/css/slashdotjp.css 2008-11-19 03:36:49 UTC (rev 821) @@ -134,14 +134,12 @@ /* Fix list-style image location */ #slashboxes #slashd ul li, -#slashboxes #future ul li -{ +#slashboxes #future ul li { list-style: url(//images.slashdot.jp/drop.gif); } /* Fix slashdot.org impremant */ -div.article div.intro i -{ +div.article div.intro i { border-left: none; display: inline; font-style: italic; @@ -150,8 +148,8 @@ } /* Fix blockquote color */ -blockquote, .quote -{ +blockquote, +.quote { color: #000; } @@ -285,6 +283,11 @@ div#metamod ul, div#bookmark ul, div#topics .generalbody ul, +.error ul, +.err ul, +.warning ul, +.warn ul, +.info ul, form#createuserform ul { margin: 1em 0pt 1em 2em !important; } From svnnotify ¡÷ sourceforge.jp Wed Nov 19 13:47:04 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 19 Nov 2008 13:47:04 +0900 Subject: [Slashdotjp-dev 1293] [822] Add some wiki page to wikicontents redirection Message-ID: <1227070024.786235.10387.nullmailer@users.sourceforge.jp> Revision: 822 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=822 Author: tach Date: 2008-11-19 13:47:04 +0900 (Wed, 19 Nov 2008) Log Message: ----------- Add some wiki page to wikicontents redirection Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-11-19 03:36:49 UTC (rev 821) +++ slashjp/branches/2.5.0.192/Slash/Apache/Apache.pm 2008-11-19 04:47:04 UTC (rev 822) @@ -520,7 +520,7 @@ } # some static contents for slashdot.jp - if ($uri =~ m!^/(about|code)(/|\.shtml)?$!x) { + if ($uri =~ m!^/(about|code|prettypictures|supporters|why_login|submit_guide|bookreview_guide)(/|\.shtml)?$!x) { my ($word, $sl) = ($1, $2); my @args = (); my $fpath = "/$constants->{sfjp_wikicontents_path}/$word.shtml"; Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-11-19 03:36:49 UTC (rev 821) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-11-19 04:47:04 UTC (rev 822) @@ -14,8 +14,9 @@ * Add pollquestions to page title and fix title format * Fix poll voting booth layout to use template "poll;pollBooth;default" * Fix previewSlashbox layout to use template "previewSlashbox;users;default" + * Add some wiki page to wikicontents redirection - -- Taku YASUI Tue, 11 Nov 2008 12:00:54 +0000 + -- Taku YASUI Wed, 19 Nov 2008 04:46:30 +0000 slash (2.5.0.192-20) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Nov 19 17:00:57 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 19 Nov 2008 17:00:57 +0900 Subject: [Slashdotjp-dev 1294] [823] fix margin-top of notes and note Message-ID: <1227081657.707240.4239.nullmailer@users.sourceforge.jp> Revision: 823 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=823 Author: tach Date: 2008-11-19 17:00:57 +0900 (Wed, 19 Nov 2008) Log Message: ----------- fix margin-top of notes and note Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-19 04:47:04 UTC (rev 822) +++ images/css/slashdotjp.css 2008-11-19 08:00:57 UTC (rev 823) @@ -153,6 +153,12 @@ color: #000; } +/* notes and note override */ +.notes, +.note { + margin-top: 0.2em; +} + /* Fix left menu (#links) bottom image */ div#links { background: #eee url(//images.slashdot.jp/slashbox-bottom-left.png) no-repeat left bottom; From svnnotify ¡÷ sourceforge.jp Wed Nov 19 17:47:27 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 19 Nov 2008 17:47:27 +0900 Subject: [Slashdotjp-dev 1295] [824] Fix for invalid form input at Slash/Utility/Environment/Environment. pm Message-ID: <1227084447.371245.13501.nullmailer@users.sourceforge.jp> Revision: 824 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=824 Author: tach Date: 2008-11-19 17:47:27 +0900 (Wed, 19 Nov 2008) Log Message: ----------- Fix for invalid form input at Slash/Utility/Environment/Environment.pm Modified Paths: -------------- slashjp/branches/2.5.0.192/Slash/Utility/Environment/Environment.pm slashjp/branches/2.5.0.192/debian/changelog -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/Slash/Utility/Environment/Environment.pm =================================================================== --- slashjp/branches/2.5.0.192/Slash/Utility/Environment/Environment.pm 2008-11-19 08:00:57 UTC (rev 823) +++ slashjp/branches/2.5.0.192/Slash/Utility/Environment/Environment.pm 2008-11-19 08:47:27 UTC (rev 824) @@ -1988,7 +1988,7 @@ $data =~ s|[^a-zA-Z0-9_]+||g; } else { for my $ri (@regints) { - $data = fixint($data) if $ri =~ $key; + $data = fixint($data) if $ri =~ quotemeta($key); } # convert input to internal character encoding Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-11-19 08:00:57 UTC (rev 823) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-11-19 08:47:27 UTC (rev 824) @@ -15,8 +15,9 @@ * Fix poll voting booth layout to use template "poll;pollBooth;default" * Fix previewSlashbox layout to use template "previewSlashbox;users;default" * Add some wiki page to wikicontents redirection + * Fix for invalid form input at Slash/Utility/Environment/Environment.pm - -- Taku YASUI Wed, 19 Nov 2008 04:46:30 +0000 + -- Taku YASUI Wed, 19 Nov 2008 08:47:10 +0000 slash (2.5.0.192-20) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Nov 19 19:24:13 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 19 Nov 2008 19:24:13 +0900 Subject: [Slashdotjp-dev 1296] [825] fix metamod css Message-ID: <1227090253.520068.11332.nullmailer@users.sourceforge.jp> Revision: 825 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=825 Author: tach Date: 2008-11-19 19:24:13 +0900 (Wed, 19 Nov 2008) Log Message: ----------- fix metamod css Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-19 08:47:27 UTC (rev 824) +++ images/css/slashdotjp.css 2008-11-19 10:24:13 UTC (rev 825) @@ -286,7 +286,7 @@ div#polls div.generalbody ul, div#submit div.generalbody ul, div#commentBody ul, -div#metamod ul, +div#metamod #metamod-intro ul, div#bookmark ul, div#topics .generalbody ul, .error ul, @@ -370,6 +370,24 @@ vertical-align: middle; } +/* fix metamod comment */ +#metamod-intro { + padding: 0.6em 0; +} + +#metamod #commentlisting li.comment { + margin-bottom: 1.2em; +} + +#metamod div.commentTop div.title { + padding: 0; +} + +#metamod div.commentTop div.title h4 { + padding: 0.3em 0; + display: block; +} + /* comment login form */ .loginform { margin: 0.8em 0; From svnnotify ¡÷ sourceforge.jp Thu Nov 20 17:53:59 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 20 Nov 2008 17:53:59 +0900 Subject: [Slashdotjp-dev 1297] [826] add big write-comment link css and tooltip css Message-ID: <1227171239.202006.13086.nullmailer@users.sourceforge.jp> Revision: 826 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=826 Author: tach Date: 2008-11-20 17:53:58 +0900 (Thu, 20 Nov 2008) Log Message: ----------- add big write-comment link css and tooltip css Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-19 10:24:13 UTC (rev 825) +++ images/css/slashdotjp.css 2008-11-20 08:53:58 UTC (rev 826) @@ -170,6 +170,24 @@ work-break: break-all; } +/* write comment big link */ +.write-comment-link { + font-size: 160%; + text-align: center; + margin-top: 0.1em; +} + +.write-comment-link a { + -moz-border-radius: 10px; + -border-radius: 10px; + -webkit-border-radius: 10px; + background: #DDD; + border: 3px solid #666; + color: #055; + padding: 0.2em 1em; + text-decoration: none; +} + /* Override moderation summary box for AdSense */ #mod_summary { margin-left: 0; @@ -433,6 +451,24 @@ margin: .5em 0 1em 0; } +/* show tooltip (http://f32.aaa.livedoor.jp/~azusa/index.php?t=ajax&p=balloonjs_css) */ +a.tooltip span { + display: none; + padding: 2px 3px; + margin-left: 8px; + width: 200px; + white-space: normal; + line-height: 1.4; +} + +a.tooltip:hover span{ + display: inline; + position: absolute; + border: 1px solid #cccccc; + background: #ffffff; + color: #6c6c6c; +} + /* ads format */ div.article div.bigbanner, div.adsense_468x60 { From svnnotify ¡÷ sourceforge.jp Thu Nov 20 19:08:06 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 20 Nov 2008 19:08:06 +0900 Subject: [Slashdotjp-dev 1298] [827] fix to remove crossover for big write-comment link Message-ID: <1227175686.193458.15682.nullmailer@users.sourceforge.jp> Revision: 827 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=827 Author: tach Date: 2008-11-20 19:08:06 +0900 (Thu, 20 Nov 2008) Log Message: ----------- fix to remove crossover for big write-comment link Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-20 08:53:58 UTC (rev 826) +++ images/css/slashdotjp.css 2008-11-20 10:08:06 UTC (rev 827) @@ -175,6 +175,7 @@ font-size: 160%; text-align: center; margin-top: 0.1em; + padding: 4px; } .write-comment-link a { From svnnotify ¡÷ sourceforge.jp Thu Nov 20 19:12:58 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 20 Nov 2008 19:12:58 +0900 Subject: [Slashdotjp-dev 1299] [828] change author link color to black like normal text Message-ID: <1227175978.148276.18592.nullmailer@users.sourceforge.jp> Revision: 828 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=828 Author: tach Date: 2008-11-20 19:12:58 +0900 (Thu, 20 Nov 2008) Log Message: ----------- change author link color to black like normal text Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-20 10:08:06 UTC (rev 827) +++ images/css/slashdotjp.css 2008-11-20 10:12:58 UTC (rev 828) @@ -164,6 +164,11 @@ background: #eee url(//images.slashdot.jp/slashbox-bottom-left.png) no-repeat left bottom; } +/* author link become black */ +.article .details a.author { + color: #111; +} + /* Suppress long URLs/words */ div.commentBody { overflow-x: auto; From svnnotify ¡÷ sourceforge.jp Thu Nov 20 19:32:48 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 20 Nov 2008 19:32:48 +0900 Subject: [Slashdotjp-dev 1300] [829] fix tooltip z-index Message-ID: <1227177168.318768.4098.nullmailer@users.sourceforge.jp> Revision: 829 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=829 Author: tach Date: 2008-11-20 19:32:48 +0900 (Thu, 20 Nov 2008) Log Message: ----------- fix tooltip z-index Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-20 10:12:58 UTC (rev 828) +++ images/css/slashdotjp.css 2008-11-20 10:32:48 UTC (rev 829) @@ -465,6 +465,7 @@ width: 200px; white-space: normal; line-height: 1.4; + z-index: 10; } a.tooltip:hover span{ From svnnotify ¡÷ sourceforge.jp Thu Nov 20 19:36:36 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 20 Nov 2008 19:36:36 +0900 Subject: [Slashdotjp-dev 1301] [830] force line-height for tooltip Message-ID: <1227177396.670467.7487.nullmailer@users.sourceforge.jp> Revision: 830 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=830 Author: tach Date: 2008-11-20 19:36:36 +0900 (Thu, 20 Nov 2008) Log Message: ----------- force line-height for tooltip Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-20 10:32:48 UTC (rev 829) +++ images/css/slashdotjp.css 2008-11-20 10:36:36 UTC (rev 830) @@ -464,7 +464,7 @@ margin-left: 8px; width: 200px; white-space: normal; - line-height: 1.4; + line-height: 1.4 !important; z-index: 10; } From svnnotify ¡÷ sourceforge.jp Thu Nov 20 20:10:17 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 20 Nov 2008 20:10:17 +0900 Subject: [Slashdotjp-dev 1302] [831] fix tooltip place and size for login slashbox Message-ID: <1227179417.422907.6075.nullmailer@users.sourceforge.jp> Revision: 831 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=831 Author: tach Date: 2008-11-20 20:10:17 +0900 (Thu, 20 Nov 2008) Log Message: ----------- fix tooltip place and size for login slashbox Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-20 10:36:36 UTC (rev 830) +++ images/css/slashdotjp.css 2008-11-20 11:10:17 UTC (rev 831) @@ -476,6 +476,12 @@ color: #6c6c6c; } +#slashboxes #login-content a.tooltip span { + width: 160px; + margin-left: -60px; + margin-top: 20px; +} + /* ads format */ div.article div.bigbanner, div.adsense_468x60 { From svnnotify ¡÷ sourceforge.jp Fri Nov 21 14:04:58 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 21 Nov 2008 14:04:58 +0900 Subject: [Slashdotjp-dev 1303] [832] * Fix to show correct error message on new user creation Message-ID: <1227243898.898102.3883.nullmailer@users.sourceforge.jp> Revision: 832 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=832 Author: tach Date: 2008-11-21 14:04:58 +0900 (Fri, 21 Nov 2008) Log Message: ----------- * Fix to show correct error message on new user creation * Add to set more messaging preferences on new user creation Modified Paths: -------------- slashjp/branches/2.5.0.192/debian/changelog slashjp/branches/2.5.0.192/plugins/Login/login.pl -------------- next part -------------- Modified: slashjp/branches/2.5.0.192/debian/changelog =================================================================== --- slashjp/branches/2.5.0.192/debian/changelog 2008-11-20 11:10:17 UTC (rev 831) +++ slashjp/branches/2.5.0.192/debian/changelog 2008-11-21 05:04:58 UTC (rev 832) @@ -16,8 +16,10 @@ * Fix previewSlashbox layout to use template "previewSlashbox;users;default" * Add some wiki page to wikicontents redirection * Fix for invalid form input at Slash/Utility/Environment/Environment.pm + * Fix to show correct error message on new user creation + * Add to set more messaging preferences on new user creation - -- Taku YASUI Wed, 19 Nov 2008 08:47:10 +0000 + -- Taku YASUI Fri, 21 Nov 2008 05:03:49 +0000 slash (2.5.0.192-20) unstable; urgency=low Modified: slashjp/branches/2.5.0.192/plugins/Login/login.pl =================================================================== --- slashjp/branches/2.5.0.192/plugins/Login/login.pl 2008-11-20 11:10:17 UTC (rev 831) +++ slashjp/branches/2.5.0.192/plugins/Login/login.pl 2008-11-21 05:04:58 UTC (rev 832) @@ -68,18 +68,42 @@ sub newUser { my($slashdb, $reader, $constants, $user, $form) = @_; - if (my $error = _validFormkey(qw(max_post_check valid_check formkey_check), 1)) { - return newUserForm(@_, $error); - } + #if (my $error = _validFormkey(qw(max_post_check valid_check formkey_check), 1)) { + # return newUserForm(@_, $error); + #} my $plugins = $slashdb->getDescriptions('plugins'); my @note; my $error = 0; + my $nc = $constants->{nick_chars} || join('', 'a' .. 'z'); + my $nr = $constants->{nick_regex} || '^[a-z]$'; + my $ns = $constants->{nick_regex_start} || '[a-zA-Z_]'; # check if new nick is OK and if user exists my $newnick = nickFix($form->{newusernick}); my $matchname = nick2matchname($newnick); + + if ($form->{newusernick} !~ /^$ns/) { + push @note, getData('nick_starts_unavailable_chars'); + $error = 1; + } + + if ($form->{newusernick} =~ /\s{2,}/) { + push @note, getData('nick_has_continuous_whitespace'); + $error = 1; + } + + if ($form->{newusernick} !~ /^[$nc]+$/) { + push @note, getData('nick_has_unavailable_chars'); + $error = 1; + } + + if (length($form->{newusernick}) > $constants->{nick_maxlen}) { + push @note, getData('nick_is_too_long'); + $error = 1; + } + if (!$newnick) { push @note, getData('nick_invalid'); $error = 1; @@ -135,7 +159,7 @@ ? strip_nohtml($form->{pubkey}, 1) : ''; - if ($form->{newsletter} || $form->{comment_reply} || $form->{headlines}) { + if (1) { my $messages = getObject('Slash::Messages'); my %params; $params{MSG_CODE_COMMENT_REPLY()} = MSG_MODE_EMAIL() @@ -144,6 +168,16 @@ if $form->{newsletter}; $params{MSG_CODE_HEADLINES()} = MSG_MODE_EMAIL() if $form->{headlines}; + $params{MSG_CODE_ZOO_CHANGE()} = MSG_MODE_EMAIL() + if $form->{zoo_change}; + $params{MSG_CODE_M2()} = MSG_MODE_EMAIL() + if $form->{m2}; + $params{MSG_CODE_COMMENT_MODERATE()} = MSG_MODE_EMAIL() + if $form->{comment_moderate}; + $params{MSG_CODE_JOURNAL_FRIEND()} = MSG_MODE_EMAIL() + if $form->{journal_friend}; + $params{MSG_CODE_JOURNAL_REPLY()} = MSG_MODE_EMAIL() + if $form->{journal_reply}; $messages->setPrefs($uid, \%params); } From svnnotify ¡÷ sourceforge.jp Fri Nov 21 14:07:28 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 21 Nov 2008 14:07:28 +0900 Subject: [Slashdotjp-dev 1304] [833] add option css for new user creation Message-ID: <1227244048.150288.5494.nullmailer@users.sourceforge.jp> Revision: 833 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=833 Author: tach Date: 2008-11-21 14:07:28 +0900 (Fri, 21 Nov 2008) Log Message: ----------- add option css for new user creation Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-21 05:04:58 UTC (rev 832) +++ images/css/slashdotjp.css 2008-11-21 05:07:28 UTC (rev 833) @@ -422,6 +422,15 @@ margin-right: 1.2em; } +/* create user option form */ +#createuserform .options { + margin-top: 1em; +} + +#createuserform .options label { + display: inline; +} + /* code.shtml rss link */ a.feed { background: url(//images.slashdot.jp/feed-14x14.png) left no-repeat; From svnnotify ¡÷ sourceforge.jp Fri Nov 21 15:41:00 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 21 Nov 2008 15:41:00 +0900 Subject: [Slashdotjp-dev 1305] [834] fix createuserform option layout Message-ID: <1227249660.583022.1013.nullmailer@users.sourceforge.jp> Revision: 834 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=834 Author: tach Date: 2008-11-21 15:41:00 +0900 (Fri, 21 Nov 2008) Log Message: ----------- fix createuserform option layout Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-21 05:07:28 UTC (rev 833) +++ images/css/slashdotjp.css 2008-11-21 06:41:00 UTC (rev 834) @@ -425,10 +425,12 @@ /* create user option form */ #createuserform .options { margin-top: 1em; + line-height: 1.8; } #createuserform .options label { display: inline; + padding: 0; } /* code.shtml rss link */ From svnnotify ¡÷ sourceforge.jp Fri Nov 21 18:07:54 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 21 Nov 2008 18:07:54 +0900 Subject: [Slashdotjp-dev 1306] [835] add submit story list comment link style Message-ID: <1227258474.611267.30710.nullmailer@users.sourceforge.jp> Revision: 835 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=835 Author: tach Date: 2008-11-21 18:07:54 +0900 (Fri, 21 Nov 2008) Log Message: ----------- add submit story list comment link style Modified Paths: -------------- images/css/slashdotjp.css -------------- next part -------------- Modified: images/css/slashdotjp.css =================================================================== --- images/css/slashdotjp.css 2008-11-21 06:41:00 UTC (rev 834) +++ images/css/slashdotjp.css 2008-11-21 09:07:54 UTC (rev 835) @@ -433,6 +433,15 @@ padding: 0; } +/* submission comment link */ +.submit_story_list .sub_title a.comment { + background: transparent url(//images.slashdot.jp/sic_icons.png) no-repeat 0 -1400px; + padding: 4px 20px 3px 2px; + text-align: center; + text-decoration: none; + font-size: 80%; +} + /* code.shtml rss link */ a.feed { background: url(//images.slashdot.jp/feed-14x14.png) left no-repeat; From svnnotify ¡÷ sourceforge.jp Wed Nov 26 15:51:21 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 26 Nov 2008 15:51:21 +0900 Subject: [Slashdotjp-dev 1307] [836] merged from upstream T_2_5_0_231 branch Message-ID: <1227682281.098290.8975.nullmailer@users.sourceforge.jp> Revision: 836 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=836 Author: tach Date: 2008-11-26 15:51:20 +0900 (Wed, 26 Nov 2008) Log Message: ----------- merged from upstream T_2_5_0_231 branch Modified Paths: -------------- slashjp/branches/upstream/current/Makefile slashjp/branches/upstream/current/Slash/Apache/User/User.pm slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/tag-ui.css slashjp/branches/upstream/current/plugins/Bookmark/bookmark.pl slashjp/branches/upstream/current/plugins/Bookmark/mysql_schema.sql slashjp/branches/upstream/current/plugins/Console/console.pl slashjp/branches/upstream/current/plugins/FireHose/FireHose.pm slashjp/branches/upstream/current/plugins/FireHose/firehose.pl slashjp/branches/upstream/current/plugins/FireHose/index2.pl slashjp/branches/upstream/current/plugins/FireHose/mysql_dump.sql slashjp/branches/upstream/current/plugins/FireHose/mysql_schema.sql slashjp/branches/upstream/current/plugins/FireHose/templates/dispFireHose;firehose;default slashjp/branches/upstream/current/plugins/FireHose/templates/fhadvprefpane;misc;default slashjp/branches/upstream/current/plugins/FireHose/templates/firehose_tabs;misc;default slashjp/branches/upstream/current/plugins/FireHose/templates/formatHoseIntro;misc;default slashjp/branches/upstream/current/plugins/FireHose/templates/formatHoseTitle;misc;default slashjp/branches/upstream/current/plugins/FireHose/templates/list;firehose;default slashjp/branches/upstream/current/plugins/FireHose/templates/paginate;firehose;default slashjp/branches/upstream/current/plugins/FireHose/templates/tag_widget;firehose;default slashjp/branches/upstream/current/plugins/Journal/Journal.pm slashjp/branches/upstream/current/plugins/Journal/journal.pl slashjp/branches/upstream/current/plugins/Submit/submit.pl slashjp/branches/upstream/current/plugins/Tags/PLUGIN slashjp/branches/upstream/current/plugins/Tags/mysql_schema.sql slashjp/branches/upstream/current/plugins/Zoo/Zoo.pm slashjp/branches/upstream/current/sql/mysql/defaults.sql slashjp/branches/upstream/current/sql/mysql/upgrades slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm slashjp/branches/upstream/current/themes/slashcode/THEME slashjp/branches/upstream/current/themes/slashcode/htdocs/slashcode_lite.css slashjp/branches/upstream/current/themes/slashcode/htdocs/users.pl slashjp/branches/upstream/current/themes/slashcode/htdocs/users2.pl slashjp/branches/upstream/current/themes/slashcode/templates/userInfo2;users;default slashjp/branches/upstream/current/utils/import_journals_firehose slashjp/branches/upstream/current/utils/import_stories_firehose Added Paths: ----------- slashjp/branches/upstream/current/plugins/Tags/archive_globjs_viewed.pl slashjp/branches/upstream/current/plugins/Users2/ slashjp/branches/upstream/current/plugins/Users2/MANIFEST slashjp/branches/upstream/current/plugins/Users2/Makefile.PL slashjp/branches/upstream/current/plugins/Users2/PLUGIN slashjp/branches/upstream/current/plugins/Users2/Users2.pm slashjp/branches/upstream/current/themes/slashcode/templates/u2AdminListComments;users;default slashjp/branches/upstream/current/themes/slashcode/templates/u2CommentsDatapane;users;default slashjp/branches/upstream/current/themes/slashcode/templates/u2ListComments;users;default slashjp/branches/upstream/current/themes/slashcode/templates/u2MainView;users;default slashjp/branches/upstream/current/themes/slashcode/templates/u2Menu;users;default slashjp/branches/upstream/current/themes/slashcode/templates/u2UserBio;users;default slashjp/branches/upstream/current/themes/slashcode/templates/u2UserBoxes;users;default -------------- next part -------------- Modified: slashjp/branches/upstream/current/Makefile =================================================================== --- slashjp/branches/upstream/current/Makefile 2008-11-21 09:07:54 UTC (rev 835) +++ slashjp/branches/upstream/current/Makefile 2008-11-26 06:51:20 UTC (rev 836) @@ -46,7 +46,7 @@ THEMEFILES = `find themes -name CVS -prune -o -name .git -prune -o -name [a-zA-z]\*.pl -print` PLUGINFILES = `find plugins themes/*/plugins -name CVS -prune -o -name .git -prune -o -name [a-zA-Z]\*.pl -print` TAGBOXFILES = `find tagboxes themes/*/tagboxes -name CVS -prune -o -name .git -prune -o -name [a-zA-Z]\*.pl -print` -PLUGINSTALL = `find . -name CVS -prune -o -name .git -prune -o -type d -print | egrep 'plugins/[a-zA-Z]+$$'` +PLUGINSTALL = `find . -name CVS -prune -o -name .git -prune -o -type d -print | egrep 'plugins/[a-zA-Z0-9]+$$'` TAGINSTALL = `find . -name CVS -prune -o -name .git -prune -o -type d -print | egrep 'tagboxes/[a-zA-Z]+$$'` PLUGINDIRS = `find . -name CVS -prune -o -name .git -prune -o -type d -print | egrep 'plugins$$'` TAGBOXDIRS = `find . -name CVS -prune -o -name .git -prune -o -type d -print | egrep 'tagboxes$$'` Modified: slashjp/branches/upstream/current/Slash/Apache/User/User.pm =================================================================== --- slashjp/branches/upstream/current/Slash/Apache/User/User.pm 2008-11-21 09:07:54 UTC (rev 835) +++ slashjp/branches/upstream/current/Slash/Apache/User/User.pm 2008-11-26 06:51:20 UTC (rev 836) @@ -395,7 +395,7 @@ $r->err_header_out(Location => URI->new_abs('/', $constants->{absolutedir}) ); - return REDIRECT; + return REDIRECT; } # If the user is connecting over SSL, make sure this is allowed. @@ -404,7 +404,7 @@ # If allow_nonadmin_ssl is 2, then admins and subscribers are allowed in. my $redirect_to_nonssl = 0; if ($is_ssl && !( - # If the user is trying to log in, they are always + # If the user is trying to log in, they are always # allowed to make the attempt on the SSL server. # Logging in means the users.pl script and either # an empty op or the 'userlogin' op. @@ -413,7 +413,7 @@ || $uri =~ m{^/(?:users|login)\.pl} ) && (!$form->{op} || $form->{op} eq 'userlogin') - ) + ) ) { my $ans = $constants->{allow_nonadmin_ssl}; if ($ans == 1) { @@ -436,14 +436,14 @@ # also subscribers are allowed in. if ($user->{seclev} > 1 || $user->{state}{lostprivs} || $user->{is_subscriber}) { - # It's an admin or a subscriber, this is fine. - } else { - # Not an admin or subscriber, SSL access forbidden. - $redirect_to_nonssl = 1; - } + # It's an admin or a subscriber, this is fine. + } else { + # Not an admin or subscriber, SSL access forbidden. + $redirect_to_nonssl = 1; + } } } - if ($redirect_to_nonssl) { + if ($redirect_to_nonssl) { # User is not authorized to connect to the SSL webserver. # Redirect them to the non-SSL URL. my $newloc = $uri; @@ -590,13 +590,13 @@ return OK; } - if ($uri =~ m[^/help (?: /([^?]*) | /? ) $]x) { - $r->args("op=displayhelp"); - $r->uri('/help.pl'); - $r->filename($constants->{basedir} . '/help.pl'); - return OK; - } - + if ($uri =~ m[^/help (?: /([^?]*) | /? ) $]x) { + $r->args("op=displayhelp"); + $r->uri('/help.pl'); + $r->filename($constants->{basedir} . '/help.pl'); + return OK; + } + # for self-references (/~/ and /my/) if (($saveuri =~ m[^/(?:%7[eE]|~)] && $uri =~ m[^/~ (?: /(.*) | /? ) $]x) # /my/ or /my can match, but not /mything @@ -633,17 +633,23 @@ } elsif ($logged_in) { $found_the_op = 1; if ($op eq 'journal') { - my $args; - if ($extra =~ /^\d+$/) { - $args = "id=$extra&op=edit"; - } elsif ($extra eq 'friends') { - $args = "op=friendview"; + if ($constants->{u2}) { + $r->args("op=userinfo&dp=journal"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); } else { - $args = "op=list"; + my $args; + if ($extra =~ /^\d+$/) { + $args = "id=$extra&op=edit"; + } elsif ($extra eq 'friends') { + $args = "op=friendview"; + } else { + $args = "op=list"; + } + $r->args($args); + $r->uri('/journal.pl'); + $r->filename($constants->{basedir} . '/journal.pl'); } - $r->args($args); - $r->uri('/journal.pl'); - $r->filename($constants->{basedir} . '/journal.pl'); } elsif ($op eq 'discussions') { $r->args("op=personal_index"); @@ -657,25 +663,48 @@ $r->filename($constants->{basedir} . '/messages.pl'); } elsif ($op =~ /^(?:friends|fans|freaks|foes|zoo)$/) { - my $args = "op=$op"; - $extra .= '/'; + if ($constants->{u2}) { + $extra .= '/'; - if ($op eq 'friends' && $extra =~ s/^friends\///) { - $args =~ s/friends/fof/; - } elsif ($op eq 'friends' && $extra =~ s/^foes\///) { - $args =~ s/friends/eof/; - } elsif ($op eq 'zoo') { - $args =~ s/zoo/all/; + if ($op eq 'friends' && $extra =~ s/^friends\///) { + $op =~ s/friends/fof/; + } elsif ($op eq 'friends' && $extra =~ s/^foes\///) { + $op =~ s/friends/eof/; + } elsif ($op eq 'zoo') { + $op =~ s/zoo/all/; + } + + my $args = "op=userinfo&dp=$op"; + $r->args($args); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + my $args = "op=$op"; + $extra .= '/'; + + if ($op eq 'friends' && $extra =~ s/^friends\///) { + $args =~ s/friends/fof/; + } elsif ($op eq 'friends' && $extra =~ s/^foes\///) { + $args =~ s/friends/eof/; + } elsif ($op eq 'zoo') { + $args =~ s/zoo/all/; + } + + $r->args($args); + $r->uri('/zoo.pl'); + $r->filename($constants->{basedir} . '/zoo.pl'); } - $r->args($args); - $r->uri('/zoo.pl'); - $r->filename($constants->{basedir} . '/zoo.pl'); - } elsif ($op eq 'comments') { - $r->args("op=editcomm"); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); + if ($constants->{u2}) { + $r->args("op=userinfo&dp=comments"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + $r->args("op=editcomm"); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } elsif ($op eq 'homepage') { $r->args("op=edithome"); @@ -703,28 +732,47 @@ $r->filename($constants->{basedir} . '/journal.pl'); } elsif ($op eq 'tags') { - my $args = 'op=showtags'; - # XXX "!" is a 'reserved' char in URI, escape it here? - $args .= "&tagname=$extra" if $extra; - $r->args($args); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); + if ($constants->{u2}) { + $r->args("op=userinfo&dp=tags"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + my $args = 'op=showtags'; + # XXX "!" is a 'reserved' char in URI, escape it here? + $args .= "&tagname=$extra" if $extra; + $r->args($args); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } elsif ($op eq 'bookmarks') { - $r->args("op=showbookmarks"); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); + if ($constants->{u2}) { + $r->args("op=userinfo&dp=bookmarks"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + $r->args("op=showbookmarks"); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } elsif ($op eq 'firehose') { - my $filter = fixparam("user:"); - $r->args("op=userfirehose"); - $r->uri('users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); + if ($constants->{u2}) { + my $filter = fixparam("user:"); + $r->args("op=userinfo&dp=firehose"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + my $filter = fixparam("user:"); + $r->args("op=userfirehose"); + $r->uri('users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } - } elsif ($op eq 'preferences') { - $r->args("op=displayprefs"); - $r->uri('/preferences.pl'); - $r->filename($constants->{basedir} . '/preferences.pl'); + } elsif ($op eq 'preferences') { + $r->args("op=displayprefs"); + $r->uri('/preferences.pl'); + $r->filename($constants->{basedir} . '/preferences.pl'); } else { $r->args("op=edituser"); @@ -784,31 +832,40 @@ $r->filename($constants->{basedir} . '/users.pl'); } elsif ($op eq 'journal') { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { - $r->args("nick=$nick&dp=journal&uid=$uid"); - $r->uri('/users2.pl'); - $r->filename($constants->{basedir} . '/users2.pl'); - } else { - my $args = "op=display&nick=$nick&uid=$uid"; - $extra .= '/' . $more; - if ($extra) { - if ($extra =~ /^(\d+)\/$/) { - $args .= "&id=$1"; - } - if ($extra =~ s/^friends\///) { - $args =~ s/display/friendview/; - } - if ($extra =~ m{^ (rss|atom) / ? $}x) { - $args .= "&logtoken=$logtoken" if $logtoken; - $args .= "&content_type=$1"; - } - } + $extra .= '/' . $more; - $args .= "&$query"; - $r->args($args); - $r->uri('/journal.pl'); - $r->filename($constants->{basedir} . '/journal.pl'); - } + if ( + ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) + && + !($extra =~ m{^ (rss|atom) /?$}x || $extra =~ /^(\d+)\/$/) + ) { + my $args = "nick=$nick&uid=$uid&dp=journal"; + + if ($extra =~ s/^friends\///) { # show hose in friend view + $args .= 'friends'; + } + + $r->args($args); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + + } else { + my $args = "op=display&nick=$nick&uid=$uid"; + if ($extra =~ /^(\d+)\/$/) { + $args .= "&id=$1"; + } elsif ($extra =~ s/^friends\///) { + $args =~ s/display/friendview/; + } + if ($extra =~ m{^ (rss|atom) / ? $}x) { + $args .= "&logtoken=$logtoken" if $logtoken; + $args .= "&content_type=$1"; + } + + $args .= "&$query"; + $r->args($args); + $r->uri('/journal.pl'); + $r->filename($constants->{basedir} . '/journal.pl'); + } } elsif ($op eq 'discussions') { $r->args("op=creator_index&nick=$nick&uid=$uid"); $r->uri('/comments.pl'); @@ -820,99 +877,115 @@ $r->filename($constants->{basedir} . '/pubkey.pl'); } elsif ($op eq 'submissions') { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { - $r->args("nick=$nick&dp=submissions&uid=$uid"); - $r->uri('/users2.pl'); - $r->filename($constants->{basedir} . '/users2.pl'); - } else { - $r->args("nick=$nick&op=usersubmissions&uid=$uid"); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); - } + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { + $r->args("nick=$nick&dp=submissions&uid=$uid"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + $r->args("nick=$nick&op=usersubmissions&uid=$uid"); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } elsif ($op eq 'comments') { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { - $r->args("nick=$nick&dp=comments&uid=$uid"); - $r->uri('/users2.pl'); - $r->filename($constants->{basedir} . '/users2.pl'); - } else { - $r->args("nick=$nick&op=usercomments&uid=$uid"); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); - } + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { + $r->args("nick=$nick&dp=comments&uid=$uid"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + $r->args("nick=$nick&op=usercomments&uid=$uid"); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } elsif ($op =~ /^(?:friends|fans|freaks|foes|zoo)$/) { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { - my $args = "nick=$nick&dp=friends&uid=$uid"; - $extra .= '/' . $more; + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { + my $args = "nick=$nick&uid=$uid&dp="; + $extra .= '/' . $more; - if ($op eq 'friends' && $extra =~ s/^friends\///) { - $args =~ s/friends/fof/; - } elsif ($op eq 'friends' && $extra =~ s/^foes\///) { - $args =~ s/friends/eof/; - } elsif ($op eq 'zoo') { - $args =~ s/zoo/all/; - } + if ($op eq 'friends' && $extra =~ s/^friends\///) { + $op =~ s/friends/fof/; + } elsif ($op eq 'friends' && $extra =~ s/^foes\///) { + $op =~ s/friends/eof/; + } elsif ($op eq 'zoo') { + $op =~ s/zoo/all/; + } - if ($extra =~ m{^ (rss|atom) /?$}x) { - $args .= "&content_type=$1"; - } + if ($extra =~ m{^ (rss|atom) /?$}x) { + my $args = "nick=$nick&uid=$uid&op=$op"; + $args .= "&content_type=$1"; - $r->args($args); - $r->uri('/users2.pl'); - $r->filename($constants->{basedir} . '/users2.pl'); - } else { - my $args = "op=$op&nick=$nick&uid=$uid"; - $extra .= '/' . $more; + $r->args($args); + $r->uri('/zoo.pl'); + $r->filename($constants->{basedir} . '/zoo.pl'); + } else { + $r->args($args . $op); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } + } else { + my $args = "op=$op&nick=$nick&uid=$uid"; + $extra .= '/' . $more; - if ($op eq 'friends' && $extra =~ s/^friends\///) { - $args =~ s/friends/fof/; - } elsif ($op eq 'friends' && $extra =~ s/^foes\///) { - $args =~ s/friends/eof/; - } elsif ($op eq 'zoo') { - $args =~ s/zoo/all/; - } + if ($op eq 'friends' && $extra =~ s/^friends\///) { + $args =~ s/friends/fof/; + } elsif ($op eq 'friends' && $extra =~ s/^foes\///) { + $args =~ s/friends/eof/; + } elsif ($op eq 'zoo') { + $args =~ s/zoo/all/; + } - if ($extra =~ m{^ (rss|atom) /?$}x) { - $args .= "&content_type=$1"; - } + if ($extra =~ m{^ (rss|atom) /?$}x) { + $args .= "&content_type=$1"; + } - $r->args($args); - $r->uri('/zoo.pl'); - $r->filename($constants->{basedir} . '/zoo.pl'); - } + $r->args($args); + $r->uri('/zoo.pl'); + $r->filename($constants->{basedir} . '/zoo.pl'); + } } elsif ($op eq 'amigos') { - $r->args("op=friendview&nick=$nick&uid=$uid"); - $r->uri('/journal.pl'); - $r->filename($constants->{basedir} . '/journal.pl'); + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { + $r->args("nick=$nick&uid=$uid&dp=journalfriends"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + $r->args("op=friendview&nick=$nick&uid=$uid"); + $r->uri('/journal.pl'); + $r->filename($constants->{basedir} . '/journal.pl'); + } } elsif ($op eq 'tags') { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { - my $args = "nick=$nick&dp=tags&uid=$uid"; - $args .= "&tagname=$extra" if $extra; - $r->args($args); - $r->uri('/users2.pl'); - $r->filename($constants->{basedir} . '/users2.pl'); - } else { - my $args = "op=showtags&nick=$nick&uid=$uid"; - # XXX "!" is a 'reserved' char in URI, escape it here? - $args .= "&tagname=$extra" if $extra; - $r->args($args); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); - } + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + my $args; + if ($extra) { + $args = "op=userinfo&nick=$nick&dp=usertag&uid=$uid"; + $args .= "&tagname=$extra" if $extra; + } else { + $args = "op=userinfo&uid=$uid&nick=$nick&dp=tags"; + } + $r->args($args); + } else { + my $args = "op=showtags&nick=$nick&uid=$uid"; + # XXX "!" is a 'reserved' char in URI, escape it here? + $args .= "&tagname=$extra" if $extra; + $r->args($args); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } elsif ($op eq 'bookmarks') { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { - $r->args("nick=$nick&dp=bookmarks&uid=$uid"); - $r->uri('/users2.pl'); - $r->filename($constants->{basedir} . '/users2.pl'); - } else { - $r->args("op=showbookmarks&nick=$nick&uid=$uid"); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); - } + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { + $r->args("nick=$nick&dp=bookmarks&uid=$uid"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + $r->args("op=showbookmarks&nick=$nick&uid=$uid"); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } elsif ($op eq 'firehose') { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { my $filter = fixparam("\"user:$nick_orig\""); $r->args("dp=firehose&uid=$uid"); $r->uri('/users2.pl'); @@ -923,17 +996,22 @@ $r->uri('/users.pl'); $r->filename($constants->{basedir} . '/users.pl'); } + } elsif (($op eq 'admin' && $constants->{u2}) || + ($op eq 'admin' && $saveuri =~ m[^/(?:%5[eE]|\^)(.+)])) { + $r->args("nick=$nick&dp=admin&uid=$uid"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); } else { - if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)]) { - $r->args("nick=$nick&uid=$uid"); - $r->uri('/users2.pl'); - $r->filename($constants->{basedir} . '/users2.pl'); - } else { - $r->args("nick=$nick&uid=$uid"); - $r->uri('/users.pl'); - $r->filename($constants->{basedir} . '/users.pl'); - } + if ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)] || $constants->{u2}) { + $r->args("nick=$nick&uid=$uid"); + $r->uri('/users2.pl'); + $r->filename($constants->{basedir} . '/users2.pl'); + } else { + $r->args("nick=$nick&uid=$uid"); + $r->uri('/users.pl'); + $r->filename($constants->{basedir} . '/users.pl'); + } } return OK; Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js 2008-11-21 09:07:54 UTC (rev 835) +++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js 2008-11-26 06:51:20 UTC (rev 836) @@ -29,6 +29,10 @@ firehose_settings.color = ''; firehose_settings.orderby = ''; firehose_settings.orderdir = ''; + firehose_settings.view = ''; + firehose_settings.tab = ''; + firehose_settings.fhfilter = ''; + firehose_settings.base_filter = ''; firehose_settings.issue = ''; firehose_settings.is_embedded = 0; @@ -324,7 +328,7 @@ after_article_moved($('#firehose-'+id)[0]); } -function firehose_set_options(name, value) { +function firehose_set_options(name, value, context) { if (firehose_user_class === 0) { return; } @@ -343,10 +347,11 @@ ]; var params = {}; params.setting_name = name; + params.context = context; params.op = 'firehose_set_options'; params.reskey = reskey_static; var theForm = document.forms.firehoseform; - if (name == "firehose_usermode") { + if (name == "usermode") { value = value ? 1 : 0; params.setusermode = 1; params[name] = value; @@ -376,14 +381,30 @@ } firehose_settings.page = 0; firehose_settings.more_num = 0; + params.filterchanged = 1; } if (name == "setfhfilter") { firehose_settings.fhfilter = value; firehose_settings.page = 0; firehose_settings.more_num = 0; + params.filterchanged = 1; } + if (name == "view") { + firehose_settings.view = value; + params.viewchanged = 1; + firehose_settings.page = 0; + firehose_settings.more_num = 0; + } + + if (name == "tab") { + firehose_settings.tab = value; + params.tabchanged = 1; + firehose_settings.page = 0; + firehose_settings.more_num = 0; + } + if (name != "color") { for (i=0; i< pairs.length; i++) { var el = pairs[i]; @@ -400,7 +421,7 @@ } } } - if (name == "mode" || name == "firehose_usermode" || name == "tab" || name == "mixedmode" || name == "nocolors" || name == "nothumbs") { + if (name == "mode" || name == "firehose_usermode" || name == "tab" || name == "mixedmode" || name == "nocolors" || name == "nothumbs" || name == "view") { // blur out then remove items if (name == "mode") { fh_view_mode = value; @@ -568,6 +589,9 @@ } function firehose_click_tag( event ) { + // _any_ click can trigger, but click-specific ad will win + setTimeout(function(){ inlineAdFirehose(); }, 0); + var $target = $(event.target), command='', $menu; $related_trigger = $target; @@ -1097,8 +1121,10 @@ } if ( firehose_future[firehose_ordered[i]] ) { $('#ttype-'+firehose_ordered[i]).setClass('future'); + $('#firehose-'+firehose_ordered[i] + "h3").setClass('future'); } else { $('#ttype-'+firehose_ordered[i]+'.future').setClass('story'); + $('#firehose-'+firehose_ordered[i] + "h3.future").setClass('story'); } } if ( moved ) after_article_moved(); @@ -1260,10 +1286,10 @@ show_modal_box(); } -function firehose_play() { +function firehose_play(context) { fh_play = 1; setFirehoseAction(); - firehose_set_options('pause', '0'); + firehose_set_options('pause', '0', context); $('#message_area').html(''); $('#pauseorplay').html('Updated'); $('#play').setClass('hide'); @@ -1274,12 +1300,12 @@ return fh_play==1; } -function firehose_pause() { +function firehose_pause(context) { fh_play = 0; $('#pause').setClass('hide'); $('#play').setClass('show'); $('#pauseorplay').html('Paused'); - firehose_set_options('pause', '1'); + firehose_set_options('pause', '1', context); } function firehose_add_update_timerid(timerid) { @@ -1858,9 +1884,12 @@ if (!fh_adTimerUrl) return 0; - if (!$article) + if ($article) + $article = Slash.Firehose.at_or_below_ad_space($article); + else $article = Slash.Firehose.choose_article_for_next_ad(); - if (!$article) + + if (!$article || !$article.length) return 0; var id = $article.article_info__key().key; @@ -1913,7 +1942,7 @@ $(function(){ $footer = $('#ft'); $slashboxes = $('#slashboxes'). - append('