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

[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  87a14bd519095238326b0fe3bd412e827c0b79e0 (commit)
       via  38b2ca67cf4314dfa5335b428759dac383d0dc4c (commit)
      from  7833f01427ce29bd4b207d91ec6ad4ce733ef538 (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 87a14bd519095238326b0fe3bd412e827c0b79e0
Author: Ivan1986 <iva...@li...>
Date:   Wed Jun 2 12:54:40 2010 +0400

    Исправлена ошибка при редиректе на самого себя при включенном index.php из nginx

diff --git a/QFW/QuickFW/Router.php b/QFW/QuickFW/Router.php
index 70b946a..b00f72f 100644
--- a/QFW/QuickFW/Router.php
+++ b/QFW/QuickFW/Router.php
@@ -291,7 +291,7 @@ class QuickFW_Router
 		if ($ref && isset($_SERVER['HTTP_REFERER']))
 			$url = $_SERVER['HTTP_REFERER'];
 		else
-			$url = $url ? $url : $_SERVER['REQUEST_URI'];
+			$url = $url ? $url :  Url::site($this->RequestUri);;
 		header('Location: '.$url);
 		exit();
 	}

commit 38b2ca67cf4314dfa5335b428759dac383d0dc4c
Author: Ivan1986 <iva...@li...>
Date:   Wed Jun 2 12:52:43 2010 +0400

    Добавлена картинка сортировки в скафолдинг

diff --git a/lib/Modules/Scafold/ScafoldController.php b/lib/Modules/Scafold/ScafoldController.php
index 65b3259..64259a1 100644
--- a/lib/Modules/Scafold/ScafoldController.php
+++ b/lib/Modules/Scafold/ScafoldController.php
@@ -95,7 +95,7 @@ abstract class ScafoldController extends Controller
 	 */
 	public function  __construct()
 	{
-		QFW::$view->P->addCSS('css/buildin/scafold.css');
+		QFW::$view->P->addCSS('buildin/scafold.css');
 		$this->setup = true;
 		parent::__construct();
 		$this->ControllerUrl = QFW::$router->module.'/'.QFW::$router->controller;
diff --git a/lib/Modules/Scafold/scafold/index.html b/lib/Modules/Scafold/scafold/index.html
index 5f4ede6..ff3d096 100644
--- a/lib/Modules/Scafold/scafold/index.html
+++ b/lib/Modules/Scafold/scafold/index.html
@@ -16,8 +16,12 @@
 		?>
 		<th><a href="<?php echo $P->siteUrl($info['ControllerUrl'].
 			'/sort/'.$key) ?>"><?php echo $i->title ?></a>
-			<span class="scafoldSort"><span><?php if (isset($order) && $order['field'] == $key)
-			echo $order['direction']=='ASC' ? 'А->Я' : 'Я->А' ?></span></span></th>
+			<?php if (isset($order) && $order['field'] == $key) { ?><span class="scafoldSort">
+				<span><?php echo $order['direction']=='ASC' ? '↓' : '↑' ?></span>
+				<?php /*<img src="/buildin/<?php echo $order['direction']=='ASC' ? 'az' : 'za' ?>.png"
+					 alt="<?php echo $order['direction']=='ASC' ? '↓' : '↑' ?>" />*/?>
+			</span><?php } ?>
+		</th>
 	<?php } ?>
 	<th><a href="<?php echo $P->siteUrl($info['ControllerUrl'].
 		'/edit/-1') ?>">доб.</a></th>
diff --git a/www/buildin/az.png b/www/buildin/az.png
new file mode 100644
index 0000000..9385bbc
Binary files /dev/null and b/www/buildin/az.png differ
diff --git a/www/css/buildin/scafold.css b/www/buildin/scafold.css
similarity index 95%
rename from www/css/buildin/scafold.css
rename to www/buildin/scafold.css
index 5a9c5e7..24bc8bb 100644
--- a/www/css/buildin/scafold.css
+++ b/www/buildin/scafold.css
@@ -30,9 +30,8 @@ table.scafoldTable
 	position: relative;
 }
 
-.scafoldTable .scafoldSort span {
+.scafoldTable .scafoldSort * {
 	position: absolute;
-	white-space: nowrap;
 }
 
 form.scafoldEdit .err {color: red;}
diff --git a/www/buildin/za.png b/www/buildin/za.png
new file mode 100644
index 0000000..372cb07
Binary files /dev/null and b/www/buildin/za.png differ

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

Summary of changes:
 QFW/QuickFW/Router.php                    |    2 +-
 lib/Modules/Scafold/ScafoldController.php |    2 +-
 lib/Modules/Scafold/scafold/index.html    |    8 ++++++--
 www/buildin/az.png                        |  Bin 0 -> 601 bytes
 www/{css => }/buildin/scafold.css         |    3 +--
 www/buildin/za.png                        |  Bin 0 -> 613 bytes
 6 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 www/buildin/az.png
 rename www/{css => }/buildin/scafold.css (95%)
 create mode 100644 www/buildin/za.png


hooks/post-receive
-- 
quickfw