Canonicalize URLs (updated xhtml-compiler), move news.xhtml appropriately.
[htmlpurifier-web.git] / phorum-skin.patch
blobdf128da86e7a0058b9da0dc74d7d1e7d1bc49eeb
1 diff -u lightweight/css.tpl htmlpurifier/css.tpl
2 --- lightweight/css.tpl 2008-10-13 16:59:55.536800000 -0400
3 +++ htmlpurifier/css.tpl 2008-10-13 17:00:01.773800000 -0400
4 @@ -463,7 +463,7 @@
6 #phorum #post-body {
7 border: 1px solid {border_color};
8 - background-color: {default_background_color};
9 + background-color: #FFF;
10 padding: 8px;
13 diff -u lightweight/footer.tpl htmlpurifier/footer.tpl
14 --- lightweight/footer.tpl 2008-10-13 16:59:55.609800000 -0400
15 +++ htmlpurifier/footer.tpl 2008-10-13 17:00:01.785800000 -0400
16 @@ -1,4 +1,3 @@
17 -<div id="footer-plug">This <a href="http://www.phorum.org/">forum</a> is powered by <a href="http://www.phorum.org/">Phorum</a>.</div>
18 -</div>
19 +</div></div> <!-- we added another div -->
20 </body>
21 </html>
22 \ No newline at end of file
23 diff -u lightweight/header.tpl htmlpurifier/header.tpl
24 --- lightweight/header.tpl 2008-10-13 16:59:55.623800000 -0400
25 +++ htmlpurifier/header.tpl 2008-10-13 17:00:01.803800000 -0400
26 @@ -35,12 +35,20 @@
27 <meta name="description" content="{DESCRIPTION}" />
28 {/IF}
30 +<link rel="stylesheet" href="../phorum.css" media="screen,projection" type="text/css" />
31 +<link rel="stylesheet" href="../common.css" media="screen,projection" type="text/css" />
33 {HEAD_TAGS}
35 </head>
36 <body onload="{IF FOCUS_TO_ID}var focuselt=document.getElementById('{FOCUS_TO_ID}'); if (focuselt) focuselt.focus();{/IF}">
38 +<div id="logo"></div>
39 +<div id="header"><a href="../">HTML Purifier</a></div>
40 +{HP_NAVIGATION}
42 {! Please leave this div in your template you can alter anything above this line }
43 +<div id="alt-content">
44 <div id="phorum">
45 {IF NOT PRINTVIEW}
46 <div id="user-info">
47 @@ -61,11 +69,6 @@
48 {/IF}
49 </div>
51 -<div id="logo">
53 -<a href="{URL->BASE}"><img src="{URL->TEMPLATE}/images/logo.png" width="111" height="25" alt="Phorum" border="0" /></a>
54 -</div>
56 <div id="breadcrumb">
57 {VAR FIRST TRUE}
58 {LOOP BREADCRUMBS}
59 Common subdirectories: lightweight/images and htmlpurifier/images
60 diff -u lightweight/info.php htmlpurifier/info.php
61 --- lightweight/info.php 2008-10-13 16:59:56.900800000 -0400
62 +++ htmlpurifier/info.php 2008-10-13 17:00:01.817800000 -0400
63 @@ -2,9 +2,12 @@
65 if(!defined("PHORUM")) return;
67 - $name="Phorum Lightweight Template";
68 - $version="1.0";
69 + $name="HTML Purifier Template";
70 + $version="2.0";
71 // uncomment this to hide this template from the user-select-box
72 //$template_hide=1;
74 -?>
75 + if (basename(dirname(__FILE__)) == 'htmlpurifier.bak') {
76 + $name .= ' Backup';
77 + $template_hide = 1;
78 + }
79 diff -u lightweight/posting.tpl htmlpurifier/posting.tpl
80 --- lightweight/posting.tpl 2008-10-13 16:59:57.238800000 -0400
81 +++ htmlpurifier/posting.tpl 2008-10-13 17:00:01.829800000 -0400
82 @@ -60,7 +60,6 @@
83 {IF SHOW_SPECIALOPTIONS}
85 <div id="post-moderation">
86 - <small>
87 {LANG->Special}:<br />
89 {IF OPTION_ALLOWED->sticky}
90 @@ -72,19 +71,17 @@
91 {/IF}
93 <input type="checkbox" id="allow-reply" name="allow_reply" value="1" {IF POSTING->allow_reply} checked="checked"{/IF} /> <label for="allow-reply">{LANG->AllowReplies}</label>
94 - </small>
95 </div>
96 {/IF}
97 - <small>
98 {IF MODE "moderation"}
99 - {LANG->YourName}:<br/>
100 + {LANG->YourName}:
101 {ELSE}
102 - {LANG->Author}:<br />
103 + {LANG->Author}:
104 {/IF}
105 {IF OPTION_ALLOWED->edit_author}
106 <input type="text" name="author" size="30" value="{POSTING->author}" />
107 {ELSE}
108 - <big><strong>{POSTING->author}</strong></big><br />
109 + <strong>{POSTING->author}</strong><br />
110 {/IF}
111 <br/>
113 @@ -92,7 +89,7 @@
115 {IF NOT LOGGEDIN}
117 - {LANG->YourEmail}:<br />
118 + {LANG->YourEmail}:
119 <input type="text" name="email" size="30" value="{POSTING->email}" /><br />
120 <br />
122 @@ -102,7 +99,7 @@
124 {IF POSTING->user_id 0}
126 - {LANG->Email}:<br />
127 + {LANG->Email}:
128 <input type="text" name="email" size="30" value="{POSTING->email}" /><br />
129 <br />
131 @@ -110,25 +107,24 @@
133 {/IF}
135 - {LANG->Subject}:<br />
136 + {LANG->Subject}:
137 <input type="text" name="subject" id="subject" size="50" value="{POSTING->subject}" /><br />
138 <br />
140 {HOOK "tpl_editor_after_subject"}
142 - </small>
143 {IF POSTING->user_id}
145 - <small>{LANG->Options}:</small><br />
146 + {LANG->Options}:<br />
148 {IF OPTION_ALLOWED->subscribe}
150 - <input type="checkbox" id="subscription-follow" name="subscription_follow" value="1" {IF POSTING->subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} /> <label for="subscription-follow"><small>{LANG->FollowThread}</small></label><br />
151 + <input type="checkbox" id="subscription-follow" name="subscription_follow" value="1" {IF POSTING->subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} /> <label for="subscription-follow">{LANG->FollowThread}</label><br />
153 {IF OPTION_ALLOWED->subscribe_mail}
154 <div id="subscription-mail-div">
155 <img src="{URL->TEMPLATE}/images/tree-L.gif" border="0" alt="tree-L" />
156 - <input type="checkbox" id="subscription-mail" name="subscription_mail" value="1" {IF POSTING->subscription "message"}checked="checked"{/IF} /> <label for="subscription-mail"><small>{LANG->EmailReplies}</small></label>
157 + <input type="checkbox" id="subscription-mail" name="subscription_mail" value="1" {IF POSTING->subscription "message"}checked="checked"{/IF} /> <label for="subscription-mail">{LANG->EmailReplies}</label>
158 </div>
160 <script type="text/javascript">
161 @@ -149,13 +145,13 @@
162 {/IF}
163 {/IF}
165 - <input type="checkbox" id="show-signature" name="show_signature" value="1" {IF POSTING->show_signature} checked="checked"{/IF} /> <label for="show-signature"><small>{LANG->AddSig}</small></label><br />
166 + <input type="checkbox" id="show-signature" name="show_signature" value="1" {IF POSTING->show_signature} checked="checked"{/IF} /> <label for="show-signature">{LANG->AddSig}</label><br />
167 <br/>
169 {/IF}
171 {IF ATTACHMENTS}
172 - <small>{LANG->Attachments}:</small><br />
173 + {LANG->Attachments}:<br />
174 {IF POSTING->attachments}
175 <table id="attachment-list" cellspacing="0">
176 {VAR LIST POSTING->attachments}
177 @@ -209,7 +205,7 @@
178 {/IF}
180 {HOOK "tpl_editor_before_textarea"}
181 - <small>{LANG->Message}:</small>
182 + {LANG->Message}:
183 <div id="post-body">
184 <!-- fieldset is a work around for an MSIE rendering bug -->
185 <fieldset>
186 @@ -224,7 +220,9 @@
187 {HOOK "tpl_editor_buttons"}
189 <input type="submit" name="preview" value=" {LANG->Preview} " />
190 - <input type="submit" name="finish" value=" {POSTING->submitbutton_text} " />
191 + {IF PREVIEW}
192 + <input type="submit" name="finish" value=" {POSTING->submitbutton_text} " />
193 + {/IF}
194 {IF SHOW_CANCEL_BUTTON}
195 <input type="submit" name="cancel" onclick="return confirm('{LANG->CancelConfirm}')" value=" {LANG->Cancel} " />
196 {/IF}
197 diff -u lightweight/settings.tpl htmlpurifier/settings.tpl
198 --- lightweight/settings.tpl 2008-10-13 16:59:57.417800000 -0400
199 +++ htmlpurifier/settings.tpl 2008-10-13 17:00:01.840800000 -0400
200 @@ -13,7 +13,7 @@
201 {DEFINE show_notify_for_pages "index,list,cc"}
203 {! -- This is the image for the gauge bar to show how full the PM box is -- }
204 -{VAR gauge_image "templates/emerald/images/gauge.gif"}
205 +{VAR gauge_image "templates/htmlpurifier/images/gauge.gif"}
207 {! --- Apply some compression to the template data. This feature is --- }
208 {! --- implemented by Phorum's template parsing code. Possible values --- }
209 @@ -25,13 +25,7 @@
210 {! so it is mainly useful for a production environment. --- }
211 {DEFINE tidy_template 0}
213 -{VAR template_dir "emerald"}
216 -{! -- Fonts -- }
218 -{VAR default_font "Arial"}
219 -{VAR base_font_size "12pt"} {! -- Need this for IE -- }
220 +{VAR template_dir "htmlpurifier"}
222 {VAR font_xx_large "145%"}
223 {VAR font_x_large "125%"}
224 @@ -40,25 +34,21 @@
225 {VAR font_x_small "75%"}
226 {VAR font_xx_small "65%"}
229 {! -- Sizes -- }
230 {VAR max_width "900px"} {! -- No effect in IE 6 -- }
233 {! -- colors -- }
234 -{VAR default_font_color "Black"}
235 -{VAR default_background_color "White"}
236 -{VAR alt_background_color "#edf2ed"} {! -- should compliment default_background_color -- }
237 -{VAR highlight_background_color "#f0f7f0"} {! -- should compliment the two above -- }
238 -{VAR border_color "#4d894d"}
239 +{VAR alt_background_color "#EBEFF4"} {! -- should compliment default_background_color -- }
240 +{VAR highlight_background_color "#F0F1F7"} {! -- should compliment the two above -- }
241 +{VAR border_color "#6480A6"}
242 {VAR border_font_color "White"}
243 {VAR quote_border_color "#808080"}
244 +{VAR link_color "#35355F"}
245 +{VAR link_hover_color "#BB8144"}
246 {VAR pre_border_color "#C4C6A2"}
247 {VAR pre_background_color "#FEFFEC"}
248 -{VAR link_color "#355F35"}
249 -{VAR link_hover_color "#709CCC"}
250 {VAR new_color "red"}
251 -{VAR logo_background_color "#78ad78"}
252 {VAR breadcrumb_border_color "#b6b6b6"}
253 {VAR post_moderation_background_color "#fffdf6"}