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

[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  961d08f187aadbfece0d87ee0233080fa78f141a (commit)
      from  fb0aa4c74502b2d656a98eb8c16fb465963e6e4d (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 961d08f187aadbfece0d87ee0233080fa78f141a
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 16:12:01 2010 +0300

    Переименованы старые html

diff --git a/application/admin/templates/auth.php b/application/admin/templates/auth.php
index 195d207..c74d626 100644
--- a/application/admin/templates/auth.php
+++ b/application/admin/templates/auth.php
@@ -14,5 +14,6 @@
 			    </tr>
 			</table>
 		</form>
+		</div>
 	</div>
 </div>
diff --git a/lib/Modules/admin/controllers/Controller.php b/lib/Modules/admin/controllers/Controller.php
index 39f4569..ee65639 100644
--- a/lib/Modules/admin/controllers/Controller.php
+++ b/lib/Modules/admin/controllers/Controller.php
@@ -7,7 +7,7 @@ class Controller extends QuickFW_Auth
 	function __construct()
 	{
 		if(!parent::__construct('admin'))
-			die (QFW::$view->displayMain(QFW::$view->fetch(('auth.html'))));
+			die (QFW::$view->displayMain(QFW::$view->fetch(('auth.php'))));
 	}
 
 	protected function acl($level)
diff --git a/lib/Modules/admin/controllers/InfoController.php b/lib/Modules/admin/controllers/InfoController.php
index 520ad7c..ee9eccb 100644
--- a/lib/Modules/admin/controllers/InfoController.php
+++ b/lib/Modules/admin/controllers/InfoController.php
@@ -20,7 +20,7 @@ class InfoController extends Controller
 		QFW::$view->assign('stat', '<pre>'.print_r($mc->getStats(), true).'</pre>');
 		unset($mc);
 
-		return QFW::$view->fetch('memcache.html');
+		return QFW::$view->fetch('memcache.php');
 	}
 
 	public function phpinfoAction()
diff --git a/lib/Modules/admin/controllers/NavController.php b/lib/Modules/admin/controllers/NavController.php
index 3689f6b..c5018af 100644
--- a/lib/Modules/admin/controllers/NavController.php
+++ b/lib/Modules/admin/controllers/NavController.php
@@ -11,7 +11,7 @@ class NavController
 			'c'=>$cur,
 			'url'=>$url,
 		));
-		return QFW::$view->fetch('pager.html');
+		return QFW::$view->fetch('pager.php');
 	}
 
 	public function menuBlock($type)
@@ -31,7 +31,7 @@ class NavController
 
 		$data = $data[$type];
 
-		return QFW::$view->assign('menu',$data)->fetch('sub/head_stripe.html');
+		return QFW::$view->assign('menu',$data)->fetch('sub/head_stripe.php');
 	}
 
 }
diff --git a/lib/Modules/admin/templates/auth.html b/lib/Modules/admin/templates/auth.php
similarity index 98%
rename from lib/Modules/admin/templates/auth.html
rename to lib/Modules/admin/templates/auth.php
index 195d207..c74d626 100644
--- a/lib/Modules/admin/templates/auth.html
+++ b/lib/Modules/admin/templates/auth.php
@@ -14,5 +14,6 @@
 			    </tr>
 			</table>
 		</form>
+		</div>
 	</div>
 </div>
diff --git a/lib/Modules/admin/templates/main.html b/lib/Modules/admin/templates/main.php
similarity index 100%
rename from lib/Modules/admin/templates/main.html
rename to lib/Modules/admin/templates/main.php
diff --git a/lib/Modules/admin/templates/memcache.html b/lib/Modules/admin/templates/memcache.php
similarity index 100%
rename from lib/Modules/admin/templates/memcache.html
rename to lib/Modules/admin/templates/memcache.php
diff --git a/lib/Modules/admin/templates/pager.html b/lib/Modules/admin/templates/pager.php
similarity index 100%
rename from lib/Modules/admin/templates/pager.html
rename to lib/Modules/admin/templates/pager.php
diff --git a/lib/Modules/admin/templates/sub/head_stripe.html b/lib/Modules/admin/templates/sub/head_stripe.php
similarity index 100%
rename from lib/Modules/admin/templates/sub/head_stripe.html
rename to lib/Modules/admin/templates/sub/head_stripe.php

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

Summary of changes:
 application/admin/templates/auth.php               |    1 +
 lib/Modules/admin/controllers/Controller.php       |    2 +-
 lib/Modules/admin/controllers/InfoController.php   |    2 +-
 lib/Modules/admin/controllers/NavController.php    |    4 ++--
 .../admin/templates/{auth.html => auth.php}        |    1 +
 .../admin/templates/{main.html => main.php}        |    0
 .../templates/{memcache.html => memcache.php}      |    0
 .../admin/templates/{pager.html => pager.php}      |    0
 .../sub/{head_stripe.html => head_stripe.php}      |    0
 9 files changed, 6 insertions(+), 4 deletions(-)
 rename lib/Modules/admin/templates/{auth.html => auth.php} (98%)
 rename lib/Modules/admin/templates/{main.html => main.php} (100%)
 rename lib/Modules/admin/templates/{memcache.html => memcache.php} (100%)
 rename lib/Modules/admin/templates/{pager.html => pager.php} (100%)
 rename lib/Modules/admin/templates/sub/{head_stripe.html => head_stripe.php} (100%)


hooks/post-receive
-- 
quickfw