Removed HTML formating code

This commit is contained in:
Timothy Warren 2011-12-14 14:18:27 -05:00
parent d043477bc3
commit eb38699b23
1 changed files with 10 additions and 18 deletions

View File

@ -23,15 +23,6 @@ class Page
$this->body_id = ""; $this->body_id = "";
$this->base = ""; $this->base = "";
$this->CI =& get_instance(); $this->CI =& get_instance();
//Define some constants for formatting
define('NL', "\n");
define('T1', "\t");
define('T2', T1 . T1);
define('T3', T2 . T1);
define('T4', T2 . T2);
define('T5', T3 . T2);
define('T6', T3 . T3);
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -63,7 +54,7 @@ class Page
//Predefine charset //Predefine charset
$charset = "UTF-8"; $charset = "UTF-8";
//If xhtml flag is false, set html4 header //If xhtml flag is false, set html5 header
if ($xhtml == TRUE) if ($xhtml == TRUE)
{ {
//Check that the user agent accepts application/xhtml+xml, or if it's the W3C Validator //Check that the user agent accepts application/xhtml+xml, or if it's the W3C Validator
@ -138,7 +129,7 @@ class Page
*/ */
public function set_meta($meta) public function set_meta($meta)
{ {
$this->meta .= T1 . meta($meta) . NL; $this->meta .= meta($meta);
return $this; return $this;
} }
@ -191,7 +182,7 @@ class Page
'rel' => 'stylesheet', 'rel' => 'stylesheet',
'type' => 'text/css' 'type' => 'text/css'
); );
$this->css .= T1 . link_tag($link) . NL; $this->css .= link_tag($link);
return $this; return $this;
} }
@ -206,7 +197,7 @@ class Page
public function set_foot_js_group($group, $debug = FALSE) public function set_foot_js_group($group, $debug = FALSE)
{ {
$file = $this->CI->config->item('group_js_path') . $group; $file = $this->CI->config->item('group_js_path') . $group;
$file .= ($debug == TRUE) ? "?debug=1" : ""; $file .= ($debug == TRUE) ? "/debug/1" : "";
$this->foot_js .= $this->script_tag($file, FALSE); $this->foot_js .= $this->script_tag($file, FALSE);
return $this; return $this;
} }
@ -295,7 +286,7 @@ class Page
if ($domain == FALSE) if ($domain == FALSE)
$css_file = $name; $css_file = $name;
$this->css_tags .= T1 . link_tag($name, "stylesheet", "text/css", "", $media) . NL; $this->css_tags .= link_tag($name, "stylesheet", "text/css", "", $media);
return $this; return $this;
} }
@ -341,7 +332,10 @@ class Page
$data = array(); $data = array();
//Set Meta Tags //Set Meta Tags
$this->meta = ($html5 == TRUE) ? T1 . '<meta charset="utf-8" />' . NL . $this->meta : T1 . meta('content-type', 'text/html; charset=utf-8', 'equiv') . NL . $this->meta; $this->meta = ($html5 == TRUE)
? '<meta charset="utf-8" />'. $this->meta
: meta('content-type', 'text/html; charset=utf-8', 'equiv') . $this->meta;
$data['meta'] = $this->meta; $data['meta'] = $this->meta;
//Set CSS //Set CSS
@ -388,8 +382,6 @@ class Page
//Output Header //Output Header
$this->CI->load->view('header', $data); $this->CI->load->view('header', $data);
flush();
return $this; return $this;
} }
@ -427,7 +419,7 @@ class Page
if ($domain == FALSE) if ($domain == FALSE)
$js_file = $js; $js_file = $js;
$tag = T1 . '<script src="' . $js_file . '"></script>' . NL; $tag = '<script src="' . $js_file . '"></script>';
return $tag; return $tag;
} }