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

[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  0540b977bca89f875823bc1b307c0e65ec4446ef (commit)
       via  6ecc6c87af795452fe92b6d122f9d96487b0d904 (commit)
      from  d1c7b365ce3d4c4084e986b0b1370427afcf3f45 (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 0540b977bca89f875823bc1b307c0e65ec4446ef
Author: Ivan1986 <iva...@li...>
Date:   Mon Apr 26 19:05:25 2010 +0400

    Исправлена ошибка в хелпере паджинатора

diff --git a/application/helper/controllers/NavController.php b/application/helper/controllers/NavController.php
index fd48ad4..d32e38c 100644
--- a/application/helper/controllers/NavController.php
+++ b/application/helper/controllers/NavController.php
@@ -24,7 +24,7 @@ class NavController
 			'url'=>$url,
 			'size'=>$size,
 		));
-		return QFW::$view->fetch($name.'.html');
+		return QFW::$view->fetch('pager/'.$name.'.html');
 	}
 
 	/**

commit 6ecc6c87af795452fe92b6d122f9d96487b0d904
Author: Ivan1986 <iva...@li...>
Date:   Mon Apr 26 19:04:57 2010 +0400

    Исправлена верстка в скафолдинге

diff --git a/lib/Modules/Scafold/ScafoldController.php b/lib/Modules/Scafold/ScafoldController.php
index 7d1b626..a4bb15b 100644
--- a/lib/Modules/Scafold/ScafoldController.php
+++ b/lib/Modules/Scafold/ScafoldController.php
@@ -48,6 +48,7 @@ abstract class ScafoldController extends Controller
 	 */
 	public function  __construct()
 	{
+		QFW::$view->P->addCSS('css/buildin/scafold.css');
 		$this->setup = true;
 		parent::__construct();
 		$this->ControllerUrl = QFW::$router->module.'/'.QFW::$router->controller;
diff --git a/lib/Modules/Scafold/scafold/edit.html b/lib/Modules/Scafold/scafold/edit.html
index 23087f7..3b47bf1 100644
--- a/lib/Modules/Scafold/scafold/edit.html
+++ b/lib/Modules/Scafold/scafold/edit.html
@@ -5,6 +5,7 @@
 <?php } ?>
 <form action="<?php echo $P->siteUrl($info['ControllerUrl'].'/edit/'.$id) ?>" class="scafoldEdit"
 	  method="post" id="form_<?php echo $table ?>" enctype="multipart/form-data">
+	<dl>
 <?php foreach($data as $k=>$v) {
 	$i = $fields[$k];
 	if ($i->hide)
@@ -13,16 +14,16 @@
 	if (!$i->primaryKey && !($i->hide === false))
 		continue;
 	?>
-	<p>
-		<label<?php if (isset($errors[$k])) echo ' class="err"'; ?>>
-			<?php echo $i->title ?></label>
-		<?php
+	<dt<?php if (isset($errors[$k])) echo ' class="err"'; ?>>
+			<?php echo $i->title ?></dt>
+	<dd><?php
 		if (isset($methods['editor_'.ucfirst($k)]))
 			echo call_user_func($class.'::editor_'.ucfirst($k), $id, $v);
 		else
 			echo $i->editor($id, $v); ?>
 		<?php if ($i->desc) {?><small><?php echo $i->desc ?></small><?php } ?>
-	</p>
+	</dd>
 <?php } ?>
+	</dl>
 	<input type="submit" value="Отправить" name="send" />
 </form>
diff --git a/www/css/buildin/scafold.css b/www/css/buildin/scafold.css
new file mode 100644
index 0000000..e69de29

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

Summary of changes:
 application/helper/controllers/NavController.php |    2 +-
 lib/Modules/Scafold/ScafoldController.php        |    1 +
 lib/Modules/Scafold/scafold/edit.html            |   11 ++++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 www/css/buildin/scafold.css


hooks/post-receive
-- 
quickfw