Changeset 1850 in subversion


Ignore:
Timestamp:
Sep 19, 2008 1:01:57 PM (5 years ago)
Author:
thomasb
Message:

Fix search box on Safari and make pages validate

Location:
trunk/roundcubemail
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/program/include/html.php

    r1806 r1850  
    249249    protected $tagname = 'input'; 
    250250    protected $type = 'text'; 
    251     protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck'); 
     251    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck','results'); 
    252252 
    253253    public function __construct($attrib = array()) 

  • trunk/roundcubemail/program/include/rcube_browser.php

    r1673 r1850  
    4444        $this->ie  = stristr($HTTP_USER_AGENT, 'compatible; msie') && !$this->opera; 
    4545        $this->mz  = stristr($HTTP_USER_AGENT, 'mozilla/5'); 
    46         $this->safari = stristr($HTTP_USER_AGENT, 'safari'); 
     46        $this->khtml = stristr($HTTP_USER_AGENT, 'khtml'); 
     47        $this->safari = ($this->khtml || stristr($HTTP_USER_AGENT, 'safari')); 
    4748 
    4849        if ($this->ns) { 

  • trunk/roundcubemail/program/include/rcube_template.php

    r1846 r1850  
    5555        $this->app = rcmail::get_instance(); 
    5656        $this->config = $this->app->config->all(); 
     57        $this->browser = new rcube_browser(); 
    5758         
    5859        //$this->framed = $framed; 
    … …  
    708709        } 
    709710 
    710         $browser   = new rcube_browser(); 
    711  
    712711        // try to find out the button type 
    713712        if ($attrib['type']) { 
    … …  
    756755        } 
    757756        // set title to alt attribute for IE browsers 
    758         if ($browser->ie && $attrib['title'] && !$attrib['alt']) { 
     757        if ($this->browser->ie && $attrib['title'] && !$attrib['alt']) { 
    759758            $attrib['alt'] = $attrib['title']; 
    760759            unset($attrib['title']); 
    … …  
    10191018            $attrib['id'] = 'rcmqsearchbox'; 
    10201019        } 
     1020        if ($attrib['type'] == 'search' && !$this->browser->khtml) { 
     1021          unset($attrib['type'], $attrib['results']); 
     1022        } 
     1023         
    10211024        $input_q = new html_inputfield($attrib); 
    10221025        $out = $input_q->show(); 

  • trunk/roundcubemail/skins/default/mail.css

    r1832 r1850  
    756756{ 
    757757  position:relative; 
    758   min-height: 300px; 
    759758  padding-bottom: 10px; 
    760759  background-color: #FFFFFF; 

  • trunk/roundcubemail/skins/default/watermark.html

    r3 r1850  
    22<html xmlns="http://www.w3.org/1999/xhtml"> 
    33<head> 
     4  <title></title> 
    45</head> 
    56<body style="background-color:#F2F2F2;"> 
Note: See TracChangeset for help on using the changeset viewer.