[pLog-svn] r6682 - in plog/branches/lifetype-1.2: class/action/admin templates/admin
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Mon Jun 30 14:37:48 EDT 2008
Author: jondaley
Date: 2008-06-30 14:37:48 -0400 (Mon, 30 Jun 2008)
New Revision: 6682
Modified:
plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php
plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php
plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php
plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php
plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php
plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php
plog/branches/lifetype-1.2/templates/admin/newblogcategory.template
plog/branches/lifetype-1.2/templates/admin/newglobalarticlecategory.template
plog/branches/lifetype-1.2/templates/admin/newpostcategory.template
Log:
standardized descriptions to be optional across the whole site
Modified: plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php 2008-06-30 18:37:48 UTC (rev 6682)
@@ -3,7 +3,7 @@
lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecategorieslistview.class.php" );
@@ -18,7 +18,7 @@
{
var $_categoryName;
- var $_categoryDescription;
+ var $_categoryDescription;
var $_categoryInMainPage;
/**
@@ -31,9 +31,9 @@
// register two validators
$this->registerFieldValidator( "categoryName", new StringValidator());
- $this->registerFieldValidator( "categoryDescription", new StringValidator() );
+ $this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
$this->registerFieldValidator( "categoryInMainPage", new IntegerValidator(), true );
-
+
// and the view we should show in case there is a validation error
$errorView = new AdminTemplatedView( $this->_blogInfo, "newpostcategory" );
$errorView->setErrorMessage( $this->_locale->tr("error_adding_article_category" ));
Modified: plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php 2008-06-30 18:37:48 UTC (rev 6682)
@@ -27,7 +27,7 @@
// register two validators
$this->registerFieldValidator( "categoryName", new StringValidator());
- $this->registerFieldValidator( "categoryDescription", new StringValidator() );
+ $this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
// and the view we should show in case there is a validation error
$errorView = new AdminTemplatedView( $this->_blogInfo, "newblogcategory" );
$errorView->setErrorMessage( $this->_locale->tr("error_adding_blog_category" ));
Modified: plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php 2008-06-30 18:37:48 UTC (rev 6682)
@@ -33,7 +33,7 @@
// register two validators
$this->registerFieldValidator( "categoryName", new StringValidator());
- $this->registerFieldValidator( "categoryDescription", new StringValidator() );
+ $this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
// and the view we should show in case there is a validation error
$errorView = new AdminTemplatedView( $this->_blogInfo, "newglobalarticlecategory" );
$errorView->setErrorMessage( $this->_locale->tr("error_adding_global_article_category" ));
Modified: plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php 2008-06-30 18:37:48 UTC (rev 6682)
@@ -34,7 +34,7 @@
// data validation settings
$this->registerFieldValidator( "categoryName", new StringValidator());
$this->registerFieldValidator( "categoryId", new IntegerValidator());
- $this->registerFieldValidator( "categoryDescription", new StringValidator() );
+ $this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
$this->registerFieldValidator( "categoryInMainPage", new IntegerValidator(), true );
$errorView = new AdminTemplatedView( $this->_blogInfo, "editarticlecategory" );
$errorView->setErrorMessage( $this->_locale->tr("error_updating_article_category" ));
Modified: plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php 2008-06-30 18:37:48 UTC (rev 6682)
@@ -33,7 +33,7 @@
// data validation settings
$this->registerFieldValidator( "categoryName", new StringValidator());
$this->registerFieldValidator( "categoryId", new IntegerValidator());
- $this->registerFieldValidator( "categoryDescription", new StringValidator() );
+ $this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
$errorView = new AdminTemplatedView( $this->_blogInfo, "editblogcategory" );
$errorView->setErrorMessage( $this->_locale->tr("error_updating_article_category" ));
$this->setValidationErrorView( $errorView );
Modified: plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php 2008-06-30 18:37:48 UTC (rev 6682)
@@ -37,7 +37,7 @@
// data validation settings
$this->registerFieldValidator( "categoryName", new StringValidator());
$this->registerFieldValidator( "categoryId", new IntegerValidator());
- $this->registerFieldValidator( "categoryDescription", new StringValidator() );
+ $this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
$errorView = new AdminTemplatedView( $this->_blogInfo, "editglobalarticlecategory" );
$errorView->setErrorMessage( $this->_locale->tr("error_updating_article_category" ));
$this->setValidationErrorView( $errorView );
Modified: plog/branches/lifetype-1.2/templates/admin/newblogcategory.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/newblogcategory.template 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/templates/admin/newblogcategory.template 2008-06-30 18:37:48 UTC (rev 6682)
@@ -16,7 +16,6 @@
<div class="field">
<label for="categoryDescription">{$locale->tr("description")}</label>
- <span class="required">*</span>
<div class="formHelp">{$locale->tr("category_description_help")}</div>
<textarea name="categoryDescription" cols="60" id="categoryDescription" rows="5">{$categoryDescription}</textarea>
{include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_description")}
Modified: plog/branches/lifetype-1.2/templates/admin/newglobalarticlecategory.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/newglobalarticlecategory.template 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/templates/admin/newglobalarticlecategory.template 2008-06-30 18:37:48 UTC (rev 6682)
@@ -16,7 +16,6 @@
<div class="field">
<label for="categoryDescription">{$locale->tr("description")}</label>
- <span class="required">*</span>
<div class="formHelp">{$locale->tr("global_category_description_help")}</div>
<textarea name="categoryDescription" cols="60" id="categoryDescription" rows="5">{$categoryDescription}</textarea>
{include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_description")}
@@ -31,4 +30,4 @@
</div>
</form>
{include file="$blogtemplate/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}
Modified: plog/branches/lifetype-1.2/templates/admin/newpostcategory.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/newpostcategory.template 2008-06-30 18:18:41 UTC (rev 6681)
+++ plog/branches/lifetype-1.2/templates/admin/newpostcategory.template 2008-06-30 18:37:48 UTC (rev 6682)
@@ -16,7 +16,6 @@
<div class="field">
<label for="categoryDescription">{$locale->tr("description")}</label>
- <span class="required">*</span>
<div class="formHelp">{$locale->tr("category_description_help")}</div>
<textarea name="categoryDescription" cols="60" id="categoryDescription" rows="5">{$categoryDescription}</textarea>
{include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_description")}
More information about the pLog-svn
mailing list