| Index: trunk/phpwiki/fpw/wikiPage.php |
| — | — | @@ -973,15 +973,20 @@ |
| 974 | 974 | if ( isset ( $framed ) and $framed != "top" ) return "" ; |
| 975 | 975 | $t = $this->getNiceTitle ( $this->title ) ; |
| 976 | 976 | if ( substr_count ( $t , ":" ) > 0 ) $t = ucfirstIntl ( $t ) ; |
| 977 | | - $ret = "<table ".$user->options["quickBarBackground"]. "width=\"100%\" class=\"topbar\" cellspacing=0>\n<tr>" ; |
| 978 | | - if ( $user->options["leftImage"] != "" ) |
| 979 | | - $ret .= "<td width=\"1%\" rowspan=2 bgcolor=\"#000000\"><img src=\"".$user->options["leftImage"]."\"></td>" ; |
| 980 | | - $ret .= "<td valign=top height=1>" ; |
| 981 | | - if ( $this->isSpecialPage ) { |
| 982 | | - $ret .= "<font size=\"+3\">".$t."</font>" ; |
| 983 | | - if ( $action == "" ) { |
| 984 | | - $ret .= "<br>\n<br>\n<a href=\"".wikiLink("special:whatlinkshere&target=$this->url")."\">$wikiWhatLinksHere</a>" ; |
| 985 | | - } |
| | 977 | + |
| | 978 | + if ( $user->options["skin"] == "Nostalgy" ) { |
| | 979 | + $ret = "<a href=\"".wikiLink("")."\"><img border=0 align=right src=\"$wikiLogoFile\" alt=\"[$wikiMainPage]\"></a>\n" ; |
| | 980 | + } else { |
| | 981 | + $ret = "<table ".$user->options["quickBarBackground"]. "width=\"100%\" class=\"topbar\" cellspacing=0>\n<tr>" ; |
| | 982 | + if ( $user->options["leftImage"] != "" ) |
| | 983 | + $ret .= "<td width=\"1%\" rowspan=2 bgcolor=\"#000000\"><img src=\"".$user->options["leftImage"]."\"></td>" ; |
| | 984 | + $ret .= "<td valign=top height=1>" ; |
| | 985 | + if ( $this->isSpecialPage ) { |
| | 986 | + $ret .= "<font size=\"+3\">".$t."</font>" ; |
| | 987 | + } |
| | 988 | + } |
| | 989 | + if ( $action == "" ) { |
| | 990 | + $ret .= "<br>\n<br>\n<a href=\"".wikiLink("special:whatlinkshere&target=$this->url")."\">$wikiWhatLinksHere</a>" ; |
| 986 | 991 | } else { |
| 987 | 992 | $ret .= "<font size=\"+3\"><b><u>" ; |
| 988 | 993 | if ( $this->secureTitle == $wikiMainPage and $action == "view" ) $ret .= $wikiMainPageTitle.$this->thisVersion ; |
| — | — | @@ -1012,10 +1017,13 @@ |
| 1013 | 1018 | $ret .= "<br>".str_replace ( "$1" , $subText , $wikiOtherLanguagesText ) ; |
| 1014 | 1019 | } |
| 1015 | 1020 | } |
| 1016 | | - $ret .= "</td>\n<td valign=top width=200 rowspan=2 nowrap>".$user->getLink()."<br>" ; |
| | 1021 | + |
| | 1022 | + if ( $user->options["skin"] == "Nostalgy" ) $ret .= " | <b>".$user->getLink()."</b> | " ; |
| | 1023 | + else $ret .= "</td>\n<td valign=top width=200 rowspan=2 nowrap>".$user->getLink()."<br>" ; |
| | 1024 | + |
| 1017 | 1025 | if ( $user->isLoggedIn ) $ret .= "<a href=\"".wikiLink("special:userLogout")."\">$wikiLogOut</a> | <a href=\"".wikiLink("special:editUserSettings")."\">$wikiPreferences</a>" ; |
| 1018 | 1026 | else $ret .= "<a href=\"".wikiLink("special:userLogin")."\">$wikiLogIn</a>" ; |
| 1019 | | - $ret .= " | <a href=\"".wikiLink($wikiHelpLink)."\">$wikiHelp</a><br>\n" ; |
| | 1027 | + $ret .= " | <a href=\"".wikiLink($wikiHelpLink)."\">$wikiHelp</a><br>\n" ; |
| 1020 | 1028 | |
| 1021 | 1029 | # Text encoding |
| 1022 | 1030 | if(count($wikiEncodingNames) > 1) { # Shortcut for switching character encodings |
| — | — | @@ -1032,9 +1040,14 @@ |
| 1033 | 1041 | } |
| 1034 | 1042 | } |
| 1035 | 1043 | |
| 1036 | | - $ret .= "<FORM method=post action=\"".wikiLink("")."\"><INPUT TYPE=text NAME=search SIZE=16 VALUE=\"$search\"><INPUT TYPE=submit value=\"$wikiSearch\"></FORM>" ; |
| 1037 | | - $ret .= "</td>\n<td rowspan=2 width=1><a href=\"".wikiLink("")."\"><img border=0 src=\"$wikiLogoFile\" alt=\"[$wikiMainPage]\"></a></td></tr>\n" ; |
| 1038 | | - $ret .= "<tr><td valign=bottom>".$this->getLinkBar()."</td></tr></table>" ; |
| | 1044 | + if ( $user->options["skin"] == "Nostalgy" ) { |
| | 1045 | + $ret .= $this->getLinkBar()."<hr>\n" ; |
| | 1046 | + |
| | 1047 | + } else { |
| | 1048 | + $ret .= "<FORM method=post action=\"".wikiLink("")."\"><INPUT TYPE=text NAME=search SIZE=16 VALUE=\"$search\"><INPUT TYPE=submit value=\"$wikiSearch\"></FORM>" ; |
| | 1049 | + $ret .= "</td>\n<td rowspan=2 width=1><a href=\"".wikiLink("")."\"><img border=0 src=\"$wikiLogoFile\" alt=\"[$wikiMainPage]\"></a></td></tr>\n" ; |
| | 1050 | + $ret .= "<tr><td valign=bottom>".$this->getLinkBar()."</td></tr></table>" ; |
| | 1051 | + } |
| 1039 | 1052 | return $ret ; |
| 1040 | 1053 | } |
| 1041 | 1054 | |
| — | — | @@ -1043,8 +1056,7 @@ |
| 1044 | 1057 | global $wikiMainPage , $wikiRecentChanges , $wikiRecentChangesLink , $wikiUpload , $wikiPopularPages , $wikiLongPages , $action ; |
| 1045 | 1058 | global $user , $oldID , $version , $wikiEditThisPage , $wikiDeleteThisPage , $wikiHistory , $wikiMyWatchlist , $wikiAskSQL ; |
| 1046 | 1059 | global $wikiStatistics , $wikiNewPages , $wikiOrphans , $wikiMostWanted , $wikiAllPages , $wikiRandomPage , $wikiStubs , $wikiListUsers ; |
| 1047 | | - global $wikiRecentLinked, $wikiRecentLinkedLink ; |
| 1048 | | - global $wikiBugReports , $wikiBugReportsLink ; |
| | 1060 | + global $wikiRecentLinked, $wikiRecentLinkedLink , $wikiBugReports , $wikiBugReportsLink ; |
| 1049 | 1061 | |
| 1050 | 1062 | $editOldVersion = "" ; |
| 1051 | 1063 | if ( $oldID != "" ) $editOldVersion="&oldID=$oldID&version=$version" ; |
| Index: trunk/phpwiki/fpw/wikiUser.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | $this->skinBlank() ; |
| 58 | 58 | $this->options["background"] = "#FFFFFF" ; |
| 59 | 59 | $this->options["text"] = "#000000" ; |
| 60 | | -# $this->options["forceQuickBar"] = "none" ; |
| | 60 | + $this->options["forceQuickBar"] = "none" ; |
| 61 | 61 | # $this->options["quickBarBackground"] = " bgcolor=yellow " ; |
| 62 | 62 | # $this->options["textTableBackground"] = " bgcolor=\"#444444\"" ; |
| 63 | 63 | # $this->options["forceLinks"] = " style=\"color:#0000FF;text-decoration:none\" " ; |
| — | — | @@ -74,6 +74,7 @@ |
| 75 | 75 | $ret .= "body { "; |
| 76 | 76 | $textcolor = $this->options[text]; |
| 77 | 77 | $bgcolor = $this->options[background]; |
| | 78 | + if ( $this->options["skin"] == "Nostalgy" ) $namespaceBackground = "" ; |
| 78 | 79 | if ( $namespaceBackground != "" ) $bgcolor = $namespaceBackground ; |
| 79 | 80 | if ( $textcolor == "" ) |
| 80 | 81 | $textcolor = "black"; # For un-coloring links. Should be "inherit" but Netscape 4.x messes it up |