Changeset 983
- Timestamp:
- 06/10/08 19:05:52 (6 months ago)
- Files:
-
- trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php (modified) (4 diffs)
- trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php (modified) (4 diffs)
- trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php (modified) (4 diffs)
- trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php (modified) (4 diffs)
- trunk/lib/jelix/CREDITS (modified) (1 diff)
- trunk/lib/jelix/CREDITS (modified) (1 diff)
- trunk/lib/jelix/CREDITS (modified) (1 diff)
- trunk/lib/jelix/CREDITS (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php
r913 r983 4 4 * @subpackage core_response 5 5 * @author Tahina Ramaroson 6 * @contributor Sylvain de Vathaire 6 * @contributor Sylvain de Vathaire, Dominique Papin 7 7 * @copyright 2008 Tahina Ramaroson, Sylvain de Vathaire 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html … … 36 37 public $tpl = null; 37 38 39 /**#@+ 40 * content surrounding template content 41 * @var array 42 */ 43 protected $_contentTop = array(); 44 protected $_contentBottom = array(); 45 /**#@-*/ 46 38 47 /** 39 48 * constructor; … … 59 68 if($this->hasErrors()) return false; 60 69 61 $content = '';70 $content = implode("\n",$this->_contentTop); 62 71 if($this->tplname!=''){ 63 $content =$this->tpl->fetch($this->tplname,'html');72 $content.=$this->tpl->fetch($this->tplname,'html'); 64 73 if($this->hasErrors()) return false; 65 74 } 75 $content .= implode("\n",$this->_contentBottom); 66 76 67 77 $this->_httpHeaders['Content-Type']='text/plain;charset='.$gJConfig->charset; … … 71 81 return true; 72 82 } 83 84 /** 85 * add content to the response 86 * you can add additionnal content, before or after the content generated by the main template 87 * @param string $content additionnal html content 88 * @param boolean $beforeTpl true if you want to add it before the template content, else false for after 89 */ 90 function addContent($content, $beforeTpl = false){ 91 if($beforeTpl){ 92 $this->_contentTop[]=$content; 93 }else{ 94 $this->_contentBottom[]=$content; 95 } 96 } 97 73 98 74 99 /** trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php
r913 r983 4 4 * @subpackage core_response 5 5 * @author Tahina Ramaroson 6 * @contributor Sylvain de Vathaire 6 * @contributor Sylvain de Vathaire, Dominique Papin 7 7 * @copyright 2008 Tahina Ramaroson, Sylvain de Vathaire 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html … … 36 37 public $tpl = null; 37 38 39 /**#@+ 40 * content surrounding template content 41 * @var array 42 */ 43 protected $_contentTop = array(); 44 protected $_contentBottom = array(); 45 /**#@-*/ 46 38 47 /** 39 48 * constructor; … … 59 68 if($this->hasErrors()) return false; 60 69 61 $content = '';70 $content = implode("\n",$this->_contentTop); 62 71 if($this->tplname!=''){ 63 $content =$this->tpl->fetch($this->tplname,'html');72 $content.=$this->tpl->fetch($this->tplname,'html'); 64 73 if($this->hasErrors()) return false; 65 74 } 75 $content .= implode("\n",$this->_contentBottom); 66 76 67 77 $this->_httpHeaders['Content-Type']='text/plain;charset='.$gJConfig->charset; … … 71 81 return true; 72 82 } 83 84 /** 85 * add content to the response 86 * you can add additionnal content, before or after the content generated by the main template 87 * @param string $content additionnal html content 88 * @param boolean $beforeTpl true if you want to add it before the template content, else false for after 89 */ 90 function addContent($content, $beforeTpl = false){ 91 if($beforeTpl){ 92 $this->_contentTop[]=$content; 93 }else{ 94 $this->_contentBottom[]=$content; 95 } 96 } 97 73 98 74 99 /** trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php
r913 r983 4 4 * @subpackage core_response 5 5 * @author Tahina Ramaroson 6 * @contributor Sylvain de Vathaire 6 * @contributor Sylvain de Vathaire, Dominique Papin 7 7 * @copyright 2008 Tahina Ramaroson, Sylvain de Vathaire 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html … … 36 37 public $tpl = null; 37 38 39 /**#@+ 40 * content surrounding template content 41 * @var array 42 */ 43 protected $_contentTop = array(); 44 protected $_contentBottom = array(); 45 /**#@-*/ 46 38 47 /** 39 48 * constructor; … … 59 68 if($this->hasErrors()) return false; 60 69 61 $content = '';70 $content = implode("\n",$this->_contentTop); 62 71 if($this->tplname!=''){ 63 $content =$this->tpl->fetch($this->tplname,'html');72 $content.=$this->tpl->fetch($this->tplname,'html'); 64 73 if($this->hasErrors()) return false; 65 74 } 75 $content .= implode("\n",$this->_contentBottom); 66 76 67 77 $this->_httpHeaders['Content-Type']='text/plain;charset='.$gJConfig->charset; … … 71 81 return true; 72 82 } 83 84 /** 85 * add content to the response 86 * you can add additionnal content, before or after the content generated by the main template 87 * @param string $content additionnal html content 88 * @param boolean $beforeTpl true if you want to add it before the template content, else false for after 89 */ 90 function addContent($content, $beforeTpl = false){ 91 if($beforeTpl){ 92 $this->_contentTop[]=$content; 93 }else{ 94 $this->_contentBottom[]=$content; 95 } 96 } 97 73 98 74 99 /** trunk/lib/jelix/core/response/jResponseHtmlFragment.class.php
r913 r983 4 4 * @subpackage core_response 5 5 * @author Tahina Ramaroson 6 * @contributor Sylvain de Vathaire 6 * @contributor Sylvain de Vathaire, Dominique Papin 7 7 * @copyright 2008 Tahina Ramaroson, Sylvain de Vathaire 8 * @copyright 2008 Dominique Papin 8 9 * @link http://www.jelix.org 9 10 * @licence GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html … … 36 37 public $tpl = null; 37 38 39 /**#@+ 40 * content surrounding template content 41 * @var array 42 */ 43 protected $_contentTop = array(); 44 protected $_contentBottom = array(); 45 /**#@-*/ 46 38 47 /** 39 48 * constructor; … … 59 68 if($this->hasErrors()) return false; 60 69 61 $content = '';70 $content = implode("\n",$this->_contentTop); 62 71 if($this->tplname!=''){ 63 $content =$this->tpl->fetch($this->tplname,'html');72 $content.=$this->tpl->fetch($this->tplname,'html'); 64 73 if($this->hasErrors()) return false; 65 74 } 75 $content .= implode("\n",$this->_contentBottom); 66 76 67 77 $this->_httpHeaders['Content-Type']='text/plain;charset='.$gJConfig->charset; … … 71 81 return true; 72 82 } 83 84 /** 85 * add content to the response 86 * you can add additionnal content, before or after the content generated by the main template 87 * @param string $content additionnal html content 88 * @param boolean $beforeTpl true if you want to add it before the template content, else false for after 89 */ 90 function addContent($content, $beforeTpl = false){ 91 if($beforeTpl){ 92 $this->_contentTop[]=$content; 93 }else{ 94 $this->_contentBottom[]=$content; 95 } 96 } 97 73 98 74 99 /** trunk/lib/jelix/CREDITS
r982 r983 65 65 - improved addCssLink usability for IE (#348) 66 66 - added support of 'else' keyword for block plugin in jtpl (#349) 67 - fixed bug in firebug support (#362)68 67 - added support of <reset> in jforms (#258) 69 - fixed bug in swf* plugin (#585)68 - fixed some bugs (#362,#585) 70 69 - jforms dao datasource : enhancements (#581,#582) 71 70 - added ifctrl block plugin (#601) 71 - added addContent method to jResponseHtmlFragment (#610) 72 72 73 73 Christophe Thiriot (aka Doubleface) trunk/lib/jelix/CREDITS
r982 r983 65 65 - improved addCssLink usability for IE (#348) 66 66 - added support of 'else' keyword for block plugin in jtpl (#349) 67 - fixed bug in firebug support (#362)68 67 - added support of <reset> in jforms (#258) 69 - fixed bug in swf* plugin (#585)68 - fixed some bugs (#362,#585) 70 69 - jforms dao datasource : enhancements (#581,#582) 71 70 - added ifctrl block plugin (#601) 71 - added addContent method to jResponseHtmlFragment (#610) 72 72 73 73 Christophe Thiriot (aka Doubleface) trunk/lib/jelix/CREDITS
r982 r983 65 65 - improved addCssLink usability for IE (#348) 66 66 - added support of 'else' keyword for block plugin in jtpl (#349) 67 - fixed bug in firebug support (#362)68 67 - added support of <reset> in jforms (#258) 69 - fixed bug in swf* plugin (#585)68 - fixed some bugs (#362,#585) 70 69 - jforms dao datasource : enhancements (#581,#582) 71 70 - added ifctrl block plugin (#601) 71 - added addContent method to jResponseHtmlFragment (#610) 72 72 73 73 Christophe Thiriot (aka Doubleface) trunk/lib/jelix/CREDITS
r982 r983 65 65 - improved addCssLink usability for IE (#348) 66 66 - added support of 'else' keyword for block plugin in jtpl (#349) 67 - fixed bug in firebug support (#362)68 67 - added support of <reset> in jforms (#258) 69 - fixed bug in swf* plugin (#585)68 - fixed some bugs (#362,#585) 70 69 - jforms dao datasource : enhancements (#581,#582) 71 70 - added ifctrl block plugin (#601) 71 - added addContent method to jResponseHtmlFragment (#610) 72 72 73 73 Christophe Thiriot (aka Doubleface)
