From 87421f9e6fbf29443a24fea2515a66019c1d3fef Mon Sep 17 00:00:00 2001 From: carstenklapp Date: Sat, 5 Jan 2002 06:17:02 +0000 Subject: [PATCH] just reflowing text git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@1018 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- themes/Hawaiian/Hawaiian-heavy.css | 10 +- themes/Hawaiian/Hawaiian.css | 6 +- themes/Hawaiian/pictures/random.php | 44 ++++---- themes/Hawaiian/themeinfo.php | 58 +++++------ themes/MacOSX/MacOSX-heavy.css | 10 +- themes/MacOSX/themeinfo.php | 122 ++++++++++++----------- themes/WikiTrek/WikiTrek-gravimetric.css | 19 ++-- themes/WikiTrek/WikiTrek.css | 28 +++--- themes/WikiTrek/themeinfo.php | 86 ++++++++-------- themes/default/themeinfo.php | 56 ++++++----- 10 files changed, 236 insertions(+), 203 deletions(-) diff --git a/themes/Hawaiian/Hawaiian-heavy.css b/themes/Hawaiian/Hawaiian-heavy.css index 66b482d4e..7b2dc34a0 100644 --- a/themes/Hawaiian/Hawaiian-heavy.css +++ b/themes/Hawaiian/Hawaiian-heavy.css @@ -1,9 +1,9 @@ /* - * $Id: Hawaiian-heavy.css,v 1.1 2001-12-31 23:24:37 carstenklapp Exp $ + * $Id: Hawaiian-heavy.css,v 1.2 2002-01-05 06:17:02 carstenklapp Exp $ * - * phpwiki-heavy.css + * Hawaiian-heavy.css * - * This is stuff which should be in phpwiki.css, but which breaks NS4. + * This is stuff which should be in Hawaiian.css, but which breaks NS4. */ /* Hide the elements we put in just to get around NS4 bugs. */ @@ -41,7 +41,7 @@ A.wikiaction, A.wikiadmin, INPUT.button } /* Link icons */ -img.linkicon { vertical-align: middle; } +img.linkicon { vertical-align: middle; } /**************************************************************** ** @@ -49,6 +49,6 @@ img.linkicon { vertical-align: middle; } ** *****************************************************************/ .diff .block div { position: relative; padding-left: 1.5em; } -.diff .prefix { position: absolute; left: 0.5em; top: 0; } +.diff .prefix { position: absolute; left: 0.5em; top: 0; } diff --git a/themes/Hawaiian/Hawaiian.css b/themes/Hawaiian/Hawaiian.css index be3bd3abe..daa94f2b1 100644 --- a/themes/Hawaiian/Hawaiian.css +++ b/themes/Hawaiian/Hawaiian.css @@ -1,5 +1,5 @@ /* - $Id: Hawaiian.css,v 1.2 2002-01-01 21:40:46 carstenklapp Exp $ + $Id: Hawaiian.css,v 1.3 2002-01-05 06:17:02 carstenklapp Exp $ Classes: @@ -254,10 +254,10 @@ div.wikis-edithelp { /* These screw up NS4 --- moved to phpwiki-heavy.css .diff .block div { position: relative; padding-left: 1.5em; } -.diff .prefix { position: absolute; left: 0.5em; top: 0; } +.diff .prefix { position: absolute; left: 0.5em; top: 0; } */ -.diff .block { background: #ccc; } +.diff .block { background: #ccc; } .diff .context { background: #fff; } .diff .original, .diff .deleted { background: #fcc; } diff --git a/themes/Hawaiian/pictures/random.php b/themes/Hawaiian/pictures/random.php index 30a2d4723..9684fae83 100644 --- a/themes/Hawaiian/pictures/random.php +++ b/themes/Hawaiian/pictures/random.php @@ -1,21 +1,28 @@ themeinfo.php -> random.php // /* -$RandomPictures = array("BeachPalmDusk.jpg", "Coastline.jpg", - "HawaiiMauiFromSpace.jpg", "LavaTwilight.jpg", - "LoihiSeamount.jpg", "SteamVolcanoDusk.jpg", - "SubmersiblePiscesV.jpg", "SwimmingPoolWater.jpg", - "Waterfall.jpg", "WhaleRainbow.jpg"); +$RandomPictures = array( + "BeachPalmDusk.jpg", + "Coastline.jpg", + "HawaiiMauiFromSpace.jpg", + "LavaTwilight.jpg", + "LoihiSeamount.jpg", + "SteamVolcanoDusk.jpg", + "SubmersiblePiscesV.jpg", + "SwimmingPoolWater.jpg", + "Waterfall.jpg", + "WhaleRainbow.jpg" + ); */ // Mac users take note: @@ -26,17 +33,18 @@ $RandomPictures = array("BeachPalmDusk.jpg", "Coastline.jpg", // bytes of the file). // // This code is a variation of function LoadDir in lib/loadsave.php -// See http://www.php.net/manual/en/function.readdir.php +// See http://www.php.net/manual/en/function.readdir.php function imagelist($dirname) { if (empty($dirname)) { - //ignore quietly - //trigger_error(("dirname is empty"), E_USER_NOTICE); - //$imagelist = ""; + // ignore quietly + //trigger_error(("dirname is empty"), + //E_USER_NOTICE); $imagelist = ""; } else { $handle = opendir($dir = $dirname); if (empty($handle)) { - // FIXME: gettext doesn't work in index.php or themeinfo.php + // FIXME: gettext doesn't work in index.php or + // themeinfo.php trigger_error(sprintf(("Unable to open directory '%s' for reading"), $dir), E_USER_NOTICE); //$imagelist = ""; @@ -46,7 +54,8 @@ function imagelist($dirname) { if ($fn[0] == '.' || filetype("$dir/$fn") != 'file') continue; - // FIXME: Use $InlineImages instead of just ".jpg" hardcoded. + // FIXME: Use $InlineImages instead of just ".jpg" + // hardcoded. if (substr($fn,-4) == ".jpg") array_push($imagelist, "$fn"); @@ -78,14 +87,15 @@ if (!empty($RandomPictures)) { my_srand(); - // For testing the randomization out, just use $logo instead - // of #Signature + // For testing the randomization out, just use $logo instead of + // #Signature -// $logo = "themes/$theme/pictures/" + // $logo = "themes/$theme/pictures/" $SignatureImg = "themes/$theme/pictures/" - . $RandomPictures[mt_rand(0,count($RandomPictures)-1)]; + .$RandomPictures[mt_rand(0,count($RandomPictures)-1)]; } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // (c-file-style: "gnu") // Local Variables: // mode: php diff --git a/themes/Hawaiian/themeinfo.php b/themes/Hawaiian/themeinfo.php index ac8b9c2d7..ef03a5413 100644 --- a/themes/Hawaiian/themeinfo.php +++ b/themes/Hawaiian/themeinfo.php @@ -1,6 +1,6 @@ "themes/$theme/${CSS_DEFAULT}.css")); +$CSS_URLS = array_merge($CSS_URLS, + array("$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css")); // Logo image appears on every page and links to the HomePage. $logo = "themes/$theme/PalmBeach.jpg"; -// Signature image which is shown after saving an edited page. -// If this is left blank, 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. +// Signature image which is shown after saving an edited page. If +// this is left blank, 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. //$SignatureImg = "themes/$theme/pictures/SubmersiblePiscesV.jpg"; #for Steve $SignatureImg = "themes/$theme/WaterFall.jpg"; -// If you want to see more than just the waterfall -// let a random picture be chosen for the signature image: +// If you want to see more than just the waterfall let a random +// picture be chosen for the signature image: //include("themes/$theme/pictures/random.php"); // If this theme defines any templates, they will completely override // whatever templates have been defined in index.php. /* -$templates = array('BROWSE' => "themes/$theme/templates/browse.html", - 'EDITPAGE' => "themes/$theme/templates/editpage.html", - 'MESSAGE' => "themes/$theme/templates/message.html"); +$templates = array( + 'BROWSE' => "themes/$theme/templates/browse.html", + 'EDITPAGE' => "themes/$theme/templates/editpage.html", + 'MESSAGE' => "themes/$theme/templates/message.html" + ); */ -// If this theme defines any custom link icons, they will completely override -// any link icon settings defined in index.php. +// If this theme defines any custom link icons, they will completely +// override any link icon settings defined in index.php. $URL_LINK_ICONS = array( -/* 'http' => "themes/$theme/http.png", */ -/* 'https' => "themes/$theme/https.png", */ -/* 'ftp' => "themes/$theme/ftp.png", */ -/* 'mailto' => "themes/$theme/mailto.png", */ - 'interwiki' => "themes/$theme/interwiki.png", - '*' => "themes/$theme/flower.png" - ); - -// If this theme defines any templates, they will completely override -// whatever templates have been defined in index.php. -/* -$templates = array('BROWSE' => "themes/$theme/templates/browse.html", - 'EDITPAGE' => "themes/$theme/templates/editpage.html", - 'MESSAGE' => "themes/$theme/templates/message.html"); -*/ + /* 'http' => "themes/$theme/http.png", */ + /* 'https' => "themes/$theme/https.png", */ + /* 'ftp' => "themes/$theme/ftp.png", */ + /* 'mailto' => "themes/$theme/mailto.png", */ + 'interwiki' => "themes/$theme/interwiki.png", + '*' => "themes/$theme/flower.png" + ); +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // (c-file-style: "gnu") // Local Variables: // mode: php diff --git a/themes/MacOSX/MacOSX-heavy.css b/themes/MacOSX/MacOSX-heavy.css index 4a9ece6d6..99e677d35 100644 --- a/themes/MacOSX/MacOSX-heavy.css +++ b/themes/MacOSX/MacOSX-heavy.css @@ -1,9 +1,9 @@ /* - * $Id: MacOSX-heavy.css,v 1.1 2002-01-04 01:56:08 carstenklapp Exp $ + * $Id: MacOSX-heavy.css,v 1.2 2002-01-05 06:17:02 carstenklapp Exp $ * - * phpwiki-heavy.css + * MacOSX-heavy.css * - * This is stuff which should be in phpwiki.css, but which breaks NS4. + * This is stuff which should be in MacOSX.css, but which breaks NS4. */ /* Hide the elements we put in just to get around NS4 bugs. */ @@ -37,7 +37,7 @@ A.wikiaction, A.wikiadmin, INPUT.button } /* Link icons */ -img.linkicon { vertical-align: middle; } +img.linkicon { vertical-align: middle; } /**************************************************************** ** @@ -45,6 +45,6 @@ img.linkicon { vertical-align: middle; } ** *****************************************************************/ .diff .block div { position: relative; padding-left: 1.5em; } -.diff .prefix { position: absolute; left: 0.5em; top: 0; } +.diff .prefix { position: absolute; left: 0.5em; top: 0; } diff --git a/themes/MacOSX/themeinfo.php b/themes/MacOSX/themeinfo.php index b02895955..6051ab968 100644 --- a/themes/MacOSX/themeinfo.php +++ b/themes/MacOSX/themeinfo.php @@ -1,6 +1,6 @@ "themes/$theme/${CSS_DEFAULT}.css" ) ); +$CSS_URLS = array_merge($CSS_URLS, + array("$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css")); // Logo image appears on every page and links to the HomePage. $logo = "themes/$theme/PhpWiki.png"; //$RSS = -// Signature image which is shown after saving an edited page. -// If this is left blank, 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. +// Signature image which is shown after saving an edited page. If +// this is left blank, 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. $SignatureImg = "themes/$theme/Signature.png"; // Papyrus 19pt // If this theme defines any templates, they will completely override // whatever templates have been defined in index.php. -$templates = array('BROWSE' => "themes/$theme/templates/browse.html", - 'EDITPAGE' => "themes/$theme/templates/editpage.html", - 'MESSAGE' => "themes/$theme/templates/message.html"); +$templates = array( + 'BROWSE' => "themes/$theme/templates/browse.html", + 'EDITPAGE' => "themes/$theme/templates/editpage.html", + 'MESSAGE' => "themes/$theme/templates/message.html" + ); - -// If this theme defines any custom link icons, they will completely override -// any link icon settings defined in index.php. +// If this theme defines any custom link icons, they will completely +// override any link icon settings defined in index.php. /* $URL_LINK_ICONS = array( - 'http' => "themes/$theme/icons/http.png", - 'https' => "themes/$theme/icons/https.png", - 'ftp' => "themes/$theme/icons/ftp.png", - 'mailto' => "themes/$theme/icons/mailto.png", - 'interwiki' => "themes/$theme/icons/interwiki.png", - '*' => "themes/$theme/icons/zapg.png" - ); + 'http' => "themes/$theme/icons/http.png", + 'https' => "themes/$theme/icons/https.png", + 'ftp' => "themes/$theme/icons/ftp.png", + 'mailto' => "themes/$theme/icons/mailto.png", + 'interwiki' => "themes/$theme/icons/interwiki.png", + '*' => "themes/$theme/icons/zapg.png" + ); */ +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // (c-file-style: "gnu") // Local Variables: // mode: php diff --git a/themes/WikiTrek/WikiTrek-gravimetric.css b/themes/WikiTrek/WikiTrek-gravimetric.css index 5941cbf9f..80484515c 100644 --- a/themes/WikiTrek/WikiTrek-gravimetric.css +++ b/themes/WikiTrek/WikiTrek-gravimetric.css @@ -1,14 +1,19 @@ /* -$Id: WikiTrek-gravimetric.css,v 1.3 2002-01-03 21:38:02 carstenklapp Exp $ -*/ + * $Id: WikiTrek-gravimetric.css,v 1.4 2002-01-05 06:17:01 carstenklapp Exp $ + * + * WikiTrek-gravimetric.css + * + * This is stuff which should be in WikiTrek.css, but which breaks NS4. + */ /* -These colors are here to prevent OmniWeb from rendering black text on -black. -*/ - .toolbar .wiki { + * These colors are here to prevent OmniWeb from rendering black text + * on black. + */ + +.toolbar .wiki { color : #000; -} + } .wikiaction { color : #000; diff --git a/themes/WikiTrek/WikiTrek.css b/themes/WikiTrek/WikiTrek.css index d6ace40e9..5d8a936da 100644 --- a/themes/WikiTrek/WikiTrek.css +++ b/themes/WikiTrek/WikiTrek.css @@ -1,16 +1,17 @@ /** - * $Id: WikiTrek.css,v 1.4 2002-01-01 07:10:47 carstenklapp Exp $ + * $Id: WikiTrek.css,v 1.5 2002-01-05 06:17:01 carstenklapp Exp $ * - * This PhpWiki theme is experimental and will likely not appear as part of any release. - * ("accessories not included"--download seperately) + * This PhpWiki theme is experimental and will likely not appear as + * part of any release. ("accessories not included"--download + * seperately) * * http://www.w3.org/TR/REC-CSS2/indexlist.html * #fff; /white/ #000; /black/ - #ffcf00; /yellow/ - #0700ff; /blue/ - #8452b5; /magenta/ + #ffcf00; /yellow/ + #0700ff; /blue/ + #8452b5; /magenta/ */ /* NS4 doesn't grok @import. This allows us to put things which @@ -18,7 +19,7 @@ */ @import url(WikiTrek-gravimetric.css); -BODY { +BODY { /* the background image url is relative to this file's directory */ color : #fff; background-color : #000; @@ -27,7 +28,8 @@ BODY { } BODY { - font-family : "Helvetica Narrow", "Arial Narrow", Helvetica, Arial, sans-serif; + font-family : "Helvetica Narrow", "Arial Narrow", Helvetica, + Arial, sans-serif; } .rssicon { @@ -36,11 +38,13 @@ BODY { } .wikitext , .toolbar , P , TD { - font-family : "Helvetica Narrow", "Arial Narrow", Helvetica, Arial, sans-serif; + font-family : "Helvetica Narrow", "Arial Narrow", Helvetica, + Arial, sans-serif; } INPUT.button { - font-family : "Helvetica Narrow", "Arial Narrow", Helvetica, Arial, sans-serif; + font-family : "Helvetica Narrow", "Arial Narrow", Helvetica, + Arial, sans-serif; } .wikitext PRE { @@ -142,11 +146,11 @@ b.wikisummary { } img.linkicon, img.rssicon { - border : 0px; + border : 0px; } img.rssicon { - vertical-align : top; + vertical-align : top; } /* this doesn't work! */ diff --git a/themes/WikiTrek/themeinfo.php b/themes/WikiTrek/themeinfo.php index ac58360da..9fa635bd0 100644 --- a/themes/WikiTrek/themeinfo.php +++ b/themes/WikiTrek/themeinfo.php @@ -1,76 +1,84 @@ - "themes/$theme/${CSS_DEFAULT}.css" ) ); +$CSS_URLS = array_merge($CSS_URLS, + array("$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css")); // Logo image appears on every page and links to the HomePage. $logo = "themes/$theme/Ufp-logo.png"; -// Signature image which is shown after saving an edited page. -// If this is left blank, 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. +// Signature image which is shown after saving an edited page. If +// this is left blank, 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. $SignatureImg = "themes/$theme/lights.gif"; // If this theme defines any templates, they will completely override // whatever templates have been defined in index.php. /* -$templates = array('BROWSE' => "themes/$theme/templates/browse.html", - 'EDITPAGE' => "themes/$theme/templates/editpage.html", - 'MESSAGE' => "themes/$theme/templates/message.html"); +$templates = array( + 'BROWSE' => "themes/$theme/templates/browse.html", + 'EDITPAGE' => "themes/$theme/templates/editpage.html", + 'MESSAGE' => "themes/$theme/templates/message.html" + ); */ -// If this theme defines any custom link icons, it will completely override -// any link icon settings defined in index.php. +// If this theme defines any custom link icons, it will completely +// override any link icon settings defined in index.php. /* $URL_LINK_ICONS = array( - 'http' => "themes/$theme/http.png", - 'https' => "themes/$theme/https.png", - 'ftp' => "themes/$theme/ftp.png", - 'mailto' => "themes/$theme/mailto.png", - 'interwiki' => "themes/$theme/interwiki.png", - '*' => "themes/$theme/zapg.png" - ); + 'http' => "themes/$theme/http.png", + 'https' => "themes/$theme/https.png", + 'ftp' => "themes/$theme/ftp.png", + 'mailto' => "themes/$theme/mailto.png", + 'interwiki' => "themes/$theme/interwiki.png", + '*' => "themes/$theme/zapg.png" + ); */ -//gettext() does not work here because we are included from index.php -//normally themes shouldn't override date & time settings because this will mess up -//any future user-specific preferences for locale -$datetimeformat = sprintf(("Stardate %s"),'%B.%e.%Y'); // may contain time of day -$dateformat = sprintf(("Stardate %s"),'%B.%e.%Y'); // must not contain time +// The gettext() function does not work here because we are included +// from 'index.php'. Normally themes shouldn't override date & time +// settings because this will mess up any future user-specific +// preferences for locale. +$datetimeformat = sprintf(("Stardate %s"),'%B.%e.%Y'); // may contain + // time of day +$dateformat = sprintf(("Stardate %s"),'%B.%e.%Y'); // must not contain + // time +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // (c-file-style: "gnu") // Local Variables: // mode: php diff --git a/themes/default/themeinfo.php b/themes/default/themeinfo.php index d0f2c6374..fe71c75d7 100644 --- a/themes/default/themeinfo.php +++ b/themes/default/themeinfo.php @@ -1,50 +1,54 @@ "themes/$theme/${CSS_DEFAULT}.css" ) ); +$CSS_URLS = array_merge($CSS_URLS, + array("$CSS_DEFAULT" => "themes/$theme/${CSS_DEFAULT}.css")); // Logo image appears on every page and links to the HomePage. $logo = "themes/$theme/wikibase.png"; -// Signature image which is shown after saving an edited page. -// If this is left blank, 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. +// Signature image which is shown after saving an edited page. If +// this is left blank, 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. $SignatureImg = "themes/$theme/signature.png"; // If this theme defines any templates, they will completely override // whatever templates have been defined in index.php. -$templates = array('BROWSE' => "themes/$theme/templates/browse.html", - 'EDITPAGE' => "themes/$theme/templates/editpage.html", - 'MESSAGE' => "themes/$theme/templates/message.html"); - -// If this theme defines any custom link icons, they will completely override -// any link icon settings defined in index.php. +$templates = array( + 'BROWSE' => "themes/$theme/templates/browse.html", + 'EDITPAGE' => "themes/$theme/templates/editpage.html", + 'MESSAGE' => "themes/$theme/templates/message.html" + ); + +// If this theme defines any custom link icons, they will completely +// override any link icon settings defined in index.php. $URL_LINK_ICONS = array( - 'http' => "themes/$theme/icons/http.png", - 'https' => "themes/$theme/icons/https.png", - 'ftp' => "themes/$theme/icons/ftp.png", - 'mailto' => "themes/$theme/icons/mailto.png", - 'interwiki' => "themes/$theme/icons/interwiki.png", - '*' => "themes/$theme/icons/zapg.png" - ); - + 'http' => "themes/$theme/icons/http.png", + 'https' => "themes/$theme/icons/https.png", + 'ftp' => "themes/$theme/icons/ftp.png", + 'mailto' => "themes/$theme/icons/mailto.png", + 'interwiki' => "themes/$theme/icons/interwiki.png", + '*' => "themes/$theme/icons/zapg.png" + ); + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // (c-file-style: "gnu") // Local Variables: // mode: php -- 2.45.0