phorum.patch

   1 diff -u lightweight/css.tpl htmlpurifier/css.tpl
   2 --- lightweight/css.tpl 2007-12-15 11:43:35.000000000 -0500
   3 +++ htmlpurifier/css.tpl        2008-01-12 20:00:29.675475200 -0500
   4 @@ -456,7 +456,7 @@
   5
   6  #phorum #post-body {
   7      border: 1px solid {border_color};
   8 -    background-color: {default_background_color};
   9 +    background-color: #FFF;
  10      padding: 8px;
  11  }
  12
  13 diff -u lightweight/footer.tpl htmlpurifier/footer.tpl
  14 --- lightweight/footer.tpl      2007-02-02 23:20:28.000000000 -0500
  15 +++ htmlpurifier/footer.tpl     2008-01-12 19:23:47.346875200 -0500
  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      2007-12-24 06:21:03.000000000 -0500
  25 +++ htmlpurifier/header.tpl     2008-01-12 21:01:21.236875200 -0500
  26 @@ -35,12 +35,20 @@
  27      <meta name="description" content="{DESCRIPTION}" />
  28  {/IF}
  29
  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" />
  32 +
  33  {HEAD_TAGS}
  34
  35  </head>
  36  <body onload="{IF FOCUS_TO_ID}var focuselt=document.getElementById('{FOCUS_TO_ID}'); if (focuselt) focuselt.focus();{/IF}">
  37
  38 +<div id="logo"></div>
  39 +<div id="header"><a href="../">HTML Purifier</a></div>
  40 +{HP_NAVIGATION}
  41 +
  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>
  50
  51 -<div id="logo">
  52 -
  53 -<a href="{URL->BASE}"><img src="{URL->TEMPLATE}/images/logo.png" width="111" height="25" alt="Phorum" border="0" /></a>
  54 -</div>
  55 -
  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        2007-07-21 16:49:46.000000000 -0400
  62 +++ htmlpurifier/info.php       2008-01-12 19:22:56.578875200 -0500
  63 @@ -2,9 +2,12 @@
  64
  65      if(!defined("PHORUM")) return;
  66
  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;
  73
  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     2007-12-15 13:34:48.000000000 -0500
  81 +++ htmlpurifier/posting.tpl    2008-05-10 13:46:31.546566800 -0400
  82 @@ -60,7 +60,6 @@
  83                  {IF SHOW_SPECIALOPTIONS}
  84
  85                    <div id="post-moderation">
  86 -                    <small>
  87                      {LANG->Special}:<br />
  88
  89                      {IF OPTION_ALLOWED->sticky}
  90 @@ -72,19 +71,17 @@
  91                      {/IF}
  92
  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/>
 112
 113 @@ -92,7 +89,7 @@
 114
 115                      {IF NOT LOGGEDIN}
 116
 117 -                        {LANG->YourEmail}:<br />
 118 +                        {LANG->YourEmail}:
 119                          <input type="text" name="email" size="30" value="{POSTING->email}" /><br />
 120                          <br />
 121
 122 @@ -102,7 +99,7 @@
 123
 124                      {IF POSTING->user_id 0}
 125
 126 -                        {LANG->Email}:<br />
 127 +                        {LANG->Email}:
 128                          <input type="text" name="email" size="30" value="{POSTING->email}" /><br />
 129                          <br />
 130
 131 @@ -110,25 +107,25 @@
 132
 133                  {/IF}
 134
 135 -                {LANG->Subject}:<br />
 136 +                {LANG->Subject}:
 137                  <input type="text" name="subject" id="subject" size="50" value="{POSTING->subject}" /><br />
 138                  <br />
 139 +
 140
 141                  {HOOK "tpl_editor_after_subject"}
 142
 143 -                </small>
 144                  {IF POSTING->user_id}
 145
 146 -                    <small>{LANG->Options}:</small><br />
 147 +                    {LANG->Options}:<br />
 148
 149                      {IF OPTION_ALLOWED->subscribe}
 150
 151 -                        <input type="checkbox" id="subscription-follow" name="subscription_follow" value="1" {IF POSTING->subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onchange="phorum_subscription_displaystate()"{/IF} /> <label for="subscription-follow"><small>{LANG->FollowThread}</small></label><br />
 152 +                        <input type="checkbox" id="subscription-follow" name="subscription_follow" value="1" {IF POSTING->subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onchange="phorum_subscription_displaystate()"{/IF} /> <label for="subscription-follow">{LANG->FollowThread}</label><br />
 153
 154                          {IF OPTION_ALLOWED->subscribe_mail}
 155                            <div id="subscription-mail-div">
 156                              <img src="{URL->TEMPLATE}/images/tree-L.gif" border="0" alt="tree-L" />
 157 -                            <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>
 158 +                            <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>
 159                            </div>
 160
 161                            <script type="text/javascript">
 162 @@ -149,13 +146,13 @@
 163                          {/IF}
 164                      {/IF}
 165
 166 -                    <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 />
 167 +                    <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 />
 168                      <br/>
 169
 170                  {/IF}
 171
 172              {IF ATTACHMENTS}
 173 -                <small>{LANG->Attachments}:</small><br />
 174 +                {LANG->Attachments}:<br />
 175                  {IF POSTING->attachments}
 176                      <table id="attachment-list" cellspacing="0">
 177                        {VAR LIST POSTING->attachments}
 178 @@ -209,7 +206,7 @@
 179              {/IF}
 180
 181              {HOOK "tpl_editor_before_textarea"}
 182 -            <small>{LANG->Message}:</small>
 183 +            {LANG->Message}:
 184              <div id="post-body">
 185                <!-- fieldset is a work around for an MSIE rendering bug -->
 186                <fieldset>
 187 @@ -224,7 +221,9 @@
 188              {HOOK "tpl_editor_buttons"}
 189
 190              <input type="submit" name="preview" value=" {LANG->Preview} " />
 191 -            <input type="submit" name="finish" value=" {POSTING->submitbutton_text} " />
 192 +            {IF PREVIEW}
 193 +                <input type="submit" name="finish" value=" {POSTING->submitbutton_text} " />
 194 +            {/IF}
 195              <input type="submit" name="cancel" onclick="return confirm('{LANG->CancelConfirm}')" value=" {LANG->Cancel} " />
 196
 197          </div>
 198 diff -u lightweight/settings.tpl htmlpurifier/settings.tpl
 199 --- lightweight/settings.tpl    2007-12-14 07:16:34.000000000 -0500
 200 +++ htmlpurifier/settings.tpl   2008-01-12 20:01:57.503475200 -0500
 201 @@ -13,7 +13,7 @@
 202  {DEFINE show_notify_for_pages "index,list,cc"}
 203
 204  {! -- This is the image for the gauge bar to show how full the PM box is -- }
 205 -{VAR gauge_image "templates/emerald/images/gauge.gif"}
 206 +{VAR gauge_image "templates/htmlpurifier/images/gauge.gif"}
 207
 208  {! --- Apply some compression to the template data. This feature is      --- }
 209  {! --- implemented by Phorum's template parsing code. Possible values    --- }
 210 @@ -25,13 +25,7 @@
 211  {!         so it is mainly useful for a production environment.          --- }
 212  {DEFINE tidy_template 0}
 213
 214 -{VAR template_dir "emerald"}
 215 -
 216 -
 217 -{! -- Fonts -- }
 218 -
 219 -{VAR default_font "Arial"}
 220 -{VAR base_font_size "12pt"} {! -- Need this for IE -- }
 221 +{VAR template_dir "htmlpurifier"}
 222
 223  {VAR font_xx_large "145%"}
 224  {VAR font_x_large  "125%"}
 225 @@ -40,25 +34,21 @@
 226  {VAR font_x_small   "75%"}
 227  {VAR font_xx_small  "65%"}
 228
 229 -
 230  {! -- Sizes -- }
 231  {VAR max_width "900px"}  {! -- No effect in IE 6 -- }
 232
 233
 234  {! -- colors -- }
 235 -{VAR default_font_color "Black"}
 236 -{VAR default_background_color "White"}
 237 -{VAR alt_background_color "#edf2ed"} {! -- should compliment default_background_color -- }
 238 -{VAR highlight_background_color "#f0f7f0"} {! -- should compliment the two above -- }
 239 -{VAR border_color "#4d894d"}
 240 +{VAR alt_background_color "#EBEFF4"} {! -- should compliment default_background_color -- }
 241 +{VAR highlight_background_color "#F0F1F7"} {! -- should compliment the two above -- }
 242 +{VAR border_color "#6480A6"}
 243  {VAR border_font_color "White"}
 244  {VAR quote_border_color "#808080"}
 245 +{VAR link_color "#35355F"}
 246 +{VAR link_hover_color "#BB8144"}
 247  {VAR pre_border_color "#C4C6A2"}
 248  {VAR pre_background_color "#FEFFEC"}
 249 -{VAR link_color "#355F35"}
 250 -{VAR link_hover_color "#709CCC"}
 251  {VAR new_color "red"}
 252 -{VAR logo_background_color "#78ad78"}
 253  {VAR breadcrumb_border_color "#b6b6b6"}
 254  {VAR post_moderation_background_color "#fffdf6"}
 255