phpwiki-checkins Mailing List for PhpWiki

Revision: 7709
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7709&view=rev
Author: vargenau
Date: 2010年09月30日 15:48:54 +0000 (2010年9月30日)
Log Message:
-----------
Fixed: Some constructs might incorrectly be recognized as a header (e.g. lines starting with "!!!" or "==" inside <verbatim>)
Modified Paths:
--------------
 trunk/lib/plugin/CreateToc.php
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2010年09月22日 18:19:06 UTC (rev 7708)
+++ trunk/lib/plugin/CreateToc.php	2010年09月30日 15:48:54 UTC (rev 7709)
@@ -34,8 +34,6 @@
 * - Certain corner-edges will not work with TOC_FULL_SYNTAX.
 * I believe I fixed all of them now, but who knows?
 * - bug #969495 "existing labels not honored" seems to be fixed.
- * - some constructs might incorrectly be recognized as a header
- * (e.g. lines starting with "!!!" or "==" inside <verbatim>)
 */
 
 if (!defined('TOC_FULL_SYNTAX'))
@@ -241,8 +239,6 @@
 // - Wikicreole syntax (lines starting with "==", "===", etc.)
 // We must omit lines starting with "!" if inside a Mediawiki table
 // (they represent a table header)
- // Some constructs might incorrectly be recognized as a header
- // (e.g. lines starting with "!!!" or "==" inside <verbatim>)
 // Feature request: proper nesting; multiple levels (e.g. 1,3)
 function extractHeaders (&$content, &$markup, $backlink=0,
 $counter=0, $levels=false, $firstlevelstyle='number', $basepage='')
@@ -254,16 +250,26 @@
 $headers = array();
 $j = 0;
 $insidetable = false;
+ $insideverbatim = false;
 for ($i=0; $i<count($content); $i++) {
 if (preg_match('/^\s*{\|/', $content[$i])) {
 $insidetable = true;
 continue;
- }
- if (preg_match('/^\s*\|}/', $content[$i])) {
+ } else if (preg_match('/^\s*{{{/', $content[$i]) 
+ || preg_match('/^\s*<pre>/', $content[$i]) 
+ || preg_match('/^\s*<verbatim>/', $content[$i])) {
+ $insideverbatim = true;
+ continue;
+ } else if (preg_match('/^\s*\|}/', $content[$i])) {
 $insidetable = false;
 continue;
+ } else if (preg_match('/^\s*}}}/', $content[$i]) 
+ || preg_match('/^\s*<\/pre>/', $content[$i]) 
+ || preg_match('/^\s*<\/verbatim>/', $content[$i])) {
+ $insideverbatim = false;
+ continue;
 }
- if ($insidetable) {
+ if (($insidetable) || ($insideverbatim)) {
 continue;
 }
 foreach ($levels as $level) {
@@ -311,11 +317,11 @@
 if (($hstart === 0) && is_string($markup->_content[$j])) {
 if ($backlink) {
 if ($counter)
- $anchorString = "<a href=\"$url\" name=\"$manchor\">$counterString</a> - \2ドル";
+ $anchorString = "<a href=\"$url\" id=\"$manchor\">$counterString</a> - \2ドル";
 else
- $anchorString = "<a href=\"$url\" name=\"$manchor\">\2ドル</a>";
+ $anchorString = "<a href=\"$url\" id=\"$manchor\">\2ドル</a>";
 } else {
- $anchorString = "<a name=\"$manchor\"></a>";
+ $anchorString = "<a id=\"$manchor\"></a>";
 if ($counter)
 $anchorString .= "$counterString - ";
 }
@@ -334,15 +340,15 @@
 
 if ($backlink) {
 if ($counter) {
- $anchorString = "\1ドル<a href=\"$url\" name=\"$manchor\">$counterString</a> - ";
+ $anchorString = "\1ドル<a href=\"$url\" id=\"$manchor\">$counterString</a> - ";
 } else {
 /* Not possible to make a backlink on a
 * title with a WikiWord */
- $anchorString = "\1ドル<a name=\"$manchor\"></a>";
+ $anchorString = "\1ドル<a id=\"$manchor\"></a>";
 }
 }
 else {
- $anchorString = "\1ドル<a name=\"$manchor\"></a>";
+ $anchorString = "\1ドル<a id=\"$manchor\"></a>";
 if ($counter)
 $anchorString .= "$counterString - ";
 }
@@ -404,9 +410,10 @@
 $r = $page->getCurrentRevision();
 }
 
+ $current = $page->getCurrentRevision();
 //FIXME: I suspect this only to crash with Apache2
- if (!$r->get('markup') or $r->get('markup') < 2) {
- if (in_array(php_sapi_name(), array('apache2handler','apache2filter'))) {
+ if (!$current->get('markup') or $current->get('markup') < 2) {
+ if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
 return $this->error(_("CreateToc disabled for old markup."));
 }
 }
@@ -466,7 +473,7 @@
 if ($extracollapse)
 $toclink = HTML(_("Table of Contents"),
 " ",
- HTML::a(array('name'=>'TOC')),
+ HTML::a(array('id'=>'TOC')),
 HTML::img(array(
 'id'=>$toctoggleid,
 'class'=>'wikiaction',
@@ -475,7 +482,7 @@
 'alt' => 'toctoggle',
 'src' => $jshide ? $close : $open )));
 else
- $toclink = HTML::a(array('name'=>'TOC',
+ $toclink = HTML::a(array('id'=>'TOC',
 'class'=>'wikiaction',
 'title'=>_("Click to display"),
 'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7708
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7708&view=rev
Author: vargenau
Date: 2010年09月22日 18:19:06 +0000 (2010年9月22日)
Log Message:
-----------
Update from Fusionforge
Modified Paths:
--------------
 trunk/g
 trunk/wikiadmin.php
Modified: trunk/g
===================================================================
--- trunk/g	2010年09月22日 14:57:42 UTC (rev 7707)
+++ trunk/g	2010年09月22日 18:19:06 UTC (rev 7708)
@@ -52,9 +52,9 @@
 require_once $gfplugins.'wiki/common/wikiconfig.class.php';
 
 if (!$group_id || !$project) {
- exit_no_group();
+ exit_no_group();
 } else if (!($project->usesPlugin("wiki"))) {
- exit_error("Wiki plugin not activated in project", $project->getPublicName());
+ exit_disabled('home');
 } else {
 
 $group_name = $project->getUnixName();
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2010年09月22日 14:57:42 UTC (rev 7707)
+++ trunk/wikiadmin.php	2010年09月22日 18:19:06 UTC (rev 7708)
@@ -60,8 +60,12 @@
 
 $user = session_get_user(); // get the session user
 
-if (!$user || !is_object($user) || $user->isError() || !$user->isActive()) {
- exit_error("Invalid User", "Cannot Process your request for this user.");
+if (!$user || !is_object($user)) {
+ exit_error(_('Invalid User'),'home');
+} else if ( $user->isError()) {
+	exit_error($user->getErrorMessage(),'home');
+} else if ( !$user->isActive()) {
+	exit_error(_('User not active'),'home');
 }
 
 $type = getStringFromRequest('type');
@@ -70,21 +74,21 @@
 $config = getArrayFromRequest('config');
 
 if (!$type) {
- exit_error("Cannot Process your request","No TYPE specified");
+ exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No TYPE specified')),'home');
 } elseif (!$id) {
- exit_error("Cannot Process your request","No ID specified");
+ exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No ID specified')),'home');
 } else {
 if ($type == 'admin_post') {
 $group = group_get_object($id);
 if ( !$group) {
- exit_error(_('Invalid Project'), _('Inexistent Project'));
+			exit_no_group();
 }
 if (!($group->usesPlugin($pluginname))) { //check if the group has the wiki plugin active
- exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
+			exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
 }
 $userperm = $group->getPermission($user); //we'll check if the user belongs to the group
 if ( !$userperm->IsMember()) {
- exit_error(_('Access Denied'), _('You are not a member of this project'));
+			exit_permission_denied(_('You are not a member of this project'),'home');
 }
 //only project admin can access here
 if ( $userperm->isAdmin() ) {
@@ -105,20 +109,20 @@
 $type = 'admin';
 $feedback = _('Configuration saved.');
 } else {
- exit_error(_('Access Denied'), _('You are not a project Admin'));
+ exit_permission_denied(_('You are not a project Admin'),'home');
 }
 }
 if ($type == 'admin') {
 $group = group_get_object($id);
 if ( !$group) {
- exit_error(_('Invalid Project'), _('Inexistent Project'));
+			exit_no_group();
 }
 if ( ! ($group->usesPlugin ($pluginname)) ) {//check if the group has the plugin active
- exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
+			exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
 }
 $userperm = $group->getPermission($user); //we'll check if the user belongs to the group
 if ( !$userperm->IsMember()) {
- exit_error(_('Access Denied'), _('You are not a member of this project'));
+ exit_permission_denied(_('You are not a member of this project'),'home');
 }
 //only project admin can access here
 if ( $userperm->isAdmin() ) {
@@ -166,7 +170,7 @@
 print "</tr>\n";
 print "</table>\n";
 } else {
- exit_error(_('Access Denied'), _('You are not a project Admin'));
+ exit_permission_denied(_('You are not a project Admin'),'home');
 }
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7707
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7707&view=rev
Author: vargenau
Date: 2010年09月22日 14:57:42 +0000 (2010年9月22日)
Log Message:
-----------
Wiki page title in bold
Modified Paths:
--------------
 trunk/themes/fusionforge/fusionforge-min.css
 trunk/themes/fusionforge/fusionforge.css
Modified: trunk/themes/fusionforge/fusionforge-min.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-min.css	2010年09月22日 14:39:24 UTC (rev 7706)
+++ trunk/themes/fusionforge/fusionforge-min.css	2010年09月22日 14:57:42 UTC (rev 7707)
@@ -1 +1 @@
-li p{margin:0;}div.br{display:none;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background:white;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.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;}h1 .backlinks{text-decoration:none;color:inherit;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;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:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#navbuttons,#actionbuttons{white-space:nowrap;}#navbuttons .named-wiki,#actionbuttons .named-wiki,#navbuttons .wikiaction,#actionbuttons .wikiaction,#navbuttons .wikiadmin,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#navbuttons .named-wiki:hover,#actionbuttons .named-wiki:hover,#navbuttons .wikiaction:hover,#actionbuttons .wikiaction:hover,#navbuttons .wikiadmin:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.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;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}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;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;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:1px black solid;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.errors{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}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;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;background:white;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}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;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}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;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;}
\ No newline at end of file
+li p{margin:0;}div.br{display:none;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background:white;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.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;}h1 .backlinks{text-decoration:none;color:inherit;}h1{font-weight:bold;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;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:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#navbuttons,#actionbuttons{white-space:nowrap;}#navbuttons .named-wiki,#actionbuttons .named-wiki,#navbuttons .wikiaction,#actionbuttons .wikiaction,#navbuttons .wikiadmin,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#navbuttons .named-wiki:hover,#actionbuttons .named-wiki:hover,#navbuttons .wikiaction:hover,#actionbuttons .wikiaction:hover,#navbuttons .wikiadmin:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.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;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}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;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;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:1px black solid;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.errors{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}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;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;background:white;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}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;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}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;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;}
\ No newline at end of file
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2010年09月22日 14:39:24 UTC (rev 7706)
+++ trunk/themes/fusionforge/fusionforge.css	2010年09月22日 14:57:42 UTC (rev 7707)
@@ -230,6 +230,8 @@
 }
 h1 .backlinks { text-decoration: none; color: inherit; }
 
+h1 { font-weight: bold; }
+
 /* Interwiki links */
 .wikipage { font-weight: normal; }
 .interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7706
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7706&view=rev
Author: vargenau
Date: 2010年09月22日 14:39:24 +0000 (2010年9月22日)
Log Message:
-----------
Better handle nonexistent revisions
Modified Paths:
--------------
 trunk/themes/fusionforge/templates/actionbar.tmpl
 trunk/themes/fusionforge/templates/browse.tmpl
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2010年09月21日 07:45:12 UTC (rev 7705)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2010年09月22日 14:39:24 UTC (rev 7706)
@@ -50,8 +50,16 @@
 <td class="spacer">&nbsp;</td>
 <td class="spacer">&nbsp;</td>
 
- <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName())) and $revision) { ?>
- <td class="bold"><?php echo Button("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page")) ?></td>
+ <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName()))) { ?>
+ <td class="bold">
+ <?php if (! $dbh->isWikiPage($page->getName())) { ?>
+ <?php echo Button("edit", _("Create Page")) ?>
+ <?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?>
+ <?php echo Button("edit", _("Edit")) ?>
+ <?php } else { ?>
+ <?php echo Button("edit", _("Edit Old Revision")) ?>
+ <?php } ?>
+ </td>
 <?php } else if ($dbh->isWikiPage($page->getName())) { ?>
 <td><?php echo Button("viewsource", _("View Source")) ?></td>
 <?php } ?>
Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl	2010年09月21日 07:45:12 UTC (rev 7705)
+++ trunk/themes/fusionforge/templates/browse.tmpl	2010年09月22日 14:39:24 UTC (rev 7706)
@@ -5,10 +5,16 @@
 $curuserprefs = $user->getPreferences();
 ?>
 
+<?php if ($page->exists() and $revision and $revision->hasDefaultContents()) { ?>
+ <p class="error"><strong><?php echo _("Error:")?></strong>
+ <?php echo _("This revision of the page does not exist.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
+ </p>
+<?php } else { ?>
 <?php if ($revision and !$revision->isCurrent()) { ?>
 <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version"), $page)?>.
+ <?php echo _("You are viewing an old revision of this page.")?>
+ <?php echo Button('browse', _("View the current version."), $page)?>
 </p>
 <?php } ?>
 <?php if (!empty($redirected)) { ?>
@@ -31,6 +37,8 @@
 
 <?php echo $CONTENT?>
 
+<?php } ?>
+
 <div id="footer"><?php // for top & bottom toolbars stylesheet ?>
 <?php echo Template('browse-footer')?>
 </div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7705
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7705&view=rev
Author: vargenau
Date: 2010年09月21日 07:45:12 +0000 (2010年9月21日)
Log Message:
-----------
If you display an old revision of a page, the Table of Contents will not be correct. The Table of Contents will be taken from the last saved revision: fixed
Modified Paths:
--------------
 trunk/pgsrc/Help%2FCreateTocPlugin
Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2010年09月21日 07:08:56 UTC (rev 7704)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2010年09月21日 07:45:12 UTC (rev 7705)
@@ -1,4 +1,4 @@
-Date: 2010年9月20日 18:07:40 +0000
+Date: 2010年9月21日 09:44:16 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -144,7 +144,6 @@
 ** an image,
 ** or a ~~.
 * If you preview the page, the Table of Contents will not be correct if you modified headers. The Table of Contents will be taken from the last saved revision.
-* If you display an old revision of a page, the Table of Contents will not be correct. The Table of Contents will be taken from the last saved revision.
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7704
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7704&view=rev
Author: rurban
Date: 2010年09月21日 07:08:56 +0000 (2010年9月21日)
Log Message:
-----------
revert 7551-7553. we use named anchors to jump to, not internal ids
Modified Paths:
--------------
 trunk/lib/plugin/CreateToc.php
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2010年09月21日 06:28:07 UTC (rev 7703)
+++ trunk/lib/plugin/CreateToc.php	2010年09月21日 07:08:56 UTC (rev 7704)
@@ -311,11 +311,11 @@
 if (($hstart === 0) && is_string($markup->_content[$j])) {
 if ($backlink) {
 if ($counter)
- $anchorString = "<a href=\"$url\" id=\"$manchor\">$counterString</a> - \2ドル";
+ $anchorString = "<a href=\"$url\" name=\"$manchor\">$counterString</a> - \2ドル";
 else
- $anchorString = "<a href=\"$url\" id=\"$manchor\">\2ドル</a>";
+ $anchorString = "<a href=\"$url\" name=\"$manchor\">\2ドル</a>";
 } else {
- $anchorString = "<a id=\"$manchor\"></a>";
+ $anchorString = "<a name=\"$manchor\"></a>";
 if ($counter)
 $anchorString .= "$counterString - ";
 }
@@ -334,15 +334,15 @@
 
 if ($backlink) {
 if ($counter) {
- $anchorString = "\1ドル<a href=\"$url\" id=\"$manchor\">$counterString</a> - ";
+ $anchorString = "\1ドル<a href=\"$url\" name=\"$manchor\">$counterString</a> - ";
 } else {
 /* Not possible to make a backlink on a
 * title with a WikiWord */
- $anchorString = "\1ドル<a id=\"$manchor\"></a>";
+ $anchorString = "\1ドル<a name=\"$manchor\"></a>";
 }
 }
 else {
- $anchorString = "\1ドル<a id=\"$manchor\"></a>";
+ $anchorString = "\1ドル<a name=\"$manchor\"></a>";
 if ($counter)
 $anchorString .= "$counterString - ";
 }
@@ -404,10 +404,9 @@
 $r = $page->getCurrentRevision();
 }
 
- $current = $page->getCurrentRevision();
 //FIXME: I suspect this only to crash with Apache2
- if (!$current->get('markup') or $current->get('markup') < 2) {
- if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
+ if (!$r->get('markup') or $r->get('markup') < 2) {
+ if (in_array(php_sapi_name(), array('apache2handler','apache2filter'))) {
 return $this->error(_("CreateToc disabled for old markup."));
 }
 }
@@ -467,7 +466,7 @@
 if ($extracollapse)
 $toclink = HTML(_("Table of Contents"),
 " ",
- HTML::a(array('id'=>'TOC')),
+ HTML::a(array('name'=>'TOC')),
 HTML::img(array(
 'id'=>$toctoggleid,
 'class'=>'wikiaction',
@@ -476,7 +475,7 @@
 'alt' => 'toctoggle',
 'src' => $jshide ? $close : $open )));
 else
- $toclink = HTML::a(array('id'=>'TOC',
+ $toclink = HTML::a(array('name'=>'TOC',
 'class'=>'wikiaction',
 'title'=>_("Click to display"),
 'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7703
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7703&view=rev
Author: rurban
Date: 2010年09月21日 06:28:07 +0000 (2010年9月21日)
Log Message:
-----------
revert r7639. This external source is written in tab-width 4 (windows) even if there are currently no tabs anymore. The vim settings are also in tab-width 4
Modified Paths:
--------------
 trunk/lib/pear/DB/common.php
 trunk/lib/pear/DB/dbase.php
 trunk/lib/pear/DB/fbsql.php
 trunk/lib/pear/DB/ibase.php
 trunk/lib/pear/DB/ifx.php
 trunk/lib/pear/DB/ldap.php
 trunk/lib/pear/DB/msql.php
 trunk/lib/pear/DB/mssql.php
 trunk/lib/pear/DB/mysql.php
 trunk/lib/pear/DB/mysqli.php
 trunk/lib/pear/DB/oci8.php
 trunk/lib/pear/DB/odbc.php
 trunk/lib/pear/DB/pgsql.php
 trunk/lib/pear/DB/sqlite.php
 trunk/lib/pear/DB/storage.php
 trunk/lib/pear/DB/sybase.php
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/common.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -2019,7 +2019,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/dbase.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -212,7 +212,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/fbsql.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -647,7 +647,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/ibase.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -776,7 +776,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/ifx.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -571,7 +571,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/ldap.php
===================================================================
--- trunk/lib/pear/DB/ldap.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/ldap.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -909,7 +909,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/msql.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -234,7 +234,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/mssql.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -730,7 +730,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/mysql.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -907,7 +907,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/mysqli.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -883,7 +883,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/oci8.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -881,7 +881,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/odbc.php
===================================================================
--- trunk/lib/pear/DB/odbc.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/odbc.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -569,7 +569,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/pgsql.php
===================================================================
--- trunk/lib/pear/DB/pgsql.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/pgsql.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -843,7 +843,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/sqlite.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -687,7 +687,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/storage.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -487,7 +487,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php	2010年09月21日 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/sybase.php	2010年09月21日 06:28:07 UTC (rev 7703)
@@ -829,7 +829,7 @@
 
 /*
 * Local variables:
- * tab-width: 8
+ * tab-width: 4
 * c-basic-offset: 4
 * End:
 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7702
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7702&view=rev
Author: rurban
Date: 2010年09月21日 06:08:32 +0000 (2010年9月21日)
Log Message:
-----------
new may return an empty object. we must check for _userid to avoid recursion cycles
Modified Paths:
--------------
 trunk/lib/WikiUserNew.php
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2010年09月20日 16:09:07 UTC (rev 7701)
+++ trunk/lib/WikiUserNew.php	2010年09月21日 06:08:32 UTC (rev 7702)
@@ -222,7 +222,8 @@
 	 	 $class = $_PassUser->nextClass();
 	 	else
 		 $class = get_class($_PassUser);
- 		if ($user = new $class($UserName, $_PassUser->_prefs)) {
+ 		if ($user = new $class($UserName, $_PassUser->_prefs)
+ 		 and $user->_userid) {
 	 return $user;
 	} else {
 	 return $_PassUser;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7701
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7701&view=rev
Author: vargenau
Date: 2010年09月20日 16:09:07 +0000 (2010年9月20日)
Log Message:
-----------
Display correct TOC in history
Modified Paths:
--------------
 trunk/lib/plugin/CreateToc.php
 trunk/pgsrc/Help%2FCreateTocPlugin
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2010年09月20日 16:03:26 UTC (rev 7700)
+++ trunk/lib/plugin/CreateToc.php	2010年09月20日 16:09:07 UTC (rev 7701)
@@ -67,6 +67,7 @@
 'width' => '200px',
 'with_counter' => 0,
 'with_toclink' => 0, // link back to TOC
+ 'version' => false,
 );
 }
 // Initialisation of toc counter
@@ -168,13 +169,13 @@
 $level, &$hstart, &$hend, $basepage=false) {
 $hstart = 0;
 $hend = 0;
- $h = $this->_getHeader($level);
+ $h = $this->_getHeader($level);
 $qheading = $this->_quote($heading);
- for ($j=$start_index; $j < count($content); $j++) {
+ for ($j=$start_index; $j < count($content); $j++) {
 if (is_string($content[$j])) {
- if (preg_match("/<$h>$qheading<\/$h>/",
+ if (preg_match("/<$h>$qheading<\/$h>/",
 $content[$j]))
- return $j;
+ return $j;
 }
 elseif (isa($content[$j], 'cached_link'))
 {
@@ -213,10 +214,10 @@
 }
 }
 }
- }
 }
- trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
- return 0;
+ }
+ trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
+ return 0;
 }
 
 /** prevent from duplicate anchors,
@@ -371,7 +372,7 @@
 $pagename = $page->name;
 }
 if (!$pagename) {
- return $this->error(_("no page specified"));
+ return $this->error(_("No page specified."));
 }
 if (isBrowserIE() and browserDetect("Mac")) {
 $jshide = 0;
@@ -380,22 +381,39 @@
 $with_counter = 1;
 }
 
- // Check if user is allowed to get the Page.
+ // Check if page exists.
+ if (!($dbi->isWikiPage($pagename))) {
+ return $this->error(sprintf(_("Page '%s' does not exist."), $pagename));
+ }
+
+ // Check if user is allowed to get the page.
 if (!mayAccessPage ('view', $pagename)) {
 return $this->error(sprintf(_("Illegal access to page %s: no read access"),
 $pagename));
 }
 
 $page = $dbi->getPage($pagename);
+
+ if ($version) {
+ $r = $page->getRevision($version);
+ if ((!$r) || ($r->hasDefaultContents())) {
+ return $this->error(sprintf(_("%s: no such revision %d."),
+ $pagename, $version));
+ }
+ } else {
+ $r = $page->getCurrentRevision();
+ }
+
 $current = $page->getCurrentRevision();
 //FIXME: I suspect this only to crash with Apache2
 if (!$current->get('markup') or $current->get('markup') < 2) {
 if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
- trigger_error(_("CreateToc disabled for old markup"), E_USER_WARNING);
- return '';
+ return $this->error(_("CreateToc disabled for old markup."));
 }
 }
- $content = $current->getContent();
+
+ $content = $r->getContent();
+
 $html = HTML::div(array('class' => 'toc', 'id'=> GenerateId("toc")));
 if ($notoc) {
 $html->setAttr('style','display:none;');
Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2010年09月20日 16:03:26 UTC (rev 7700)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2010年09月20日 16:09:07 UTC (rev 7701)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2010年9月20日 18:07:40 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -63,6 +63,10 @@
 | Table of Contents of which page?
 | current pagename
 |-
+| **version**
+| page version
+| most recent version
+|-
 | **position**
 | Where to display the Table of Contents: full, left or right.
 | full
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7700
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7700&view=rev
Author: vargenau
Date: 2010年09月20日 16:03:26 +0000 (2010年9月20日)
Log Message:
-----------
Better test that a given revision exists
Modified Paths:
--------------
 trunk/lib/plugin/IncludePage.php
 trunk/lib/plugin/PageGroup.php
 trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2010年09月20日 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/IncludePage.php	2010年09月20日 16:03:26 UTC (rev 7700)
@@ -107,8 +107,8 @@
 $p = $dbi->getPage($page);
 if ($rev) {
 $r = $p->getRevision($rev);
- if (!$r) {
- return $this->error(sprintf(_("%s(%d): no such revision"),
+ if ((!$r) || ($r->hasDefaultContents())) {
+ return $this->error(sprintf(_("%s: no such revision %d."),
 $page, $rev));
 }
 } else {
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2010年09月20日 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/PageGroup.php	2010年09月20日 16:03:26 UTC (rev 7700)
@@ -120,10 +120,9 @@
 $p = $dbi->getPage($parent);
 if ($rev) {
 $r = $p->getRevision($rev);
- if (!$r) {
- $this->error(sprintf(_("%s(%d): no such revision"), $parent,
- $rev));
- return '';
+ if ((!$r) || ($r->hasDefaultContents())) {
+ return $this->error(sprintf(_("%s: no such revision %d."),
+ $parent, $rev));
 }
 } else {
 $r = $p->getCurrentRevision();
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2010年09月20日 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/Template.php	2010年09月20日 16:03:26 UTC (rev 7700)
@@ -145,8 +145,8 @@
 $p = $dbi->getPage($page);
 if ($args['rev']) {
 $r = $p->getRevision($args['rev']);
- if (!$r) {
- return $this->error(sprintf(_("%s(%d): no such revision."),
+ if ((!$r) || ($r->hasDefaultContents())) {
+ return $this->error(sprintf(_("%s: no such revision %d."),
 $page, $args['rev']));
 }
 } else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7699
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7699&view=rev
Author: vargenau
Date: 2010年09月20日 14:45:28 +0000 (2010年9月20日)
Log Message:
-----------
Add "version" as synonym of "rev"
Modified Paths:
--------------
 trunk/lib/plugin/IncludePage.php
 trunk/pgsrc/Help%2FIncludePagePlugin
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2010年09月20日 13:28:46 UTC (rev 7698)
+++ trunk/lib/plugin/IncludePage.php	2010年09月20日 14:45:28 UTC (rev 7699)
@@ -41,6 +41,7 @@
 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
@@ -68,6 +69,13 @@
 function run($dbi, $argstr, &$request, $basepage) {
 $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/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2010年09月20日 13:28:46 UTC (rev 7698)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2010年09月20日 14:45:28 UTC (rev 7699)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2010年9月20日 16:44:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -31,8 +31,12 @@
 |-
 | **rev**
 | the revision
-| defaults to most recent
+| most recent revision
 |-
+| **version**
+| page revision (same as ##rev##)
+| most recent revision
+|-
 | **quiet**
 | if set, inclusion appears as normal content
 | false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7698
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7698&view=rev
Author: vargenau
Date: 2010年09月20日 13:28:46 +0000 (2010年9月20日)
Log Message:
-----------
Add "version" as synonym of "rev"
Modified Paths:
--------------
 trunk/lib/plugin/Template.php
 trunk/pgsrc/Help%2FTemplatePlugin
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2010年09月20日 13:04:55 UTC (rev 7697)
+++ trunk/lib/plugin/Template.php	2010年09月20日 13:28:46 UTC (rev 7698)
@@ -70,6 +70,7 @@
 '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
 );
@@ -94,17 +95,24 @@
 }
 
 function run($dbi, $argstr, &$request, $basepage) {
- $this->vars = array();
+ $this->vars = array();
 $args = $this->getArgs($argstr, $request);
 $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);
 $page = $page->name;
 }
 if (!$page) {
- return $this->error(_("no page specified"));
+ return $this->error(_("No page specified."));
 }
 
 // If "Template:$page" exists, use it
@@ -125,12 +133,12 @@
 
 // Check if page exists
 if (!($dbi->isWikiPage($page))) {
- return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+ return $this->error(sprintf(_("Page '%s' does not exist."), $page));
 }
 
 // Check if user is allowed to get the Page.
 if (!mayAccessPage ('view', $page)) {
- return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+ return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
 $page));
 }
 
@@ -138,7 +146,7 @@
 if ($args['rev']) {
 $r = $p->getRevision($args['rev']);
 if (!$r) {
- return $this->error(sprintf(_("%s(%d): no such revision"),
+ return $this->error(sprintf(_("%s(%d): no such revision."),
 $page, $args['rev']));
 }
 } else {
Modified: trunk/pgsrc/Help%2FTemplatePlugin
===================================================================
--- trunk/pgsrc/Help%2FTemplatePlugin	2010年09月20日 13:04:55 UTC (rev 7697)
+++ trunk/pgsrc/Help%2FTemplatePlugin	2010年09月20日 13:28:46 UTC (rev 7698)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2010年9月20日 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -73,6 +73,10 @@
 | 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: 7697
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7697&view=rev
Author: vargenau
Date: 2010年09月20日 13:04:55 +0000 (2010年9月20日)
Log Message:
-----------
{{foo?version=2}} no longer worked
Modified Paths:
--------------
 trunk/lib/BlockParser.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2010年09月20日 10:20:25 UTC (rev 7696)
+++ trunk/lib/BlockParser.php	2010年09月20日 13:04:55 UTC (rev 7697)
@@ -1182,7 +1182,7 @@
 // {{foo?version=5}}
 // in that case, output is "page=foo rev=5"
 if (strstr($pi, "?")) {
- $pi = str_replace("?version=", "\" rev=\"", $page);
+ $pi = str_replace("?version=", "\" rev=\"", $pi);
 }
 
 if ($vars)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7696
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7696&view=rev
Author: rurban
Date: 2010年09月20日 10:20:25 +0000 (2010年9月20日)
Log Message:
-----------
remove duplicate global decl. This may have actually led to a bug
Modified Paths:
--------------
 trunk/lib/EditToolbar.php
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2010年09月17日 11:49:14 UTC (rev 7695)
+++ trunk/lib/EditToolbar.php	2010年09月20日 10:20:25 UTC (rev 7696)
@@ -216,7 +216,6 @@
 	 }
 
 foreach ($toolarray as $tool) {
- 	global $WikiTheme;
 $image = $WikiTheme->getImageURL($tool["image"]);
 $open = $tool["open"];
 $close = $tool["close"];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7695
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7695&view=rev
Author: rurban
Date: 2010年09月17日 11:49:14 +0000 (2010年9月17日)
Log Message:
-----------
fix ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2010年09月17日 11:34:00 UTC (rev 7694)
+++ trunk/pgsrc/ReleaseNotes	2010年09月17日 11:49:14 UTC (rev 7695)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 14:12:16 +0000
+Date: 2010年9月17日 14:12:16 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,11 +10,13 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
-== 1.4.0RC1 2010年09月10日 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+== 1.4.0RC1 2010年09月17日 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
 
-An important modification in this release is the implementation of full Wikicreole 1.0
-syntax, including additions.
+This is a new major release, where everything changed from 1.2, and lots of changes since 13.4.
 
+An important modification in this release is the implementation 
+of full Wikicreole 1.0 syntax, including additions.
+
 The "classic" Phpwiki syntax is still supported.
 
 The documentation pages found in pgsrc have been mostly converted to UTF-8 and 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7694
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7694&view=rev
Author: rurban
Date: 2010年09月17日 11:34:00 +0000 (2010年9月17日)
Log Message:
-----------
useful /wiki settings overrides only as comments
Modified Paths:
--------------
 trunk/wiki
Modified: trunk/wiki
===================================================================
--- trunk/wiki	2010年09月17日 11:33:14 UTC (rev 7693)
+++ trunk/wiki	2010年09月17日 11:34:00 UTC (rev 7694)
@@ -20,9 +20,9 @@
 define('VIRTUAL_PATH', $_SERVER['SCRIPT_NAME']);
 
 // Override the default configuration for CONSTANTS before index.php
-$LANG='de'; $LC_ALL='de_DE';
-define('THEME', 'default');
-define('WIKI_NAME', "WikiDemo:$LANG:" . THEME);
+//$LANG='de'; $LC_ALL='de_DE';
+//define('THEME', 'default');
+//define('WIKI_NAME', "WikiDemo:$LANG:" . THEME);
 
 // Load the default configuration.
 include "index.php";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7693
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7693&view=rev
Author: rurban
Date: 2010年09月17日 11:33:14 +0000 (2010年9月17日)
Log Message:
-----------
avoid setup error
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010年09月17日 11:32:55 UTC (rev 7692)
+++ trunk/lib/IniConfig.php	2010年09月17日 11:33:14 UTC (rev 7693)
@@ -125,6 +125,7 @@
 if (!file_exists($file)) {
 // We need to DATA_PATH for configurator, or pass the posted values
 // somewhow to the script
+ $GLOBALS['charset'] = 'utf-8';
 include_once(dirname(__FILE__)."/install.php");
 run_install("_part1");
 if (!defined("_PHPWIKI_INSTALL_RUNNING"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7692
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7692&view=rev
Author: rurban
Date: 2010年09月17日 11:32:55 +0000 (2010年9月17日)
Log Message:
-----------
fix windows abs_path
Modified Paths:
--------------
 trunk/lib/FileFinder.php
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2010年09月17日 08:59:58 UTC (rev 7691)
+++ trunk/lib/FileFinder.php	2010年09月17日 11:32:55 UTC (rev 7692)
@@ -154,7 +154,7 @@
 if (substr($path,0,1) == '/') {
 return true;
 } elseif (isWindows() and preg_match("/^[a-z]:/i", $path)
- and (substr($path,3,1) == "/" or substr($path,3,1) == "\\")) 
+ and (substr($path,2,1) == "/" or substr($path,2,1) == "\\")) 
 {
 return true;
 } else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7691
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7691&view=rev
Author: vargenau
Date: 2010年09月17日 08:59:58 +0000 (2010年9月17日)
Log Message:
-----------
Remove Sidebar/templates/browse.tmpl, is the same as MonoBook/templates/browse.tmpl
Removed Paths:
-------------
 trunk/themes/Sidebar/templates/browse.tmpl
Deleted: trunk/themes/Sidebar/templates/browse.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/browse.tmpl	2010年09月17日 08:46:20 UTC (rev 7690)
+++ trunk/themes/Sidebar/templates/browse.tmpl	2010年09月17日 08:59:58 UTC (rev 7691)
@@ -1,16 +0,0 @@
-<?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-
-<?php if ($revision and !$revision->isCurrent()) { ?>
- <p><strong><?php echo _("Note:")?></strong>
- <?php echo _("You are viewing an old revision of this page.")?>
- <?php echo Button('browse', _("View the current version"), $page)?>.
- </p>
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
- <p><?php echo $redirected ?></p>
-<?php } ?>
-
-<?php echo $CONTENT?>
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7690
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7690&view=rev
Author: vargenau
Date: 2010年09月17日 08:46:20 +0000 (2010年9月17日)
Log Message:
-----------
Update themes documentation
Modified Paths:
--------------
 trunk/doc/THEMES
 trunk/themes/Crao/themeinfo.php
 trunk/themes/MonoBook/themeinfo.php
 trunk/themes/README
 trunk/themes/blog/themeinfo.php
Modified: trunk/doc/THEMES
===================================================================
--- trunk/doc/THEMES	2010年09月17日 08:41:10 UTC (rev 7689)
+++ trunk/doc/THEMES	2010年09月17日 08:46:20 UTC (rev 7690)
@@ -1,4 +1,4 @@
-! Brief Example of Creating Your Own WikiTheme
+== Brief Example of Creating Your Own WikiTheme ==
 
 To create or modify one of the existing themes:
 * Make a copy of one of the themes.
@@ -23,7 +23,7 @@
 of your theme to index.php.
 define('THEME','NewName');
 
-! Template Structure
+== Template Structure ==
 
 Templates currently must use the .tmpl extension (simple PHP parsed files).
 Other file extensions are reserved for future use (i.e. .tpl for Smarty or 
@@ -58,4 +58,4 @@
 to produce validating XHTML, by using custom templates not.
 
 ----
-PhpWikiDocumentation
+[[PhpWikiDocumentation]]
Modified: trunk/themes/Crao/themeinfo.php
===================================================================
--- trunk/themes/Crao/themeinfo.php	2010年09月17日 08:41:10 UTC (rev 7689)
+++ trunk/themes/Crao/themeinfo.php	2010年09月17日 08:46:20 UTC (rev 7690)
@@ -9,7 +9,7 @@
 // rcs_id('$Id$');
 
 /*
- * This file defines the default appearance ("theme") of PhpWiki.
+ * This file defines the Crao theme of PhpWiki.
 */
 
 require_once('lib/WikiTheme.php');
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php	2010年09月17日 08:41:10 UTC (rev 7689)
+++ trunk/themes/MonoBook/themeinfo.php	2010年09月17日 08:46:20 UTC (rev 7690)
@@ -49,9 +49,7 @@
 $WikiTheme->makeActionButton($action, $label, $page_or_rev, $options));
 }
 
-class WikiTheme_MonoBook
-/* extends WikiTheme */
-extends WikiTheme_Wikilens
+class WikiTheme_MonoBook extends WikiTheme_Wikilens
 {
 
 /* this adds selected to the class */
Modified: trunk/themes/README
===================================================================
--- trunk/themes/README	2010年09月17日 08:41:10 UTC (rev 7689)
+++ trunk/themes/README	2010年09月17日 08:46:20 UTC (rev 7690)
@@ -1,24 +1,30 @@
 Some files may be removed from this directory to save space, if
-needed:
-
-17k Portland
-16k smaller
-175k Hawaiian
-235k MacOSX
-151 Sidebar
-115k SpaceWiki
-21k wikilens
-27k Wordpress
-
+needed.
 *The default theme must always be present,* even when using another
 theme! Wherever a theme has no specific variant (override) of a
 template or button or image, PhpWiki will look for one in the default 
 theme. Same with the language: 
 Language and theme specific specific buttons will be search in 
 sub-directories like <theme>/buttons/en, and if none will be found, 
-the default buttons, which might be language-indepedent, in default/buttons 
+the default buttons, which might be language-independent, in default/buttons 
 will be used.
 
+List of current themes:
+* default
+* blog
+* Crao
+* fusionforge (extends wikilens, can be used only with Fusionforge)
+* Hawaiian
+* MacOSX
+* MonoBook (extends wikilens)
+* Portland
+* shamino_com
+* Sidebar (extends MonoBook)
+* smaller
+* SpaceWiki
+* wikilens
+* Wordpress
+
 See doc/THEMES for more info on PhpWiki themes.
 
 TODO:
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php	2010年09月17日 08:41:10 UTC (rev 7689)
+++ trunk/themes/blog/themeinfo.php	2010年09月17日 08:46:20 UTC (rev 7690)
@@ -44,7 +44,6 @@
 */
 
 require_once('lib/WikiTheme.php');
-//require_once('themes/Sidebar/themeinfo.php');
 
 class WikiTheme_blog extends WikiTheme {
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7689
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7689&view=rev
Author: vargenau
Date: 2010年09月17日 08:41:10 +0000 (2010年9月17日)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
 trunk/lib/plugin/CreateToc.php
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2010年09月13日 15:05:24 UTC (rev 7688)
+++ trunk/lib/plugin/CreateToc.php	2010年09月17日 08:41:10 UTC (rev 7689)
@@ -246,7 +246,6 @@
 function extractHeaders (&$content, &$markup, $backlink=0,
 $counter=0, $levels=false, $firstlevelstyle='number', $basepage='')
 {
-
 if (!$levels) $levels = array(1,2);
 $tocCounter = $this->_initTocCounter();
 reset($levels);
@@ -374,8 +373,7 @@
 if (!$pagename) {
 return $this->error(_("no page specified"));
 }
- if ($jshide and isBrowserIE() and browserDetect("Mac")) {
- //trigger_error(_("jshide set to 0 on Mac IE"), E_USER_NOTICE);
+ if (isBrowserIE() and browserDetect("Mac")) {
 $jshide = 0;
 }
 if (($notoc) or ($liststyle == 'ol')) {
@@ -384,8 +382,8 @@
 
 // Check if user is allowed to get the Page.
 if (!mayAccessPage ('view', $pagename)) {
- return $this->error(sprintf(_("Illegal access to page %s: no read access"),
- $pagename));
+ return $this->error(sprintf(_("Illegal access to page %s: no read access"),
+ $pagename));
 }
 
 $page = $dbi->getPage($pagename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7688
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7688&view=rev
Author: vargenau
Date: 2010年09月13日 15:05:24 +0000 (2010年9月13日)
Log Message:
-----------
Minify ajax.js moacdropdown.js toolbar.js sortable.js
Modified Paths:
--------------
 trunk/themes/default/Makefile
Added Paths:
-----------
 trunk/themes/default/ajax-min.js
 trunk/themes/default/moacdropdown-min.js
 trunk/themes/default/sortable-min.js
 trunk/themes/default/toolbar-min.js
Modified: trunk/themes/default/Makefile
===================================================================
--- trunk/themes/default/Makefile	2010年09月13日 14:52:49 UTC (rev 7687)
+++ trunk/themes/default/Makefile	2010年09月13日 15:05:24 UTC (rev 7688)
@@ -10,8 +10,8 @@
 	 toolbar.css \
 	 moacdropdown/css/dropdown.css
 MAIN = wikicommon
-JS_MAIN = wikicommon.js sortable.js ajax.js moacdropdown.js toolbar.js
-JS_REST = ASCIIsvg.js
+JS_MAIN = wikicommon.js
+JS_REST = ASCIIsvg.js sortable.js ajax.js moacdropdown.js toolbar.js
 
 CSS_FILES = $(patsubst %.css,%-min.css,$(CSS_SRC))
 
Added: trunk/themes/default/ajax-min.js
===================================================================
--- trunk/themes/default/ajax-min.js	 (rev 0)
+++ trunk/themes/default/ajax-min.js	2010年09月13日 15:05:24 UTC (rev 7688)
@@ -0,0 +1 @@
+function showHide(a){this.init(a)}showHide.prototype.onXmlHttpLoad=function(){if(this.hXMLHttp.readyState==4){var d=this.hXMLHttp.parseError;var c=document.getElementById(this.id+"-img");if(d&&d.errorCode!=0){alert(d.reason)}else{var a=document.getElementById(this.id+"-body");var b=this.hXMLHttp.responseXML;if(b!=null){if(b.firstChild&&b.firstChild.nodeName=="xml"){b=b.firstChild.nextSibling.nextSibling}if(b.firstChild&&b.firstChild.nodeName=="html"){b=b.childNodes[1]}if(b==null){alert("showHideDone "+this.id+"\nno xml children from "+this.hXMLHttp.responseText)}var e=CreateHtmlFromXml(b);e.className="wikitext";a.appendChild(e);a.style.display="block"}else{alert("showHideDone "+this.id+"\nerror no xml from "+this.hXMLHttp.responseText)}}if(c){if(!folderArrowPath){folderArrowPath=stylepath+"images/"}c.src=folderArrowPath+"/folderArrowOpen.png"}}};showHide.prototype.init=function(b){this.id=b;this.hXMLHttp=XmlHttp.create();var a=this;this.hXMLHttp.onreadystatechange=function(){a.onXmlHttpLoad()}};var cShowHide;function CreateHtmlFromXml(a){if(a==null){return document.createElement("xml")}var d=a.nodeName;var c;if(d=="#text"){c=document.createTextNode(a.nodeValue);c.nodeValue=a.nodeValue;if(a.attributes&&(a.attributes!=null)){for(var b=0;b<a.attributes.length;b++){c.setAttribute(a.attributes[b].name,a.attributes[b].value)}}}else{c=document.createElement(d);if(a.nodeValue){c.nodeValue=a.nodeValue}if(a.attributes&&(a.attributes!=null)){for(var b=0;b<a.attributes.length;b++){c.setAttribute(a.attributes[b].name,a.attributes[b].value)}}if(a.hasChildNodes()){for(var b=0;b<a.childNodes.length;b++){c.appendChild(CreateHtmlFromXml(a.childNodes[b]))}}}return c}function showHideAsync(c,d){var a=document.getElementById(d+"-body");if(!a){alert("Error: id="+d+"-body missing.");return}if(a.hasChildNodes()){showHideFolder(d)}else{if(!folderArrowPath){folderArrowPath=stylepath+"images/"}var b=document.getElementById(d+"-img");if(b){b.src=folderArrowPath+"/folderArrowLoading.gif"}cShowHide=new showHide(d);cShowHide.hXMLHttp.open("GET",c,true);cShowHide.hXMLHttp.send(null)}}function showHideDone(b){var a=document.getElementById(b+"-body");a.parentNode.replaceChild(cShowHide.hXMLHttp.responseText,a);alert("showHideDone "+b+"\ngot "+cShowHide.hXMLHttp.responseText);showHideFolder(b)}function showHideDelayed(a){window.setTimeout("doshowHide("+a+")",400)}function doshowHide(b){document.getElementById(b).style.display="none";var a=document.getElementById("LSHighlight");if(a){a.removeAttribute("id")}};
\ No newline at end of file
Added: trunk/themes/default/moacdropdown-min.js
===================================================================
--- trunk/themes/default/moacdropdown-min.js	 (rev 0)
+++ trunk/themes/default/moacdropdown-min.js	2010年09月13日 15:05:24 UTC (rev 7688)
@@ -0,0 +1 @@
+function cBrowser(){var a=navigator.userAgent.toLowerCase();this.version=parseInt(navigator.appVersion);this.subVersion=parseFloat(navigator.appVersion);this.ns=((a.indexOf("mozilla")!=-1)&&((a.indexOf("spoofer")==-1)&&(a.indexOf("compatible")==-1)));this.ns2=(this.ns&&(this.version==2));this.ns3=(this.ns&&(this.version==3));this.ns4b=(this.ns&&(this.subVersion<4.04));this.ns4=(this.ns&&(this.version==4));this.ns5=(this.ns&&(this.version==5));this.ie=(a.indexOf("msie")!=-1);this.ie3=(this.ie&&(this.version==2));this.ie4=(this.ie&&(this.version==4)&&(a.indexOf("msie 4.")!=-1));this.ie5=(this.ie&&(this.version==4)&&(a.indexOf("msie 5.0")!=-1));this.ie55=(this.ie&&(this.version==4)&&(a.indexOf("msie 5.5")!=-1));this.ie6=(this.ie&&(this.version==4)&&(a.indexOf("msie 6.0")!=-1));this.op3=(a.indexOf("opera")!=-1);this.win=(a.indexOf("win")!=-1);this.mac=(a.indexOf("mac")!=-1);this.unix=(a.indexOf("x11")!=-1);this.name=navigator.appName;this.dom=this.ns5||this.ie5||this.ie55||this.ie6}var bw=new cBrowser();cDomEvent={e:null,type:"",button:0,key:0,x:0,y:0,pagex:0,pagey:0,target:null,from:null,to:null};cDomEvent.init=function(a){if(window.event){a=window.event}this.e=a;this.type=a.type;this.button=(a.which)?a.which:a.button;this.key=(a.which)?a.which:a.keyCode;this.target=(a.srcElement)?a.srcElement:a.originalTarget;this.currentTarget=(a.currentTarget)?a.currentTarget:a.srcElement;this.from=(a.originalTarget)?a.originalTarget:(a.fromElement)?a.fromElement:null;this.to=(a.currentTarget)?a.currentTarget:(a.toElement)?a.toElement:null;this.x=(a.layerX)?a.layerX:(a.offsetX)?a.offsetX:null;this.y=(a.layerY)?a.layerY:(a.offsetY)?a.offsetY:null;this.screenX=a.screenX;this.screenY=a.screenY;this.pageX=(a.pageX)?a.pageX:a.x+document.body.scrollLeft;this.pageY=(a.pageY)?a.pageY:a.y+document.body.scrollTop};cDomEvent.getEvent=function(a){if(window.event){a=window.event}return{e:a,type:a.type,button:(a.which)?a.which:a.button,key:(a.which)?a.which:a.keyCode,target:(a.srcElement)?a.srcElement:a.originalTarget,currentTarget:(a.currentTarget)?a.currentTarget:a.srcElement,from:(a.originalTarget)?a.originalTarget:(a.fromElement)?a.fromElement:null,to:(a.currentTarget)?a.currentTarget:(a.toElement)?a.toElement:null,x:(a.layerX)?a.layerX:(a.offsetX)?a.offsetX:null,y:(a.layerY)?a.layerY:(a.offsetY)?a.offsetY:null,screenX:a.screenX,screenY:a.screenY,pageX:(a.pageX)?a.pageX:(a.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)),pageY:(a.pageY)?a.pageY:(a.clientY+(document.documentElement.scrollTop||document.body.scrollTop))}};cDomEvent.cancelEvent=function(a){if(a.preventDefault){a.preventDefault()}a.returnValue=false;a.cancelBubble=true;return false};cDomEvent.addEvent=function(hElement,sEvent,handler,bCapture){if(hElement.addEventListener){hElement.addEventListener(sEvent,handler,bCapture);return true}else{if(hElement.attachEvent){return hElement.attachEvent("on"+sEvent,handler)}else{if(document.all||hElement.captureEvents){if(hElement.captureEvents){eval("hElement.captureEvents( Event."+sEvent.toUpperCase()+" )")}eval("hElement.on"+sEvent+" = "+handler)}else{alert("Not implemented yet!")}}}};cDomEvent.encapsulateEvent=function(a){return function(b){b=cDomEvent.getEvent(b);a.call(b.target,b.e)}};cDomEvent.addEvent2=function(c,d,a,b){if(c){if(c.addEventListener){c.addEventListener(d,cDomEvent.encapsulateEvent(a),b);return true}else{if(c.attachEvent){return c.attachEvent("on"+d,cDomEvent.encapsulateEvent(a))}else{alert("Not implemented yet!")}}}else{}};cDomEvent.addCustomEvent2=function(b,c,a){if(b){b[c]=a}else{}};cDomEvent.removeEvent=function(hElement,sEvent,handler,bCapture){if(hElement.addEventListener){hElement.removeEventListener(sEvent,handler,bCapture);return true}else{if(hElement.attachEvent){return hElement.detachEvent("on"+sEvent,handler)}else{if(document.all||hElement.captureEvents){eval("hElement.on"+sEvent+" = null")}else{alert("Not implemented yet!")}}}};function MouseButton(){if(document.layers){this.left=1;this.middle=2;this.right=3}else{if(document.all){this.left=1;this.middle=4;this.right=2}else{this.left=0;this.middle=1;this.right=2}}}var MB=new MouseButton();if(document.ELEMENT_NODE==null){document.ELEMENT_NODE=1;document.TEXT_NODE=3}function getSubNodeByName(a,f){if(a!=null){var c=0;var e=0;var b=a.childNodes;var d=null;while(e<b.length){d=b.item(e++);if((d.nodeType==1)&&(d.nodeName.toLowerCase()==f)){return d}}}return null}function getPrevNodeSibling(a){if(a!=null){do{a=a.previousSibling}while(a!=null&&a.nodeType!=1);return a}}function getNextNodeSibling(a){if(a!=null){do{a=a.nextSibling}while(a!=null&&a.nodeType!=1);return a}}function getLastSubNodeByName(a,g){if(a!=null){var c=0;var f=0;var b=a.childNodes;var d=null;var e=b.length-1;while(e>=0){d=b.item(e);if((d.nodeType==1)&&(d.nodeName.toLowerCase()==g)){return d}e--}}return null}function getSubNodeByProperty(hNode,sProperty,sPropValue){if(hNode!=null){var nNc=0;var nC=0;var hNodeChildren=hNode.childNodes;var hCNode=null;var sAttribute;var hProp;sPropValue=sPropValue.toLowerCase();while(nC<hNodeChildren.length){hCNode=hNodeChildren.item(nC++);if(hCNode.nodeType==document.ELEMENT_NODE){hProp=eval("hCNode."+sProperty);if(typeof(sPropValue)!="undefined"){if(hProp.toLowerCase()==sPropValue){return hCNode}}else{return hCNode}}nNc++}}return null}function findAttribute(a,c){c=c.toLowerCase();for(var b=0;b<a.attributes.length;b++){if(a.attributes.item(b).nodeName.toLowerCase()==c){return a.attributes.item(b).nodeValue}}return null}function getSubNodeByAttribute(b,f,e){if(b!=null){var d=0;var h=0;var c=b.childNodes;var g=null;var a;e=e.toLowerCase();while(h<c.length){g=c.item(h++);if(g.nodeType==document.ELEMENT_NODE){a=g.getAttribute(f);if(a&&a.toLowerCase()==e){return g}}d++}}return null}function getLastSubNodeByAttribute(a,e,d){if(a!=null){var c=0;var h=0;var b=a.childNodes;var f=null;var g=b.length-1;while(g>=0){f=b.item(g);if(f.nodeType==document.ELEMENT_NODE){sAttribute=f.getAttribute(e);if(sAttribute&&sAttribute.toLowerCase()==d){return f}}g--}}return null}function getParentByTagName(a,b){while((a.tagName)&&!(/(body|html)/i.test(a.tagName))){if(a.tagName==b){return a}a=a.parentNode}return null}function getParentByAttribute(a,d,b){while((a.tagName)&&!(/(body|html)/i.test(a.tagName))){var c=a.getAttribute(d);if(c!=null&&c.toString().length>0){if(b!==null){if(c==b){return a}}else{return a}}a=a.parentNode}return null}function getParentByProperty(hNode,sProperty,sPropValue){while((hNode.tagName)&&!(/(body|html)/i.test(hNode.tagName))){var hProp=eval("hNode."+sProperty);if(hProp!=null&&hProp.toString().length>0){if(sPropValue!==null){if(hProp==sPropValue){return hNode}}else{return hNode}}hNode=hNode.parentNode}return null}function getNodeText(a){if(a==null){return""}var b;if(a.hasChildNodes()){b=a.childNodes.item(0).nodeValue}else{b=a.text}return b}function cDomExtension(a,b,c){this.hParent=a;this.aSelectors=b;this.hInitFunction=c}cDomExtensionManager={aExtensions:new Array()};cDomExtensionManager.register=function(a){cDomExtensionManager.aExtensions.push(a)};cDomExtensionManager.initSelector=function(f,i,d){var a;var c;var b;var h;var e;a=/([a-z0-9_]*)\[?([^\]]*)\]?/i;c=/([a-z0-9_]*)([\*\^\$]?)(=?)(([a-z0-9_=]*))/i;if(a.test(i)&&!/[@#\.]/.test(i)){b=a.exec(i);if(b[1]!=""){g=f.getElementsByTagName(b[1].toLowerCase());for(nI=0;nI<g.length;nI++){g[nI].markExt=true}for(nI=0;nI<g.length;nI++){if(!g[nI].markExt){continue}else{g[nI].markExt=false}if(b[2]==""){if(g[nI].tagName.toLowerCase()==b[1].toLowerCase()){d(g[nI])}}else{h=c.exec(b[2]);if(h[1]=="class"){e=g[nI].className}else{e=g[nI].getAttribute(h[1])}if(e!=null&&e.length>0){if(h[3]=="="){if(h[2]==""){if(e==h[4]){d(g[nI])}}else{switch(h[2]){case"^":if(e.indexOf(h[4])==0){d(g[nI])}break;case"$":if(e.lastIndexOf(h[4])==e.length-h[4].length){d(g[nI])}break;case"*":if(e.indexOf(h[4])>=0){d(g[nI])}break}}}else{d(g[nI])}}}}return}}a=/([a-z0-9_]*)([\.#@]?)([a-z0-9_=~]*)/i;c=/([a-z0-9_]*)([=~])?([a-z0-9_]*)/i;b=a.exec(i);if(b[1]!=""){var g=f.getElementsByTagName(b[1]);for(nI=0;nI<g.length;nI++){g[nI].markExt=true}for(nI=0;nI<g.length;nI++){if(!g[nI].markExt){continue}else{g[nI].markExt=false}if(b[2]!=""){switch(b[2]){case".":if(g[nI].className==b[3]){d(g[nI])}break;case"#":if(g[nI].id==b[3]){d(g[nI])}break;case"@":h=c.exec(b[3]);e=g[nI].getAttribute(h[1]);if(e!=null&&e.length>0){if(h[3]!=""){if(h[2]=="="){if(e==h[3]){d(g[nI])}}else{if(e.indexOf(h[3])>=0){d(g[nI])}}}else{d(g[nI])}}break}}}}};cDomExtensionManager.initialize=function(){var d=null;var c;for(var a in cDomExtensionManager.aExtensions){c=cDomExtensionManager.aExtensions[a].aSelectors;for(var b in c){cDomExtensionManager.initSelector(cDomExtensionManager.aExtensions[a].hParent,c[b],cDomExtensionManager.aExtensions[a].hInitFunction)}}};if(window.addEventListener){window.addEventListener("load",cDomExtensionManager.initialize,false)}else{if(window.attachEvent){window.attachEvent("onload",cDomExtensionManager.initialize)}}function cDomObject(a){if(bw.dom||bw.ie){this.hElement=document.getElementById(a);this.hStyle=this.hElement.style}}cDomObject.prototype.getWidth=function(){return cDomObject.getWidth(this.hElement)};cDomObject.getWidth=function(b){if(b.currentStyle){var a=parseInt(b.currentStyle.width);if(isNaN(a)){return parseInt(b.offsetWidth)}else{return a}}else{return parseInt(b.offsetWidth)}};cDomObject.prototype.getHeight=function(){return cDomObject.getHeight(this.hElement)};cDomObject.getHeight=function(b){if(b.currentStyle){var a=parseInt(b.currentStyle.height);if(isNaN(a)){return parseInt(b.offsetHeight)}else{return a}}else{return parseInt(b.offsetHeight)}};cDomObject.prototype.getLeft=function(){return cDomObject.getLeft(this.hElement)};cDomObject.getLeft=function(a){return parseInt(a.offsetLeft)};cDomObject.prototype.getTop=function(){return cDomObject.getTop(this.hElement)};cDomObject.getTop=function(a){return parseInt(a.offsetTop)};cDomObject.getOffsetParam=function(hElement,sParam,hLimitParent){var nRes=0;if(hLimitParent==null){hLimitParent=document.body.parentElement}while(hElement!=hLimitParent){nRes+=eval("hElement."+sParam);if(!hElement.offsetParent){break}hElement=hElement.offsetParent}return nRes};cDomObject.getScrollOffset=function(hElement,sParam,hLimitParent){nRes=0;if(hLimitParent==null){hLimitParent=document.body.parentElement}while(hElement!=hLimitParent){nRes+=eval("hElement.scroll"+sParam);if(!hElement.offsetParent){break}hElement=hElement.parentNode}return nRes};function getDomDocumentPrefix(){if(getDomDocumentPrefix.prefix){return getDomDocumentPrefix.prefix}var c=["MSXML2","Microsoft","MSXML","MSXML3"];var d;for(var b=0;b<c.length;b++){try{d=new ActiveXObject(c[b]+".DomDocument");return getDomDocumentPrefix.prefix=c[b]}catch(a){}}throw new Error("Could not find an installed XML parser")}function getXmlHttpPrefix(){if(getXmlHttpPrefix.prefix){return getXmlHttpPrefix.prefix}var c=["MSXML2","Microsoft","MSXML","MSXML3"];var d;for(var b=0;b<c.length;b++){try{d=new ActiveXObject(c[b]+".XmlHttp");return getXmlHttpPrefix.prefix=c[b]}catch(a){}}throw new Error("Could not find an installed XML parser")}function XmlHttp(){}XmlHttp.create=function(){try{if(window.XMLHttpRequest){var b=new XMLHttpRequest();if(b.readyState==null){b.readyState=1;b.addEventListener("load",function(){b.readyState=4;if(typeof b.onreadystatechange=="function"){b.onreadystatechange()}},false)}return b}if(window.ActiveXObject){return new ActiveXObject(getXmlHttpPrefix()+".XmlHttp")}}catch(a){}throw new Error("Your browser does not support XmlHttp objects")};function XmlDocument(){}XmlDocument.create=function(){try{if(document.implementation&&document.implementation.createDocument){var b=document.implementation.createDocument("","",null);if(b.readyState==null){b.readyState=1;b.addEventListener("load",function(){b.readyState=4;if(typeof b.onreadystatechange=="function"){b.onreadystatechange()}},false)}return b}if(window.ActiveXObject){return new ActiveXObject(getDomDocumentPrefix()+".DomDocument")}}catch(a){}throw new Error("Your browser does not support XmlDocument objects")};if(window.DOMParser&&window.XMLSerializer&&window.Node&&Node.prototype&&Node.prototype.__defineGetter__){Document.prototype.loadXML=function(b){var c=(new DOMParser()).parseFromString(b,"text/xml");while(this.hasChildNodes()){this.removeChild(this.lastChild)}for(var a=0;a<c.childNodes.length;a++){this.appendChild(this.importNode(c.childNodes[a],true))}};Document.prototype.__defineGetter__("xml",function(){return(new XMLSerializer()).serializeToString(this)})}function cAutocomplete(a){this.init(a)}var xmlrpc_url;cAutocomplete.CS_NAME="Autocomplete component";cAutocomplete.CS_OBJ_NAME="AC_COMPONENT";cAutocomplete.CS_LIST_PREFIX="ACL_";cAutocomplete.CS_BUTTON_PREFIX="ACB_";cAutocomplete.CS_INPUT_PREFIX="AC_";cAutocomplete.CS_HIDDEN_INPUT_PREFIX="ACH_";cAutocomplete.CS_INPUT_CLASSNAME="dropdown";cAutocomplete.CB_AUTOINIT=true;cAutocomplete.CB_AUTOCOMPLETE=false;cAutocomplete.CB_FORCECORRECT=false;cAutocomplete.CB_MATCHSUBSTRING=false;cAutocomplete.CS_SEPARATOR=",";cAutocomplete.CS_ARRAY_SEPARATOR=",";cAutocomplete.CB_MATCHSTRINGBEGIN=true;cAutocomplete.CN_OFFSET_TOP=2;cAutocomplete.CN_OFFSET_LEFT=-1;cAutocomplete.CN_LINE_HEIGHT=19;cAutocomplete.CN_NUMBER_OF_LINES=10;cAutocomplete.CN_HEIGHT_FIX=2;cAutocomplete.CN_CLEAR_TIMEOUT=300;cAutocomplete.CN_SHOW_TIMEOUT=400;cAutocomplete.CN_REMOTE_SHOW_TIMEOUT=1000;cAutocomplete.CN_MARK_TIMEOUT=400;cAutocomplete.hListDisplayed=null;cAutocomplete.nCount=0;cAutocomplete.autoInit=function(){var a=0;var f=null;var c;var g=document.getElementsByTagName("INPUT").length;for(a=0;a<g;a++){if(document.getElementsByTagName("INPUT")[a].type.toLowerCase()=="text"){c=document.getElementsByTagName("INPUT")[a].getAttribute("acdropdown");if(c!=null&&c.length>0){if(document.getElementsByTagName("INPUT")[a].id==null||document.getElementsByTagName("INPUT")[a].id.length==0){document.getElementsByTagName("INPUT")[a].id=cAutocomplete.CS_OBJ_NAME+cAutocomplete.nCount}f=new cAutocomplete(document.getElementsByTagName("INPUT")[a].id)}}}var b=document.getElementsByTagName("TEXTAREA").length;for(a=0;a<b;a++){c=document.getElementsByTagName("TEXTAREA")[a].getAttribute("acdropdown");if(c!=null&&c.length>0){if(document.getElementsByTagName("TEXTAREA")[a].id==null||document.getElementsByTagName("TEXTAREA")[a].id.length==0){document.getElementsByTagName("TEXTAREA")[a].id=cAutocomplete.CS_OBJ_NAME+cAutocomplete.nCount}f=new cAutocomplete(document.getElementsByTagName("TEXTAREA")[a].id)}}var e=document.getElementsByTagName("SELECT").length;var d=null;for(a=0;a<e;a++){d=document.getElementsByTagName("SELECT")[a];c=d.getAttribute("acdropdown");if(c!=null&&c.length>0){if(d.id==null||d.id.length==0){d.id=cAutocomplete.CS_OBJ_NAME+cAutocomplete.nCount}f=new cAutocomplete(d.id);e--;a--}}};if(cAutocomplete.CB_AUTOINIT){if(window.attachEvent){window.attachEvent("onload",cAutocomplete.autoInit)}else{if(window.addEventListener){window.addEventListener("load",cAutocomplete.autoInit,false)}}}cAutocomplete.prototype.init=function(sInputId){this.bDebug=false;this.sInputId=sInputId;this.sListId=cAutocomplete.CS_LIST_PREFIX+sInputId;this.sObjName=cAutocomplete.CS_OBJ_NAME+"_obj_"+(cAutocomplete.nCount++);this.hObj=this.sObjName;this.hActiveSelection=null;this.nSelectedItemIdx=-1;this.sLastActiveValue="";this.sActiveValue="";this.bListDisplayed=false;this.nItemsDisplayed=0;this.bAssociative=true;this.sHiddenInputId=null;this.bHasButton=false;this.aData=null;this.aSearchData=new Array();this.bSorted=false;this.nLastMatchLength=0;this.bForceCorrect=cAutocomplete.CB_FORCECORRECT;var sForceCorrect=document.getElementById(this.sInputId).getAttribute("autocomplete_forcecorrect");if(sForceCorrect!=null&&sForceCorrect.length>0){this.bForceCorrect=eval(sForceCorrect)}this.bMatchBegin=cAutocomplete.CB_MATCHSTRINGBEGIN;var sMatchBegin=document.getElementById(this.sInputId).getAttribute("autocomplete_matchbegin");if(sMatchBegin!=null&&sMatchBegin.length>0){this.bMatchBegin=eval(sMatchBegin)}this.bMatchSubstring=cAutocomplete.CB_MATCHSUBSTRING;var sMatchSubstring=document.getElementById(this.sInputId).getAttribute("autocomplete_matchsubstring");if(sMatchSubstring!=null&&sMatchSubstring.length>0){this.bMatchSubstring=eval(sMatchSubstring)}this.bAutoComplete=cAutocomplete.CB_AUTOCOMPLETE;this.bAutocompleted=false;var sAutoComplete=document.getElementById(this.sInputId).getAttribute("autocomplete_complete");if(sAutoComplete!=null&&sAutoComplete.length>0){this.bAutoComplete=eval(sAutoComplete)}this.formatOptions=null;var sFormatFunction=document.getElementById(this.sInputId).getAttribute("autocomplete_format");if(sFormatFunction!=null&&sFormatFunction.length>0){this.formatOptions=eval(sFormatFunction)}this.onSelect=null;var sOnSelectFunction=document.getElementById(this.sInputId).getAttribute("autocomplete_onselect");if(sOnSelectFunction!=null&&sOnSelectFunction.length>0){this.onSelect=eval(sOnSelectFunction)}if(this.getListArrayType()=="url"||this.getListArrayType()=="xmlrpc"){this.bAssociative=false;this.bRemoteList=true;this.sListURL=this.getListURL();this.hXMLHttp=XmlHttp.create();this.bXMLRPC=(this.getListArrayType()=="xmlrpc")}else{this.bRemoteList=false}var sAssociative=document.getElementById(this.sInputId).getAttribute("autocomplete_assoc");if(sAssociative!=null&&sAssociative.length>0){this.bAssociative=eval(sAssociative)}this.initListArray();this.initListContainer();this.initInput();eval(this.hObj+"= this")};cAutocomplete.prototype.initInput=function(){var g=document.getElementById(this.sInputId);g.hAutocomplete=this;var c=document.getElementById(this.sListId);c.hAutocomplete=this;var i=g.offsetWidth;if(!i||i==0){var f=g.cloneNode(true);f.style.position="absolute";f.style.top="-1000px";document.body.appendChild(f);var i=f.offsetWidth;document.body.removeChild(f)}var d=g.name;var e=g.form;var n=false;var h=g.value;var k=g.type.toLowerCase()=="text"?g.value:"";var b=g.getAttribute("autocomplete_button");if(b!=null&&b.length>0){n=true}if(g.type.toLowerCase()=="select-one"){n=true;if(g.selectedIndex>=0){h=g.options[g.selectedIndex].value;k=g.options[g.selectedIndex].text}}if(e){var j=document.createElement("INPUT");j.id=cAutocomplete.CS_HIDDEN_INPUT_PREFIX+this.sInputId;j.type="hidden";e.appendChild(j);if(this.bAssociative){j.name=d;g.name=cAutocomplete.CS_INPUT_PREFIX+d}else{j.name=cAutocomplete.CS_INPUT_PREFIX+d}j.value=h;this.sHiddenInputId=j.id}if(n){this.bHasButton=true;var l=document.createElement("DIV");l.className="acinputContainer";l.style.width=i;var a=document.createElement("INPUT");a.id=cAutocomplete.CS_BUTTON_PREFIX+this.sInputId;a.type="button";a.className="button";a.tabIndex=g.tabIndex+1;a.hAutocomplete=this;var m=document.createElement("INPUT");if(this.bAssociative){m.name=cAutocomplete.CS_INPUT_PREFIX+d}else{m.name=d}m.type="text";m.value=k;m.style.width=i-22;m.className=cAutocomplete.CS_INPUT_CLASSNAME;m.tabIndex=g.tabIndex;m.hAutocomplete=this;l.appendChild(m);l.appendChild(a);g.parentNode.replaceChild(l,g);m.id=this.sInputId;g=m}if(g.attachEvent){g.attachEvent("onkeyup",cAutocomplete.onInputKeyUp);g.attachEvent("onkeyup",cAutocomplete.saveCaretPosition);g.attachEvent("onkeydown",cAutocomplete.onInputKeyDown);g.attachEvent("onblur",cAutocomplete.onInputBlur);g.attachEvent("onfocus",cAutocomplete.onInputFocus);if(a){a.attachEvent("onclick",cAutocomplete.onButtonClick)}}else{if(g.addEventListener){g.addEventListener("keyup",cAutocomplete.onInputKeyUp,false);g.addEventListener("keyup",cAutocomplete.saveCaretPosition,false);g.addEventListener("keydown",cAutocomplete.onInputKeyDown,false);g.addEventListener("keypress",cAutocomplete.onInputKeyPress,false);g.addEventListener("blur",cAutocomplete.onInputBlur,false);g.addEventListener("focus",cAutocomplete.onInputFocus,false);if(a){a.addEventListener("click",cAutocomplete.onButtonClick,false)}}}g.setAttribute("autocomplete","OFF");if(e){if(e.attachEvent){e.attachEvent("onsubmit",cAutocomplete.onFormSubmit);if(this.bDebug){this.debug("attachEvent added")}}else{if(e.addEventListener){e.addEventListener("submit",cAutocomplete.onFormSubmit,false);if(this.bDebug){this.debug("addEventListener")}}}}};cAutocomplete.prototype.initListContainer=function(){var b=document.getElementById(this.sInputId);var e=document.createElement("DIV");e.className="autocomplete_holder";e.id=this.sListId;e.style.zIndex=10000+cAutocomplete.nCount;e.hAutocomplete=this;var d=document.createElement("DIV");d.className="autocomplete_firstborder";var c=document.createElement("DIV");c.className="autocomplete_secondborder";var a=document.createElement("UL");a.className="autocomplete";c.appendChild(a);d.appendChild(c);e.appendChild(d);document.body.appendChild(e);if(e.attachEvent){e.attachEvent("onblur",cAutocomplete.onListBlur);e.attachEvent("onfocus",cAutocomplete.onListFocus)}else{if(b.addEventListener){e.addEventListener("blur",cAutocomplete.onListBlur,false);e.addEventListener("focus",cAutocomplete.onListFocus,false)}}if(e.attachEvent){e.attachEvent("onclick",cAutocomplete.onItemClick)}else{if(e.addEventListener){e.addEventListener("click",cAutocomplete.onItemClick,false)}}};cAutocomplete.prototype.createList=function(){var f=document.getElementById(this.sInputId);var a=document.getElementById(this.sListId);var k=a.getElementsByTagName("UL")[0];if(k){k=k.parentNode.removeChild(k);while(k.hasChildNodes()){k.removeChild(k.childNodes[0])}}var j=null;var h=null;var e=null;var l=null;var d=this.aData;var g=0;var b;for(e in d){l=d[e];j=document.createElement("LI");h=document.createElement("A");h.setAttribute("itemvalue",e);var c=l.split(cAutocomplete.CS_ARRAY_SEPARATOR);if(c.length>1){this.aData[e]=c[0];h.setAttribute("itemdata",l.substring(l.indexOf(cAutocomplete.CS_ARRAY_SEPARATOR)+1));b=c[0]}else{b=l}h.href="#";h.appendChild(document.createTextNode(b));h.realText=b;if(g==this.nSelectedItemIdx){this.hActiveSelection=h;this.hActiveSelection.className="selected"}j.appendChild(h);k.appendChild(j);this.aSearchData[g++]=b.toLowerCase()}var i=a.firstChild.firstChild;i.appendChild(k);this.bListUpdated=false};cAutocomplete.prototype.initListArray=function(){var hInput=document.getElementById(this.sInputId);var hArr=null;if(hInput.type.toLowerCase()=="select-one"){hArr=new Object();for(var nI=0;nI<hInput.options.length;nI++){hArrKey=hInput.options.item(nI).value;sArrEl=hInput.options.item(nI).text;hArr[hArrKey]=sArrEl;if(hInput.options.item(nI).selected){this.nSelectedItemIdx=nI}}}else{var sAA=hInput.getAttribute("autocomplete_list");var sAAS=hInput.getAttribute("autocomplete_list_sort");var sArrayType=this.getListArrayType();switch(sArrayType){case"array":hArr=eval(sAA.substring(6));break;case"list":hArr=new Array();var hTmpArray=sAA.substring(5).split("|");var aValueArr;for(hKey in hTmpArray){aValueArr=hTmpArray[hKey].split(cAutocomplete.CS_ARRAY_SEPARATOR);if(aValueArr.length==1){hArr[hKey]=hTmpArray[hKey];this.bAssociative=false}else{hArr[aValueArr[0]]=aValueArr[1]}}break}if(sAAS!=null&&eval(sAAS)){this.bSorted=true;this.aData=hArr.sort();hArr=hArr.sort()}}this.setArray(hArr)};cAutocomplete.prototype.setArray=function(sArray){if(typeof sArray=="string"){this.aData=eval(sArray)}else{this.aData=sArray}this.bListUpdated=true};cAutocomplete.prototype.setListArray=function(a){this.setArray(a);this.updateAndShowList()};cAutocomplete.prototype.getListArrayType=function(){var b=document.getElementById(this.sInputId);var a=b.getAttribute("autocomplete_list");if(a!=null&&a.length>0){if(a.indexOf("array:")>=0){return"array"}else{if(a.indexOf("list:")>=0){return"list"}else{if(a.indexOf("url:")>=0){return"url"}else{if(a.indexOf("xmlrpc:")>=0){return"xmlrpc"}}}}}};cAutocomplete.prototype.getListURL=function(){var b=document.getElementById(this.sInputId);var a=b.getAttribute("autocomplete_list");if(a!=null&&a.length>0){if(a.indexOf("url:")>=0){return a.substring(4)}if(a.indexOf("xmlrpc:")>=0){return a.substring(7)}}};cAutocomplete.prototype.setListURL=function(a){this.sListURL=a};cAutocomplete.prototype.onXmlHttpLoad=function(){if(this.hXMLHttp.readyState==4){var a=this.hXMLHttp.parseError;if(a&&a.errorCode!=0){alert(a.reason)}else{this.afterRemoteLoad()}}};cAutocomplete.prototype.onXMLRPCHttpLoad=function(){if(this.hXMLHttp.readyState==4){var a=this.hXMLHttp.parseError;if(a&&a.errorCode!=0){alert(a.reason)}else{this.afterRemoteLoadXMLRPC()}}};cAutocomplete.prototype.loadXMLRPCListArray=function(){var f=this.sListURL;var i=data_path+"/RPC2.php";var h=f.split(" ");var g=h[0];var b=this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint);b=b.replace(/^\s/,"");b=b.replace(/\s$/,"");if(g.indexOf("?")>0){g=g.replace("/^.+?/","");f=f.replace("/?.+$/","")}else{f=i}if(g.length<1){var d=document.getElementById(this.sInputId);d.value=this.sActiveValue;return}var c="<?xml version='1.0' encoding=\"utf-8\" ?>\n";c+="<methodCall><methodName>"+g+"</methodName>\n";if(h.length<=1){c+="<params/>\n"}else{c+="<params>\n";for(var e=1;e<h.length;e++){var j=h[e];if(j.indexOf("[S]")>=0){j=j.replace("[S]",b)}c+="<param><value><string>";c+=j;c+="</string></value></param>\n"}c+="</params>\n"}c+="</methodCall>";if(this.bDebug){this.debug('url: "'+f+'" sRequest: "'+c.substring(20)+'"')}this.hXMLHttp.open("POST",f,true);var a=this;this.hXMLHttp.onreadystatechange=function(){a.onXMLRPCHttpLoad()};this.hXMLHttp.send(c)};cAutocomplete.prototype.loadListArray=function(){var b=this.sListURL;var a=this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint);a=a.replace(/^\s/,"");a=a.replace(/\s$/,"");if(b.indexOf("[S]")>=0){b=b.replace("[S]",a)}else{b+=this.sActiveValue}this.hXMLHttp.open("GET",b,true);var c=this;this.hXMLHttp.onreadystatechange=function(){c.onXmlHttpLoad()};this.hXMLHttp.send(null)};cAutocomplete.prototype.afterRemoteLoad=function(){var d=document.getElementById(this.sInputId);var c=new Array();var b=this.hXMLHttp.responseText.split("|");var a;for(hKey in b){a=b[hKey].split(cAutocomplete.CS_ARRAY_SEPARATOR);if(a.length==1){c[hKey]=b[hKey]}else{c[a[0]]=b[hKey].substr(b[hKey].indexOf(cAutocomplete.CS_ARRAY_SEPARATOR)+1)}}d.className="";d.readonly=false;d.value=this.sActiveValue;this.setListArray(c)};cAutocomplete.prototype.afterRemoteLoadXMLRPC=function(){var d=document.getElementById(this.sInputId);var b=new Array();sResult=this.hXMLHttp.responseText;if(this.bDebug){this.debug("response: "+sResult.substring(70,190))}sResult.replace("\n","");sResult.replace("\r","");var e=0;var c=sResult.indexOf("<string>");while(c>=0){var a;sResult=sResult.substring(c+8);a=sResult.indexOf("</string>");b[e]=sResult.substring(0,a);e+=1;sResult=sResult.substring(a+9);c=sResult.indexOf("<string>")}d.className="";d.readonly=false;d.value=this.sActiveValue;this.setListArray(b)};cAutocomplete.prototype.prepareList=function(a){var c=document.getElementById(this.sInputId);this.sActiveValue=c.value;var d=this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint);var b=this.getStringForAutocompletion(this.sLastActiveValue,this.nInsertPoint);if(b!=d||a||!this.bListDisplayed||this.bMatchSubstring){if(this.bRemoteList){c.className="search";this.bXMLRPC?this.loadXMLRPCListArray():this.loadListArray();return}this.updateAndShowList(a)}};cAutocomplete.prototype.updateAndShowList=function(a){var b=document.getElementById(this.sListId);var h=b.getElementsByTagName("UL")[0];var f=document.getElementById(this.sInputId);if(this.bListUpdated){this.createList()}var e=this.bMatchSubstring?this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint):this.sActiveValue;var i=this.bMatchSubstring?this.getStringForAutocompletion(this.sLastActiveValue,this.nInsertPoint):this.sLastActiveValue;if(e==i){if(!this.bMatchSubstring){a=true}}this.filterOptions(a);if(this.nItemsDisplayed==0){if(this.bForceCorrect){var g=this.getInsertPos(this.sActiveValue,this.nInsertPoint,"");cAutocomplete.markInputRange(f,this.nLastMatchLength,g[0])}}this.sLastActiveValue=this.sActiveValue;if(this.nItemsDisplayed>0){if(!a||this.bMatchSubstring){this.deselectOption()}if(this.bAutoComplete&&this.nItemsDisplayed==1){var c=this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint);var d=h.getElementsByTagName("LI")[this.nFirstDisplayed].getElementsByTagName("A")[0].realText;if(c.toLowerCase()==d.toLowerCase()){this.selectOption(h.getElementsByTagName("LI")[this.nFirstDisplayed].getElementsByTagName("A")[0]);this.hideOptions();return}}if(this.bAutoComplete&&!a){this.selectOption(h.getElementsByTagName("LI")[this.nFirstDisplayed].getElementsByTagName("A")[0])}this.showList()}else{this.clearList()}};cAutocomplete.prototype.showList=function(){if(cAutocomplete.hListDisplayed){cAutocomplete.hListDisplayed.clearList()}var e=document.getElementById(this.sInputId);var b=cDomObject.getOffsetParam(e,"offsetTop");var d=cDomObject.getOffsetParam(e,"offsetLeft");var f=document.getElementById(this.sListId);var a=f.getElementsByTagName("UL")[0];if(this.bHasButton){f.style.width=document.getElementById(this.sInputId).parentNode.offsetWidth}else{f.style.width=document.getElementById(this.sInputId).offsetWidth}var c=(this.nItemsDisplayed<cAutocomplete.CN_NUMBER_OF_LINES)?this.nItemsDisplayed:cAutocomplete.CN_NUMBER_OF_LINES;a.style.height=c*cAutocomplete.CN_LINE_HEIGHT+cAutocomplete.CN_HEIGHT_FIX+"px";f.style.top=b+e.offsetHeight+cAutocomplete.CN_OFFSET_TOP+"px";f.style.left=d+cAutocomplete.CN_OFFSET_LEFT+"px";f.style.display="none";f.style.visibility="visible";f.style.display="block";cAutocomplete.hListDisplayed=this;this.bListDisplayed=true};cAutocomplete.prototype.binarySearch=function(f){var a=0;var b=this.aSearchData.length-1;var c;var g,e;var h;var i=f.length;var d;while(a<=b){c=(a+b)/2;g=(c<1)?0:parseInt(c);h=this.aSearchData[g].substr(0,i);if(h<f){a=g+1;continue}if(h>f){b=g-1;continue}if(h==f){b=g-1;e=g;continue}return g}if(typeof(e)!="undefined"){return e}else{return null}};cAutocomplete.prototype.getStringForAutocompletion=function(e,c){if(e==null||e.length==0){return""}if(this.bMatchSubstring){var d=e.lastIndexOf(cAutocomplete.CS_SEPARATOR,c-1);d=d<0?0:d;var b=e.indexOf(cAutocomplete.CS_SEPARATOR,c);b=b<0?e.length:b;var a=e.substr(d,b-d);a=a.replace(/^(,円?)(\s*)(\S*)(\s*)(,円?)$/g,"3ドル");return a}else{return e}};cAutocomplete.prototype.insertString=function(f,d,a){if(this.bMatchSubstring){var e=f.lastIndexOf(cAutocomplete.CS_SEPARATOR,d-1);e=e<0?0:e;var c=f.indexOf(cAutocomplete.CS_SEPARATOR,d);c=c<0?f.length:c;var b=f.substr(e,c-e);b=b.replace(/^(,円?)(\s*)(\S?[\S\s]*\S?)(\s*)(,円?)$/g,"1ドル2ドル"+a+"4ドル5ドル");b=f.substr(0,e)+b+f.substr(c);return b}else{return a}};cAutocomplete.prototype.getInsertPos=function(f,d,a){d=d==null?0:d;var e=f.lastIndexOf(cAutocomplete.CS_SEPARATOR,d-1);e=e<0?0:e;var c=f.indexOf(cAutocomplete.CS_SEPARATOR,d);c=c<0?f.length:c;var b=f.substr(e,c-e);b=b.replace(/^(,円?)(\s*)(\S?[\S\s]*\S?)(\s*)(,円?)$/g,"1ドル2ドル"+a);return[d,e+b.length]};cAutocomplete.prototype.filterOptions=function(j){if(this.hActiveSelection&&!j){this.hActiveSelection.className=""}if(typeof j=="undefined"){j=false}var g=document.getElementById(this.sInputId);var c=this.getStringForAutocompletion(this.sActiveValue,this.nInsertPoint);if(j){c=""}var b=document.getElementById(this.sListId);var n=b.getElementsByTagName("UL")[0];var k=n.childNodes.length;var d=null;var a=0;var h=n.parentNode;var n=n.parentNode.removeChild(n);var l=n.childNodes;this.nItemsDisplayed=0;if(c.length==0){for(var i=0;i<k;i++){if(this.formatOptions){l[i].childNodes[0].innerHTML=this.formatOptions(l[i].childNodes[0].realText,i)}l[i].style.display="block"}a=k;if(k>0){this.nFirstDisplayed=0;this.nLastDisplayed=k-1}else{this.nFirstDisplayed=this.nLastDisplayed=-1}var f=this.getInsertPos(this.sActiveValue,this.nInsertPoint,c);this.nLastMatchLength=f[0]}else{this.nFirstDisplayed=this.nLastDisplayed=-1;c=c.toLowerCase();var m=false;if(this.bSorted&&this.bMatchBegin){var e=this.binarySearch(c);for(var i=0;i<k;i++){l[i].style.display="none";if(i>=e&&!m){if(!m&&this.aSearchData[i].indexOf(c)!=0){m=true;continue}if(this.formatOptions){l[i].childNodes[0].innerHTML=this.formatOptions(l[i].childNodes[0].realText,i)}l[i].style.display="block";a++;if(this.nFirstDisplayed<0){this.nFirstDisplayed=i}this.nLastDisplayed=i}}}else{for(var i=0;i<k;i++){l[i].style.display="none";if((this.bMatchBegin&&this.aSearchData[i].indexOf(c)==0)||(!this.bMatchBegin&&this.aSearchData[i].indexOf(c)>=0)){if(this.formatOptions){l[i].childNodes[0].innerHTML=this.formatOptions(l[i].childNodes[0].realText,i)}l[i].style.display="block";a++;if(this.nFirstDisplayed<0){this.nFirstDisplayed=i}this.nLastDisplayed=i}}}if(a>0){var f=this.getInsertPos(this.sActiveValue,this.nInsertPoint,c);this.nLastMatchLength=f[0]}}h.appendChild(n);this.nItemsDisplayed=a};cAutocomplete.prototype.hideOptions=function(){var a=document.getElementById(this.sListId);a.style.visibility="hidden";a.style.display="none";this.hListDisplayed=null};cAutocomplete.prototype.markAutocompletedValue=function(){var c=document.getElementById(this.sInputId);var e=this.hActiveSelection.realText;if(this.bMatchSubstring){var a=this.getInsertPos(this.sLastActiveValue,this.nInsertPoint,e);var d=a[0];var b=a[1]}else{var d=this.nInsertPoint;var b=e.length}this.nStartAC=d;this.nEndAC=b;if(this.hMarkRangeTimeout!=null){clearTimeout(this.hMarkRangeTimeout)}this.hMarkRangeTimeout=setTimeout(function(){cAutocomplete.markInputRange2(c.id)},cAutocomplete.CN_MARK_TIMEOUT)};cAutocomplete.prototype.selectOptionByIndex=function(b){if(this.bListUpdated){this.createList()}var d=document.getElementById(this.sListId);var a=d.getElementsByTagName("UL")[0];var c=a.childNodes.length;if(b>=0&&b<c){this.selectOption(a.childNodes[b].getElementsByTagName("A")[0])}};cAutocomplete.prototype.selectOptionByValue=function(f){if(this.bListUpdated){this.createList()}f=f.toLowerCase();var e=document.getElementById(this.sListId);var a=e.getElementsByTagName("UL")[0];var c=a.childNodes.length;var d=-1;for(var b=0;b<c;b++){if(this.aSearchData[b].indexOf(f)==0){d=b}}if(d>=0){this.selectOption(a.childNodes[d].getElementsByTagName("A")[0])}};cAutocomplete.prototype.selectOption=function(b){if(this.hActiveSelection){if(this.hActiveSelection==b){return}else{this.hActiveSelection.className=""}}this.hActiveSelection=b;var c=document.getElementById(this.sInputId);if(this.hActiveSelection!=null){if(this.sHiddenInputId!=null){if(this.bMatchSubstring){document.getElementById(this.sHiddenInputId).value=this.hActiveSelection.getAttribute("itemvalue")}else{document.getElementById(this.sHiddenInputId).value=this.hActiveSelection.getAttribute("itemvalue")}}this.hActiveSelection.className="selected";if(this.bAutoComplete){c.value=this.insertString(this.sLastActiveValue,this.nInsertPoint,this.hActiveSelection.realText);this.bAutocompleted=true;this.markAutocompletedValue()}else{var a=this.getInsertPos(this.sLastActiveValue,this.nInsertPoint,this.hActiveSelection.realText);c.value=this.insertString(this.sActiveValue,this.nInsertPoint,this.hActiveSelection.realText);cAutocomplete.setInputCaretPosition(c,a[1])}this.sActiveValue=c.value;if(this.onSelect){this.onSelect()}}else{c.value=this.sActiveValue;cAutocomplete.setInputCaretPosition(c,this.nInsertPoint)}};cAutocomplete.prototype.deselectOption=function(){if(this.hActiveSelection!=null){this.hActiveSelection.className="";this.hActiveSelection=null}};cAutocomplete.prototype.clearList=function(){this.hideOptions();this.bListDisplayed=false};cAutocomplete.prototype.getPrevDisplayedItem=function(a){if(a==null){var b=document.getElementById(this.sListId);a=b.getElementsByTagName("UL")[0].childNodes.item(b.getElementsByTagName("UL")[0].childNodes.length-1)}else{a=getPrevNodeSibling(a.parentNode)}while(a!=null){if(a.style.display=="block"){return a}a=a.previousSibling}return null};cAutocomplete.prototype.getNextDisplayedItem=function(a){if(a==null){var b=document.getElementById(this.sListId);a=b.getElementsByTagName("UL")[0].childNodes.item(0)}else{a=getNextNodeSibling(a.parentNode)}while(a!=null){if(a.style.display=="block"){return a}a=a.nextSibling}return null};cAutocomplete.prototype.debug=function(b){if(this.bDebug){var a=document.getElementById(this.sInputId);var c=document.createElement("DIV");c.className="debug";c.innerHTML=b;a.form.appendChild(c)}};cAutocomplete.onInputKeyDown=function(g){if(g==null){g=window.event}var d=(g.srcElement)?g.srcElement:g.originalTarget;var a=d.hAutocomplete;var b=document.getElementById(a.sListId);var f=document.getElementById(a.sInputId);var i=b.getElementsByTagName("UL")[0];var h=getParentByTagName(d,"A");if(b!=null&&a.bListDisplayed){var j=null;var c=null;if((g.keyCode==13)||(g.keyCode==27)){var e=g.keyCode==13?true:false;a.clearList();if(a.bDebug){a.debug("key "+g.keyCode+" new active selection")}}if(g.keyCode==38){if(a.bDebug){a.debug("key "+g.keyCode+" up")}c=a.getPrevDisplayedItem(a.hActiveSelection);if(c!=null){a.selectOption(c.childNodes.item(0));if(a.nItemsDisplayed>cAutocomplete.CN_NUMBER_OF_LINES){if(i.scrollTop<5&&c.offsetTop>i.offsetHeight){i.scrollTop=i.scrollHeight-i.offsetHeight}if(c.offsetTop-i.scrollTop<0){i.scrollTop-=c.offsetHeight}}}else{a.selectOption(null)}}else{if(g.keyCode==40){if(a.bDebug){a.debug("key "+g.keyCode+" down")}c=a.getNextDisplayedItem(a.hActiveSelection);if(c!=null){a.selectOption(c.childNodes.item(0));if(a.nItemsDisplayed>cAutocomplete.CN_NUMBER_OF_LINES){if(i.scrollTop>0&&i.scrollTop>c.offsetTop){i.scrollTop=0}if(Math.abs(c.offsetTop-i.scrollTop-i.offsetHeight)<5){i.scrollTop+=c.offsetHeight}}}else{a.selectOption(null)}}}}if(f.form){f.form.bLocked=true;if(a.bDebug){a.debug("onInputKeyDown form blocked")}}if(g.keyCode==13||g.keyCode==27||g.keyCode==38||g.keyCode==40){if(g.preventDefault){g.preventDefault()}else{if(a.bDebug){a.debug("no preventDefault return false")}}g.cancelBubble=true;g.returnValue=false;return false}};cAutocomplete.onInputKeyPress=function(a){if(a.keyCode==13||a.keyCode==38||a.keyCode==40){if(a.preventDefault){a.preventDefault()}a.cancelBubble=true;a.returnValue=false;return false}};cAutocomplete.onInputKeyUp=function(e){if(e==null){e=window.event}var b=(e.srcElement)?e.srcElement:e.originalTarget;var d=b.hAutocomplete;var a=document.getElementById(d.sInputId);switch(e.keyCode){case 8:if(d.bAutoComplete&&d.bAutocompleted){d.bAutocompleted=false;return false}break;case 38:case 40:if(d.bListDisplayed){if(e.preventDefault){e.preventDefault()}e.cancelBubble=true;e.returnValue=false;return false}break;case 32:case 46:case 35:case 36:break;default:if(e.keyCode<48){if(e.preventDefault){e.preventDefault()}if(d.bDebug){d.debug("keyUp: hEvent.returnValue = false")}e.cancelBubble=true;e.returnValue=false;return false}break}if(d.hMarkRangeTimeout!=null){clearTimeout(d.hMarkRangeTimeout)}if(d.hShowTimeout){clearTimeout(d.hShowTimeout);d.hShowTimeout=null}var c=d.bRemoteList?cAutocomplete.CN_REMOTE_SHOW_TIMEOUT:cAutocomplete.CN_SHOW_TIMEOUT;d.hShowTimeout=setTimeout(function(){d.prepareList()},c);if(d.bDebug){d.debug("setTimeout "+c)}};cAutocomplete.onInputBlur=function(c){if(c==null){c=window.event}var a=(c.srcElement)?c.srcElement:c.originalTarget;if(a.form){a.form.bLocked=false}var b=a.hAutocomplete;if(!b.hClearTimeout){b.hClearTimeout=setTimeout(function(){b.clearList()},cAutocomplete.CN_CLEAR_TIMEOUT)}};cAutocomplete.onInputFocus=function(c){if(c==null){c=window.event}var a=(c.srcElement)?c.srcElement:c.originalTarget;var b=a.hAutocomplete;if(b.hClearTimeout){clearTimeout(b.hClearTimeout);b.hClearTimeout=null}};cAutocomplete.saveCaretPosition=function(d){if(d==null){d=window.event}var b=(d.srcElement)?d.srcElement:d.originalTarget;var c=b.hAutocomplete;var a=document.getElementById(c.sInputId);if(d.keyCode!=38&&d.keyCode!=40){c.nInsertPoint=cAutocomplete.getInputCaretPosition(a)}};cAutocomplete.getInputCaretPosition=function(c){if(typeof c.selectionStart!="undefined"){if(c.selectionStart==c.selectionEnd){return c.selectionStart}else{return c.selectionStart}}else{if(c.createTextRange){var e=document.selection.createRange();if(c.tagName.toLowerCase()=="textarea"){var a=e.duplicate();var b=e.duplicate();e.moveToElementText(c);a.setEndPoint("StartToStart",e);return a.text.length}else{e.moveStart("character",-1*c.value.length);var d=e.text.length;return d}}}return null};cAutocomplete.setInputCaretPosition=function(c,a){if(c.setSelectionRange){c.setSelectionRange(a,a)}else{if(c.createTextRange){var b=c.createTextRange();b.moveStart("character",a);b.moveEnd("character",a);b.collapse(true);b.select()}}};cAutocomplete.markInputRange=function(c,d,a){if(c.setSelectionRange){c.focus();c.setSelectionRange(d,a)}else{if(c.createTextRange){var b=c.createTextRange();b.collapse(true);b.moveStart("character",d);b.moveEnd("character",a-d);b.select()}}};cAutocomplete.markInputRange2=function(a){var c=document.getElementById(a);var d=c.hAutocomplete.nStartAC;var b=c.hAutocomplete.nEndAC;cAutocomplete.markInputRange(c,d,b)};cAutocomplete.onListBlur=function(c){if(c==null){c=window.event}var a=(c.srcElement)?c.srcElement:c.originalTarget;a=getParentByProperty(a,"className","autocomplete_holder");var b=a.hAutocomplete;if(!b.hClearTimeout){b.hClearTimeout=setTimeout(function(){b.clearList()},cAutocomplete.CN_CLEAR_TIMEOUT)}};cAutocomplete.onListFocus=function(c){if(c==null){c=window.event}var a=(c.srcElement)?c.srcElement:c.originalTarget;a=getParentByProperty(a,"className","autocomplete_holder");var b=a.hAutocomplete;if(b.hClearTimeout){clearTimeout(b.hClearTimeout);b.hClearTimeout=null}};cAutocomplete.onItemClick=function(d){if(d==null){d=window.event}var a=(d.srcElement)?d.srcElement:d.originalTarget;var e=getParentByProperty(a,"className","autocomplete_holder");var c=getParentByTagName(a,"A");if(e!=null){var b=e.hAutocomplete;b.selectOption(c);document.getElementById(b.sInputId).focus();b.clearList()}if(d.preventDefault){d.preventDefault()}d.cancelBubble=true;d.returnValue=false;return false};cAutocomplete.onButtonClick=function(d){if(d==null){d=window.event}var b=(d.srcElement)?d.srcElement:d.originalTarget;var c=b.hAutocomplete;var a=document.getElementById(c.sInputId);if(a.disabled){return}if(c.bDebug){c.debug("onButtonClick")}c.prepareList(true);var a=document.getElementById(c.sInputId);a.focus()};cAutocomplete.onFormSubmit=function(c){if(c==null){c=window.event}var a=(c.srcElement)?c.srcElement:c.originalTarget;if(a.bLocked){var b=a.hAutocomplete;if(b.bDebug){b.debug("onSubmit: hElement.bLocked")}a.bLocked=false;c.returnValue=false;if(c.preventDefault){c.preventDefault()}return false}};
\ No newline at end of file
Added: trunk/themes/default/sortable-min.js
===================================================================
--- trunk/themes/default/sortable-min.js	 (rev 0)
+++ trunk/themes/default/sortable-min.js	2010年09月13日 15:05:24 UTC (rev 7688)
@@ -0,0 +1 @@
+var image_path="/images/";var image_up="sort_up.gif";var image_down="sort_down.gif";var image_none="sort_none.gif";var europeandate=true;var alternate_row_colors=true;addEvent(window,"load",sortables_init);var SORT_COLUMN_INDEX;var thead=false;function sortables_init(){if(!document.getElementsByTagName){return}tbls=document.getElementsByTagName("table");for(ti=0;ti<tbls.length;ti++){thisTbl=tbls[ti];if(((" "+thisTbl.className+" ").indexOf("sortable")!=-1)&&(thisTbl.id)){ts_makeSortable(thisTbl)}}}function ts_makeSortable(d){if(d.rows&&d.rows.length>0){if(d.tHead&&d.tHead.rows.length>0){var e=d.tHead.rows[d.tHead.rows.length-1];thead=true}else{var e=d.rows[0]}}if(!e){return}for(var c=0;c<e.cells.length;c++){var b=e.cells[c];var a=ts_getInnerText(b);if(b.className!="unsortable"&&b.className.indexOf("unsortable")==-1){b.innerHTML='<a href="#" class="sortheader" onclick="ts_resortTable(this, '+c+');return false;">'+a+'<span class="sortarrow">&nbsp;&nbsp;<img src="'+image_path+image_none+'" alt="&darr;"/></span></a>'}}if(alternate_row_colors){alternate(d)}}function ts_getInnerText(d){if(typeof d=="string"){return d}if(typeof d=="undefined"){return d}if(d.innerText){return d.innerText}var e="";var c=d.childNodes;var a=c.length;for(var b=0;b<a;b++){switch(c[b].nodeType){case 1:e+=ts_getInnerText(c[b]);break;case 3:e+=c[b].nodeValue;break}}return e}function ts_resortTable(g,l){var n;for(var p=0;p<g.childNodes.length;p++){if(g.childNodes[p].tagName&&g.childNodes[p].tagName.toLowerCase()=="span"){n=g.childNodes[p]}}var a=ts_getInnerText(n);var b=g.parentNode;var c=l||b.cellIndex;var o=getParent(b,"TABLE");if(o.rows.length<=1){return}var h="";var e=0;while(h==""&&e<o.tBodies[0].rows.length){var h=ts_getInnerText(o.tBodies[0].rows[e].cells[c]);h=trim(h);if(h.substr(0,4)=="<!--"||h.length==0){h=""}e++}if(h==""){return}sortfn=ts_sort_caseinsensitive;if(h.match(/^\d\d[\/\.-][a-zA-z][a-zA-Z][a-zA-Z][\/\.-]\d\d\d\d$/)){sortfn=ts_sort_date}if(h.match(/^\d\d[\/\.-]\d\d[\/\.-]\d\d\d{2}?$/)){sortfn=ts_sort_date}if(h.match(/^-?[�$�ۢ�]\d/)){sortfn=ts_sort_numeric}if(h.match(/^\d+ *(B|KB|MB)$/)){sortfn=ts_sort_numeric}if(h.match(/^-?(\d+[,\.]?)+(E[-+][\d]+)?%?$/)){sortfn=ts_sort_numeric}SORT_COLUMN_INDEX=c;var d=new Array();var f=new Array();for(k=0;k<o.tBodies.length;k++){for(e=0;e<o.tBodies[k].rows[0].length;e++){d[e]=o.tBodies[k].rows[0][e]}}for(k=0;k<o.tBodies.length;k++){if(!thead){for(j=1;j<o.tBodies[k].rows.length;j++){f[j-1]=o.tBodies[k].rows[j]}}else{for(j=0;j<o.tBodies[k].rows.length;j++){f[j]=o.tBodies[k].rows[j]}}}f.sort(sortfn);if(n.getAttribute("sortdir")=="down"){ARROW='&nbsp;&nbsp;<img src="'+image_path+image_down+'" alt="&darr;"/>';f.reverse();n.setAttribute("sortdir","up")}else{ARROW='&nbsp;&nbsp;<img src="'+image_path+image_up+'" alt="&uarr;"/>';n.setAttribute("sortdir","down")}for(e=0;e<f.length;e++){if(!f[e].className||(f[e].className&&(f[e].className.indexOf("sortbottom")==-1))){o.tBodies[0].appendChild(f[e])}}for(e=0;e<f.length;e++){if(f[e].className&&(f[e].className.indexOf("sortbottom")!=-1)){o.tBodies[0].appendChild(f[e])}}var m=document.getElementsByTagName("span");for(var p=0;p<m.length;p++){if(m[p].className=="sortarrow"){if(getParent(m[p],"table")==getParent(g,"table")){m[p].innerHTML='&nbsp;&nbsp;<img src="'+image_path+image_none+'" alt="&darr;"/>'}}}n.innerHTML=ARROW;alternate(o)}function getParent(b,a){if(b==null){return null}else{if(b.nodeType==1&&b.tagName.toLowerCase()==a.toLowerCase()){return b}else{return getParent(b.parentNode,a)}}}function sort_date(b){dt="00000000";if(b.length==11){mtstr=b.substr(3,3);mtstr=mtstr.toLowerCase();switch(mtstr){case"jan":var a="01";break;case"feb":var a="02";break;case"mar":var a="03";break;case"apr":var a="04";break;case"may":var a="05";break;case"jun":var a="06";break;case"jul":var a="07";break;case"aug":var a="08";break;case"sep":var a="09";break;case"oct":var a="10";break;case"nov":var a="11";break;case"dec":var a="12";break}dt=b.substr(7,4)+a+b.substr(0,2);return dt}else{if(b.length==10){if(europeandate==false){dt=b.substr(6,4)+b.substr(0,2)+b.substr(3,2);return dt}else{dt=b.substr(6,4)+b.substr(3,2)+b.substr(0,2);return dt}}else{if(b.length==8){yr=b.substr(6,2);if(parseInt(yr)<50){yr="20"+yr}else{yr="19"+yr}if(europeandate==true){dt=yr+b.substr(3,2)+b.substr(0,2);return dt}else{dt=yr+b.substr(0,2)+b.substr(3,2);return dt}}}}return dt}function ts_sort_date(d,c){dt1=sort_date(ts_getInnerText(d.cells[SORT_COLUMN_INDEX]));dt2=sort_date(ts_getInnerText(c.cells[SORT_COLUMN_INDEX]));if(dt1==dt2){return 0}if(dt1<dt2){return -1}return 1}function ts_sort_numeric(d,c){var e=ts_getInnerText(d.cells[SORT_COLUMN_INDEX]);e=clean_num(e);var f=ts_getInnerText(c.cells[SORT_COLUMN_INDEX]);f=clean_num(f);return compare_numeric(e,f)}function compare_numeric(d,c){var e=parseFloat(d);e=(isNaN(e)?0:e);var f=parseFloat(c);f=(isNaN(f)?0:f);return e-f}function ts_sort_caseinsensitive(d,c){var e=ts_getInnerText(d.cells[SORT_COLUMN_INDEX]).toLowerCase();var f=ts_getInnerText(c.cells[SORT_COLUMN_INDEX]).toLowerCase();if(e==f){return 0}if(e<f){return -1}return 1}function ts_sort_default(d,c){var e=ts_getInnerText(d.cells[SORT_COLUMN_INDEX]);var f=ts_getInnerText(c.cells[SORT_COLUMN_INDEX]);if(e==f){return 0}if(e<f){return -1}return 1}function addEvent(e,d,b,a){if(e.addEventListener){e.addEventListener(d,b,a);return true}else{if(e.attachEvent){var c=e.attachEvent("on"+d,b);return c}else{alert("Handler could not be removed");return false}}}function clean_num(a){a=a.replace(new RegExp(/[^-?0-9.]/g),"");return a}function trim(a){return a.replace(/^\s+|\s+$/g,"")}function alternate(e){var c=e.getElementsByTagName("tbody");for(var b=0;b<c.length;b++){var d=c[b].getElementsByTagName("tr");for(var a=0;a<d.length;a++){if((a%2)==0){if(!(d[a].className.indexOf("odd")==-1)){d[a].className=d[a].className.replace("odd","even")}else{if(d[a].className.indexOf("even")==-1){d[a].className+=" even"}}}else{if(!(d[a].className.indexOf("even")==-1)){d[a].className=d[a].className.replace("even","odd")}else{if(d[a].className.indexOf("odd")==-1){d[a].className+=" odd"}}}}}};
\ No newline at end of file
Added: trunk/themes/default/toolbar-min.js
===================================================================
--- trunk/themes/default/toolbar-min.js	 (rev 0)
+++ trunk/themes/default/toolbar-min.js	2010年09月13日 15:05:24 UTC (rev 7688)
@@ -0,0 +1 @@
+var doctype='<?xml version="1.0" encoding="utf-8"?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">';var cssfile='<link rel="stylesheet" type="text/css" href="'+data_path+'/themes/default/toolbar.css" />';if(window.top!=window){window.top.location=window.location}var pullwin;function addButton(e,a,d,b){var c;a=escapeQuotes(a);document.write('<a href="javascript:'+d+"(");for(c=0;c<b.length;c++){if(c>0){document.write(",")}document.write("'"+escapeQuotes(b[c])+"'")}document.write(');"><img src="'+e+'" width="18" height="18" border="0" alt="'+a+'" title="'+a+'">');document.write("</a>");return}function addTagButton(e,a,c,b,d){addButton(e,a,"insertTags",[c,b,d]);return}function showPulldown(j,c,g,a,d){var l=new String(Math.min(315,80+(c.length*12)));var b=500;var e=(screen.height-l)/2;var k=(screen.width-b)/2;pullwin=window.open("","","toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top="+e+",left="+k+",height="+l+",width="+b);pullwin.window.document.writeln(doctype);pullwin.window.document.writeln("<html>\n<head>\n<title>"+escapeQuotes(j)+"</title>");pullwin.window.document.writeln(cssfile);pullwin.window.document.writeln("</head>\n<body>");pullwin.window.document.writeln("<p>\nYou can double-click to insert.\n</p>");pullwin.window.document.writeln('<form action=""><div id="buttons"><input type="button" value="'+g+'" onclick="if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+d+'\'); return false;" /><input type="button" value="'+a+'" onclick="self.close(); return false;" /></div>\n<div>\n<select style="margin-top:10px;width:190px;" name="select" size="'+((c.length>20)?"20":new String(c.length))+'" ondblclick="if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+d+"'); return false;\">");for(i=0;i<c.length;i++){if(typeof c[i]=="string"){pullwin.window.document.write('<option value="'+c[i]+'">'+escapeQuotes(c[i])+"</option>\n")}else{pullwin.window.document.write('<option value="'+c[i][1]+'">'+escapeQuotes(c[i][0])+"</option>\n")}}pullwin.window.document.writeln("</select>\n</div>\n</form>\n</body>\n</html>");pullwin.window.document.close();return false}function do_pulldown(b,a){if(a=="tb-categories"){var c=document.getElementById("edit-content");b=unescapeSpecial(b);c.value+="\n"+b}else{insertTags(b,"","\n")}return}function addInfobox(c){var b=navigator.userAgent.toLowerCase();var a=((b.indexOf("gecko")!=-1)&&(b.indexOf("spoofer")==-1)&&(b.indexOf("khtml")==-1));if(!document.selection&&!a){c=escapeQuotesHTML(c);document.write("<form name='infoform' id='infoform'><input size=80 id='infobox' name='infobox' value=\""+c+'" readonly="readonly"></form>')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,"&quot;");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,"&quot;");return b}function unescapeSpecial(b){var a=new RegExp("%0A","g");b=b.replace(a,"\n");var a=new RegExp("%22","g");b=b.replace(a,'"');var a=new RegExp("%27","g");b=b.replace(a,"'");var a=new RegExp("%09","g");b=b.replace(a," ");var a=new RegExp("%7C","g");b=b.replace(a,"|");var a=new RegExp("%5B","g");b=b.replace(a,"[");var a=new RegExp("%5D","g");b=b.replace(a,"]");var a=new RegExp("%5C","g");b=b.replace(a,"\\");return b}function insertTags(g,a,b){var j=document.getElementById("edit-content");g=unescapeSpecial(g);if(document.selection){var k=document.selection.createRange().text;if(!k){k=b}j.focus();if(k.charAt(k.length-1)==" "){k=k.substring(0,k.length-1);document.selection.createRange().text=g+k+a+" "}else{document.selection.createRange().text=g+k+a}}else{if(j.selectionStart||j.selectionStart=="0"){var h=j.selectionStart;var c=j.selectionEnd;var e=j.scrollTop;var d=(j.value).substring(h,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=g+d.substring(0,(d.length-1))+a+" "}else{subst=g+d+a}j.value=j.value.substring(0,h)+subst+j.value.substring(c,j.value.length);j.focus();var l=h+(g.length+d.length+a.length);j.selectionStart=l;j.selectionEnd=l;j.scrollTop=e}else{j.value+=g+b+a;j.focus()}}if(j.createTextRange){j.caretPos=document.selection.createRange().duplicate()}}var f,sr_undo,replacewin,undo_buffer=new Array(),undo_buffer_index=0;function define_f(){f=document.getElementById("editpage");f.editarea=document.getElementById("edit-content");sr_undo=document.getElementById("sr_undo");undo_enable(false);f.editarea.focus()}function undo_enable(a){if(a){sr_undo.src=uri_undo_btn;sr_undo.alt=msg_undo_alt;sr_undo.disabled=false}else{sr_undo.src=uri_undo_d_btn;sr_undo.alt=msg_undo_d_alt;sr_undo.disabled=true;if(sr_undo.blur){sr_undo.blur()}}}function replace(){var a=120;var d=600;var c=(screen.height-a)/2;var b=(screen.width-d)/2;replacewin=window.open("","","toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top="+c+",left="+b+",height="+a+",width="+d);replacewin.window.document.writeln(doctype);replacewin.window.document.writeln("<html>\n<head>\n<title>"+msg_repl_title+"</title>");replacewin.window.document.writeln(cssfile);replacewin.window.document.writeln("</head>");replacewin.window.document.writeln('<body onload="if(document.forms[0].searchinput.focus) document.forms[0].searchinput.focus(); return false;">\n<form action="">\n<center>\n<table>\n<tr>\n<td align="right">'+msg_repl_search+':\n</td>\n<td align="left">\n<input type="text" name="searchinput" size="45" maxlength="500" />\n</td>\n</tr>\n<tr>\n<td align="right">'+msg_repl_replace_with+':\n</td>\n<td align="left">\n<input type="text" name="replaceinput" size="45" maxlength="500" />\n</td>\n</tr>\n<tr>\n<td colspan="2" align="center">\n<input type="button" value=" '+msg_repl_ok+' " onclick="if(self.opener)self.opener.do_replace(); return false;" />&nbsp;&nbsp;&nbsp;<input type="button" value="'+msg_repl_close+'" onclick="self.close(); return false;" />\n</td>\n</tr>\n</table>\n</center>\n</form>\n</body>\n</html>');replacewin.window.document.close();return false}function do_replace(){var a=undo_buffer[undo_buffer_index]=f.editarea.value;var d=new RegExp(replacewin.document.forms[0].searchinput.value,"g");var b=replacewin.document.forms[0].replaceinput.value;if(d==""||d==null){if(replacewin){replacewin.window.document.forms[0].searchinput.focus()}return}var c=a.match(d)?a.match(d).length:0;a=a.replace(d,b);d=d.toString().substring(1,d.toString().length-2);msg_replfound=msg_replfound.replace("1円",d).replace("2円",c).replace("3円",b);msg_replnot=msg_replnot.replace("%s",d);result(c,msg_replfound,a,msg_replnot);replacewin.window.focus();replacewin.window.document.forms[0].searchinput.focus();return false}function result(c,a,d,b){if(c>0){if(window.confirm(a)==true){f.editarea.value=d;undo_save();undo_enable(true)}}else{alert(b)}}function do_undo(){if(undo_buffer_index==0){return}else{if(undo_buffer_index>0){f.editarea.value=undo_buffer[undo_buffer_index-1];undo_buffer[undo_buffer_index]=null;undo_buffer_index--;if(undo_buffer_index==0){alert(msg_do_undo);undo_enable(false)}}}}function undo_save(){undo_buffer[undo_buffer_index]=f.editarea.value;undo_buffer_index++;undo_enable(true)};
\ 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: 7687
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7687&view=rev
Author: vargenau
Date: 2010年09月13日 14:52:49 +0000 (2010年9月13日)
Log Message:
-----------
Minify toolbar.css
Modified Paths:
--------------
 trunk/themes/default/Makefile
Added Paths:
-----------
 trunk/themes/default/toolbar-min.css
Modified: trunk/themes/default/Makefile
===================================================================
--- trunk/themes/default/Makefile	2010年09月13日 12:41:32 UTC (rev 7686)
+++ trunk/themes/default/Makefile	2010年09月13日 14:52:49 UTC (rev 7687)
@@ -7,6 +7,7 @@
 
 CSS_SRC = IEFixes.css phpwiki-printer.css phpwiki.css \
 	 highlight.css phpwiki-modern.css phpwiki-topbottombars.css \
+	 toolbar.css \
 	 moacdropdown/css/dropdown.css
 MAIN = wikicommon
 JS_MAIN = wikicommon.js sortable.js ajax.js moacdropdown.js toolbar.js
Added: trunk/themes/default/toolbar-min.css
===================================================================
--- trunk/themes/default/toolbar-min.css	 (rev 0)
+++ trunk/themes/default/toolbar-min.css	2010年09月13日 14:52:49 UTC (rev 7687)
@@ -0,0 +1 @@
+body{font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:10pt;background-color:#ddd;}input{font-weight:bold;margin-left:2px;margin-right:2px;}option,td{font-size:9pt;}#buttons{background-color:#ddd;padding-right:10px;width:180px;}
\ 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: 7686
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7686&view=rev
Author: vargenau
Date: 2010年09月13日 12:41:32 +0000 (2010年9月13日)
Log Message:
-----------
Center pop-up windows
Modified Paths:
--------------
 trunk/themes/default/toolbar.js
Added Paths:
-----------
 trunk/themes/default/toolbar.css
Property Changed:
----------------
 trunk/themes/default/sortable.js
 trunk/themes/default/wikicommon.js
Property changes on: trunk/themes/default/sortable.js
___________________________________________________________________
Modified: svn:keywords
 - id
 + Id
Added: trunk/themes/default/toolbar.css
===================================================================
--- trunk/themes/default/toolbar.css	 (rev 0)
+++ trunk/themes/default/toolbar.css	2010年09月13日 12:41:32 UTC (rev 7686)
@@ -0,0 +1,26 @@
+/*
+ * $Id$
+ *
+ */
+
+body {
+ font-family: Tahoma,Arial,Helvetica,sans-serif;
+ font-size: 10pt;
+ background-color: #dddddd;
+}
+
+input {
+ font-weight: bold;
+ margin-left: 2px;
+ margin-right: 2px;
+}
+
+option, td {
+ font-size: 9pt
+}
+
+#buttons {
+ background-color: #dddddd;
+ padding-right: 10px;
+ width: 180px;
+}
Property changes on: trunk/themes/default/toolbar.css
___________________________________________________________________
Added: svn:keywords
 + Id
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2010年09月13日 12:27:54 UTC (rev 7685)
+++ trunk/themes/default/toolbar.js	2010年09月13日 12:41:32 UTC (rev 7686)
@@ -1,6 +1,10 @@
 // Toolbar JavaScript support functions. Taken from mediawiki 
 // $Id$
 
+// Some "constants"
+var doctype = '<?xml version="1.0" encoding="utf-8"?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">';
+var cssfile = '<link rel="stylesheet" type="text/css" href="'+data_path+'/themes/default/toolbar.css" />'
+
 // Un-trap us from framesets
 if( window.top != window ) window.top.location = window.location;
 var pullwin;
@@ -36,17 +40,24 @@
 //}
 // pages is either an array of strings or an array of array(name,value)
 function showPulldown(title, pages, okbutton, closebutton, fromid) {
- height = new String(Math.min(315, 80 + (pages.length * 12))); // 270 or smaller
- pullwin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,height='+height+',width=200');
- pullwin.window.document.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>'+escapeQuotes(title)+'</title><style type=\"text/css\"><'+'!'+'-- body {font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:10pt;background-color:#dddddd;} input { font-weight:bold;margin-left:2px;margin-right:2px;} option {font-size:9pt} #buttons { background-color:#dddddd;padding-right:10px;width:180px;} --'+'></style></head>');
- pullwin.window.document.write('\n<body bgcolor=\"#dddddd\"><form action=\"\"><div id=\"buttons\"><input type=\"button\" value=\"'+okbutton+'\" onclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\"><input type=\"button\" value=\"'+closebutton+'\" onClick=\"self.close(); return false;\"></div>\n<select style=\"margin-top:10px;width:190px;\" name=\"select\" size=\"'+((pages.length>20)?'20':new String(pages.length))+'\" onDblClick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\">');
+ var height = new String(Math.min(315, 80 + (pages.length * 12))); // 270 or smaller
+ var width = 500;
+ var h = (screen.height-height)/2;
+ var w = (screen.width-width)/2;
+ pullwin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top='+h+',left='+w+',height='+height+',width='+width);
+ pullwin.window.document.writeln(doctype);
+ pullwin.window.document.writeln('<html>\n<head>\n<title>'+escapeQuotes(title)+'</title>');
+ pullwin.window.document.writeln(cssfile);
+ pullwin.window.document.writeln('</head>\n<body>');
+ pullwin.window.document.writeln('<p>\nYou can double-click to insert.\n</p>');
+ pullwin.window.document.writeln('<form action=\"\"><div id=\"buttons\"><input type=\"button\" value=\"'+okbutton+'\" onclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\" /><input type=\"button\" value=\"'+closebutton+'\" onclick=\"self.close(); return false;\" /></div>\n<div>\n<select style=\"margin-top:10px;width:190px;\" name=\"select\" size=\"'+((pages.length>20)?'20':new String(pages.length))+'\" ondblclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\">');
 for (i=0; i<pages.length; i++){
 if (typeof pages[i] == 'string')
 pullwin.window.document.write('<option value="'+pages[i]+'">'+escapeQuotes(pages[i])+'</option>\n');
 else // array=object
 pullwin.window.document.write('<option value="'+pages[i][1]+'">'+escapeQuotes(pages[i][0])+'</option>\n');
 }
- pullwin.window.document.write('</select></form></body></html>');
+ pullwin.window.document.writeln('</select>\n</div>\n</form>\n</body>\n</html>');
 pullwin.window.document.close();
 return false;
 }
@@ -183,8 +194,16 @@
 }
 }
 function replace() {
- replacewin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,height=90,width=450');
- replacewin.window.document.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>'+msg_repl_title+"</title><style type=\"text/css\"><'+'!'+'-- body, input {font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:10pt;font-weight:bold;} td {font-size:9pt} --'+'></style></head><body bgcolor=\"#dddddd\" onload=\"if(document.forms[0].searchinput.focus) document.forms[0].searchinput.focus(); return false;\"><form action=\"\"><center><table><tr><td align=\"right\">"+msg_repl_search+":</td><td align=\"left\"><input type=\"text\" name=\"searchinput\" size=\"45\" maxlength=\"500\"></td></tr><tr><td align=\"right\">"+msg_repl_replace_with+":</td><td align=\"left\"><input type=\"text\" name=\"replaceinput\" size=\"45\" maxlength=\"500\"></td></tr><tr><td colspan=\"2\" align=\"center\"><input type=\"button\" value=\" "+msg_repl_ok+" \" onclick=\"if(self.opener)self.opener.do_replace(); return false;\">&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\""+msg_repl_close+"\" onclick=\"self.close(); return false;\"></td></tr></table></center></form></body></html>");
+ var height = 120;
+ var width = 600;
+ var h = (screen.height-height)/2;
+ var w = (screen.width-width)/2;
+ replacewin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top='+h+',left='+w+',height='+height+',width='+width);
+ replacewin.window.document.writeln(doctype);
+ replacewin.window.document.writeln('<html>\n<head>\n<title>'+msg_repl_title+'</title>');
+ replacewin.window.document.writeln(cssfile);
+ replacewin.window.document.writeln('</head>');
+ replacewin.window.document.writeln("<body onload=\"if(document.forms[0].searchinput.focus) document.forms[0].searchinput.focus(); return false;\">\n<form action=\"\">\n<center>\n<table>\n<tr>\n<td align=\"right\">"+msg_repl_search+":\n</td>\n<td align=\"left\">\n<input type=\"text\" name=\"searchinput\" size=\"45\" maxlength=\"500\" />\n</td>\n</tr>\n<tr>\n<td align=\"right\">"+msg_repl_replace_with+":\n</td>\n<td align=\"left\">\n<input type=\"text\" name=\"replaceinput\" size=\"45\" maxlength=\"500\" />\n</td>\n</tr>\n<tr>\n<td colspan=\"2\" align=\"center\">\n<input type=\"button\" value=\" "+msg_repl_ok+" \" onclick=\"if(self.opener)self.opener.do_replace(); return false;\" />&nbsp;&nbsp;&nbsp;<input type=\"button\" value=\""+msg_repl_close+"\" onclick=\"self.close(); return false;\" />\n</td>\n</tr>\n</table>\n</center>\n</form>\n</body>\n</html>");
 replacewin.window.document.close();
 return false;
 }
Property changes on: trunk/themes/default/wikicommon.js
___________________________________________________________________
Modified: svn:keywords
 - id
 + Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7685
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7685&view=rev
Author: vargenau
Date: 2010年09月13日 12:27:54 +0000 (2010年9月13日)
Log Message:
-----------
Valid XHTML
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2010年09月10日 12:13:48 UTC (rev 7684)
+++ trunk/lib/WikiTheme.php	2010年09月13日 12:27:54 UTC (rev 7685)
@@ -1469,7 +1469,7 @@
 // define ENABLE_DOUBLECLICKEDIT
 function initDoubleClickEdit() {
 if (!$this->HTML_DUMP_SUFFIX)
- $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" OnDblClick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\""));
+ $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\""));
 }
 
 // Immediate title search results via XMLHTML(HttpRequest)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.