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

[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  12aae4200c4d4b7210bb7c3435a4039105c9a960 (commit)
      from  e6a6e4c525528920929d974ef7027f8d94b0a452 (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 12aae4200c4d4b7210bb7c3435a4039105c9a960
Author: Ivan1986 <iva...@li...>
Date:   Tue Apr 27 12:22:01 2010 +0400

    Документация по Url

diff --git a/QFW/QuickFW/Url.php b/QFW/QuickFW/Url.php
index d121285..67c4d3f 100644
--- a/QFW/QuickFW/Url.php
+++ b/QFW/QuickFW/Url.php
@@ -68,9 +68,9 @@ class Url
 	 * @param string $ancor якорь
 	 * @return self адрес на сайте
 	 */
-	public static function A($get='', $ancor='')
+	public static function A($url, $get='', $ancor='')
 	{
-		return new self('', $get, $ancor, QFW::$router->cModule.
+		return new self($url, $get, $ancor, QFW::$router->cModule.
 				QuickFW_Router::PATH_SEPARATOR.
 			QFW::$router->cController.
 				QuickFW_Router::PATH_SEPARATOR.
diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile
index c5da5ba..f676452 100644
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@@ -1,6 +1,6 @@
 all: quickfw.pdf quickfw.html
 
-FILES = quickfw general quickstart directory mvc blocks templates cache auth autoload features
+FILES = quickfw general quickstart directory mvc blocks templates cache auth autoload helpers features
 TEXTS = $(addsuffix .txt, $(FILES) )
 
 quickfw.pdf: $(TEXTS)
diff --git a/doc/asciidoc/helpers.txt b/doc/asciidoc/helpers.txt
new file mode 100644
index 0000000..73eced0
--- /dev/null
+++ b/doc/asciidoc/helpers.txt
@@ -0,0 +1,21 @@
+Хелперы
+-------
+
+Генерация URL
+~~~~~~~~~~~~~
+
+Для генерации URL существует отдельный класс +Url+ в котором есть статические методы.
+Каждая функция-генератор кромя base принимает три параметра: относительный адрес, get параметы и якорь.
+
++Url::base+::
+	отдает базовый Url
++Url::site+::
+	Url относительно корня сайта
++Url::M+::
+	Url относительно модуля
++Url::C+::
+	Url относительно контроллера
++Url::A+::
+	Url относительно экшена
+
+Для переинициализации есть функция +Url::Init+, которая перечитывает массив +QFW::$config[\'redirection']+.
diff --git a/doc/asciidoc/quickfw.txt b/doc/asciidoc/quickfw.txt
index 664bd48..0fe9ffc 100644
--- a/doc/asciidoc/quickfw.txt
+++ b/doc/asciidoc/quickfw.txt
@@ -21,4 +21,6 @@ include::auth.txt[]
 
 include::autoload.txt[]
 
+include::helpers.txt[]
+
 include::features.txt[]

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

Summary of changes:
 QFW/QuickFW/Url.php      |    4 ++--
 doc/asciidoc/Makefile    |    2 +-
 doc/asciidoc/helpers.txt |   21 +++++++++++++++++++++
 doc/asciidoc/quickfw.txt |    2 ++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 doc/asciidoc/helpers.txt


hooks/post-receive
-- 
quickfw