From b64eeac165a655f8bc0b74b632e2b069bbc68f3e Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 13 Jan 2008 02:03:37 +0000 Subject: [PATCH] Commit updated Phorum templates for Phorum 5.2. git-svn-id: http://htmlpurifier.org/svnroot@1500 48356398-32a2-884e-a903-53898d9a118a --- phorum.css | 500 ++++---------------------------------------------------- phorum.patch | 352 +++++++++++++++++++++++++++------------ phorum_diff.bat | 2 +- phorum_patch.sh | 2 +- 4 files changed, 277 insertions(+), 579 deletions(-) rewrite phorum.css (94%) rewrite phorum.patch (96%) diff --git a/phorum.css b/phorum.css dissimilarity index 94% index ba69990..025624f 100644 --- a/phorum.css +++ b/phorum.css @@ -1,469 +1,31 @@ -/* new styles */ - -#phorum-index -{ - width: 100%; - border: 1px solid #777; - border-bottom-width: 0; - text-align: left; -} - -#phorum-index th -{ - background-color: #EEE; - border-bottom: 1px solid #777; - padding: .2em 0; - vertical-align: middle; -} - -#phorum-index td -{ - background-color: #FFF; - padding: .2em 0; - border-bottom: 1px solid #777; -} - -#phorum-index th.forum-name -{ - padding-left: 0.5em; -} - -#phorum-index th.forum-threads, #phorum-index th.forum-posts -{ - width: 8em; - text-align: center; -} - -#phorum-index th.forum-last-post -{ - width: 12em; -} - -#phorum-index td.forum-name -{ - padding: 0.5em 1em; -} - -#phorum-index td.forum-name a -{ - font-weight: bold; - color: #339; -} - -#phorum-index td.forum-name p -{ - margin: 0.1em 0; -} - -#phorum-index td.forum-name small a -{ - color: #66B; - font-weight: normal; -} - -#phorum-index td.forum-threads, #phorum-index td.forum-posts -{ - text-align: center; -} - -#phorum-index td.forum-last-post -{ - padding-right: 1em; -} - - - -#phorum-menu-table -{ - width: 100%; - border-width: 0; -} - -#phorum-menu -{ - width: 16em; -} - -#phorum-content, #phorum-menu -{ - padding-bottom: 0.2em; - vertical-align: top; -} - - - -div.phorum-menu -{ - background-color: #FFF; - border: 1px solid #808080; - padding: 0.2em 0.6em; -} - -div.phorum-menu ul -{ - margin: 0 0 0.8em 1.3em; - padding: 0; -} - -div.phorum-menu a.phorum-current-page -{ - font-weight: bold; -} - - - -/* Standard classes for use in any page */ -/* PhorumDesignDiv - a div for keeping the forum-size size */ -.PDDiv -{ - width: 100%; - text-align: left; -} - -.PhorumTitleText -{ - float: right; -} - -.PhorumStdBlock -{ - background-color: #FFF; - border: 1px solid #808080; - padding: 0.3em; - text-align: left; -} - -.PhorumStdBlockHeader -{ - background-color: #EEEEEE; - border: 1px solid #808080; - border-bottom: 0; - padding: 0.3em; - text-align: left; -} - -.PhorumHeaderText -{ - font-weight: bold; -} - -.PhorumNavBlock -{ - border: 1px solid #808080; - margin-top: 1px; - margin-bottom: 1px; - background-color: #EEEEEE; - padding: 0.3em; -} - -.PhorumNavHeading -{ - font-weight: bold; -} - -a.PhorumNavLink -{ - color: #000; - text-decoration: none; - font-weight: normal; - padding: 0 .2em; - border: 1px solid #EEE; -} - -a.PhorumNavLink:visited {color:#000;} -a.PhorumNavLink:hover { - color:#FF6600; - background-color: #FFFFFF; - font-weight: normal; - border: 1px solid #808080; -} - -.PhorumSelectedFolder -{ - color: #000; - text-decoration: none; - font-weight: normal; - border: 1px solid #EEE; - padding: 0px .2em; -} - -.PhorumFloatingText -{ - padding: 1em; -} - -.PhorumHeadingLeft -{ - padding-left: 0.4em; - font-weight: bold; -} - -.PhorumUserError, .PhorumOkMsg -{ - padding: 1em; - text-align: center; - font-size: 1.3em; - font-weight: bold; -} - -.PhorumUserError {color: #F00;} -.PhorumOkMsg {color: #0C0;} - -.PhorumNewFlag -{ - font-size: 0.8em; - font-weight: bold; - color: #CC0000; -} - -.PhorumNotificationArea -{ - float: right; - border: 1px dotted #808080; -} - -/* PSUEDO Table classes */ -/* In addition to these, each file that uses them will have a */ -/* column with a style property to set its right margin */ - -.PhorumColumnFloatXSmall -{ - float: right; - width: 75px; -} - -.PhorumColumnFloatSmall -{ - float: right; - width: 100px; -} - -.PhorumColumnFloatMedium -{ - float: right; - width: 150px; -} - -.PhorumColumnFloatLarge -{ - float: right; - width: 200px; -} - -.PhorumColumnFloatXLarge -{ - float: right; - width: 400px; -} - -.PhorumRowBlock -{ - background-color: #FFF; - border-bottom: 1px solid #F2F2F2; - padding: 5px 0px 0px 0px; -} - -.PhorumRowBlockAlt -{ - background-color: #EEEEEE; - border-bottom: 1px solid #F2F2F2; - padding: 5px 0px 0px 0px; -} - -/************/ - - -/* All that is left of the tables */ - -.PhorumStdTable -{ - border: 1px solid #808080; - width: 100%; -} - -.PhorumTableHeader -{ - background-color: #EEEEEE; - border-bottom: 1px solid #808080; - font-weight: bold; - padding: 0.2em 0.6em; -} - -.PhorumTableRow, .PhorumTableRowAlt -{ - background-color: #FFF; - border-bottom: 1px solid #F2F2F2; - padding: 0.2em 0.6em; -} - -.PhorumTableRowAlt -{ - background-color: #EEEEEE; -} - -/**********************/ - - -/* Read Page specifics */ - -.PhorumReadMessageBlock -{ - margin: 0.2em 0; -} - -.PhorumReadBodySubject -{ - font-size: 1.1em; - margin-left: 0.83em; - font-weight: bold; -} - -.PhorumReadBodyHead -{ - margin-left: 1em; -} - -.PhorumReadBodyText -{ - margin: 1em; -} - -.PhorumReadNavBlock -{ - border: 1px solid #808080; - border-top: 0; - background-color: #EEEEEE; - padding: 0.2em; -} - -/********************/ - -/* List page specifics */ - -.PhorumListSubText -{ - color: #707070; - font-size: 0.8em; -} - -.PhorumListPageLink -{ - color: #707070; - font-size: 0.8em; -} - -.PhorumListSubjPrefix -{ - font-weight: bold; -} - -/********************/ - -/* Posting editor specifics */ - -.PhorumListModLink, .PhorumListModLink a -{ - color: #707070; - font-size: 0.8em; -} - -.PhorumAttachmentRow { - border-bottom: 1px solid #EEEEEE; - padding: 0.2em 0; -} - -/********************/ - -/* PM specifics */ - -.phorum-recipientblock -{ - border: 1px solid black; - position:relative; - float:left; - padding: 1px 1px 1px 5px; - margin: 0px 5px 5px 0px; - font-size: 11px; - background-color: White; - border: 1px solid #808080; - white-space: nowrap; -} - -.phorum-pmuserselection -{ - padding-bottom: 5px; -} - -.phorum-gaugetable { - border-collapse: collapse; -} - -.phorum-gauge { - border: 1px solid #808080; - background-color: #EEEEEE; -} - -.phorum-gaugeprefix { - border: none; - background-color: white; - padding-right: 10px; -} - -/********************/ - -/* Override classes - Must stay at the end */ - -.PhorumNarrowBlock -{ - width: 40em; -} - -.PhorumSmallFont -{ - font-size: 0.9em; -} - -.PhorumLargeFont -{ - font-size: 1.1em; - font-weight: bold; -} - - -/* Our styles */ - -#title a { - text-decoration: none; - color: #333399; -} - -#title a:hover { - color: #FF6600; -} - -p { - margin: 1em 0; - text-indent: 0; -} - -pre { - margin: 0.8em 2em; - padding: 0.5em 0.8em; - background: #EEE; -} - -.ModTaggerDashboard form { - padding: 0; - margin: 0; -} - -.ModTaggerDashboard input.TaggerInput { - float: right; -} - -input.TaggerInput { - background: #EEE; - border: 1px solid #999; - font: inherit; - padding: 1px 4px; -} + +/* Our styles */ + +p { + margin: 1em 0; + text-indent: 0; +} + +pre { + margin: 0.8em 2em; + padding: 0.5em 0.8em; + background: #EBEFF4; +} + +/** Currently unused */ + +.ModTaggerDashboard form { + padding: 0; + margin: 0; +} + +.ModTaggerDashboard input.TaggerInput { + float: right; +} + +input.TaggerInput { + background: #EEE; + border: 1px solid #999; + font: inherit; + padding: 1px 4px; +} diff --git a/phorum.patch b/phorum.patch dissimilarity index 96% index 8045c7e..2140be2 100644 --- a/phorum.patch +++ b/phorum.patch @@ -1,108 +1,244 @@ -diff -u default/footer.tpl htmlpurifier/footer.tpl ---- default/footer.tpl 2006-02-19 19:21:15.000000000 -0500 -+++ htmlpurifier/footer.tpl 2007-10-30 21:04:56.151359100 -0400 -@@ -1,6 +1,3 @@ --
-- This forum powered by Phorum. --
- {! these are the two div´s from header.tpl } - - -diff -u default/header.tpl htmlpurifier/header.tpl ---- default/header.tpl 2006-04-03 06:00:29.000000000 -0400 -+++ htmlpurifier/header.tpl 2007-10-30 21:04:56.151359100 -0400 -@@ -5,14 +5,13 @@ - {/IF} - xml version="1.0" encoding="{CHARSET}"' ?> - -- -+ - -- - {IF URL->RSS} - - {/IF} -+ -+ - {IF URL->REDIRECT} - - {/IF} -@@ -21,8 +20,14 @@ - {HEAD_TAGS} - - --
--
-+ -+ -+ -+ {HP_NAVIGATION} -+ -+

Forums {IF NAME}:: {NAME}{/IF}

-+
-+
- {IF notice_all} -
- {IF NEW_PRIVATE_MESSAGES}{LANG->NewPrivateMessages}
{/IF} -@@ -31,9 +36,3 @@ - {IF notice_groups}{LANG->UnapprovedGroupMembers}
{/IF} -
- {/IF} -- -- {IF NAME}{NAME} : {/IF} -- {TITLE} -- -- {IF URL->INDEX}{/IF}The fastest message board... ever. {IF URL->INDEX}{/IF} --
{DESCRIPTION} 
-Common subdirectories: default/images and htmlpurifier/images -diff -u default/info.php htmlpurifier/info.php ---- default/info.php 2006-02-19 19:33:50.000000000 -0500 -+++ htmlpurifier/info.php 2007-11-01 16:35:37.058150500 -0400 -@@ -1,10 +1,12 @@ - -diff -u default/posting_preview.tpl htmlpurifier/posting_preview.tpl ---- default/posting_preview.tpl 2006-02-19 19:21:15.000000000 -0500 -+++ htmlpurifier/posting_preview.tpl 2007-10-30 21:04:56.166959100 -0400 -@@ -8,8 +8,8 @@ -
{PREVIEW->subject}
- {/IF} -
{LANG->Postedby}: {PREVIEW->author}
--
{LANG->Date}: {PREVIEW->datestamp}

--
{PREVIEW->body}

-+
{LANG->Date}: {PREVIEW->datestamp}
-+
{PREVIEW->body}
- {IF ATTACHMENTS} - {IF PREVIEW->attachments} - {LANG->Attachments}: -diff -u default/read.tpl htmlpurifier/read.tpl ---- default/read.tpl 2006-02-19 19:21:15.000000000 -0500 -+++ htmlpurifier/read.tpl 2007-10-30 21:04:56.166959100 -0400 -@@ -24,8 +24,8 @@ -
{MESSAGES->subject} {MESSAGES->new}
- {/IF} -
{LANG->Postedby}: {MESSAGES->linked_author} ({MESSAGES->ip})
--
{LANG->Date}: {MESSAGES->datestamp}

--
{MESSAGES->body}

-+
{LANG->Date}: {MESSAGES->datestamp}
-+
{MESSAGES->body}
- {IF ATTACHMENTS} - {IF MESSAGES->attachments} - {LANG->Attachments}: +diff -u lightweight/css.tpl htmlpurifier/css.tpl +--- lightweight/css.tpl 2007-12-15 11:43:35.000000000 -0500 ++++ htmlpurifier/css.tpl 2008-01-12 20:00:29.675475200 -0500 +@@ -456,7 +456,7 @@ + + #phorum #post-body { + border: 1px solid {border_color}; +- background-color: {default_background_color}; ++ background-color: #FFF; + padding: 8px; + } + +diff -u lightweight/footer.tpl htmlpurifier/footer.tpl +--- lightweight/footer.tpl 2007-02-02 23:20:28.000000000 -0500 ++++ htmlpurifier/footer.tpl 2008-01-12 19:23:47.346875200 -0500 +@@ -1,4 +1,3 @@ +- +-
++
+ + +\ No newline at end of file +diff -u lightweight/header.tpl htmlpurifier/header.tpl +--- lightweight/header.tpl 2007-12-24 06:21:03.000000000 -0500 ++++ htmlpurifier/header.tpl 2008-01-12 21:01:21.236875200 -0500 +@@ -35,12 +35,20 @@ + + {/IF} + ++ ++ ++ + {HEAD_TAGS} + + + + ++ ++ ++{HP_NAVIGATION} ++ + {! Please leave this div in your template you can alter anything above this line } ++
+
+ {IF NOT PRINTVIEW} +
+@@ -61,11 +69,6 @@ + {/IF} +
+ +- +- +