You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
S | M | T | W | T | F | S |
---|---|---|---|---|---|---|
|
|
|
|
|
|
1
|
2
|
3
|
4
(8) |
5
(8) |
6
|
7
(11) |
8
|
9
|
10
|
11
(1) |
12
|
13
(10) |
14
(1) |
15
|
16
|
17
(2) |
18
(1) |
19
(3) |
20
(5) |
21
(9) |
22
(8) |
23
|
24
|
25
(32) |
26
(17) |
27
(6) |
28
|
29
|
30
|
31
(5) |
|
|
|
|
|
Revision: 7849 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7849&view=rev Author: vargenau Date: 2011年01月21日 08:57:55 +0000 (2011年1月21日) Log Message: ----------- Strings easier to translate Modified Paths: -------------- trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminMarkup.php Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2011年01月20日 13:19:57 UTC (rev 7848) +++ trunk/lib/plugin/WikiAdminChown.php 2011年01月21日 08:57:55 UTC (rev 7849) @@ -195,8 +195,7 @@ } function chownForm(&$header, $post_args) { - $header->pushContent(_("Change owner")." "); - $header->pushContent(' '._("to").': '); + $header->pushContent(_("Change owner to: ")); $header->pushContent(HTML::input(array('name' => 'admin_chown[user]', 'value' => $post_args['user'], 'size' => 40))); Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2011年01月20日 13:19:57 UTC (rev 7848) +++ trunk/lib/plugin/WikiAdminMarkup.php 2011年01月21日 08:57:55 UTC (rev 7849) @@ -187,8 +187,7 @@ } function chmarkupForm(&$header, $post_args) { - $header->pushContent(_("Change markup")." "); - $header->pushContent(' '._("to").': '); + $header->pushContent(_("Change markup to: ")); $header->pushContent(HTML::input(array('name' => 'admin_markup[markup]', 'value' => $post_args['markup']))); return $header; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7848 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7848&view=rev Author: vargenau Date: 2011年01月20日 13:19:57 +0000 (2011年1月20日) Log Message: ----------- Kibibytes Modified Paths: -------------- trunk/lib/plugin/SystemInfo.php trunk/lib/stdlib.php trunk/themes/MonoBook/templates/info.tmpl Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2011年01月20日 13:02:53 UTC (rev 7847) +++ trunk/lib/plugin/SystemInfo.php 2011年01月20日 13:19:57 UTC (rev 7848) @@ -397,9 +397,9 @@ $pagesize = $content['pagesize']; } - $s = sprintf(_("Application size: %d Kb"), $appsize); + $s = sprintf(_("Application size: %d KiB"), $appsize); if ($pagesize) - $s .= ", " . sprintf(_("Pagedata size: %d Kb", $pagesize)); + $s .= ", " . sprintf(_("Pagedata size: %d KiB", $pagesize)); return $s; } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2011年01月20日 13:02:53 UTC (rev 7847) +++ trunk/lib/stdlib.php 2011年01月20日 13:19:57 UTC (rev 7848) @@ -1406,7 +1406,7 @@ /** - * Format number as kilobytes or bytes. + * Format number as kibibytes or bytes. * Short format is used for PageList * Long format is used in PageInfo * @@ -1419,16 +1419,16 @@ return fmt("-???"); if ($bytes < 1024) { if (! $longformat) - $size = fmt("%s b", $bytes); + $size = fmt("%s B", $bytes); else $size = fmt("%s bytes", $bytes); } else { $kb = round($bytes / 1024, 1); if (! $longformat) - $size = fmt("%s k", $kb); + $size = fmt("%s KiB", $kb); else - $size = fmt("%s Kb (%s bytes)", $kb, $bytes); + $size = fmt("%s KiB (%s bytes)", $kb, $bytes); } return $size; } Modified: trunk/themes/MonoBook/templates/info.tmpl =================================================================== --- trunk/themes/MonoBook/templates/info.tmpl 2011年01月20日 13:02:53 UTC (rev 7847) +++ trunk/themes/MonoBook/templates/info.tmpl 2011年01月20日 13:19:57 UTC (rev 7848) @@ -30,7 +30,7 @@ $size = fmt("%s bytes", $bytes); else { $kb = round($bytes / 1024, 1); - $size = fmt("%s Kb (%s bytes)", $kb, $bytes); + $size = fmt("%s KiB (%s bytes)", $kb, $bytes); } // Count words preg_match_all('/\\w+\\W*/', $revision->_data['%content'], $whitespacematches); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7847 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7847&view=rev Author: vargenau Date: 2011年01月20日 13:02:53 +0000 (2011年1月20日) Log Message: ----------- No colon Modified Paths: -------------- trunk/themes/default/templates/info.tmpl Modified: trunk/themes/default/templates/info.tmpl =================================================================== --- trunk/themes/default/templates/info.tmpl 2011年01月20日 12:54:59 UTC (rev 7846) +++ trunk/themes/default/templates/info.tmpl 2011年01月20日 13:02:53 UTC (rev 7847) @@ -126,7 +126,7 @@ <?php if ($is_current) { ?> <tr> <td align="right"><?php echo $LOCKED_CB ?></td> - <td class="pageinfo"><?php echo _("Locked:")?></td> + <td class="pageinfo"><?php echo _("Locked")?></td> </tr> <?php if (ENABLE_EXTERNAL_PAGES) { ?> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7846 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7846&view=rev Author: vargenau Date: 2011年01月20日 12:54:59 +0000 (2011年1月20日) Log Message: ----------- Translate strings Modified Paths: -------------- trunk/themes/default/templates/info.tmpl Modified: trunk/themes/default/templates/info.tmpl =================================================================== --- trunk/themes/default/templates/info.tmpl 2011年01月20日 09:22:12 UTC (rev 7845) +++ trunk/themes/default/templates/info.tmpl 2011年01月20日 12:54:59 UTC (rev 7846) @@ -126,20 +126,20 @@ <?php if ($is_current) { ?> <tr> <td align="right"><?php echo $LOCKED_CB ?></td> - <td class="pageinfo"><?php echo _("Locked")?></td> + <td class="pageinfo"><?php echo _("Locked:")?></td> </tr> <?php if (ENABLE_EXTERNAL_PAGES) { ?> <tr> - <td align="right" class="pageinfo">Is External:</td> + <td align="right" class="pageinfo"><?php echo _("Is External:") ?></td> <td><?php echo $page->get('external') ? _("Yes") : _("No") ?></td> </tr> <?php } ?> <tr> - <td align="right" class="pageinfo">ACL type</td> + <td align="right" class="pageinfo"><?php echo _("ACL type:") ?></td> <td><?php echo $type ?></td> </tr> <tr> - <td align="right" valign="top" class="pageinfo">ACL</td> + <td align="right" valign="top" class="pageinfo"><?php echo _("ACL:") ?></td> <td><?php echo $perm->asAclLines() ?></td> </tr> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7845 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7845&view=rev Author: vargenau Date: 2011年01月20日 09:22:12 +0000 (2011年1月20日) Log Message: ----------- Use group_id Modified Paths: -------------- trunk/wikiadmin.php Modified: trunk/wikiadmin.php =================================================================== --- trunk/wikiadmin.php 2011年01月20日 08:38:06 UTC (rev 7844) +++ trunk/wikiadmin.php 2011年01月20日 09:22:12 UTC (rev 7845) @@ -47,17 +47,6 @@ require_once forge_get_config('plugins_path').'wiki/common/WikiPlugin.class.php'; require_once forge_get_config('plugins_path').'wiki/common/wikiconfig.class.php'; -// the header that displays for the user portion of the plugin -function wiki_Project_Header($params) { - global $id; - $params['toptab']='wiki'; - $params['group']=$id; - /* - Show horizontal links - */ - site_project_header($params); -} - $user = session_get_user(); // get the session user if (!$user || !is_object($user)) { @@ -69,17 +58,17 @@ } $type = getStringFromRequest('type'); -$id = getIntFromRequest('id'); +$group_id = getIntFromRequest('group_id'); $pluginname = 'wiki'; $config = getArrayFromRequest('config'); if (!$type) { - exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No TYPE specified')),'home'); -} elseif (!$id) { - exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No ID specified')),'home'); + exit_missing_param($_SERVER['HTTP_REFERER'],array(_('No TYPE specified')),'home'); +} elseif (!$group_id) { + exit_missing_param($_SERVER['HTTP_REFERER'],array(_('No ID specified')),'home'); } else { if ($type == 'admin_post') { - $group = group_get_object($id); + $group = group_get_object($group_id); if ( !$group) { exit_no_group(); } @@ -93,7 +82,7 @@ //only project admin can access here if ( $userperm->isAdmin() ) { - $wc = new WikiConfig($id); + $wc = new WikiConfig($group_id); foreach ($wc->getWikiConfigNames() as $c) { if ( ! array_key_exists($c, $config)) { @@ -113,7 +102,7 @@ } } if ($type == 'admin') { - $group = group_get_object($id); + $group = group_get_object($group_id); if ( !$group) { exit_no_group(); } @@ -126,11 +115,13 @@ } //only project admin can access here if ( $userperm->isAdmin() ) { - wiki_Project_Header(array('title' => _("Configuration for your project's wiki"), - 'pagename' => "$pluginname", - 'sectionvals' => array(group_getname($id)))); + site_project_header(array('title' => _("Configuration for your project's wiki"), + 'pagename' => $pluginname, + 'group' => $group_id, + 'toptab' => 'wiki', + 'sectionvals' => array(group_getname($group_id)))); - $wc = new WikiConfig($id); + $wc = new WikiConfig($group_id); print "<table>\n"; print "<tr>\n"; @@ -138,7 +129,7 @@ print "<fieldset>\n"; print "<legend>"._('Wiki Configuration')."</legend>\n"; print "<form action=\"/wiki/wikiadmin.php\" method=\"post\">\n"; - print "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n"; + print "<input type=\"hidden\" name=\"group_id\" value=\"$group_id\" />\n"; print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n"; print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7844 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7844&view=rev Author: vargenau Date: 2011年01月20日 08:38:06 +0000 (2011年1月20日) Log Message: ----------- Translate string Modified Paths: -------------- trunk/lib/plugin/WatchPage.php Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2011年01月19日 18:02:22 UTC (rev 7843) +++ trunk/lib/plugin/WatchPage.php 2011年01月20日 08:38:06 UTC (rev 7844) @@ -89,7 +89,7 @@ HTML::Raw(' '), Button('submit:cancel', _("Cancel")))); } - $fieldset = HTML::fieldset(HTML::legend("Watch Page"), $form); + $fieldset = HTML::fieldset(HTML::legend(_("Watch Page")), $form); return $fieldset; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7843 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7843&view=rev Author: vargenau Date: 2011年01月19日 18:02:22 +0000 (2011年1月19日) Log Message: ----------- Translate menus Modified Paths: -------------- trunk/themes/fusionforge/templates/navbar.tmpl Modified: trunk/themes/fusionforge/templates/navbar.tmpl =================================================================== --- trunk/themes/fusionforge/templates/navbar.tmpl 2011年01月19日 15:57:04 UTC (rev 7842) +++ trunk/themes/fusionforge/templates/navbar.tmpl 2011年01月19日 18:02:22 UTC (rev 7843) @@ -6,23 +6,23 @@ $username = $user->UserName(); ?> - <tr><td class="submenu"><?php echo WikiLink(_("HomePage"), "","Home Page") ?></td></tr> - <tr><td class="submenu"><?php echo WikiLink(_("RecentChanges"), "","Recent Changes") ?></td></tr> - <tr><td class="submenu"><?php echo WikiLink(_("SpecialPages"), "","Special Pages") ?></td></tr> - <tr><td class="submenu"><?php echo WikiLink(_("FindPage"), "","Search") ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("HomePage"), "", _("Home Page")) ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("RecentChanges"), "", _("Recent Changes")) ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("SpecialPages"), "", _("Special Pages")) ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("FindPage"), "", _("Search")) ?></td></tr> <?php if ($curuserprefs->get('randomPageMenuItem')) { ?> - <tr><td class="submenu"><?php echo WikiLink(_("RandomPage"), "","Random Page") ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("RandomPage"), "", _("Random Page")) ?></td></tr> <?php } ?> <?php if ($curuserprefs->get('likePagesMenuItem')) { ?> - <tr><td class="submenu"><?php echo Button(array('action'=>'LikePages'),_("Like Pages"),$page->getName()) ?></td></tr> + <tr><td class="submenu"><?php echo Button(array('action'=>'LikePages'), _("Like Pages"),$page->getName()) ?></td></tr> <?php } ?> - <tr><td class="submenu"><?php echo WikiLink(_("UpLoad"), "","Upload File") ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("UpLoad"), "", _("Upload File")) ?></td></tr> <?php if (!empty($user) && $user->isAdmin()) { ?> - <tr><td class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "","Wiki Admin") ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Wiki Admin")) ?></td></tr> <?php } ?> <?php if (!empty($user) && $user->isSignedIn()) { ?> <?php if ($dbh->isWikiPage($username)) { ?> - <tr><td class="submenu"><?php echo WikiLink($username, "","My User Page") ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></td></tr> <?php } ?> - <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "","User Preferences") ?></td></tr> + <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></td></tr> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7842 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7842&view=rev Author: vargenau Date: 2011年01月19日 15:57:04 +0000 (2011年1月19日) Log Message: ----------- Update list of pages Modified Paths: -------------- trunk/lib/plugin/_WikiTranslation.php Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2011年01月19日 13:33:57 UTC (rev 7841) +++ trunk/lib/plugin/_WikiTranslation.php 2011年01月19日 15:57:04 UTC (rev 7842) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam * @@ -44,48 +44,52 @@ /* Container for untranslated pagenames. Needed to show up in locale/po/phpwiki.pot */ $pgsrc_container = - _("AddCommentPlugin") .','. - _("AddingPages") .','. _("AllPagesCreatedByMe") .','. _("AllPagesLastEditedByMe") .','. _("AllPagesOwnedByMe") .','. - _("AuthorHistoryPlugin") .','. _("BackLinks") .','. - _("CalendarListPlugin") .','. - _("CalendarPlugin") .','. _("CategoryCategory") .','. _("CategoryHomePages") .','. - _("CommentPlugin") .','. - _("CreateTocPlugin") .','. _("DebugInfo") .','. _("EditMetaData") .','. - _("EditMetaDataPlugin") .','. - _("ExternalSearchPlugin") .','. _("FindPage") .','. - _("FoafViewerPlugin") .','. - _("FrameIncludePlugin") .','. _("FullRecentChanges") .','. - _("HelloWorldPlugin") .','. + _("Help/AddingPages") .','. + _("Help/AddCommentPlugin") .','. + _("Help/AuthorHistoryPlugin") .','. + _("Help/CalendarListPlugin") .','. + _("Help/CalendarPlugin") .','. + _("Help/CommentPlugin") .','. + _("Help/CreateTocPlugin") .','. + _("Help/EditMetaDataPlugin") .','. + _("Help/ExternalSearchPlugin") .','. + _("Help/FoafViewerPlugin") .','. + _("Help/FrameIncludePlugin") .','. + _("Help/HelloWorldPlugin") .','. + _("Help/IncludePagePlugin") .','. + _("Help/LinkIcons") .','. + _("Help/MagicPhpWikiURLs") .','. + _("Help/MoreAboutMechanics") .','. + _("Help/OldStyleTablePlugin") .','. + _("Help/PhotoAlbumPlugin") .','. + _("Help/PhpHighlightPlugin") .','. + _("Help/PhpWeatherPlugin") .','. + _("Help/PhpWiki") .','. + _("Help/PloticusPlugin") .','. + _("Help/RawHtmlPlugin") .','. + _("Help/RedirectToPlugin") .','. + _("Help/RichTablePlugin") .','. + _("Help/SystemInfoPlugin") .','. + _("Help/TranscludePlugin") .','. + _("Help/UnfoldSubpagesPlugin") .','. + _("Help/UpLoadPlugin") .','. + _("Help/WabiSabi") .','. + _("Help/WikiBlogPlugin") .','. + _("Help/WikiPlugin") .','. + _("Help/WikiWikiWeb"); _("HomePageAlias") .','. - _("IncludePagePlugin") .','. _("InterWiki") .','. - _("LinkIcons") .','. - _("MagicPhpWikiURLs") .','. - _("MoreAboutMechanics") .','. - _("NewMarkupTestPage") .','. - _("OldMarkupTestPage") .','. - _("OldStyleTablePlugin") .','. // _("PageDump") .','. - _("PageGroupTest") .','. - _("PageGroupTest/Four") .','. - _("PageGroupTest/One") .','. - _("PageGroupTest/Three") .','. - _("PageGroupTest/Two") .','. - _("PgsrcTranslation") .','. - _("PhotoAlbumPlugin") .','. - _("PhpHighlightPlugin") .','. - _("PhpWeatherPlugin") .','. - _("PhpWiki") .','. _("PhpWikiAdministration/Chmod") .','. _("PhpWikiAdministration/Chown") .','. _("PhpWikiAdministration/Remove") .','. @@ -94,33 +98,12 @@ _("PhpWikiAdministration/SetAcl") .','. _("PhpWikiDocumentation") .','. _("PhpWikiPoll") .','. - _("PloticusPlugin") .','. - _("PgsrcTranslation") .','. - _("PgsrcTranslation/de") .','. - _("PgsrcTranslation/fr") .','. - _("PgsrcTranslation/it") .','. - _("PgsrcTranslation/es") .','. - _("PgsrcTranslation/nl") .','. - _("PgsrcTranslation/sv") .','. - _("PgsrcTranslation/ja") .','. - _("PgsrcTranslation/zh") .','. - _("RawHtmlPlugin") .','. _("RecentVisitors") .','. - _("RedirectToPlugin") .','. _("ReleaseNotes") .','. - _("RichTablePlugin") .','. // _("SpellCheck") .','. _("SteveWainstead") .','. - _("SystemInfoPlugin") .','. - _("TranscludePlugin") .','. _("TranslateText") .','. - _("UnfoldSubpagesPlugin") .','. _("UpLoad") .','. - _("UpLoadPlugin") .','. - _("WabiSabi") .','. - _("WikiBlogPlugin") .','. - _("WikiPlugin") .','. - _("WikiWikiWeb"); require_once('lib/PageList.php'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7841 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7841&view=rev Author: vargenau Date: 2011年01月19日 13:33:57 +0000 (2011年1月19日) Log Message: ----------- Translate string Modified Paths: -------------- trunk/wikiadmin.php Modified: trunk/wikiadmin.php =================================================================== --- trunk/wikiadmin.php 2011年01月18日 08:44:58 UTC (rev 7840) +++ trunk/wikiadmin.php 2011年01月19日 13:33:57 UTC (rev 7841) @@ -126,12 +126,12 @@ } //only project admin can access here if ( $userperm->isAdmin() ) { - wiki_Project_Header(array('title'=>"Configuration for your project's Wiki",'pagename'=>"$pluginname",'sectionvals'=>array(group_getname($id)))); + wiki_Project_Header(array('title' => _("Configuration for your project's wiki"), + 'pagename' => "$pluginname", + 'sectionvals' => array(group_getname($id)))); $wc = new WikiConfig($id); - print "\n<h1>"._("Configuration for your project's Wiki")."</h1>\n"; - print "<table>\n"; print "<tr>\n"; print "<td>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7840 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7840&view=rev Author: vargenau Date: 2011年01月18日 08:44:58 +0000 (2011年1月18日) Log Message: ----------- Add revision (if any) to transclusion title Modified Paths: -------------- trunk/lib/plugin/IncludePage.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2011年01月17日 16:16:15 UTC (rev 7839) +++ trunk/lib/plugin/IncludePage.php 2011年01月18日 08:44:58 UTC (rev 7840) @@ -150,11 +150,13 @@ if ($quiet) return $content; - return HTML(HTML::p(array('class' => 'transclusion-title'), - fmt("Included from %s", WikiLink($page))), - - HTML::div(array('class' => 'transclusion'), - false, $content)); + if ($rev) { + $transclusion_title = fmt("Included from %s (revision %d)", WikiLink($page), $rev); + } else { + $transclusion_title = fmt("Included from %s", WikiLink($page)); + } + return HTML(HTML::p(array('class' => 'transclusion-title'), $transclusion_title), + HTML::div(array('class' => 'transclusion'), false, $content)); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7839 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7839&view=rev Author: vargenau Date: 2011年01月17日 16:16:15 +0000 (2011年1月17日) Log Message: ----------- Revert r7698 and r7699; when displaying an old version of a page, the version got transferred to included pages Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php trunk/pgsrc/Help%2FIncludePagePlugin trunk/pgsrc/Help%2FTemplatePlugin Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2011年01月17日 14:47:32 UTC (rev 7838) +++ trunk/lib/plugin/IncludePage.php 2011年01月17日 16:16:15 UTC (rev 7839) @@ -41,7 +41,6 @@ function getDefaultArguments() { return array( 'page' => false, // the page to include 'rev' => false, // the revision (defaults to most recent) - 'version' => false, // same as "rev" 'quiet' => false, // if set, inclusion appears as normal content 'bytes' => false, // maximum number of bytes to include 'words' => false, // maximum number of words to include @@ -70,12 +69,6 @@ $args = $this->getArgs($argstr, $request); extract($args); - if ($version && $rev) { - return $this->error(_("Choose only one of 'version' or 'rev' parameters.")); - } elseif ($version) { - $rev = $version; - } - if ($page) { // Expand relative page names. $page = new WikiPageName($page, $basepage); Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2011年01月17日 14:47:32 UTC (rev 7838) +++ trunk/lib/plugin/Template.php 2011年01月17日 16:16:15 UTC (rev 7839) @@ -70,7 +70,6 @@ 'page' => false, // the page to include 'vars' => false, // TODO: get rid of this, all remaining args should be vars 'rev' => false, // the revision (defaults to most recent) - 'version' => false, // same as "rev" 'section' => false, // just include a named section 'sectionhead' => false // when including a named section show the heading ); @@ -100,12 +99,6 @@ $vars = $args['vars'] ? $args['vars'] : $this->vars; $page = $args['page']; - if ($args['version'] && $args['rev']) { - return $this->error(_("Choose only one of 'version' or 'rev' parameters.")); - } elseif ($args['version']) { - $args['rev'] = $args['version']; - } - if ($page) { // Expand relative page names. $page = new WikiPageName($page, $basepage); Modified: trunk/pgsrc/Help%2FIncludePagePlugin =================================================================== --- trunk/pgsrc/Help%2FIncludePagePlugin 2011年01月17日 14:47:32 UTC (rev 7838) +++ trunk/pgsrc/Help%2FIncludePagePlugin 2011年01月17日 16:16:15 UTC (rev 7839) @@ -1,4 +1,4 @@ -Date: 2010年9月20日 16:44:13 +0000 +Date: 2011年1月17日 17:13:41 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -33,10 +33,6 @@ | the revision | most recent revision |- -| **version** -| page revision (same as ##rev##) -| most recent revision -|- | **quiet** | if set, inclusion appears as normal content | false Modified: trunk/pgsrc/Help%2FTemplatePlugin =================================================================== --- trunk/pgsrc/Help%2FTemplatePlugin 2011年01月17日 14:47:32 UTC (rev 7838) +++ trunk/pgsrc/Help%2FTemplatePlugin 2011年01月17日 16:16:15 UTC (rev 7839) @@ -1,4 +1,4 @@ -Date: 2010年9月20日 13:46:13 +0000 +Date: 2011年1月17日 17:13:41 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -73,10 +73,6 @@ | page revision | most recent revision |- -| **version** -| page revision (same as ##rev##) -| most recent revision -|- | **section** | just include a named section | (empty) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7838 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7838&view=rev Author: vargenau Date: 2011年01月17日 14:47:32 +0000 (2011年1月17日) Log Message: ----------- Revert r7806; correction prevented to include a page twice in the same page Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2011年01月14日 11:12:00 UTC (rev 7837) +++ trunk/lib/plugin/IncludePage.php 2011年01月17日 14:47:32 UTC (rev 7838) @@ -152,6 +152,8 @@ include_once('lib/BlockParser.php'); $content = TransformText($ct, $r->get('markup'), $page); + array_pop($included_pages); + if ($quiet) return $content; Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2011年01月14日 11:12:00 UTC (rev 7837) +++ trunk/lib/plugin/Template.php 2011年01月17日 14:47:32 UTC (rev 7838) @@ -204,6 +204,8 @@ $content = TransformInline($initial_content, $r->get('markup'), $page); } + array_pop($included_pages); + return $content; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7837 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7837&view=rev Author: vargenau Date: 2011年01月14日 11:12:00 +0000 (2011年1月14日) Log Message: ----------- Update for PHPUnit 3.5 Modified Paths: -------------- trunk/tests/unit/lib/AtomParserTest.php Modified: trunk/tests/unit/lib/AtomParserTest.php =================================================================== --- trunk/tests/unit/lib/AtomParserTest.php 2011年01月13日 17:04:53 UTC (rev 7836) +++ trunk/tests/unit/lib/AtomParserTest.php 2011年01月14日 11:12:00 UTC (rev 7837) @@ -23,7 +23,7 @@ * @author: Sébastien Le Callonnec */ require_once('lib/AtomParser.php'); -require_once('PHPUnit/Framework.php'); +require_once('PHPUnit/Autoload.php'); class AtomParserTest extends phpwiki_TestCase @@ -217,4 +217,4 @@ $this->assertEquals($payload, $current_entry["content"]); } } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7836 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7836&view=rev Author: vargenau Date: 2011年01月13日 17:04:53 +0000 (2011年1月13日) Log Message: ----------- New help page: Help%2FFacebookLikePlugin Added Paths: ----------- trunk/pgsrc/Help%2FFacebookLikePlugin Added: trunk/pgsrc/Help%2FFacebookLikePlugin =================================================================== --- trunk/pgsrc/Help%2FFacebookLikePlugin (rev 0) +++ trunk/pgsrc/Help%2FFacebookLikePlugin 2011年01月13日 17:04:53 UTC (rev 7836) @@ -0,0 +1,65 @@ +Date: 2011年1月13日 17:58:21 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) +X-Rcs-Id: $Id$ +Content-Type: application/x-phpwiki; + pagename=Help%2FFacebookLikePlugin; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; + markup=2; + charset=UTF-8 +Content-Transfer-Encoding: binary + +The **~FacebookLike** [[Help:WikiPlugin|plugin]] will include a "Facebook-like" button in your wiki page. + +== Usage == + +{{{ +<<FacebookLike arguments >> +}}} + +== Arguments == + +{| class="bordered" +|- +! Argument +! Description +! Default value +|- +| **width** +| Button width +| 450 +|- +| **height** +| Button height +| 35 +|- +| **colorscheme** +| 'light' or 'dark' +| light +|- +| **show_faces** +| +| false +|- +| **layout** +| 'standard' or 'button_count' +| standard +|- +| **action** +| 'like' 'recommend' +| like +|} + +== Examples == + +== Author == + +* [[PhpWiki:ReiniUrban|Reini Urban]] + +== See Also == + +* [[http://developers.facebook.com/docs/reference/plugins/like]] + +<noinclude> +---- +[[PhpWikiDocumentation]] [[CategoryWikiPlugin]] +</noinclude> Property changes on: trunk/pgsrc/Help%2FFacebookLikePlugin ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7835 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7835&view=rev Author: vargenau Date: 2011年01月13日 16:24:20 +0000 (2011年1月13日) Log Message: ----------- Add "Help/Adobe Flash" to PhpWikiManual Modified Paths: -------------- trunk/pgsrc/PhpWikiManual Modified: trunk/pgsrc/PhpWikiManual =================================================================== --- trunk/pgsrc/PhpWikiManual 2011年01月13日 15:38:07 UTC (rev 7834) +++ trunk/pgsrc/PhpWikiManual 2011年01月13日 16:24:20 UTC (rev 7835) @@ -1,4 +1,4 @@ -Date: Tue, 9 Nov 2010 16:13:37 +0000 +Date: 2011年1月13日 17:23:46 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -18,6 +18,7 @@ <<IncludePage page="Help/HowToUseWiki">> <<IncludePage page="FindPage">> <<IncludePage page="Help/Images">> +<<IncludePage page="Help/Adobe Flash">> <<IncludePage page="Help/Categories">> <<IncludePage page="Help/InterWiki">> <<IncludePage page="Help/LinkIcons">> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7834 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7834&view=rev Author: vargenau Date: 2011年01月13日 15:38:07 +0000 (2011年1月13日) Log Message: ----------- Include open graph only if needed (to get valid XHTML code) Modified Paths: -------------- trunk/config/config-default.ini trunk/config/config-dist.ini trunk/configurator.php trunk/themes/Crao/templates/head.tmpl trunk/themes/default/templates/head.tmpl trunk/themes/wikilens/templates/head.tmpl Modified: trunk/config/config-default.ini =================================================================== --- trunk/config/config-default.ini 2011年01月13日 15:06:45 UTC (rev 7833) +++ trunk/config/config-default.ini 2011年01月13日 15:38:07 UTC (rev 7834) @@ -9,6 +9,7 @@ JS_SEARCHREPLACE = true ENABLE_DOUBLECLICKEDIT = false ENABLE_XHTML_XML = false +ENABLE_OPEN_GRAPH = false USECACHE = true READONLY = false Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2011年01月13日 15:06:45 UTC (rev 7833) +++ trunk/config/config-dist.ini 2011年01月13日 15:38:07 UTC (rev 7834) @@ -86,6 +86,9 @@ ; See http://hixie.ch/advocacy/xhtml ;ENABLE_XHTML_XML = true +; Needed for FacebookLike plugin +;ENABLE_OPEN_GRAPH = true + ; Needs babycart installed. See http://phpwiki.org/SpamAssassinIntegration ; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart ;ENABLE_SPAMASSASSIN = true Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2011年01月13日 15:06:45 UTC (rev 7833) +++ trunk/configurator.php 2011年01月13日 15:38:07 UTC (rev 7834) @@ -393,6 +393,9 @@ $properties["ENABLE_XHTML_XML"] = new boolean_define_commented_optional('ENABLE_XHTML_XML'); +$properties["ENABLE_OPEN_GRAPH"] = +new boolean_define_commented_optional('ENABLE_OPEN_GRAPH'); + $properties["ENABLE_SPAMASSASSIN"] = new boolean_define_commented_optional('ENABLE_SPAMASSASSIN'); Modified: trunk/themes/Crao/templates/head.tmpl =================================================================== --- trunk/themes/Crao/templates/head.tmpl 2011年01月13日 15:06:45 UTC (rev 7833) +++ trunk/themes/Crao/templates/head.tmpl 2011年01月13日 15:38:07 UTC (rev 7834) @@ -103,7 +103,9 @@ $pagetitle = " - ". AsString($TITLE); ?> <title><?php echo WIKI_NAME.$pagetitle?></title> +<?php if (ENABLE_OPEN_GRAPH) { ?> <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/> <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/> +<?php } ?> <?php echo $WikiTheme->getMoreHeaders() ?> </head> Modified: trunk/themes/default/templates/head.tmpl =================================================================== --- trunk/themes/default/templates/head.tmpl 2011年01月13日 15:06:45 UTC (rev 7833) +++ trunk/themes/default/templates/head.tmpl 2011年01月13日 15:38:07 UTC (rev 7834) @@ -110,7 +110,9 @@ $pagetitle = " - ". AsString($TITLE); ?> <title><?php echo WIKI_NAME.$pagetitle ?></title> +<?php if (ENABLE_OPEN_GRAPH) { ?> <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/> <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/> +<?php } ?> <?php echo $WikiTheme->getMoreHeaders() ?> </head> Modified: trunk/themes/wikilens/templates/head.tmpl =================================================================== --- trunk/themes/wikilens/templates/head.tmpl 2011年01月13日 15:06:45 UTC (rev 7833) +++ trunk/themes/wikilens/templates/head.tmpl 2011年01月13日 15:38:07 UTC (rev 7834) @@ -103,8 +103,10 @@ $pagetitle = " - ". AsString($TITLE); ?> <title><?php echo WIKI_NAME.$pagetitle ?></title> +<?php if (ENABLE_OPEN_GRAPH) { ?> <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/> <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/> +<?php } ?> <?php require_once("lib/plugin/RateIt.php"); $plugin = new WikiPlugin_RateIt; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7833 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7833&view=rev Author: vargenau Date: 2011年01月13日 15:06:45 +0000 (2011年1月13日) Log Message: ----------- Remove support for IE5 and IE5.5 Modified Paths: -------------- trunk/themes/MacOSX/MacOSX-topbottombars-min.css trunk/themes/MacOSX/MacOSX-topbottombars.css trunk/themes/MonoBook/IEFixes-min.css trunk/themes/MonoBook/IEFixes.css trunk/themes/MonoBook/Makefile trunk/themes/MonoBook/themeinfo.php trunk/themes/default/phpwiki-topbottombars-min.css trunk/themes/default/phpwiki-topbottombars.css Removed Paths: ------------- trunk/themes/MonoBook/IE50Fixes-min.css trunk/themes/MonoBook/IE50Fixes.css trunk/themes/MonoBook/IE55Fixes-min.css trunk/themes/MonoBook/IE55Fixes.css Modified: trunk/themes/MacOSX/MacOSX-topbottombars-min.css =================================================================== --- trunk/themes/MacOSX/MacOSX-topbottombars-min.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MacOSX/MacOSX-topbottombars-min.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -1 +1 @@ -@import url("MacOSX.css");body{padding-top:16ex;padding-bottom:9ex;}div#header,div#footer{background:white url("images/bgpaper8.png");margin:0;padding:0;position:fixed;left:0;right:0;padding-top:.5ex;padding-bottom:.5ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:.25ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}div#actionbuttons{padding-bottom:1ex;padding-top:.25ex;}p.editdate{margin-top:.75ex;margin-bottom:.5ex;} \ No newline at end of file +@import url("MacOSX.css");body{padding-top:16ex;padding-bottom:9ex;}div#header,div#footer{background:white url("images/bgpaper8.png");margin:0;padding:0;position:fixed;left:0;right:0;padding-top:.5ex;padding-bottom:.5ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:.25ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}p.editdate{margin-top:.75ex;margin-bottom:.5ex;} \ No newline at end of file Modified: trunk/themes/MacOSX/MacOSX-topbottombars.css =================================================================== --- trunk/themes/MacOSX/MacOSX-topbottombars.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MacOSX/MacOSX-topbottombars.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -46,7 +46,6 @@ padding-bottom: 0.25ex; } - /** * Actionbar */ @@ -56,11 +55,6 @@ bottom: -1ex; padding-bottom: 0ex; } -div#actionbuttons { - /* For IE5.1Mac, workaround the Mozilla kludge */ - padding-bottom: 1ex; - padding-top: 0.25ex; -} p.editdate { margin-top: 0.75ex; margin-bottom: 0.5ex; Deleted: trunk/themes/MonoBook/IE50Fixes-min.css =================================================================== --- trunk/themes/MonoBook/IE50Fixes-min.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/IE50Fixes-min.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -1 +0,0 @@ -#column-content{margin:0!important;float:none;}#column-content #content{margin-top:3em;height:1%;}#column-one{position:absolute;overflow:visible;top:0;left:0;z-index:3;}#footer{margin:0 0 0 13.6em;}body{font-size:xx-small;}#p-cactions li{float:left;padding-top:0;padding-bottom:0!important;height:.9em;}#p-cactions li a{display:block;padding-bottom:.045em;}#p-cactions li.selected a{padding-bottom:.17em;}#p-cactions li a:hover{padding-bottom:.17em;}.link-external,.external{background:none;padding:0;}#p-personal ul{float:right;}#p-personal li{float:left;}li#pt-userpage,li#pt-anonuserpage,li#pt-login,li#pt-logout{background:none;padding-left:none;}.visualClear{width:100%;height:0;padding:0;margin:0;}.firstHeading{margin-bottom:.3em;} \ No newline at end of file Deleted: trunk/themes/MonoBook/IE50Fixes.css =================================================================== --- trunk/themes/MonoBook/IE50Fixes.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/IE50Fixes.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -1,71 +0,0 @@ -/** - * $Id$ - */ - -/* -** IE5.0 Fix Stylesheet -*/ - -#column-content { - margin: 0 !important; - float: none; -} -#column-content #content { - margin-top: 3em; - height: 1%; -} -#column-one { - position: absolute; - overflow: visible; - top: 0; - left: 0; - z-index: 3; -} -#footer { - margin: 0 0 0 13.6em; -} - -/* IE 5 & 5.5 interpret keyword sizes one off */ -body { font-size: xx-small; } -/* -** the edit tabs -*/ -#p-cactions li { - float: left; - padding-top: 0; - padding-bottom: 0 !important; - height: 0.9em; -} -#p-cactions li a { - display: block; - padding-bottom: 0.045em; -} -#p-cactions li.selected a { - padding-bottom: 0.17em; -} -#p-cactions li a:hover { - padding-bottom: 0.17em; -} -/* 5.0 doesn't like the background icon for external links and user */ -.link-external, -.external { - background: none; - padding: 0; -} -#p-personal ul { float: right } -#p-personal li { float: left } -li#pt-userpage, -li#pt-anonuserpage, -li#pt-login, -li#pt-logout { - background: none; - padding-left: none; -} -.visualClear { - width:100%; - height: 0px; - padding:0; - margin:0; -} -.firstHeading { margin-bottom: 0.3em; } -/*div{ border:1px solid Red !important;}*/ Deleted: trunk/themes/MonoBook/IE55Fixes-min.css =================================================================== --- trunk/themes/MonoBook/IE55Fixes-min.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/IE55Fixes-min.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -1 +0,0 @@ -#column-content{float:none;margin-left:0;height:1%;}#column-content #content{position:relative;z-index:5;margin-left:12.2em;margin-top:3em;height:1%;}#column-one{position:absolute;z-index:4;top:0;left:0;width:100%;}#footer{margin-left:13.6em;border-left:1px solid #fabd23;}#p-personal{padding-bottom:.1em;}body{font-size:xx-small;}pre{font-size:x-small;}#p-cactions{width:76%!important;z-index:3!important;float:none;}#p-cactions li{float:left;padding-top:0;padding-bottom:0!important;height:.9em;}#p-cactions li a{display:block;padding-bottom:.045em;}#p-cactions li.selected a{padding-bottom:.17em;padding-bottom:.17em!important;}#p-cactions li a:hover{padding-bottom:.17em;}.portlet{overflow:hidden;}#bodyContent a.external{background:url(external.png) center right no-repeat;padding-right:13px;}#p-logo a,#p-logo a:hover{cursor:pointer;}.visualClear{width:90%;height:1px;padding:0;margin:0;} \ No newline at end of file Deleted: trunk/themes/MonoBook/IE55Fixes.css =================================================================== --- trunk/themes/MonoBook/IE55Fixes.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/IE55Fixes.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -1,79 +0,0 @@ -/** - * $Id$ - */ - -/* IE5.5/win- only fixes */ - -#column-content { - float: none; - margin-left: 0; - height: 1%; -} -#column-content #content { - position: relative; - z-index: 5; - margin-left: 12.2em; - margin-top: 3em; - height: 1%; -} -#column-one { - position: absolute; - z-index: 4; - top: 0; - left: 0; - width: 100%; -} -#footer { - margin-left: 13.6em; - border-left: 1px solid #fabd23; -} - -/*#bodyContent div, -#bodyContent pre { overflow: auto; }*/ - -#p-personal { padding-bottom: 0.1em; } - -body { font-size: xx-small; } - -pre { font-size: x-small; } - -#p-cactions { - width: 76% !important; - z-index: 3 !important; - float: none; -} -#p-cactions li { - float: left; - padding-top: 0; - padding-bottom: 0 !important; - height: 0.9em; -} -#p-cactions li a { - display: block; - padding-bottom: 0.045em; -} -#p-cactions li.selected a { - padding-bottom: 0.17em; - padding-bottom: 0.17em !important; -} -#p-cactions li a:hover { - padding-bottom: 0.17em; -} -.portlet { - overflow:hidden; -} -#bodyContent a.external { - background: url(external.png) center right no-repeat; - padding-right: 13px; -} -/* show the hand */ -#p-logo a, -#p-logo a:hover { - cursor: pointer; -} -.visualClear { - width:90%; - height: 1px; - padding:0; - margin:0; -} Modified: trunk/themes/MonoBook/IEFixes-min.css =================================================================== --- trunk/themes/MonoBook/IEFixes-min.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/IEFixes-min.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -1 +1 @@ -@import "null?\"\{";@import "IE60Fixes.css";voice-family:"\"}\"";voice-family:inherit;@media tty{i{content:"\";}}@media tty{i{content:"\";}}@m;@import 'IE55Fixes.css'; \ No newline at end of file +@import "null?\"\{";@import "IE60Fixes.css";voice-family:"\"}\"";voice-family:inherit; \ No newline at end of file Modified: trunk/themes/MonoBook/IEFixes.css =================================================================== --- trunk/themes/MonoBook/IEFixes.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/IEFixes.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -13,16 +13,3 @@ voice-family: "\"}\""; voice-family:inherit; - -/* IE5.0 */ -@media tty { - i{content:"\";/*" "*/}}; @import 'IE50Fixes.css'; {;}/*";} -} - -/* IE5.5 */ -@media tty { - i{content:"\";/*" "*/}}@m; @import 'IE55Fixes.css'; /*";} -} - - - Modified: trunk/themes/MonoBook/Makefile =================================================================== --- trunk/themes/MonoBook/Makefile 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/Makefile 2011年01月13日 15:06:45 UTC (rev 7833) @@ -5,8 +5,8 @@ # minify CSS and JS # -CSS_SRC = IE50Fixes.css IE70Fixes.css commonPrint.css rtl.css \ - IE55Fixes.css IEFixes.css main.css wikiprintable.css \ +CSS_SRC = IE70Fixes.css commonPrint.css rtl.css \ + IEFixes.css main.css wikiprintable.css \ IE60Fixes.css monobook.css wikistandard.css MAIN = wikibits JS_MAIN = wikibits.js Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/MonoBook/themeinfo.php 2011年01月13日 15:06:45 UTC (rev 7833) @@ -89,14 +89,10 @@ $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikibits.js")))); if (isBrowserIE()) { $ver = browserVersion(); - if ($ver > 5.1 and $ver < 5.9) - $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE55Fixes.css'),'all')); - elseif ($ver > 5.5 and $ver < 7.0) + if ($ver > 5.5 and $ver < 7.0) $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE60Fixes.css'),'all')); elseif ($ver >= 7.0) $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE70Fixes.css'),'all')); - else - $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE50Fixes.css'),'all')); unset($ver); $this->addMoreHeaders("\n"); $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("IEFixes.js")))); Modified: trunk/themes/default/phpwiki-topbottombars-min.css =================================================================== --- trunk/themes/default/phpwiki-topbottombars-min.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/default/phpwiki-topbottombars-min.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -1 +1 @@ -@import url("phpwiki.css");body{padding-top:9ex;padding-bottom:9ex;}div#header,div#footer{background:#FFFFF0;margin:0;padding:0;position:fixed;left:0;right:0;padding-top:1ex;padding-bottom:1ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;padding-top:1.5ex;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:1ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}div#actionbuttons{padding-bottom:1ex;}p.editdate{margin-bottom:.5ex;} \ No newline at end of file +@import url("phpwiki.css");body{padding-top:9ex;padding-bottom:9ex;}div#header,div#footer{background:#FFFFF0;margin:0;padding:0;position:fixed;left:0;right:0;padding-top:1ex;padding-bottom:1ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;padding-top:1.5ex;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:1ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}p.editdate{margin-bottom:.5ex;} \ No newline at end of file Modified: trunk/themes/default/phpwiki-topbottombars.css =================================================================== --- trunk/themes/default/phpwiki-topbottombars.css 2011年01月13日 14:57:09 UTC (rev 7832) +++ trunk/themes/default/phpwiki-topbottombars.css 2011年01月13日 15:06:45 UTC (rev 7833) @@ -48,7 +48,6 @@ padding-bottom: 1ex; } - /** * Actionbar */ @@ -58,13 +57,8 @@ bottom: -1ex; padding-bottom: 0ex; } -div#actionbuttons { - /* For IE5.1Mac, workaround the Mozilla kludge */ - padding-bottom: 1ex; -} p.editdate { margin-bottom: 0.5ex; } - /* For emacs users * * Local Variables: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7832 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7832&view=rev Author: vargenau Date: 2011年01月13日 14:57:09 +0000 (2011年1月13日) Log Message: ----------- Remove support for IE Mac Modified Paths: -------------- trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MonoBook/Makefile trunk/themes/MonoBook/main-min.css trunk/themes/MonoBook/main.css trunk/themes/MonoBook/rtl-min.css trunk/themes/MonoBook/rtl.css trunk/themes/Sidebar/sidebar-min.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/SpaceWiki/themeinfo.php trunk/themes/default/phpwiki-modern.css trunk/themes/fusionforge/fusionforge.css Removed Paths: ------------- trunk/themes/MonoBook/IEMacFixes-min.css trunk/themes/MonoBook/IEMacFixes.css Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/Hawaiian/Hawaiian.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -29,8 +29,7 @@ caption-side: top; text-align: left; margin-bottom: .5ex; - /* Allow the caption to extend to the full page width - Mac ie5.1 ignores this*/ + /* Allow the caption to extend to the full page width */ width: 100%; } Deleted: trunk/themes/MonoBook/IEMacFixes-min.css =================================================================== --- trunk/themes/MonoBook/IEMacFixes-min.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/MonoBook/IEMacFixes-min.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -1 +0,0 @@ -#portal-column-content{margin:0 0 4.8em 0;float:none;}#portal-column-content #content{z-index:0;}#portal-column-one{position:absolute;top:0;left:0;z-index:3;}#portal-footer{margin-left:12em;}#portlet-contentViews li,#portlet-contentViews .selected{border:none!important;}#portlet-contentViews li a{border:1px solid #aaa;border-bottom:none;}#portlet-contentViews li.selected a{border:1px solid #fabd23;border-bottom:none;}li#personaltools-userpage,li#personaltools-login{background:none;padding-left:none;}#mactest{color:Green;} \ No newline at end of file Deleted: trunk/themes/MonoBook/IEMacFixes.css =================================================================== --- trunk/themes/MonoBook/IEMacFixes.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/MonoBook/IEMacFixes.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -1,48 +0,0 @@ -/** - * $Id$ - */ - -/* IE/Mac only fix stylesheet, imported from main.css */ -#portal-column-content { - margin: 0 0 4.8em 0; - float: none; -} -#portal-column-content #content { - z-index: 0; -} -#portal-column-one { - position: absolute; - top:0; - left:0; - z-index: 3; -} -#portal-footer { - margin-left: 12em; -} -/* -#portlet-contentViews { - top: 0.6em !important; - left: 14.5em !important; -} -*/ -#portlet-contentViews li, -#portlet-contentViews .selected { - border: none !important; -} -#portlet-contentViews li a { - border: 1px solid #aaaaaa; - border-bottom: none; -} -#portlet-contentViews li.selected a { - border: 1px solid #fabd23; - border-bottom: none; -} -/* no background images */ -li#personaltools-userpage, -li#personaltools-login/* */ { - background: none; - padding-left: none; -} -#mactest { -color: Green; -} Modified: trunk/themes/MonoBook/Makefile =================================================================== --- trunk/themes/MonoBook/Makefile 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/MonoBook/Makefile 2011年01月13日 14:57:09 UTC (rev 7832) @@ -7,7 +7,7 @@ CSS_SRC = IE50Fixes.css IE70Fixes.css commonPrint.css rtl.css \ IE55Fixes.css IEFixes.css main.css wikiprintable.css \ - IE60Fixes.css IEMacFixes.css monobook.css wikistandard.css + IE60Fixes.css monobook.css wikistandard.css MAIN = wikibits JS_MAIN = wikibits.js # JS_REST = IEFixes.js Modified: trunk/themes/MonoBook/main-min.css =================================================================== --- trunk/themes/MonoBook/main-min.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/MonoBook/main-min.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -1 +1 @@ -#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;height:1%;}#content{position:relative;z-index:2;margin:2.8em 0 0 12.2em;padding:0 1em 1.5em 1em;background:white;color:black;border:1px solid #aaa;border-right:none;line-height:1.5em;}#column-one{position:absolute;padding-top:160px;top:0;left:0;}body{font:small sans-serif;background:#f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;color:black;margin:0;padding:0;}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0;}.visualClear{clear:both;}table{font-size:100%;color:black;}a{text-decoration:none;color:#002bb8;background:none;}a:visited{color:#5a3696;}a:active{color:#faa700;}a:hover{text-decoration:underline;}a.stub{color:#723;}img{border:0;vertical-align:middle;}p{margin:.4em 0 .5em 0;line-height:1.5em;}p img{margin:0;}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0;}h1,h2,h3,h4,h5,h6{color:black;background:none;font-weight:bold;font-family:Tahoma,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1{font-size:188%;}h2{font-size:150%;}h3{font-size:132%;}h4{font-size:116%;}h5{font-size:100%;}h6{font-size:80%;}h4,h5,h6{border-bottom:none;font-weight:normal;}li p{margin:0;}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png");}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none;}li{margin-bottom:.1em;}dt{font-weight:bold;margin-bottom:.1em;}dl{margin-top:.2em;margin-bottom:.5em;}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em;}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em;}legend{padding:.5em;font-size:95%;}form{border:none;margin:0;}textarea{width:100%;padding:.1em;}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em;}select{vertical-align:top;}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background:none;cursor:help;}q{font-family:Times,"Times New Roman",serif;font-style:italic;}code{background-color:#f9f9f9;}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em;}#siteSub{display:none;}#jump-to-nav{display:none;}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto;}span.subpages{display:block;}#bodyContent h1,#bodyContent h2{margin-bottom:.6em;}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em;}.firstHeading{margin-bottom:.1em;}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle;}#siteNotice{text-align:center;font-size:95%;padding:0 .9em;}#siteNotice p{margin:0;padding:0;}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000;}.errorbox{border-color:red;background-color:#fff2f2;}.successbox{border-color:green;background-color:#dfd;}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:none;}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both;}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em;}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c;}.center{width:100%;text-align:center;}*.center *{margin-left:auto;margin-right:auto;}.small,.small *{font-size:94%;}table.small{font-size:100%;}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right;}#toc #toctitle,.toc .toctitle,.toc #toctitle{display:inline;border:none;padding:0;font-size:110%;font-weight:bold;}.toc .toclist,.toc #toclist{width:auto;border:none;}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center;}#toc p,.toc p{margin:0;}#toc ul,.toc ul{width:auto;border:none;line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;margin-left:5px;padding-left:5px;}#toc ul ul,.toc ul ul{margin:0 0 0 2em;}#toc .toctoggle,.toc .toctoggle{font-size:94%;}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}.mw-warning{margin-left:50px;margin-right:50px;text-align:center;}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0;}div.floatright p{font-style:italic;}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0;}div.magnify{float:right;border:none!important;background:none!important;}div.magnify a,div.magnify img{display:block;border:none!important;background:none!important;}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}.hiddenStructure{display:none;speak:none;}img.tex{vertical-align:middle;}span.texhtml{font-family:serif;}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}div.townBox{position:relative;float:right;background:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%;}div.townBox dl dt{background:none;margin:.4em 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}.special li{line-height:1.4em;margin:0;padding:0;}.pageinfo-majoredit{font-weight:normal;}.wiki-summary{font-size:94%;font-style:italic;}.autocomment{color:gray;}#pagehistory span.user{margin-left:1.4em;margin-right:.4em;}#pagehistory span.minor{font-weight:bold;}#pagehistory li{border:1px solid white;}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white;}td.diff-addedline{background:#cfc;font-size:smaller;}td.diff-deletedline{background:#ffa;font-size:smaller;}td.diff-context{background:#eee;font-size:smaller;}span.diffchange{color:red;font-weight:bold;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background:url("images/url.png") center right no-repeat;padding-right:13px;}#bodyContent a[href ^="https://"],.link-https{background:url("images/lock_icon.png") center right no-repeat;padding-right:16px;}#bodyContent a[href ^="mailto:"],.link-mailto{background:url("images/mail_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="news://"]{background:url("images/news_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="ftp://"],.link-ftp{background:url("images/file_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="irc://"],.link-irc{background:url("images/discussionitem_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background:none;padding:0;}#bodyContent a.external{color:#36b;}#bodyContent .plainlinks a{background:none!important;padding:0!important;}.portlet{border:none;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden;}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap;}.portlet h5{background:transparent;padding:0 1em 0 .5em;text-transform:lowercase;display:inline;font-size:91%;height:1em;font-weight:normal;white-space:nowrap;}.portlet h6{background:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;text-transform:lowercase;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap;}.pBody{font-size:95%;background-color:white;color:black;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em;}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0;}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;}.portlet li{padding:0;margin:0;margin-bottom:0;}#p-logo{position:absolute;z-index:3;top:0;left:0;height:155px;width:12em;overflow:visible;}#p-logo h5{display:none;}#p-logo a,#p-logo a:hover{display:block;height:155px;width:12.2em;background-repeat:no-repeat;background-position:35% 50%!important;text-decoration:none;}#img-logo-right{position:absolute;z-index:4;top:0;right:0;height:86px;width:86px;background:url("images/wiki_stamp.png") left no-repeat;background-repeat:no-repeat;overflow:visible;}#p-navigation{position:relative;z-index:3;}#p-navigation .pBody{padding-right:0;}#p-navigation a{display:block;}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold;}#p-search{position:relative;z-index:3;}input.searchButton{margin-top:1px;padding:0 .4em!important;font-size:95%;cursor:pointer;background-color:White;border:1px solid #2f6fab;}#searchGoButton{padding-left:.5em;padding-right:.5em;font-weight:bold;}#livesearch,#p-search input.dropdown{text-align:left;width:9.9em;font-size:95%;}#p-search .pBody{padding:.5em .4em .4em .4em;text-align:center;}#p-personal{position:absolute;z-index:4;width:40em;white-space:nowrap;padding:0;margin:0;right:90px;top:.1em;border:none;overflow:visible;color:black;line-height:1.2em;}#p-personal h5{display:none;}#p-personal .portlet,#p-personal .pBody{z-index:0;padding:0;margin:0;border:none;overflow:visible;background:none;}#p-personal ul{z-index:0;border:none;line-height:1.5em;color:#2f6fab;padding:0 2em 0 3em;margin:0;text-align:right;list-style:none;background:none;cursor:default;}#p-personal li{z-index:0;border:none;padding:0;display:inline;color:#2f6fab;margin-left:1em;line-height:1.2em;background:none;}#p-personal li.active{font-weight:bold;}#p-personal li a{text-decoration:none;color:#005896;padding-bottom:.2em;background:none;}#p-personal li a:hover{background-color:white;padding-bottom:.2em;text-decoration:none;}#p-personal li.active a:hover{background-color:transparent;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:url('images/wikiuser.png') left no-repeat;background-repeat:no-repeat;padding-left:20px;text-transform:none;}#p-personal a.new{color:#ba0000;}#p-cactions{position:absolute;top:1.3em;left:11.5em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%;}#p-cactions .hiddenStructure{display:none;}#p-cactions ul{list-style:none;}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:none;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background:white;}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0!important;}#p-cactions li a{position:relative;z-index:0;background-color:#fbfbfb;color:#002bb8;border:none;padding:0 .8em .3em;text-decoration:none;margin:0;}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em;}#p-cactions .new a{color:#ba0000;}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#dedede;}#p-cactions li a#btn-edit{background:url('images/UEB16.png') top left no-repeat;background-repeat:no-repeat;padding-left:20px!important;text-transform:none;}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff;}#p-cactions h5{display:none;}#p-cactions li.istalk{margin-right:0;}#p-cactions li.istalk a{padding-right:.5em;}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em;}li#ca-talk{margin-right:1.6em;}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em;}#p-tbx,#p-lang{position:relative;z-index:3;}#footer{background-color:white;border-top:1px solid #fabd23;border-bottom:1px solid #fabd23;margin:.6em 0 1em 0;border-left:1px solid #fabd23;margin-left:13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%;}#footer li{display:inline;margin:0 1.3em;}head:first-child+body #footer li{white-space:nowrap;}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px;}#f-poweredbyico{float:right;}#f-copyrightico{float:left;}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em;}#preftoc li{border:1px solid White;}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}#preftoc a,#preftoc a:active{display:block;color:#0014a6;}#prefcontrol{clear:both;float:left;margin-top:1em;}div.prefsectiontip{font-size:95%;margin-top:1em;}fieldset.operaprefsection{margin-left:15em;}*>html #p-cactions li{border:none;}*>html #p-cactions li a{border:1px solid #aaa;border-bottom:none;}*>html #p-cactions li.selected a{border-color:#fabd23;}*>html #f-poweredbyico,*>html #f-copyrightico{width:88px;}*>html #bodyContent,*>html #bodyContent pre{width:100%;padding-bottom:25px;}* html #footer{margin-top:0;}* html #column-content{display:inline;margin-bottom:0;}* html div.editsection{font-size:smaller;}#pagehistory li.selected{position:relative;}*>html #column-content{float:none;}*>html #column-one{position:absolute;left:0;top:0;}*>html #footer{margin-left:13.2em;}.redirectText{font-size:150%;margin:5px;}.printfooter{display:none;}.not-patrolled{background-color:#ffa;}div.patrollink{font-size:75%;text-align:right;}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold;}span.unpatrolled{font-weight:bold;color:red;}span.searchmatch{color:red;}.sharedUploadNotice{font-style:italic;}span.updatedmarker{color:black;background-color:#0f0;}span.newpageletter{font-weight:bold;color:black;background-color:yellow;}span.minoreditletter{color:black;background-color:#c5ffe6;}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white;}table.gallery tr{vertical-align:top;}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white;}table.gallery td.galleryheader{text-align:center;font-weight:bold;}div.gallerybox{margin:2px;width:150px;}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px;}div.gallerytext{font-size:94%;padding:2px 4px;}span.comment{font-style:italic;}span.changedby{font-size:95%;}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em;}.previewnote p{margin:0;padding:0;}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center;}.editExternallyHelp{font-style:italic;color:gray;}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic;}.toggle{margin-left:2em;text-indent:-2em;}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px;}table.mw_metadata caption{font-weight:bold;}table.mw_metadata th{font-weight:normal;}table.mw_metadata td{padding:.1em;}table.mw_metadata{border:none;border-collapse:collapse;}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em;}table.mw_metadata th{background-color:#f9f9f9;}table.mw_metadata td{background-color:#fcfcfc;}table.collapsed tr.collapsable{display:none;}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0;}#filetoc li{display:inline;list-style-type:none;padding-right:2em;}input#wpSave,input#wpDiff{margin-right:.33em;}#editform .editOptions{display:inline;}#wpSave{font-weight:bold;}table.revisionform_default{border:1px solid #000;}table.revisionform_focus{border:1px solid #000;background-color:#0BF;}tr.revision_tr_default{background-color:#EEE;}tr.revision_tr_first{background-color:#DDD;}p.revision_saved{color:green;font-weight:bold;}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em;}#allmessagestable th{background-color:#b2b2ff;}#allmessagestable tr.orig{background-color:#ffe2e2;}#allmessagestable tr.new{background-color:#e2ffe2;}#allmessagestable tr.def{background-color:#f0f0ff;}div.noarticletext{border:1px solid #ccc;background:#fff;padding:.2em 1em;color:#000;}div#searchTargetContainer{left:10px;top:10px;width:90%;background:white;}div#searchTarget{padding:3px;margin:5px;background:#F0F0F0;border:solid 1px blue;}div#searchTarget ul li{list-style:none;}div#searchTarget ul li:before{color:orange;content:"00円BB 0020円";}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;background:#f0f0f0;}div.multipageimagenavbox div.thumb{border:none;margin-left:2em;margin-right:2em;}div.multipageimagenavbox hr{margin:6px;}table.multipageimage td{text-align:center;}.TablePager_nav a{text-decoration:none;}.TablePager{border-collapse:collapse;}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em;}.TablePager th{background-color:#eef;}.TablePager td{background-color:#fff;}.TablePager tr:hover td{background-color:#eef;}.imagelist td,.imagelist th{white-space:nowrap;}.imagelist .TablePager_col_links{background-color:#eef;}.imagelist .TablePager_col_img_description{white-space:normal;}.imagelist th.TablePager_sort{background-color:#ccf;}.pagelist{font-size:smaller;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikipaging{font-size:80%;}.wikipaging-disabled{color:#999;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div#bottom{margin-left:12.2em;}div.errors{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.errors{color:red;margin:0;padding:0;text-decoration:underline;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}a.spell-wrong{color:#ba0000;background:yellow;}span.spell-wrong{color:#ba0000;}form.wikiformrich{background-color:#eee;}.wiki,.named-wiki{text-decoration:none;font-weight:normal;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Arial,Helvetica,sans-serif;white-space:nowrap;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em;}.error{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;} \ No newline at end of file +#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;height:1%;}#content{position:relative;z-index:2;margin:2.8em 0 0 12.2em;padding:0 1em 1.5em 1em;background:white;color:black;border:1px solid #aaa;border-right:none;line-height:1.5em;}#column-one{position:absolute;padding-top:160px;top:0;left:0;}body{font:small sans-serif;background:#f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;color:black;margin:0;padding:0;}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0;}.visualClear{clear:both;}table{font-size:100%;color:black;}a{text-decoration:none;color:#002bb8;background:none;}a:visited{color:#5a3696;}a:active{color:#faa700;}a:hover{text-decoration:underline;}a.stub{color:#723;}img{border:0;vertical-align:middle;}p{margin:.4em 0 .5em 0;line-height:1.5em;}p img{margin:0;}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0;}h1,h2,h3,h4,h5,h6{color:black;background:none;font-weight:bold;font-family:Tahoma,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1{font-size:188%;}h2{font-size:150%;}h3{font-size:132%;}h4{font-size:116%;}h5{font-size:100%;}h6{font-size:80%;}h4,h5,h6{border-bottom:none;font-weight:normal;}li p{margin:0;}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png");}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none;}li{margin-bottom:.1em;}dt{font-weight:bold;margin-bottom:.1em;}dl{margin-top:.2em;margin-bottom:.5em;}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em;}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em;}legend{padding:.5em;font-size:95%;}form{border:none;margin:0;}textarea{width:100%;padding:.1em;}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em;}select{vertical-align:top;}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background:none;cursor:help;}q{font-family:Times,"Times New Roman",serif;font-style:italic;}code{background-color:#f9f9f9;}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em;}#siteSub{display:none;}#jump-to-nav{display:none;}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto;}span.subpages{display:block;}#bodyContent h1,#bodyContent h2{margin-bottom:.6em;}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em;}.firstHeading{margin-bottom:.1em;}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle;}#siteNotice{text-align:center;font-size:95%;padding:0 .9em;}#siteNotice p{margin:0;padding:0;}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000;}.errorbox{border-color:red;background-color:#fff2f2;}.successbox{border-color:green;background-color:#dfd;}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:none;}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both;}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em;}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c;}.center{width:100%;text-align:center;}*.center *{margin-left:auto;margin-right:auto;}.small,.small *{font-size:94%;}table.small{font-size:100%;}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right;}#toc #toctitle,.toc .toctitle,.toc #toctitle{display:inline;border:none;padding:0;font-size:110%;font-weight:bold;}.toc .toclist,.toc #toclist{width:auto;border:none;}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center;}#toc p,.toc p{margin:0;}#toc ul,.toc ul{width:auto;border:none;line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;margin-left:5px;padding-left:5px;}#toc ul ul,.toc ul ul{margin:0 0 0 2em;}#toc .toctoggle,.toc .toctoggle{font-size:94%;}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}.mw-warning{margin-left:50px;margin-right:50px;text-align:center;}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0;}div.floatright p{font-style:italic;}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0;}div.magnify{float:right;border:none!important;background:none!important;}div.magnify a,div.magnify img{display:block;border:none!important;background:none!important;}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}.hiddenStructure{display:none;speak:none;}img.tex{vertical-align:middle;}span.texhtml{font-family:serif;}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}div.townBox{position:relative;float:right;background:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%;}div.townBox dl dt{background:none;margin:.4em 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}.special li{line-height:1.4em;margin:0;padding:0;}.pageinfo-majoredit{font-weight:normal;}.wiki-summary{font-size:94%;font-style:italic;}.autocomment{color:gray;}#pagehistory span.user{margin-left:1.4em;margin-right:.4em;}#pagehistory span.minor{font-weight:bold;}#pagehistory li{border:1px solid white;}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white;}td.diff-addedline{background:#cfc;font-size:smaller;}td.diff-deletedline{background:#ffa;font-size:smaller;}td.diff-context{background:#eee;font-size:smaller;}span.diffchange{color:red;font-weight:bold;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background:url("images/url.png") center right no-repeat;padding-right:13px;}#bodyContent a[href ^="https://"],.link-https{background:url("images/lock_icon.png") center right no-repeat;padding-right:16px;}#bodyContent a[href ^="mailto:"],.link-mailto{background:url("images/mail_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="news://"]{background:url("images/news_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="ftp://"],.link-ftp{background:url("images/file_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="irc://"],.link-irc{background:url("images/discussionitem_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background:none;padding:0;}#bodyContent a.external{color:#36b;}#bodyContent .plainlinks a{background:none!important;padding:0!important;}.portlet{border:none;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden;}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap;}.portlet h5{background:transparent;padding:0 1em 0 .5em;text-transform:lowercase;display:inline;font-size:91%;height:1em;font-weight:normal;white-space:nowrap;}.portlet h6{background:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;text-transform:lowercase;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap;}.pBody{font-size:95%;background-color:white;color:black;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em;}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0;}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;}.portlet li{padding:0;margin:0;margin-bottom:0;}#p-logo{position:absolute;z-index:3;top:0;left:0;height:155px;width:12em;overflow:visible;}#p-logo h5{display:none;}#p-logo a,#p-logo a:hover{display:block;height:155px;width:12.2em;background-repeat:no-repeat;background-position:35% 50%!important;text-decoration:none;}#img-logo-right{position:absolute;z-index:4;top:0;right:0;height:86px;width:86px;background:url("images/wiki_stamp.png") left no-repeat;background-repeat:no-repeat;overflow:visible;}#p-navigation{position:relative;z-index:3;}#p-navigation .pBody{padding-right:0;}#p-navigation a{display:block;}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold;}#p-search{position:relative;z-index:3;}input.searchButton{margin-top:1px;padding:0 .4em!important;font-size:95%;cursor:pointer;background-color:White;border:1px solid #2f6fab;}#searchGoButton{padding-left:.5em;padding-right:.5em;font-weight:bold;}#livesearch,#p-search input.dropdown{text-align:left;width:9.9em;font-size:95%;}#p-search .pBody{padding:.5em .4em .4em .4em;text-align:center;}#p-personal{position:absolute;z-index:4;width:40em;white-space:nowrap;padding:0;margin:0;right:90px;top:.1em;border:none;overflow:visible;color:black;line-height:1.2em;}#p-personal h5{display:none;}#p-personal .portlet,#p-personal .pBody{z-index:0;padding:0;margin:0;border:none;overflow:visible;background:none;}#p-personal ul{z-index:0;border:none;line-height:1.5em;color:#2f6fab;padding:0 2em 0 3em;margin:0;text-align:right;list-style:none;background:none;cursor:default;}#p-personal li{z-index:0;border:none;padding:0;display:inline;color:#2f6fab;margin-left:1em;line-height:1.2em;background:none;}#p-personal li.active{font-weight:bold;}#p-personal li a{text-decoration:none;color:#005896;padding-bottom:.2em;background:none;}#p-personal li a:hover{background-color:white;padding-bottom:.2em;text-decoration:none;}#p-personal li.active a:hover{background-color:transparent;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:url('images/wikiuser.png') left no-repeat;background-repeat:no-repeat;padding-left:20px;text-transform:none;}#p-personal a.new{color:#ba0000;}#p-cactions{position:absolute;top:1.3em;left:11.5em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%;}#p-cactions .hiddenStructure{display:none;}#p-cactions ul{list-style:none;}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:none;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background:white;}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0!important;}#p-cactions li a{position:relative;z-index:0;background-color:#fbfbfb;color:#002bb8;border:none;padding:0 .8em .3em;text-decoration:none;margin:0;}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em;}#p-cactions .new a{color:#ba0000;}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#dedede;}#p-cactions li a#btn-edit{background:url('images/UEB16.png') top left no-repeat;background-repeat:no-repeat;padding-left:20px!important;text-transform:none;}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff;}#p-cactions h5{display:none;}#p-cactions li.istalk{margin-right:0;}#p-cactions li.istalk a{padding-right:.5em;}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em;}li#ca-talk{margin-right:1.6em;}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em;}#p-tbx,#p-lang{position:relative;z-index:3;}#footer{background-color:white;border-top:1px solid #fabd23;border-bottom:1px solid #fabd23;margin:.6em 0 1em 0;border-left:1px solid #fabd23;margin-left:13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%;}#footer li{display:inline;margin:0 1.3em;}head:first-child+body #footer li{white-space:nowrap;}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px;}#f-poweredbyico{float:right;}#f-copyrightico{float:left;}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em;}#preftoc li{border:1px solid White;}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}#preftoc a,#preftoc a:active{display:block;color:#0014a6;}#prefcontrol{clear:both;float:left;margin-top:1em;}div.prefsectiontip{font-size:95%;margin-top:1em;}fieldset.operaprefsection{margin-left:15em;}* html #footer{margin-top:0;}* html #column-content{display:inline;margin-bottom:0;}* html div.editsection{font-size:smaller;}#pagehistory li.selected{position:relative;}*>html #column-one{position:absolute;left:0;top:0;}*>html #footer{margin-left:13.2em;}.redirectText{font-size:150%;margin:5px;}.printfooter{display:none;}.not-patrolled{background-color:#ffa;}div.patrollink{font-size:75%;text-align:right;}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold;}span.unpatrolled{font-weight:bold;color:red;}span.searchmatch{color:red;}.sharedUploadNotice{font-style:italic;}span.updatedmarker{color:black;background-color:#0f0;}span.newpageletter{font-weight:bold;color:black;background-color:yellow;}span.minoreditletter{color:black;background-color:#c5ffe6;}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white;}table.gallery tr{vertical-align:top;}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white;}table.gallery td.galleryheader{text-align:center;font-weight:bold;}div.gallerybox{margin:2px;width:150px;}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px;}div.gallerytext{font-size:94%;padding:2px 4px;}span.comment{font-style:italic;}span.changedby{font-size:95%;}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em;}.previewnote p{margin:0;padding:0;}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center;}.editExternallyHelp{font-style:italic;color:gray;}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic;}.toggle{margin-left:2em;text-indent:-2em;}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px;}table.mw_metadata caption{font-weight:bold;}table.mw_metadata th{font-weight:normal;}table.mw_metadata td{padding:.1em;}table.mw_metadata{border:none;border-collapse:collapse;}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em;}table.mw_metadata th{background-color:#f9f9f9;}table.mw_metadata td{background-color:#fcfcfc;}table.collapsed tr.collapsable{display:none;}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0;}#filetoc li{display:inline;list-style-type:none;padding-right:2em;}input#wpSave,input#wpDiff{margin-right:.33em;}#editform .editOptions{display:inline;}#wpSave{font-weight:bold;}table.revisionform_default{border:1px solid #000;}table.revisionform_focus{border:1px solid #000;background-color:#0BF;}tr.revision_tr_default{background-color:#EEE;}tr.revision_tr_first{background-color:#DDD;}p.revision_saved{color:green;font-weight:bold;}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em;}#allmessagestable th{background-color:#b2b2ff;}#allmessagestable tr.orig{background-color:#ffe2e2;}#allmessagestable tr.new{background-color:#e2ffe2;}#allmessagestable tr.def{background-color:#f0f0ff;}div.noarticletext{border:1px solid #ccc;background:#fff;padding:.2em 1em;color:#000;}div#searchTargetContainer{left:10px;top:10px;width:90%;background:white;}div#searchTarget{padding:3px;margin:5px;background:#F0F0F0;border:solid 1px blue;}div#searchTarget ul li{list-style:none;}div#searchTarget ul li:before{color:orange;content:"00円BB 0020円";}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;background:#f0f0f0;}div.multipageimagenavbox div.thumb{border:none;margin-left:2em;margin-right:2em;}div.multipageimagenavbox hr{margin:6px;}table.multipageimage td{text-align:center;}.TablePager_nav a{text-decoration:none;}.TablePager{border-collapse:collapse;}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em;}.TablePager th{background-color:#eef;}.TablePager td{background-color:#fff;}.TablePager tr:hover td{background-color:#eef;}.imagelist td,.imagelist th{white-space:nowrap;}.imagelist .TablePager_col_links{background-color:#eef;}.imagelist .TablePager_col_img_description{white-space:normal;}.imagelist th.TablePager_sort{background-color:#ccf;}.pagelist{font-size:smaller;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikipaging{font-size:80%;}.wikipaging-disabled{color:#999;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div#bottom{margin-left:12.2em;}div.errors{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.errors{color:red;margin:0;padding:0;text-decoration:underline;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}a.spell-wrong{color:#ba0000;background:yellow;}span.spell-wrong{color:#ba0000;}form.wikiformrich{background-color:#eee;}.wiki,.named-wiki{text-decoration:none;font-weight:normal;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Arial,Helvetica,sans-serif;white-space:nowrap;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em;}.error{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;} \ No newline at end of file Modified: trunk/themes/MonoBook/main.css =================================================================== --- trunk/themes/MonoBook/main.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/MonoBook/main.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -1185,28 +1185,6 @@ } fieldset.operaprefsection { margin-left: 15em } -/* -** IE/Mac fixes, hope to find a validating way to move this -** to a separate stylesheet. This would work but doesn't validate: -** @import("IEMacFixes.css"); -*/ - -/* tabs: border on the a, not the div */ -* > html #p-cactions li { border:none; } -* > html #p-cactions li a { - border: 1px solid #aaa; - border-bottom: none; -} -* > html #p-cactions li.selected a { border-color: #fabd23; } -/* footer icons need a fixed width */ -* > html #f-poweredbyico, -* > html #f-copyrightico { width: 88px; } -* > html #bodyContent, -* > html #bodyContent pre { - width: 100%; - padding-bottom: 25px; -} - /* more IE fixes */ /* float/negative margin brokenness */ * html #footer {margin-top: 0;} @@ -1217,10 +1195,6 @@ * html div.editsection { font-size: smaller; } #pagehistory li.selected { position: relative; } -/* Mac IE 5.0 fix; floated content turns invisible */ -* > html #column-content { - float: none; -} * > html #column-one { position: absolute; left: 0; Modified: trunk/themes/MonoBook/rtl-min.css =================================================================== --- trunk/themes/MonoBook/rtl-min.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/MonoBook/rtl-min.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -1 +1 @@ -body,body *{direction:rtl;unicode-bidi:embed;}#column-content{margin:0 -12.2em 0 0;float:left;}#column-content #content{margin-left:0;margin-right:12.2em;border-right:1px solid #aaa;border-left:none;}html>body .portlet{float:right;clear:right;}*>body .portlet{float:none;clear:none;}.pBody{padding-right:.8em;padding-left:.5em;}.documentByLine,.portletDetails,.portletMore,#p-personal{text-align:left;}div div.thumbcaption{text-align:right;}div.magnify,#div.townBox,#p-logo{left:auto;right:0;}#p-personal{left:auto;right:0;}#p-cactions{left:auto;right:11.5em;padding-left:0;padding-right:1em;}#p-cactions li{margin-left:.3em;margin-right:0;float:right;}* html #p-cactions li a{display:block;padding-bottom:0;}* html #p-cactions li a:hover{padding-bottom:.2em;}li#ca-talk{margin-right:auto;margin-left:1.6em;}li#ca-watch{margin-right:1.6em!important;}ul{margin-left:0;margin-right:1.5em;}ol{margin-left:0;margin-right:2.4em;}dd{margin-left:0;margin-right:1.6em;}#contentSub{margin-right:1em;margin-left:0;}.tocindent{margin-left:0;margin-right:2em;}div.townBox{margin-left:0;margin-right:1em;}div.townBox dl dd{margin-left:0;margin-right:1.1em;}#p-personal li{margin-left:0;margin-right:1em;}li#ca-talk,li#ca-watch{margin-right:auto;margin-left:1.6em;}#p-personal li{float:left;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:none;padding-left:0;}.external{padding:0!important;background:none!important;}#footer{clear:both;}* html #footer{margin-left:0;margin-right:13.6em;border-left:0;border-right:1px solid #fabd23;}* html #column-content{float:none;margin-left:0;margin-right:0;}* html #column-content #content{margin-left:0;margin-top:3em;}* html #column-one{right:0;}#preftoc{float:right;}#preftoc li{list-style:none;}#prefcontrol{float:right;}fieldset.prefsection,fieldset.operaprefsection{margin-left:0!important;margin-right:15em;} \ No newline at end of file +body,body *{direction:rtl;unicode-bidi:embed;}#column-content{margin:0 -12.2em 0 0;float:left;}#column-content #content{margin-left:0;margin-right:12.2em;border-right:1px solid #aaa;border-left:none;}html>body .portlet{float:right;clear:right;}.pBody{padding-right:.8em;padding-left:.5em;}.documentByLine,.portletDetails,.portletMore,#p-personal{text-align:left;}div div.thumbcaption{text-align:right;}div.magnify,#div.townBox,#p-logo{left:auto;right:0;}#p-personal{left:auto;right:0;}#p-cactions{left:auto;right:11.5em;padding-left:0;padding-right:1em;}#p-cactions li{margin-left:.3em;margin-right:0;float:right;}* html #p-cactions li a{display:block;padding-bottom:0;}* html #p-cactions li a:hover{padding-bottom:.2em;}li#ca-talk{margin-right:auto;margin-left:1.6em;}li#ca-watch{margin-right:1.6em!important;}ul{margin-left:0;margin-right:1.5em;}ol{margin-left:0;margin-right:2.4em;}dd{margin-left:0;margin-right:1.6em;}#contentSub{margin-right:1em;margin-left:0;}.tocindent{margin-left:0;margin-right:2em;}div.townBox{margin-left:0;margin-right:1em;}div.townBox dl dd{margin-left:0;margin-right:1.1em;}#p-personal li{margin-left:0;margin-right:1em;}li#ca-talk,li#ca-watch{margin-right:auto;margin-left:1.6em;}#p-personal li{float:left;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:none;padding-left:0;}.external{padding:0!important;background:none!important;}#footer{clear:both;}* html #footer{margin-left:0;margin-right:13.6em;border-left:0;border-right:1px solid #fabd23;}* html #column-content{float:none;margin-left:0;margin-right:0;}* html #column-content #content{margin-left:0;margin-top:3em;}* html #column-one{right:0;}#preftoc{float:right;}#preftoc li{list-style:none;}#prefcontrol{float:right;}fieldset.prefsection,fieldset.operaprefsection{margin-left:0!important;margin-right:15em;} \ No newline at end of file Modified: trunk/themes/MonoBook/rtl.css =================================================================== --- trunk/themes/MonoBook/rtl.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/MonoBook/rtl.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -42,11 +42,6 @@ float: right; clear: right; } -/* recover IEMac (might be fine with the float, but usually it's close to IE */ -*>body .portlet { - float: none; - clear: none; -} .pBody { padding-right: 0.8em; padding-left: 0.5em; Modified: trunk/themes/Sidebar/sidebar-min.css =================================================================== --- trunk/themes/Sidebar/sidebar-min.css 2011年01月13日 14:42:49 UTC (rev 7831) +++ trunk/themes/Sidebar/sidebar-min.css 2011年01月13日 14:57:09 UTC (rev 7832) @@ -1 +1 @@ -#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;}#content{margin:61px 0 0 12.2em;padding:1em 1em 1.5em 1em;background:White;border:1px solid #aaa;border-right:none;line-height:1.5em;position:relative;z-index:2;}#column-one{padding-top:50px;}body{font:small sans-serif;background:#fff;color:black;margin:0;padding:0;}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0;}.visualClear{clear:both;}table{font-size:100%;color:black;}a{text-decoration:none;color:#004ba6;background:none;}a:visited{color:#5a3696;}a:active{color:#faa700;}a:hover{text-decoration:underline;}a.stub{color:#723;}a.new,#p-personal a.new{color:#ba0000;}a.new:visited,#p-personal a.new:visited{color:#a55858;}img{border:0;}p{margin:.4em 0 .5em 0;line-height:1.5em;}p img{margin:0;}img.inlineimage{border:none;display:inline;}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0;}h1,h2,h3,h4,h5,h6{color:black;background:none;font-weight:bold;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1{font-size:188%;}h2{font-size:150%;}h3,h4,h5,h6{border-bottom:none;font-weight:bold;}h3{font-size:132%;}h4{font-size:116%;}h5{font-size:100%;}h6{font-size:80%;}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png");}ul.clicked{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bulletLoading.gif");}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none;}li{margin-bottom:.1em;}dt{font-size:115%;margin-bottom:.5em;}dl{margin-top:.2em;margin-bottom:.5em;}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em;}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em;}legend{padding:.5em;font-size:95%;}form{border:none;margin:0;}textarea{width:100%;padding:.1em;}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em;}select{vertical-align:top;}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;ba... [truncated message content]
Revision: 7831 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7831&view=rev Author: vargenau Date: 2011年01月13日 14:42:49 +0000 (2011年1月13日) Log Message: ----------- Remove support for Konqueror < 3.5 Modified Paths: -------------- trunk/themes/MonoBook/Makefile trunk/themes/MonoBook/wikibits-min.js trunk/themes/MonoBook/wikibits.js Removed Paths: ------------- trunk/themes/MonoBook/KHTMLFixes-min.css trunk/themes/MonoBook/KHTMLFixes.css Deleted: trunk/themes/MonoBook/KHTMLFixes-min.css =================================================================== --- trunk/themes/MonoBook/KHTMLFixes-min.css 2011年01月13日 14:34:22 UTC (rev 7830) +++ trunk/themes/MonoBook/KHTMLFixes-min.css 2011年01月13日 14:42:49 UTC (rev 7831) @@ -1 +0,0 @@ -#column-content{margin-left:0;} \ No newline at end of file Deleted: trunk/themes/MonoBook/KHTMLFixes.css =================================================================== --- trunk/themes/MonoBook/KHTMLFixes.css 2011年01月13日 14:34:22 UTC (rev 7830) +++ trunk/themes/MonoBook/KHTMLFixes.css 2011年01月13日 14:42:49 UTC (rev 7831) @@ -1,7 +0,0 @@ -/** - * $Id$ - */ - -/* KHTML fix stylesheet */ -/* work around the horizontal scrollbars */ -#column-content { margin-left: 0; } Modified: trunk/themes/MonoBook/Makefile =================================================================== --- trunk/themes/MonoBook/Makefile 2011年01月13日 14:34:22 UTC (rev 7830) +++ trunk/themes/MonoBook/Makefile 2011年01月13日 14:42:49 UTC (rev 7831) @@ -5,7 +5,7 @@ # minify CSS and JS # -CSS_SRC = IE50Fixes.css IE70Fixes.css KHTMLFixes.css commonPrint.css rtl.css \ +CSS_SRC = IE50Fixes.css IE70Fixes.css commonPrint.css rtl.css \ IE55Fixes.css IEFixes.css main.css wikiprintable.css \ IE60Fixes.css IEMacFixes.css monobook.css wikistandard.css MAIN = wikibits Modified: trunk/themes/MonoBook/wikibits-min.js =================================================================== --- trunk/themes/MonoBook/wikibits-min.js 2011年01月13日 14:34:22 UTC (rev 7830) +++ trunk/themes/MonoBook/wikibits-min.js 2011年01月13日 14:42:49 UTC (rev 7831) @@ -1 +1 @@ -var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){if(is_khtml){document.write('<link rel="stylesheet" type="text/css" href="'+a+'KHTMLFixes.css">')}return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[0]&&inputs[1]){inputs[0].onclick=diffcheck;inputs[1].onclick=diffcheck}}diffcheck()}function diffcheck(){var b=false;var a=false;hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[1]&&inputs[0]){if(inputs[1].checked||inputs[0].checked){if(inputs[1].checked&&inputs[0].checked&&inputs[0].value==inputs[1].value){return false}if(a){if(inputs[1].checked){a.className="selected";return false}}else{if(inputs[0].checked){return false}}if(inputs[0].checked){b=lis[i]}if(!a){inputs[0].style.visibility="hidden"}if(b){inputs[1].style.visibility="hidden"}lis[i].className="selected";a=lis[i]}else{if(!a){inputs[0].style.visibility="hidden"}else{inputs[0].style.visibility="visible"}if(b){inputs[1].style.visibility="hidden"}else{inputs[1].style.visibility="visible"}lis[i].className=""}}}}function tabbedprefs(){prefform=document.getElementById("preferences");if(!prefform||!document.createElement){return}prefform.className=prefform.className+"jsprefs";var g=new Array();children=prefform.childNodes;var e=0;for(i=0;i<children.length;i++){if(children[i].nodeName.indexOf("FIELDSET")!=-1){children[i].id="prefsection-"+e;children[i].className="prefsection";if(is_opera||is_khtml){children[i].className="prefsection operaprefsection"}legends=children[i].getElementsByTagName("LEGEND");g[e]=new Object();if(legends[0]&&legends[0].firstChild.nodeValue){g[e].text=legends[0].firstChild.nodeValue}else{g[e].text="# "+e}g[e].secid=children[i].id;e++;if(g.length!=1){children[i].style.display="none"}else{var c=children[i].id}}}var f=document.createElement("UL");f.id="preftoc";f.selectedid=c;for(i=0;i<g.length;i++){var b=document.createElement("LI");if(i==0){b.className="selected"}var d=document.createElement("A");d.href="#"+g[i].secid;d.onclick=uncoversection;d.innerHTML=g[i].text;d.secid=g[i].secid;b.appendChild(d);f.appendChild(b)}prefform.insertBefore(f,children[0]);document.getElementById("prefsubmit").id="prefcontrol"}function uncoversection(){oldsecid=this.parentNode.parentNode.selectedid;newsec=document.getElementById(this.secid);if(oldsecid!=this.secid){ul=document.getElementById("preftoc");document.getElementById(oldsecid).style.display="none";newsec.style.display="block";ul.selectedid=this.secid;lis=ul.getElementsByTagName("LI");for(i=0;i<lis.length;i++){lis[i].className=""}this.parentNode.className="selected"}return false}function checkTimezone(h,f){var c=new Date();var g=c.getTimezoneOffset();var b=Math.floor(Math.abs(g)/60);var a=Math.abs(g)%60;var d=((g>=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("1ドル");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('<span class=\'toctoggle\'>[<a href="javascript:toggleToc()" class="internal"><span id="showlink" style="display:none;">'+a+'</span><span id="hidelink">'+b+"</span></a>]</span>")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('<a href="javascript:insertTags');document.write("('"+c+"','"+b+"','"+e+"');\">");document.write('<img width="23" height="22" src="'+f+'" border="0" ALT="'+a+'" TITLE="'+a+'"'+g+">");document.write("</a>");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("<form name='infoform' id='infoform'><input size=80 id='infobox' name='infobox' value=\""+d+'" READONLY></form>')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\1ドル","g");var f=new RegExp("\\2ドル","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}}; \ No newline at end of file +var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[0]&&inputs[1]){inputs[0].onclick=diffcheck;inputs[1].onclick=diffcheck}}diffcheck()}function diffcheck(){var b=false;var a=false;hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[1]&&inputs[0]){if(inputs[1].checked||inputs[0].checked){if(inputs[1].checked&&inputs[0].checked&&inputs[0].value==inputs[1].value){return false}if(a){if(inputs[1].checked){a.className="selected";return false}}else{if(inputs[0].checked){return false}}if(inputs[0].checked){b=lis[i]}if(!a){inputs[0].style.visibility="hidden"}if(b){inputs[1].style.visibility="hidden"}lis[i].className="selected";a=lis[i]}else{if(!a){inputs[0].style.visibility="hidden"}else{inputs[0].style.visibility="visible"}if(b){inputs[1].style.visibility="hidden"}else{inputs[1].style.visibility="visible"}lis[i].className=""}}}}function tabbedprefs(){prefform=document.getElementById("preferences");if(!prefform||!document.createElement){return}prefform.className=prefform.className+"jsprefs";var g=new Array();children=prefform.childNodes;var e=0;for(i=0;i<children.length;i++){if(children[i].nodeName.indexOf("FIELDSET")!=-1){children[i].id="prefsection-"+e;children[i].className="prefsection";if(is_opera||is_khtml){children[i].className="prefsection operaprefsection"}legends=children[i].getElementsByTagName("LEGEND");g[e]=new Object();if(legends[0]&&legends[0].firstChild.nodeValue){g[e].text=legends[0].firstChild.nodeValue}else{g[e].text="# "+e}g[e].secid=children[i].id;e++;if(g.length!=1){children[i].style.display="none"}else{var c=children[i].id}}}var f=document.createElement("UL");f.id="preftoc";f.selectedid=c;for(i=0;i<g.length;i++){var b=document.createElement("LI");if(i==0){b.className="selected"}var d=document.createElement("A");d.href="#"+g[i].secid;d.onclick=uncoversection;d.innerHTML=g[i].text;d.secid=g[i].secid;b.appendChild(d);f.appendChild(b)}prefform.insertBefore(f,children[0]);document.getElementById("prefsubmit").id="prefcontrol"}function uncoversection(){oldsecid=this.parentNode.parentNode.selectedid;newsec=document.getElementById(this.secid);if(oldsecid!=this.secid){ul=document.getElementById("preftoc");document.getElementById(oldsecid).style.display="none";newsec.style.display="block";ul.selectedid=this.secid;lis=ul.getElementsByTagName("LI");for(i=0;i<lis.length;i++){lis[i].className=""}this.parentNode.className="selected"}return false}function checkTimezone(h,f){var c=new Date();var g=c.getTimezoneOffset();var b=Math.floor(Math.abs(g)/60);var a=Math.abs(g)%60;var d=((g>=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("1ドル");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('<span class=\'toctoggle\'>[<a href="javascript:toggleToc()" class="internal"><span id="showlink" style="display:none;">'+a+'</span><span id="hidelink">'+b+"</span></a>]</span>")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('<a href="javascript:insertTags');document.write("('"+c+"','"+b+"','"+e+"');\">");document.write('<img width="23" height="22" src="'+f+'" border="0" ALT="'+a+'" TITLE="'+a+'"'+g+">");document.write("</a>");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("<form name='infoform' id='infoform'><input size=80 id='infobox' name='infobox' value=\""+d+'" READONLY></form>')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\1ドル","g");var f=new RegExp("\\2ドル","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}}; \ No newline at end of file Modified: trunk/themes/MonoBook/wikibits.js =================================================================== --- trunk/themes/MonoBook/wikibits.js 2011年01月13日 14:34:22 UTC (rev 7830) +++ trunk/themes/MonoBook/wikibits.js 2011年01月13日 14:42:49 UTC (rev 7831) @@ -27,9 +27,6 @@ // document.write special stylesheet links function addcss ( stylepath ) { - if (is_khtml) { - document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'KHTMLFixes.css">'); - } return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7830 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7830&view=rev Author: vargenau Date: 2011年01月13日 14:34:22 +0000 (2011年1月13日) Log Message: ----------- Remove support for Opera 6 and 7 Modified Paths: -------------- trunk/themes/Crao/templates/head.tmpl trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/MonoBook/Makefile trunk/themes/MonoBook/rtl.css trunk/themes/MonoBook/wikibits-min.js trunk/themes/MonoBook/wikibits.js trunk/themes/Sidebar/templates/htmldump.tmpl trunk/themes/default/templates/head.tmpl trunk/themes/default/templates/htmldump.tmpl trunk/themes/wikilens/templates/head.tmpl Removed Paths: ------------- trunk/themes/MonoBook/Opera6Fixes-min.css trunk/themes/MonoBook/Opera6Fixes.css trunk/themes/MonoBook/Opera7Fixes-min.css trunk/themes/MonoBook/Opera7Fixes.css Modified: trunk/themes/Crao/templates/head.tmpl =================================================================== --- trunk/themes/Crao/templates/head.tmpl 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/Crao/templates/head.tmpl 2011年01月13日 14:34:22 UTC (rev 7830) @@ -18,13 +18,6 @@ <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" /> <base href="<?php echo PHPWIKI_BASE_URL?>" /> <link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" /> -<?php /** - * Additional navigation links are provided here in the html header for browsers - * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). - * - * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK - * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html - */ ?> <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/Crao/templates/htmldump.tmpl 2011年01月13日 14:34:22 UTC (rev 7830) @@ -11,13 +11,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" /> -<?php /** - * Additional navigation links are provided here in the html header for browsers - * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). - * - * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK - * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html - */ ?> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> Modified: trunk/themes/MonoBook/Makefile =================================================================== --- trunk/themes/MonoBook/Makefile 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/Makefile 2011年01月13日 14:34:22 UTC (rev 7830) @@ -6,8 +6,8 @@ # CSS_SRC = IE50Fixes.css IE70Fixes.css KHTMLFixes.css commonPrint.css rtl.css \ - IE55Fixes.css IEFixes.css Opera6Fixes.css main.css wikiprintable.css \ - IE60Fixes.css IEMacFixes.css Opera7Fixes.css monobook.css wikistandard.css + IE55Fixes.css IEFixes.css main.css wikiprintable.css \ + IE60Fixes.css IEMacFixes.css monobook.css wikistandard.css MAIN = wikibits JS_MAIN = wikibits.js # JS_REST = IEFixes.js Deleted: trunk/themes/MonoBook/Opera6Fixes-min.css =================================================================== --- trunk/themes/MonoBook/Opera6Fixes-min.css 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/Opera6Fixes-min.css 2011年01月13日 14:34:22 UTC (rev 7830) @@ -1 +0,0 @@ -#column-one{position:relative;max-width:11.7em;}#p-personal{width:45em;margin-left:8.6em;right:0;}#bodyContent a.external{background:url(external.png) center right no-repeat;padding-right:13px;} \ No newline at end of file Deleted: trunk/themes/MonoBook/Opera6Fixes.css =================================================================== --- trunk/themes/MonoBook/Opera6Fixes.css 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/Opera6Fixes.css 2011年01月13日 14:34:22 UTC (rev 7830) @@ -1,18 +0,0 @@ -/** - * $Id$ - */ - -/* opera 6 fixes */ -#column-one { - position: relative; - max-width: 11.7em; -} -#p-personal { - width: 45em; - margin-left: 8.6em; - right: 0; -} -#bodyContent a.external { - background: url(external.png) center right no-repeat; - padding-right: 13px; -} Deleted: trunk/themes/MonoBook/Opera7Fixes-min.css =================================================================== --- trunk/themes/MonoBook/Opera7Fixes-min.css 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/Opera7Fixes-min.css 2011年01月13日 14:34:22 UTC (rev 7830) @@ -1 +0,0 @@ -#p-cactions{margin-top:.1em;}#p-cactions li a{top:2px;}#bodyContent a.external{background:url(external.png) center right no-repeat;padding-right:13px;} \ No newline at end of file Deleted: trunk/themes/MonoBook/Opera7Fixes.css =================================================================== --- trunk/themes/MonoBook/Opera7Fixes.css 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/Opera7Fixes.css 2011年01月13日 14:34:22 UTC (rev 7830) @@ -1,15 +0,0 @@ -/** - * $Id$ - */ - -/* small tweaks for opera seven */ -#p-cactions { - margin-top: 0.1em; -} -#p-cactions li a { - top: 2px; -} -#bodyContent a.external { - background: url(external.png) center right no-repeat; - padding-right: 13px; -} Modified: trunk/themes/MonoBook/rtl.css =================================================================== --- trunk/themes/MonoBook/rtl.css 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/rtl.css 2011年01月13日 14:34:22 UTC (rev 7830) @@ -11,9 +11,6 @@ Safari bugs (1.2.1): * Tabs are still appearing in left-to-right order. (Try after localizing) -Opera bugs (7.23 linux): -* Some bits of ltr text (sidebar box titles) have forward and backward versions overlapping each other - IE/mac bugs: * The thing barfs on Hebrew and Arabic anyway, so no point testing. @@ -24,11 +21,6 @@ Missing features due to lack of support: * external link icons, icon next to user name -To test: -* Opera6 -* IE 5.0 -* etc - */ body, body * { Modified: trunk/themes/MonoBook/wikibits-min.js =================================================================== --- trunk/themes/MonoBook/wikibits-min.js 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/wikibits-min.js 2011年01月13日 14:34:22 UTC (rev 7830) @@ -1 +1 @@ -var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_preseven=(window.opera&&!document.childNodes);var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){if(is_opera_preseven){document.write('<link rel="stylesheet" type="text/css" href="'+a+'Opera6Fixes.css">')}else{if(is_opera_seven){document.write('<link rel="stylesheet" type="text/css" href="'+a+'Opera7Fixes.css">')}else{if(is_khtml){document.write('<link rel="stylesheet" type="text/css" href="'+a+'KHTMLFixes.css">')}}}return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[0]&&inputs[1]){inputs[0].onclick=diffcheck;inputs[1].onclick=diffcheck}}diffcheck()}function diffcheck(){var b=false;var a=false;hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[1]&&inputs[0]){if(inputs[1].checked||inputs[0].checked){if(inputs[1].checked&&inputs[0].checked&&inputs[0].value==inputs[1].value){return false}if(a){if(inputs[1].checked){a.className="selected";return false}}else{if(inputs[0].checked){return false}}if(inputs[0].checked){b=lis[i]}if(!a){inputs[0].style.visibility="hidden"}if(b){inputs[1].style.visibility="hidden"}lis[i].className="selected";a=lis[i]}else{if(!a){inputs[0].style.visibility="hidden"}else{inputs[0].style.visibility="visible"}if(b){inputs[1].style.visibility="hidden"}else{inputs[1].style.visibility="visible"}lis[i].className=""}}}}function tabbedprefs(){prefform=document.getElementById("preferences");if(!prefform||!document.createElement){return}prefform.className=prefform.className+"jsprefs";var g=new Array();children=prefform.childNodes;var e=0;for(i=0;i<children.length;i++){if(children[i].nodeName.indexOf("FIELDSET")!=-1){children[i].id="prefsection-"+e;children[i].className="prefsection";if(is_opera||is_khtml){children[i].className="prefsection operaprefsection"}legends=children[i].getElementsByTagName("LEGEND");g[e]=new Object();if(legends[0]&&legends[0].firstChild.nodeValue){g[e].text=legends[0].firstChild.nodeValue}else{g[e].text="# "+e}g[e].secid=children[i].id;e++;if(g.length!=1){children[i].style.display="none"}else{var c=children[i].id}}}var f=document.createElement("UL");f.id="preftoc";f.selectedid=c;for(i=0;i<g.length;i++){var b=document.createElement("LI");if(i==0){b.className="selected"}var d=document.createElement("A");d.href="#"+g[i].secid;d.onclick=uncoversection;d.innerHTML=g[i].text;d.secid=g[i].secid;b.appendChild(d);f.appendChild(b)}prefform.insertBefore(f,children[0]);document.getElementById("prefsubmit").id="prefcontrol"}function uncoversection(){oldsecid=this.parentNode.parentNode.selectedid;newsec=document.getElementById(this.secid);if(oldsecid!=this.secid){ul=document.getElementById("preftoc");document.getElementById(oldsecid).style.display="none";newsec.style.display="block";ul.selectedid=this.secid;lis=ul.getElementsByTagName("LI");for(i=0;i<lis.length;i++){lis[i].className=""}this.parentNode.className="selected"}return false}function checkTimezone(h,f){var c=new Date();var g=c.getTimezoneOffset();var b=Math.floor(Math.abs(g)/60);var a=Math.abs(g)%60;var d=((g>=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("1ドル");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('<span class=\'toctoggle\'>[<a href="javascript:toggleToc()" class="internal"><span id="showlink" style="display:none;">'+a+'</span><span id="hidelink">'+b+"</span></a>]</span>")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('<a href="javascript:insertTags');document.write("('"+c+"','"+b+"','"+e+"');\">");document.write('<img width="23" height="22" src="'+f+'" border="0" ALT="'+a+'" TITLE="'+a+'"'+g+">");document.write("</a>");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("<form name='infoform' id='infoform'><input size=80 id='infobox' name='infobox' value=\""+d+'" READONLY></form>')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\1ドル","g");var f=new RegExp("\\2ドル","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}}; \ No newline at end of file +var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){if(is_khtml){document.write('<link rel="stylesheet" type="text/css" href="'+a+'KHTMLFixes.css">')}return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[0]&&inputs[1]){inputs[0].onclick=diffcheck;inputs[1].onclick=diffcheck}}diffcheck()}function diffcheck(){var b=false;var a=false;hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[1]&&inputs[0]){if(inputs[1].checked||inputs[0].checked){if(inputs[1].checked&&inputs[0].checked&&inputs[0].value==inputs[1].value){return false}if(a){if(inputs[1].checked){a.className="selected";return false}}else{if(inputs[0].checked){return false}}if(inputs[0].checked){b=lis[i]}if(!a){inputs[0].style.visibility="hidden"}if(b){inputs[1].style.visibility="hidden"}lis[i].className="selected";a=lis[i]}else{if(!a){inputs[0].style.visibility="hidden"}else{inputs[0].style.visibility="visible"}if(b){inputs[1].style.visibility="hidden"}else{inputs[1].style.visibility="visible"}lis[i].className=""}}}}function tabbedprefs(){prefform=document.getElementById("preferences");if(!prefform||!document.createElement){return}prefform.className=prefform.className+"jsprefs";var g=new Array();children=prefform.childNodes;var e=0;for(i=0;i<children.length;i++){if(children[i].nodeName.indexOf("FIELDSET")!=-1){children[i].id="prefsection-"+e;children[i].className="prefsection";if(is_opera||is_khtml){children[i].className="prefsection operaprefsection"}legends=children[i].getElementsByTagName("LEGEND");g[e]=new Object();if(legends[0]&&legends[0].firstChild.nodeValue){g[e].text=legends[0].firstChild.nodeValue}else{g[e].text="# "+e}g[e].secid=children[i].id;e++;if(g.length!=1){children[i].style.display="none"}else{var c=children[i].id}}}var f=document.createElement("UL");f.id="preftoc";f.selectedid=c;for(i=0;i<g.length;i++){var b=document.createElement("LI");if(i==0){b.className="selected"}var d=document.createElement("A");d.href="#"+g[i].secid;d.onclick=uncoversection;d.innerHTML=g[i].text;d.secid=g[i].secid;b.appendChild(d);f.appendChild(b)}prefform.insertBefore(f,children[0]);document.getElementById("prefsubmit").id="prefcontrol"}function uncoversection(){oldsecid=this.parentNode.parentNode.selectedid;newsec=document.getElementById(this.secid);if(oldsecid!=this.secid){ul=document.getElementById("preftoc");document.getElementById(oldsecid).style.display="none";newsec.style.display="block";ul.selectedid=this.secid;lis=ul.getElementsByTagName("LI");for(i=0;i<lis.length;i++){lis[i].className=""}this.parentNode.className="selected"}return false}function checkTimezone(h,f){var c=new Date();var g=c.getTimezoneOffset();var b=Math.floor(Math.abs(g)/60);var a=Math.abs(g)%60;var d=((g>=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("1ドル");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('<span class=\'toctoggle\'>[<a href="javascript:toggleToc()" class="internal"><span id="showlink" style="display:none;">'+a+'</span><span id="hidelink">'+b+"</span></a>]</span>")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('<a href="javascript:insertTags');document.write("('"+c+"','"+b+"','"+e+"');\">");document.write('<img width="23" height="22" src="'+f+'" border="0" ALT="'+a+'" TITLE="'+a+'"'+g+">");document.write("</a>");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("<form name='infoform' id='infoform'><input size=80 id='infobox' name='infobox' value=\""+d+'" READONLY></form>')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\1ドル","g");var f=new RegExp("\\2ドル","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}}; \ No newline at end of file Modified: trunk/themes/MonoBook/wikibits.js =================================================================== --- trunk/themes/MonoBook/wikibits.js 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/MonoBook/wikibits.js 2011年01月13日 14:34:22 UTC (rev 7830) @@ -10,7 +10,6 @@ var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled )); if (clientPC.indexOf('opera')!=-1) { var is_opera = true; - var is_opera_preseven = (window.opera && !document.childNodes); var is_opera_seven = (window.opera && document.childNodes); } @@ -28,11 +27,7 @@ // document.write special stylesheet links function addcss ( stylepath ) { - if (is_opera_preseven) { - document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'Opera6Fixes.css">'); - } else if (is_opera_seven) { - document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'Opera7Fixes.css">'); - } else if (is_khtml) { + if (is_khtml) { document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'KHTMLFixes.css">'); } return; Modified: trunk/themes/Sidebar/templates/htmldump.tmpl =================================================================== --- trunk/themes/Sidebar/templates/htmldump.tmpl 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/Sidebar/templates/htmldump.tmpl 2011年01月13日 14:34:22 UTC (rev 7830) @@ -11,13 +11,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" /> -<?php /** - * Additional navigation links are provided here in the html header for browsers - * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). - * - * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK - * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html - */ ?> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> Modified: trunk/themes/default/templates/head.tmpl =================================================================== --- trunk/themes/default/templates/head.tmpl 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/default/templates/head.tmpl 2011年01月13日 14:34:22 UTC (rev 7830) @@ -24,13 +24,6 @@ <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" /> <base href="<?php echo PHPWIKI_BASE_URL?>" /> <link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" /> -<?php /** - * Additional navigation links are provided here in the html header for browsers - * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). - * - * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK - * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html - */ ?> <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo Modified: trunk/themes/default/templates/htmldump.tmpl =================================================================== --- trunk/themes/default/templates/htmldump.tmpl 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/default/templates/htmldump.tmpl 2011年01月13日 14:34:22 UTC (rev 7830) @@ -10,13 +10,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" /> -<?php /** - * Additional navigation links are provided here in the html header for browsers - * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). - * - * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK - * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html - */ ?> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> Modified: trunk/themes/wikilens/templates/head.tmpl =================================================================== --- trunk/themes/wikilens/templates/head.tmpl 2011年01月13日 14:19:12 UTC (rev 7829) +++ trunk/themes/wikilens/templates/head.tmpl 2011年01月13日 14:34:22 UTC (rev 7830) @@ -18,13 +18,6 @@ <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" /> <base href="<?php echo PHPWIKI_BASE_URL?>" /> <link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" /> -<?php /** - * Additional navigation links are provided here in the html header for browsers - * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). - * - * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK - * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html - */ ?> <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7829 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7829&view=rev Author: vargenau Date: 2011年01月13日 14:19:12 +0000 (2011年1月13日) Log Message: ----------- Add list of supported browsers Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2011年01月13日 13:57:59 UTC (rev 7828) +++ trunk/README 2011年01月13日 14:19:12 UTC (rev 7829) @@ -5,6 +5,16 @@ See ./INSTALL for installation notes. Read ./UPGRADING before upgrading from a previous version of PhpWiki. +Supported browsers: + +Phpwiki should work with the following browsers: +* Firefox >= 2 +* Safari >= 5 +* Opera >= 8 +* Chrome >= 6 +* Konqueror >= 3.5 +* Internet Explorer >= 6 (so no Internet Explorer for Macintosh) + Additional docs: doc/: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7828 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7828&view=rev Author: vargenau Date: 2011年01月13日 13:57:59 +0000 (2011年1月13日) Log Message: ----------- Do not care about dead browsers Modified Paths: -------------- trunk/themes/default/templates/redirect.tmpl Modified: trunk/themes/default/templates/redirect.tmpl =================================================================== --- trunk/themes/default/templates/redirect.tmpl 2011年01月13日 13:55:52 UTC (rev 7827) +++ trunk/themes/default/templates/redirect.tmpl 2011年01月13日 13:57:59 UTC (rev 7828) @@ -1,10 +1,9 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* * Redirect output. */ -if (browserVersion() >= 4.0) - echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; +echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7827 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7827&view=rev Author: vargenau Date: 2011年01月13日 13:55:52 +0000 (2011年1月13日) Log Message: ----------- Do not care about dead browsers Modified Paths: -------------- trunk/themes/Sidebar/templates/html.tmpl trunk/themes/default/templates/html.tmpl Modified: trunk/themes/Sidebar/templates/html.tmpl =================================================================== --- trunk/themes/Sidebar/templates/html.tmpl 2011年01月11日 12:52:54 UTC (rev 7826) +++ trunk/themes/Sidebar/templates/html.tmpl 2011年01月13日 13:55:52 UTC (rev 7827) @@ -1,12 +1,9 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * This template is responsible mainly for the outer level <html> stuff. - * - * NS/MO/IE/Op Browsers before 4.0 don't like the xml pi. */ -if (browserVersion() >= 4.0) - echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; +echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html <?php /* xmlns="http://www.w3.org/1999/xhtml" */ ?> xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> Modified: trunk/themes/default/templates/html.tmpl =================================================================== --- trunk/themes/default/templates/html.tmpl 2011年01月11日 12:52:54 UTC (rev 7826) +++ trunk/themes/default/templates/html.tmpl 2011年01月13日 13:55:52 UTC (rev 7827) @@ -1,12 +1,9 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$' /* * This template is responsible mainly for the outer level <html> stuff. - * - * NS/MO/IE/Op Browsers before 4.0 don't like that. */ -if (browserVersion() >= 4.0) - echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; +echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7826 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7826&view=rev Author: vargenau Date: 2011年01月11日 12:52:54 +0000 (2011年1月11日) Log Message: ----------- New help page: Help%2FAdobe%20Flash Modified Paths: -------------- trunk/pgsrc/Help%2FImages trunk/pgsrc/Help%2FVideoPlugin Added Paths: ----------- trunk/pgsrc/Help%2FAdobe%20Flash Added: trunk/pgsrc/Help%2FAdobe%20Flash =================================================================== --- trunk/pgsrc/Help%2FAdobe%20Flash (rev 0) +++ trunk/pgsrc/Help%2FAdobe%20Flash 2011年01月11日 12:52:54 UTC (rev 7826) @@ -0,0 +1,78 @@ +Date: 2011年1月11日 13:48:05 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) +X-Rcs-Id: $Id$ +Content-Type: application/x-phpwiki; + pagename=Help%2FAdobe%20Flash; + flags=PAGE_LOCKED%2CEXTERNAL_PAGE; + markup=2; + charset=UTF-8 +Content-Transfer-Encoding: binary + +You can easily insert **Adobe Flash** (.swf) files in the wiki. + +== Uploading Flash files == + +First, Flash files need to be uploaded in the wiki. For that purpose, you will use the +[[Help:UpLoadPlugin|UpLoad]] plugin. + +=== Syntax === + +You give access to the uploaded Flash files with the following syntax. + +{{{ +{{myflash.swf}} +}}} +or +{{{ +[[Upload:myflash.swf]] +}}} +will inline the image. + +=== Options === + +Using the {{{Upload:}}} syntax, options are allowed to change the appearance: +{{{ +[[Upload:myflash.png size=40x25 align=center]] +}}} + +Separate options by spaces. The allowed options are the following: +* size: ''width "x" height'' or ''num + "%"'' +* align: ''string'' +* border: ''number'' +* hspace: ''number'' +* vspace: ''number'' + +== Examples == + +=== Wikicréole syntax === + +{{{ +{{ora.swf}} +}}} + +{{/themes/Sidebar/ora.swf}} + +=== Upload syntax === + +{{{ +[[Upload:ora.swf]] +[[Upload:ora.swf size=50x50]] +}}} + +=== URL syntax === + +{{{ +[[http://www.qasia.com/games/mahjong.swf]] +}}} + +[[http://www.qasia.com/games/mahjong.swf]] + +== See Also == +* [[Help:Images]] +* [[Help:VideoPlugin]] +* [[Help:Wikicreole]] + +<noinclude> +---- +[[PhpWikiDocumentation]] +</noinclude> Property changes on: trunk/pgsrc/Help%2FAdobe%20Flash ___________________________________________________________________ Added: svn:keywords + Id Modified: trunk/pgsrc/Help%2FImages =================================================================== --- trunk/pgsrc/Help%2FImages 2011年01月07日 16:35:43 UTC (rev 7825) +++ trunk/pgsrc/Help%2FImages 2011年01月11日 12:52:54 UTC (rev 7826) @@ -1,4 +1,4 @@ -Date: 2010年12月16日 12:19:19 +0000 +Date: 2011年1月11日 13:48:05 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -100,6 +100,11 @@ [[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/poweredby_phpwiki_51x31.png]] +== See Also == +* [[Help:Adobe Flash]] +* [[Help:VideoPlugin]] +* [[Help:Wikicreole]] + <noinclude> ---- [[PhpWikiDocumentation]] Modified: trunk/pgsrc/Help%2FVideoPlugin =================================================================== --- trunk/pgsrc/Help%2FVideoPlugin 2011年01月07日 16:35:43 UTC (rev 7825) +++ trunk/pgsrc/Help%2FVideoPlugin 2011年01月11日 12:52:54 UTC (rev 7826) @@ -1,4 +1,4 @@ -Date: 2010年9月10日 13:46:13 +0000 +Date: 2011年1月11日 13:48:05 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -66,6 +66,11 @@ * Roger Guignard, Alcatel-Lucent * Marc-Etienne Vargenau, Alcatel-Lucent +== See Also == +* [[Help:Images]] +* [[Help:Adobe Flash]] +* [[Help:Wikicreole]] + <noinclude> ---- [[PhpWikiDocumentation]] [[CategoryWikiPlugin]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7825 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7825&view=rev Author: vargenau Date: 2011年01月07日 16:35:43 +0000 (2011年1月07日) Log Message: ----------- Add size and mode arguments Modified Paths: -------------- trunk/pgsrc/Help%2FUpLoadPlugin Modified: trunk/pgsrc/Help%2FUpLoadPlugin =================================================================== --- trunk/pgsrc/Help%2FUpLoadPlugin 2011年01月07日 13:39:30 UTC (rev 7824) +++ trunk/pgsrc/Help%2FUpLoadPlugin 2011年01月07日 16:35:43 UTC (rev 7825) @@ -1,4 +1,4 @@ -Date: Thu, 9 Dec 2010 14:51:45 +0000 +Date: Fri, 7 Jan 2011 17:32:57 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -9,12 +9,10 @@ Content-Transfer-Encoding: binary The **~UpLoad** [[Help:WikiPlugin|plugin]] displays an editbox and two buttons. -The first button let's you choose the file to be uploaded at your local filesystem. -The textvalue of this button is localised from your browser. -The second "Upload" button actually uploads the given filename to the upload directory. +* The first button lets you choose the file to be uploaded at your local filesystem. The textvalue of this button is localised from your browser. +* The second "Upload" button actually uploads the given filename to the upload directory. This directory is not browsable, any file there may be accessed by using the "Upload~:" [[InterWikiMap]] prefix to the given filename. This way you can easily inline uploaded images. -See [[PhpWiki:InlineUploadedImages]]. == Usage == @@ -41,6 +39,14 @@ | **page** | The page where the uploaded files are publicly listed, if autolink is true. | Current page +|- +| **size** +| Size of file input box. +| 50 +|- +| **mode** +| 'actionpage' or 'edit' +| actionpage |} == Notes == @@ -58,6 +64,10 @@ <<UpLoad>> +== See Also == + +* [[PhpWiki:InlineUploadedImages]] + <noinclude> ---- [[PhpWikiDocumentation]] [[CategoryWikiPlugin]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.