Changeset 5682


Ignore:
Timestamp:
Apr 5, 2010, 10:49:32 PM (10 years ago)
Author:
grum
Message:

bug 1580 - remove some hard coded markup (move them to the template)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/functions_html.inc.php

    r5451 r5682  
    200200  $content = preg_replace($pattern, $replacement, $content);
    201201
    202   $content = '<div>'.$content.'</div>';
    203202  return $content;
    204203}
     
    458457    }
    459458  }
    460         $protocol = $_SERVER["SERVER_PROTOCOL"];
    461         if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) )
    462                 $protocol = 'HTTP/1.0';
    463 
    464         if ( version_compare( phpversion(), '4.3.0', '>=' ) )
    465   {
    466                 header( "$protocol $code $text", true, $code );
    467         }
     459  $protocol = $_SERVER["SERVER_PROTOCOL"];
     460  if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) )
     461    $protocol = 'HTTP/1.0';
     462
     463  if ( version_compare( phpversion(), '4.3.0', '>=' ) )
     464  {
     465    header( "$protocol $code $text", true, $code );
     466  }
    468467  else
    469468  {
    470                 header( "$protocol $code $text" );
    471         }
     469    header( "$protocol $code $text" );
     470  }
    472471  trigger_action('set_status_header', $code, $text);
    473472}
  • trunk/themes/default/template/comment_list.tpl

    r5207 r5682  
    4141      <a name="edit_comment"></a>
    4242      <form  method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">
    43         <fieldset>
    44           <legend>{'Edit a comment'|@translate}</legend>
    45           <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
    46           <input type="hidden" name="key" value="{$comment.KEY}">
    47           <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
    48           <input class="submit" type="submit" value="{'Submit'|@translate}">
    49         </fieldset>
     43  <fieldset>
     44    <legend>{'Edit a comment'|@translate}</legend>
     45    <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
     46    <input type="hidden" name="key" value="{$comment.KEY}">
     47    <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
     48    <input class="submit" type="submit" value="{'Submit'|@translate}">
     49  </fieldset>
    5050      </form>
    51       {else}     
    52       <blockquote>{$comment.CONTENT}</blockquote>
     51      {else}
     52      <blockquote><div>{$comment.CONTENT}</div></blockquote>
    5353      {/if}
    5454    </div>
Note: See TracChangeset for help on using the changeset viewer.