banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New template object to control HTML doctype

Browse Source
pull/1/head
thomascube 13 years ago
parent 4360276d9b
commit f230739a13
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File

24
program/include/html.php
Unescape Escape View File

@ -32,6 +32,7 @@ class html
protected $allowed = array(); protected $allowed = array();
protected $content; protected $content;
public static $doctype = 'xhtml';
public static $lc_tags = true; public static $lc_tags = true;
public static $common_attrib = array('id','class','style','title','align'); public static $common_attrib = array('id','class','style','title','align');
public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script'); public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script');
@ -88,6 +89,26 @@ class html
} }
} }
/**
*
*/
public static function doctype($type)
{
$doctypes = array(
'html5' => '<!DOCTYPE html>',
'xhtml' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
'xhtml-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
);
if ($doctypes[$type]) {
self::$doctype = preg_replace('/-\w+$/', '', $type);
return $doctypes[$type];
}
return '';
}
/** /**
* Derrived method for <div> containers * Derrived method for <div> containers
* *
@ -576,7 +597,8 @@ class html_table extends html
*/ */
public function __construct($attrib = array()) public function __construct($attrib = array())
{ {
$this->attrib = array_merge($attrib, array('summary' => '', 'border' => 0)); $default_attrib = self::$doctype == 'xhtml' ? array('summary' => '', 'border' => 0) : array();
$this->attrib = array_merge($attrib, $default_attrib);
} }
/** /**

5
program/include/rcube_template.php
Unescape Escape View File

@ -449,7 +449,7 @@ class rcube_template extends rcube_html_page
if ($realname != 'error' && ($this->config['debug_level'] & 8)) { if ($realname != 'error' && ($this->config['debug_level'] & 8)) {
$this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;display:none"> $this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;display:none">
<a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a> <a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a>
<textarea name="console" id="dbgconsole" rows="20" cols="40" wrap="off" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>' <textarea name="console" id="dbgconsole" rows="20" cols="40" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>'
); );
$this->add_script( $this->add_script(
"if (!window.console || !window.console.log) {\n". "if (!window.console || !window.console.log) {\n".
@ -747,6 +747,9 @@ class rcube_template extends rcube_html_page
else if (function_exists($handler)) { else if (function_exists($handler)) {
$content = call_user_func($handler, $attrib); $content = call_user_func($handler, $attrib);
} }
else if ($object == 'doctype') {
$content = html::doctype($attrib['value']);
}
else if ($object == 'logo') { else if ($object == 'logo') {
$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"'))); $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
if ($this->config['skin_logo']) if ($this->config['skin_logo'])

Write Preview
Loading…
Cancel
Save