[limb-svn] r6501 - in 3.x/trunk/limb/cms: src/model template/_cms template/admin template/admin_navigation

[svn at limb-project.com]

Author: 3dmax
Date: 2007-11-07 23:55:51 +0300 (Wed, 07 Nov 2007)
New Revision: 6501
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6501

Modified:
   3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php
   3.x/trunk/limb/cms/template/_cms/move_common_elements.html
   3.x/trunk/limb/cms/template/_cms/parent_select.html
   3.x/trunk/limb/cms/template/admin/display.html
   3.x/trunk/limb/cms/template/admin_navigation/display.html
Log:
-- couple template changes
-- lmbCmsUser: password and repeat password matching moved from _createValidator() to _createInsertValidator()

Modified: 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php	2007-11-07 13:58:12 UTC (rev 6500)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php	2007-11-07 20:55:51 UTC (rev 6501)
@@ -29,9 +29,6 @@
     $validator->addRequiredRule('login');
     $validator->addRequiredRule('email');
 
-    lmb_require('limb/validation/src/rule/lmbMatchRule.class.php');
-    $validator->addRule(new lmbMatchRule('password', 'password_repeat'));
-
     lmb_require('limb/cms/src/validation/rule/lmbCmsUserUniqueFieldRule.class.php');
     $validator->addRule(new lmbCmsUserUniqueFieldRule('login', $this));
     $validator->addRule(new lmbCmsUserUniqueFieldRule('email', $this));
@@ -45,6 +42,8 @@
   {
     $validator = $this->_createValidator();
     $validator->addRequiredRule('password');
+    lmb_require('limb/validation/src/rule/lmbMatchRule.class.php');
+    $validator->addRule(new lmbMatchRule('password', 'repeat_password'));
     return $validator;
   }
 

Modified: 3.x/trunk/limb/cms/template/_cms/move_common_elements.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/move_common_elements.html	2007-11-07 13:58:12 UTC (rev 6500)
+++ 3.x/trunk/limb/cms/template/_cms/move_common_elements.html	2007-11-07 20:55:51 UTC (rev 6501)
@@ -1,5 +1,5 @@
-<input name='move' type='hidden' value='1'  runat='client'/>
+<input name='move' type='hidden' value='1' runat='client'/>
 <div  class='list_actions' style='text-align:right'>
-  <input type="submit" value="{$'Move'|i18n:'cms'}" class='button'  runat='client'/>
-  <input id='cancel' type="button" value="{$'Cancel'|i18n:'cms'}" onclick='if(confirm("Вы уверены?")){window.close();}return false;'  runat='client'/>
+  <input type="submit" class='button' value="{$'Move'|i18n:'cms'}" runat='client'/>
+  <input type="button" class='button'  value="{$'Cancel'|i18n:'cms'}" onclick='if(confirm("Вы уверены?")){window.close();}return false;' runat='client'/>
 </div>

Modified: 3.x/trunk/limb/cms/template/_cms/parent_select.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/parent_select.html	2007-11-07 13:58:12 UTC (rev 6500)
+++ 3.x/trunk/limb/cms/template/_cms/parent_select.html	2007-11-07 20:55:51 UTC (rev 6501)
@@ -1,7 +1,7 @@
 <table width='100%' border='0' cellspacing='0' cellpadding='0' style="padding: 0 0 8px 0;">
 <tr>
   <td width=120>
-    <label>Родительский элемент</label><br/>
+    <label>{$'Parent element'|i18n:'cms'}</label><br/>
     <div id='parent_name' style='font-weight: bold;white-space:nowrap'><core:optional for='parent'> {$parent.title} ( {$parent.url_path} )</core:optional></div>
   </td>
   <td align=left>

Modified: 3.x/trunk/limb/cms/template/admin/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin/display.html	2007-11-07 13:58:12 UTC (rev 6500)
+++ 3.x/trunk/limb/cms/template/admin/display.html	2007-11-07 20:55:51 UTC (rev 6501)
@@ -1,9 +1,9 @@
 <core:wrap file="_cms/page.html" in="content_zone">
 <div id="dashboard">
-  <h1>Control panel</h1>
+  <h1>{$"Control panel"|i18n:"cms"}</h1>
 
-  <p><b>Wellcome to control panel</b></p>
+  <p><b>{$"Wellcome to control panel"|i18n:"cms"}</b></p>
 
-  <p><b>Please select a module you want to work with in the left menu.</b></p>
+  <p><b>{$"Please select a module you want to work with in the left menu."|i18n:"cms"}</b></p>
 </div>
 </core:wrap>

Modified: 3.x/trunk/limb/cms/template/admin_navigation/display.html
===================================================================
--- 3.x/trunk/limb/cms/template/admin_navigation/display.html	2007-11-07 13:58:12 UTC (rev 6500)
+++ 3.x/trunk/limb/cms/template/admin_navigation/display.html	2007-11-07 20:55:51 UTC (rev 6501)
@@ -31,7 +31,7 @@
           <table>
           <thead>
            <tr>
-             <th class='selector'><input type='checkbox' onclick='MarkAll(checked);' name='mark_all' /></th>
+             <th class='selector'><core:INCLUDE file='_cms/selector.html'></th>
              <th>#ID</th>
              <th  class='orders'>Порядок</th>
              <th width='100%'>Заголовок</th>