thomascube
2008-09-19 a3f149eb5729ef1ba6d1c05b29fead1058f4c888
Fix search box on Safari and make pages validate

5 files modified
16 ■■■■■ changed files
program/include/html.php 2 ●●● patch | view | raw | blame | history
program/include/rcube_browser.php 3 ●●●● patch | view | raw | blame | history
program/include/rcube_template.php 9 ●●●●● patch | view | raw | blame | history
skins/default/mail.css 1 ●●●● patch | view | raw | blame | history
skins/default/watermark.html 1 ●●●● patch | view | raw | blame | history
program/include/html.php
@@ -248,7 +248,7 @@
{
    protected $tagname = 'input';
    protected $type = 'text';
    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck');
    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck','results');
    public function __construct($attrib = array())
    {
program/include/rcube_browser.php
@@ -43,7 +43,8 @@
        $this->ns  = ($this->ns4 || stristr($HTTP_USER_AGENT, 'netscape'));
        $this->ie  = stristr($HTTP_USER_AGENT, 'compatible; msie') && !$this->opera;
        $this->mz  = stristr($HTTP_USER_AGENT, 'mozilla/5');
        $this->safari = stristr($HTTP_USER_AGENT, 'safari');
        $this->khtml = stristr($HTTP_USER_AGENT, 'khtml');
        $this->safari = ($this->khtml || stristr($HTTP_USER_AGENT, 'safari'));
        if ($this->ns) {
            $test = eregi("mozilla\/([0-9\.]+)", $HTTP_USER_AGENT, $regs);
program/include/rcube_template.php
@@ -54,6 +54,7 @@
        $this->app = rcmail::get_instance();
        $this->config = $this->app->config->all();
        $this->browser = new rcube_browser();
        
        //$this->framed = $framed;
        $this->set_env('task', $task);
@@ -707,8 +708,6 @@
            return '';
        }
        $browser   = new rcube_browser();
        // try to find out the button type
        if ($attrib['type']) {
            $attrib['type'] = strtolower($attrib['type']);
@@ -755,7 +754,7 @@
            $attrib['alt'] = Q(rcube_label($attrib['alt']));
        }
        // set title to alt attribute for IE browsers
        if ($browser->ie && $attrib['title'] && !$attrib['alt']) {
        if ($this->browser->ie && $attrib['title'] && !$attrib['alt']) {
            $attrib['alt'] = $attrib['title'];
            unset($attrib['title']);
        }
@@ -1018,6 +1017,10 @@
        if (empty($attrib['id'])) {
            $attrib['id'] = 'rcmqsearchbox';
        }
        if ($attrib['type'] == 'search' && !$this->browser->khtml) {
          unset($attrib['type'], $attrib['results']);
        }
        $input_q = new html_inputfield($attrib);
        $out = $input_q->show();
skins/default/mail.css
@@ -755,7 +755,6 @@
#messagebody
{
  position:relative;
  min-height: 300px;
  padding-bottom: 10px;
  background-color: #FFFFFF;
}
skins/default/watermark.html
@@ -1,6 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
  <title></title>
</head>
<body style="background-color:#F2F2F2;">