From: <var...@us...> - 2011-03-07 13:39:55
|
Revision: 7968 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7968&view=rev Author: vargenau Date: 2011-03-07 13:39:47 +0000 (Mon, 07 Mar 2011) Log Message: ----------- No tabs Modified Paths: -------------- trunk/themes/Crao/themeinfo.php trunk/themes/Hawaiian/themeinfo.php trunk/themes/MacOSX/themeinfo.php trunk/themes/MonoBook/themeinfo.php trunk/themes/Portland/themeinfo.php trunk/themes/Sidebar/clock.php trunk/themes/Sidebar/hyperapplet.php trunk/themes/Sidebar/hyperwiki.php trunk/themes/Sidebar/themeinfo.php trunk/themes/SpaceWiki/themeinfo.php trunk/themes/Wordpress/themeinfo.php trunk/themes/blog/themeinfo.php trunk/themes/default/themeinfo.php trunk/themes/shamino_com/themeinfo.php trunk/themes/smaller/themeinfo.php trunk/themes/wikilens/themeinfo.php Modified: trunk/themes/Crao/themeinfo.php =================================================================== --- trunk/themes/Crao/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Crao/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -17,77 +17,63 @@ class WikiTheme_Crao extends WikiTheme { function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" selected. - $this->setDefaultCSS('Crao', - array('' => 'crao.css', - 'print' => '')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" selected. + $this->setDefaultCSS('Crao', array(''=> 'crao.css', 'print' => '')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - //$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css'); - //$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); - //$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + /** + * The Signature image is shown after saving an edited page. If this + * is not set, any signature defined in index.php will be used. If it + * is not defined by index.php or in here then the "Thank you for + * editing..." screen will be omitted. + */ + // Comment this next line out to enable signature. + $this->addImageAlias('signature', false); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); + /* + * Link icons. + */ + $this->setLinkIcon('http'); + $this->setLinkIcon('https'); + $this->setLinkIcon('ftp'); + $this->setLinkIcon('mailto'); + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('*', 'url'); - /** - * The Signature image is shown after saving an edited page. If this - * is not set, any signature defined in index.php will be used. If it - * is not defined by index.php or in here then the "Thank you for - * editing..." screen will be omitted. - */ + $this->setButtonSeparator(HTML::raw(" | ")); - // Comment this next line out to enable signature. - $this->addImageAlias('signature', false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /* - * Link icons. - */ - $this->setLinkIcon('http'); - $this->setLinkIcon('https'); - $this->setLinkIcon('ftp'); - $this->setLinkIcon('mailto'); - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('*', 'url'); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); + //$this->setTimeFormat("%I:%M %p"); - $this->setButtonSeparator(HTML::raw(" | ")); + /* + * To suppress times in the "Last edited on" messages, give a + * give a second argument of false: + */ + //$this->setDateFormat("%B %d, %Y", false); + $this->setDateFormat("%A %e %B %Y"); // must not contain time + //$this->setDateFormat("%x"); // must not contain time + $this->setTimeFormat("%H:%M:%S"); + //$this->setTimeFormat("%X"); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); - - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); - //$this->setTimeFormat("%I:%M %p"); - - /* - * To suppress times in the "Last edited on" messages, give a - * give a second argument of false: - */ - //$this->setDateFormat("%B %d, %Y", false); - $this->setDateFormat("%A %e %B %Y"); // must not contain time - //$this->setDateFormat("%x"); // must not contain time - $this->setTimeFormat("%H:%M:%S"); - //$this->setTimeFormat("%X"); - } } @@ -99,5 +85,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Hawaiian/themeinfo.php =================================================================== --- trunk/themes/Hawaiian/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Hawaiian/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -26,66 +26,66 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('Hawaiian', 'Hawaiian.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('Hawaiian', 'Hawaiian.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', 'PalmBeach.jpg'); - $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', 'PalmBeach.jpg'); + $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - //$this->addImageAlias('signature', 'SubmersiblePiscesV.jpg'); - $this->addImageAlias('signature', 'WaterFall.jpg'); - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + //$this->addImageAlias('signature', 'SubmersiblePiscesV.jpg'); + $this->addImageAlias('signature', 'WaterFall.jpg'); + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - // If you want to see more than just the waterfall let a random - // picture be chosen for the signature image: - //include_once($this->file('lib/random.php')); - include_once("themes/$this->_name/lib/random.php"); - $imgSet = new randomImage($this->file("images/pictures")); - $imgFile = "pictures/" . $imgSet->filename; - $this->addImageAlias('signature', $imgFile); + // If you want to see more than just the waterfall let a random + // picture be chosen for the signature image: + //include_once($this->file('lib/random.php')); + include_once("themes/$this->_name/lib/random.php"); + $imgSet = new randomImage($this->file("images/pictures")); + $imgFile = "pictures/" . $imgSet->filename; + $this->addImageAlias('signature', $imgFile); - //To test out the randomization just use logo instead of signature - //$this->addImageAlias('logo', $imgFile); + //To test out the randomization just use logo instead of signature + //$this->addImageAlias('logo', $imgFile); - /* - * Link Icons - */ - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('*', 'flower.png'); + /* + * Link Icons + */ + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('*', 'flower.png'); - $this->setButtonSeparator(' '); + $this->setButtonSeparator(' '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(true); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(true); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); // must not contain time + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); // must not contain time } } @@ -98,5 +98,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/MacOSX/themeinfo.php =================================================================== --- trunk/themes/MacOSX/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/MacOSX/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -71,7 +71,7 @@ else { $default_text = $wikiword; } - + $url = WikiURL($wikiword, array('action' => 'create')); //$link = HTML::span(HTML::a(array('href' => $url), '?')); $button = $this->makeButton('?', $url); @@ -92,70 +92,68 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. - $this->setDefaultCSS('MacOSX', - array('' => 'MacOSX.css', - 'print' => 'phpwiki-printer.css')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. + $this->setDefaultCSS('MacOSX', array('' => 'MacOSX.css', 'print' => 'phpwiki-printer.css')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css'); + // This allows one to manually select "Printer" style (when browsing page) + // to see what the printer style looks like. + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - /* - * Link icons. - */ - $this->setLinkIcon('http'); - $this->setLinkIcon('https'); - $this->setLinkIcon('ftp'); - $this->setLinkIcon('mailto'); - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('wikiuser'); - $this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ + $this->setLinkIcon('http'); + $this->setLinkIcon('https'); + $this->setLinkIcon('ftp'); + $this->setLinkIcon('mailto'); + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('wikiuser'); + $this->setLinkIcon('*', 'url'); - $this->setButtonSeparator(""); //use no separator instead of default + $this->setButtonSeparator(""); //use no separator instead of default - $this->addButtonAlias('?', 'uww'); - $this->addButtonAlias(_("Lock Page"), "Lock Page"); - $this->addButtonAlias(_("Unlock Page"), "Unlock Page"); - $this->addButtonAlias(_("Page Locked"), "Page Locked"); - $this->addButtonAlias("...", "alltime"); + $this->addButtonAlias('?', 'uww'); + $this->addButtonAlias(_("Lock Page"), "Lock Page"); + $this->addButtonAlias(_("Unlock Page"), "Unlock Page"); + $this->addButtonAlias(_("Page Locked"), "Page Locked"); + $this->addButtonAlias("...", "alltime"); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%A, %B %d, %Y"); // must not contain time - $this->setTimeFormat("%I:%M:%S %p"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%A, %B %d, %Y"); // must not contain time + $this->setTimeFormat("%I:%M:%S %p"); } } @@ -167,5 +165,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/MonoBook/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -44,7 +44,7 @@ class WikiTheme_MonoBook extends WikiTheme_Wikilens { - + /* this adds selected to the class */ function makeActionButton ($action, $label=false, $page_or_rev=false, $options=false) { extract($this->_get_name_and_rev($page_or_rev)); @@ -78,90 +78,90 @@ } function load() { - $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '".$this->_name."';\n")); - $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikibits.js")))); - if (isBrowserIE()) { - $ver = browserVersion(); - if ($ver > 5.5 and $ver < 7.0) - $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE60Fixes.css'),'all')); - elseif ($ver >= 7.0) - $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE70Fixes.css'),'all')); - unset($ver); - $this->addMoreHeaders("\n"); - $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("IEFixes.js")))); - $this->addMoreHeaders("\n"); - $this->addMoreHeaders(HTML::Raw('<meta http-equiv="imagetoolbar" content="no" />')); - } - $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"')); + $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '".$this->_name."';\n")); + $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikibits.js")))); + if (isBrowserIE()) { + $ver = browserVersion(); + if ($ver > 5.5 and $ver < 7.0) + $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE60Fixes.css'),'all')); + elseif ($ver >= 7.0) + $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE70Fixes.css'),'all')); + unset($ver); + $this->addMoreHeaders("\n"); + $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("IEFixes.js")))); + $this->addMoreHeaders("\n"); + $this->addMoreHeaders(HTML::Raw('<meta http-equiv="imagetoolbar" content="no" />')); + } + $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"')); - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. - $this->setDefaultCSS('PhpWiki', - array('' => 'monobook.css', - 'print' => 'commonPrint.css')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. + $this->setDefaultCSS('PhpWiki', + array('' => 'monobook.css', + 'print' => 'commonPrint.css')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - $this->addAlternateCSS(_("Printer"), 'commonPrint.css', 'print, screen'); - $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + // This allows one to manually select "Printer" style (when browsing page) + // to see what the printer style looks like. + $this->addAlternateCSS(_("Printer"), 'commonPrint.css', 'print, screen'); + $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', 'MonoBook-Logo.png'); - //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', 'MonoBook-Logo.png'); + //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ - $this->addImageAlias('signature', "Signature.png"); - // Uncomment this next line to disable the signature. - $this->addImageAlias('signature', false); + $this->addImageAlias('signature', "Signature.png"); + // Uncomment this next line to disable the signature. + $this->addImageAlias('signature', false); - /* - * Link icons. - */ - $this->setLinkIcon('wikiuser'); + /* + * Link icons. + */ + $this->setLinkIcon('wikiuser'); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - /** - * Layout improvement with dangling links for mostly closed wiki's: - * If false, only users with edit permissions will be presented the - * special wikiunknown class with "?" and Tooltip. - * If true (default), any user will see the ?, but will be presented - * the PrintLoginForm on a click. - */ - $this->setAnonEditUnknownLinks(false); + /** + * Layout improvement with dangling links for mostly closed wiki's: + * If false, only users with edit permissions will be presented the + * special wikiunknown class with "?" and Tooltip. + * If true (default), any user will see the ?, but will be presented + * the PrintLoginForm on a click. + */ + $this->setAnonEditUnknownLinks(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y"); - $this->setTimeFormat("%H:%M"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y"); + $this->setTimeFormat("%H:%M"); - /* - * To suppress times in the "Last edited on" messages, give a - * give a second argument of false: - */ - //$this->setDateFormat("%B %d, %Y", false); + /* + * To suppress times in the "Last edited on" messages, give a + * give a second argument of false: + */ + //$this->setDateFormat("%B %d, %Y", false); } } @@ -173,5 +173,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Portland/themeinfo.php =================================================================== --- trunk/themes/Portland/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Portland/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -25,7 +25,7 @@ else { $default_text = $wikiword; } - + $url = WikiURL($wikiword, array('action' => 'create')); $link = HTML::span(HTML::a(array('href' => $url, 'rel' => 'nofollow'), '?')); @@ -55,56 +55,50 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('Portland', 'portland.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('Portland', 'portland.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', WIKI_NAME . 'logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', WIKI_NAME . 'logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - /* - * Link icons. - */ - //$this->setLinkIcon('http'); - //$this->setLinkIcon('https'); - //$this->setLinkIcon('ftp'); - //$this->setLinkIcon('mailto'); - //$this->setLinkIcon('interwiki'); - //$this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ - $this->setButtonSeparator(' '); + $this->setButtonSeparator(' '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y", false); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y", false); } } @@ -117,5 +111,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Sidebar/clock.php =================================================================== --- trunk/themes/Sidebar/clock.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/clock.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -1,4 +1,4 @@ -<?php +<?php // $Id$ $ora = isset($GLOBALS['WikiTheme']) ? DATA_PATH . '/' . $GLOBALS['WikiTheme']->_findFile("ora.swf") : "ora.swf"; ?> Modified: trunk/themes/Sidebar/hyperapplet.php =================================================================== --- trunk/themes/Sidebar/hyperapplet.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/hyperapplet.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -1,16 +1,16 @@ -<?php +<?php // $Id$ -/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from +/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from * http://hypergraph.sourceforge.net/download.html * and place it into your theme directory. * Include this php file and adjust the width/height. - * The static version requires a dumped "LinkDatabase.xml" via + * The static version requires a dumped "LinkDatabase.xml" via * cd themes/default; wget http://localhost/wiki/index.php/LinkDatabase?format=xml -O LinkDatabase.xml * into the same dir as hyperapplet.jar */ global $WikiTheme; ?> -<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline" +<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline" archive="<?php echo $WikiTheme->_finddata("hyperapplet.jar") ?>" width="160" height="360"> <?php // the dynamic version: ?> Modified: trunk/themes/Sidebar/hyperwiki.php =================================================================== --- trunk/themes/Sidebar/hyperwiki.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/hyperwiki.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -1,15 +1,15 @@ -<?php +<?php // $Id$ - /* Download hyperwiki.jar and GraphXML.dtd from + /* Download hyperwiki.jar and GraphXML.dtd from * http://hypergraph.sourceforge.net/download.html * and place it into your theme directory. * Include this php file and adjust the width/height. */ global $WikiTheme; - // via the RPC interface it goes like this... + // via the RPC interface it goes like this... ?> -<applet code="hypergraph.applications.hwiki.HWikiApplet.class" - archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>" +<applet code="hypergraph.applications.hwiki.HWikiApplet.class" + archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>" width="162" height="240"> <param name="startPage" value="<?php echo $page->getName() ?>" /> <param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>" /> Modified: trunk/themes/Sidebar/themeinfo.php =================================================================== --- trunk/themes/Sidebar/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -43,26 +43,26 @@ /* Display up/down button with persistent state */ /* persistent state per block in cookie for 30 days */ function folderArrow ($id, $init='Open') { - global $request; - if ($cookie = $request->cookies->get("folder_".$id)) { - $init = $cookie; - } + global $request; + if ($cookie = $request->cookies->get("folder_".$id)) { + $init = $cookie; + } if ($init == 'Open' or $init == 'Closed') $png = $this->_findData('images/folderArrow'.$init.'.png'); else $png = $this->_findData('images/folderArrowOpen.png'); - return HTML::img(array('id' => $id.'-img', - 'src' => $png, - //'align' => 'right', - 'onclick' => "showHideFolder('$id')", - 'alt' => _("Click to hide/show"), - 'title' => _("Click to hide/show"))); + return HTML::img(array('id' => $id.'-img', + 'src' => $png, + //'align' => 'right', + 'onclick' => "showHideFolder('$id')", + 'alt' => _("Click to hide/show"), + 'title' => _("Click to hide/show"))); } /* Callback when a new user creates or edits a page */ function CbNewUserEdit (&$request, $userid) { - $userid = strtoupper($userid); - $content = "{{Template/UserPage}}"; + $userid = strtoupper($userid); + $content = "{{Template/UserPage}}"; $dbi =& $request->_dbi; $page = $dbi->getPage($userid); $page->save($content, WIKIDB_FORCE_CREATE, array('author' => $userid)); @@ -81,19 +81,19 @@ */ function CbUpload (&$request, $pathname) { $cmdline = CLAMDSCAN_PATH . " --nosummary --move=" . CLAMDSCAN_VIRUS; - $report = `$cmdline "$pathname"`; - if (!$report) { - trigger_error("clamdscan failed", E_USER_WARNING); - return true; - } - if (!preg_match("/: OK$/", $report)) { - //preg_match("/: (.+)$/", $report, $m); - trigger_error("Upload failed. virus-scanner: $report", E_USER_WARNING); - return false; - } else { - return true; - } + $report = `$cmdline "$pathname"`; + if (!$report) { + trigger_error("clamdscan failed", E_USER_WARNING); + return true; } + if (!preg_match("/: OK$/", $report)) { + //preg_match("/: (.+)$/", $report, $m); + trigger_error("Upload failed. virus-scanner: $report", E_USER_WARNING); + return false; + } else { + return true; + } + } function findTemplate ($name) { @@ -111,87 +111,87 @@ $this->initGlobals(); - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS(_("Sidebar"), array('' => 'sidebar.css', + $this->setDefaultCSS(_("Sidebar"), array('' => 'sidebar.css', 'print' => 'phpwiki-printer.css')); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', 'logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is not set, any signature defined in index.php will be used. If it - * is not defined by index.php or in here then the "Thank you for - * editing..." screen will be omitted. - */ + /** + * The Signature image is shown after saving an edited page. If this + * is not set, any signature defined in index.php will be used. If it + * is not defined by index.php or in here then the "Thank you for + * editing..." screen will be omitted. + */ - // Comment this next line out to enable signature. - $this->addImageAlias('signature', false); + // Comment this next line out to enable signature. + $this->addImageAlias('signature', false); - $this->addImageAlias('search', 'search.png'); + $this->addImageAlias('search', 'search.png'); - /* - * Link icons. - */ - $this->setLinkIcon('http'); - $this->setLinkIcon('https'); - $this->setLinkIcon('ftp'); - $this->setLinkIcon('mailto'); - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ + $this->setLinkIcon('http'); + $this->setLinkIcon('https'); + $this->setLinkIcon('ftp'); + $this->setLinkIcon('mailto'); + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('*', 'url'); - //$this->setButtonSeparator(' | '); + //$this->setButtonSeparator(' | '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(true); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(true); - /** - * If true (default) show create '?' buttons on not existing pages, even if the - * user is not signed in. - * If false, anon users get no links and it looks cleaner, but then they - * cannot easily fix missing pages. - */ - $this->setAnonEditUnknownLinks(false); + /** + * If true (default) show create '?' buttons on not existing pages, even if the + * user is not signed in. + * If false, anon users get no links and it looks cleaner, but then they + * cannot easily fix missing pages. + */ + $this->setAnonEditUnknownLinks(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); - /** - * Custom UserPreferences: - * A list of name => _UserPreference class pairs. - * Rationale: Certain themes should be able to extend the predefined list - * of preferences. Display/editing is done in the theme specific userprefs.tmpl - * but storage/sanification/update/... must be extended to the Get/SetPreferences methods. - * See themes/wikilens/themeinfo.php - */ - //$this->customUserPreference(); + /** + * Custom UserPreferences: + * A list of name => _UserPreference class pairs. + * Rationale: Certain themes should be able to extend the predefined list + * of preferences. Display/editing is done in the theme specific userprefs.tmpl + * but storage/sanification/update/... must be extended to the Get/SetPreferences methods. + * See themes/wikilens/themeinfo.php + */ + //$this->customUserPreference(); - /** - * Register custom PageList type and define custom PageList classes. - * Rationale: Certain themes should be able to extend the predefined list - * of pagelist types. E.g. certain plugins, like MostPopular might use - * info=pagename,hits,rating - * which displays the rating column whenever the wikilens theme is active. - * See themes/wikilens/themeinfo.php - */ - //$this->addPageListColumn(); + /** + * Register custom PageList type and define custom PageList classes. + * Rationale: Certain themes should be able to extend the predefined list + * of pagelist types. E.g. certain plugins, like MostPopular might use + * info=pagename,hits,rating + * which displays the rating column whenever the wikilens theme is active. + * See themes/wikilens/themeinfo.php + */ + //$this->addPageListColumn(); } } @@ -214,5 +214,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/SpaceWiki/themeinfo.php =================================================================== --- trunk/themes/SpaceWiki/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/SpaceWiki/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -36,51 +36,51 @@ return false; // use default return '_SpaceWiki_PageHistory_Formatter'; } - + function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('SpaceWiki', 'SpaceWiki.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('SpaceWiki', 'SpaceWiki.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); - $this->addImageAlias('logo', 'Ufp-logo.jpg'); - $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', 'logo.png'); + $this->addImageAlias('logo', 'Ufp-logo.jpg'); + $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - $this->addImageAlias('signature', 'lights.png'); - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + $this->addImageAlias('signature', 'lights.png'); + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - $this->addImageAlias('hr', 'hr.png'); + $this->addImageAlias('hr', 'hr.png'); - $this->setButtonSeparator(" "); + $this->setButtonSeparator(" "); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - /** - * The "stardate" format here is really just metricdate.24hourtime. A - * "real" date2startdate conversion function might be fun but not very - * useful on a wiki. - */ - $this->setTimeFormat("%H%M%S"); - $this->setDateFormat("%Y%m%d"); // must not contain time + /** + * The "stardate" format here is really just metricdate.24hourtime. A + * "real" date2startdate conversion function might be fun but not very + * useful on a wiki. + */ + $this->setTimeFormat("%H%M%S"); + $this->setDateFormat("%Y%m%d"); // must not contain time } } @@ -93,5 +93,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Wordpress/themeinfo.php =================================================================== --- trunk/themes/Wordpress/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/Wordpress/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -27,7 +27,7 @@ else { $default_text = $wikiword; } - + $url = WikiURL($wikiword, array('action' => 'create')); $link = HTML::span(HTML::a(array('href' => $url, 'rel' => 'nofollow'), '?')); @@ -57,55 +57,49 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('Wordpress', 'Wordpress.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('Wordpress', 'Wordpress.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', 'logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is not set, any signature defined in index.php will be used. If it - * is not defined by index.php or in here then the "Thank you for - * editing..." screen will be omitted. - */ - $this->addImageAlias('signature', 'signature.png'); + /** + * The Signature image is shown after saving an edited page. If this + * is not set, any signature defined in index.php will be used. If it + * is not defined by index.php or in here then the "Thank you for + * editing..." screen will be omitted. + */ + $this->addImageAlias('signature', 'signature.png'); - /* - * Link icons. - */ - //$this->setLinkIcon('http'); - //$this->setLinkIcon('https'); - //$this->setLinkIcon('ftp'); - //$this->setLinkIcon('mailto'); - //$this->setLinkIcon('interwiki'); - //$this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ - $this->setButtonSeparator(' '); + $this->setButtonSeparator(' '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y", false); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y", false); } } @@ -117,5 +111,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/blog/themeinfo.php =================================================================== --- trunk/themes/blog/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/blog/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -52,7 +52,7 @@ $this->calendarInit(true); } - /* overload to load from Sidebar */ + /* overload to load from Sidebar */ function _findFile ($file, $missing_okay=false) { if (file_exists($this->_path . "themes/".$this->_name."/$file")) return "themes/".$this->_name."/$file"; @@ -83,7 +83,7 @@ return '_blog_RecentChanges_BoxFormatter'; return '_blog_RecentChanges_Formatter'; } - + /* TODO: use the blog summary as label instead of the pagename */ function linkExistingWikiWord($wikiword, $linktext = '', $version = false) { global $request; @@ -103,7 +103,7 @@ $default_text = $wikiword->shortName; else $default_text = $wikiword; - + if (!empty($linktext)) { $link->pushContent($linktext); $link->setAttr('class', 'named-wiki'); @@ -118,44 +118,44 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. + // CSS file defines fonts, colors and background images for this + // style. - // override sidebar definitions: - $this->setDefaultCSS(_("blog"), 'Kubrick.css'); - if (isBrowserIE()) { - $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'),'all')); - } - $this->addButtonAlias(_("(diff)"), "[diff]" ); - $this->addButtonAlias("...", "alltime"); + // override sidebar definitions: + $this->setDefaultCSS(_("blog"), 'Kubrick.css'); + if (isBrowserIE()) { + $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'),'all')); + } + $this->addButtonAlias(_("(diff)"), "[diff]" ); + $this->addButtonAlias("...", "alltime"); - $this->setButtonSeparator(""); + $this->setButtonSeparator(""); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /** - * If true (default) show create '?' buttons on not existing pages, even if the - * user is not signed in. - * If false, anon users get no links and it looks cleaner, but then they - * cannot easily fix missing pages. - */ - $this->setAnonEditUnknownLinks(false); + /** + * If true (default) show create '?' buttons on not existing pages, even if the + * user is not signed in. + * If false, anon users get no links and it looks cleaner, but then they + * cannot easily fix missing pages. + */ + $this->setAnonEditUnknownLinks(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); - $this->setDateFormat("%A, %B %e, %Y"); // must not contain time - $this->setTimeFormat("%H:%M:%S"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); + $this->setDateFormat("%A, %B %e, %Y"); // must not contain time + $this->setTimeFormat("%H:%M:%S"); } } @@ -168,5 +168,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/default/themeinfo.php =================================================================== --- trunk/themes/default/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/default/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -22,5 +22,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/shamino_com/themeinfo.php =================================================================== --- trunk/themes/shamino_com/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/shamino_com/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -46,81 +46,66 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. - $this->setDefaultCSS('PhpWiki', - array('' => 'shamino_com.css', - 'print' => 'phpwiki-printer.css')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. + $this->setDefaultCSS('PhpWiki', array('' => 'shamino_com.css', 'print' => 'phpwiki-printer.css')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + // This allows one to manually select "Printer" style (when browsing page) + // to see what the printer style looks like. + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ - //$this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - $this->addImageAlias('signature', false); + //$this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + $this->addImageAlias('signature', false); - /* - * Link icons. - */ - //$this->setLinkIcon('http'); - //$this->setLinkIcon('https'); - //$this->setLinkIcon('ftp'); - //$this->setLinkIcon('mailto'); - //$this->setLinkIcon('interwiki'); - //$this->setLinkIcon('wikiuser'); - //$this->setLinkIcon('*', 'url'); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - //$this->setButtonSeparator("\n | "); + /** + * Layout improvement with dangling links for mostly closed wiki's: + * If false, only users with edit permissions will be presented the + * special wikiunknown class with "?" and Tooltip. + * If true (default), any user will see the ?, but will be presented + * the PrintLoginForm on a click. + */ + $this->setAnonEditUnknownLinks(false); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y"); + $this->setTimeFormat("%H:%M"); - /** - * Layout improvement with dangling links for mostly closed wiki's: - * If false, only users with edit permissions will be presented the - * special wikiunknown class with "?" and Tooltip. - * If true (default), any user will see the ?, but will be presented - * the PrintLoginForm on a click. - */ - $this->setAnonEditUnknownLinks(false); - - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y"); - $this->setTimeFormat("%H:%M"); - - /* - * To suppress times in the "Last edited on" messages, give a - * give a second argument of false: - */ - //$this->setDateFormat("%B %d, %Y", false); + /* + * To suppress times in the "Last edited on" messages, give a + * give a second argument of false: + */ + //$this->setDateFormat("%B %d, %Y", false); } } @@ -132,5 +117,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/smaller/themeinfo.php =================================================================== --- trunk/themes/smaller/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/smaller/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -40,18 +40,15 @@ return $this->makeButton($label, WikiURL($pagename, $attr), $class); } - } $WikiTheme = new WikiTheme_smaller('smaller'); -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -// (c-file-style: "gnu") // Local Variables: // mode: php // tab-width: 8 // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/wikilens/themeinfo.php =================================================================== --- trunk/themes/wikilens/themeinfo.php 2011-03-07 13:08:01 UTC (rev 7967) +++ trunk/themes/wikilens/themeinfo.php 2011-03-07 13:39:47 UTC (rev 7968) @@ -18,82 +18,78 @@ class WikiTheme_Wikilens extends WikiTheme { function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in ... [truncated message content] |