[Quickfw-git] SF.net Git: quickfw branch, master, updated. f8b5340c3633dd292a5aeec43a82da1130cf2801

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  f8b5340c3633dd292a5aeec43a82da1130cf2801 (commit)
      from  eac6e05b69f52a1d68416862d63cdf4d6069c6d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f8b5340c3633dd292a5aeec43a82da1130cf2801
Author: Ivan Borzenkov <iva...@li...>
Date:   Fri Sep 10 22:27:39 2010 +0400

    Опция - верстка в html или в xml - пока для addCSS

diff --git a/QFW/QuickFW/Plugs.php b/QFW/QuickFW/Plugs.php
index 1e16692..371d893 100644
--- a/QFW/QuickFW/Plugs.php
+++ b/QFW/QuickFW/Plugs.php
@@ -119,14 +119,15 @@ class QuickFW_Plugs
 	public function HeaderFilter($text)
 	{
 		$head='';
+		$endSlash = QFW::$config['QFW']['addCSSXml'] ? '/' : '';
 		$this->IncFiles['css'] = array_merge($this->IncFiles['css_main'], $this->IncFiles['css']);
 		$this->IncFiles['js'] = array_merge($this->IncFiles['js_main'], $this->IncFiles['js']);
 
 		$this->IncFiles['css'] = array_unique($this->IncFiles['css']);
 		if (count($this->IncFiles['css'])>0)
 			$head.='<link rel="stylesheet" href="'.
-				join('" type="text/css" />'."\n".'<link rel="stylesheet" href="', $this->IncFiles['css']).
-				'" type="text/css" />'."\n";
+				join('" type="text/css" '.$endSlash.'>'."\n".'<link rel="stylesheet" href="', $this->IncFiles['css']).
+				'" type="text/css" '.$endSlash.'>'."\n";
 
 		$this->IncFiles['js'] = array_unique($this->IncFiles['js']);
 		if (count($this->IncFiles['js'])>0)
diff --git a/QFW/config.php b/QFW/config.php
index 4cf48f2..8e29a95 100644
--- a/QFW/config.php
+++ b/QFW/config.php
@@ -37,6 +37,7 @@ $config['QFW'] = array(
 	'cacheSessions' => false, /* Хранить сессии в кеше, не использовать стандартный механизм */
 	'autoload' => false, /* включить автолоад false|true|string */
 	'auto404' => false, /* не перенаправлять на дефолтовый контроллер все запросы  */
+	'addCSSXml' => false, /* addJS и addCSS выводят теги в XML  */
 );
 
 /**
diff --git a/application/default.php b/application/default.php
index 0cecf94..b1d1c19 100644
--- a/application/default.php
+++ b/application/default.php
@@ -85,6 +85,7 @@ $config['QFW'] = array(
 	'cacheSessions' => false, /* Хранить сессии в кеше, не использовать стандартный механизм */
 	'autoload' => true, /* включить автолоад false|true|string */
 	'auto404' => false, /* не перенаправлять на дефолтовый контроллер все запросы  */
+	'addCSSXml' => false, /* addJS и addCSS выводят теги в XML  */
 );
 
 /* Шаблонизатор - имя класса + дефолтовый шаблон */

-----------------------------------------------------------------------

Summary of changes:
 QFW/QuickFW/Plugs.php   |    5 +++--
 QFW/config.php          |    1 +
 application/default.php |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
quickfw