[pLog-svn] r5842 - in plog/trunk: class/action/admin locale/admin templates/admin
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sun Aug 19 13:20:13 EDT 2007
Author: oscar
Date: 2007-08-19 13:20:12 -0400 (Sun, 19 Aug 2007)
New Revision: 5842
Modified:
plog/trunk/class/action/admin/admindeletetemplatesaction.class.php
plog/trunk/locale/admin/locale_en_UK.php
plog/trunk/templates/admin/sitetemplates.template
plog/trunk/templates/admin/sitetemplates_table.template
Log:
Deletion of template sets via ajax.
Modified: plog/trunk/class/action/admin/admindeletetemplatesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletetemplatesaction.class.php 2007-08-19 16:34:44 UTC (rev 5841)
+++ plog/trunk/class/action/admin/admindeletetemplatesaction.class.php 2007-08-19 17:20:12 UTC (rev 5842)
@@ -5,7 +5,7 @@
lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
/**
* \ingroup Action
@@ -38,26 +38,32 @@
function perform()
{
+ // create the view and show some feedback
+ $results = $this->_deleteTemplates();
+ $this->_view = new AdminSiteTemplatesListView( $this->_blogInfo );
+ if( $results["errorMessage"] != "" ) $this->_view->setErrorMessage( $results["errorMessage"] );
+ if( $results["successMessage"] != "" ) $this->_view->setSuccessMessage( $results["successMessage"] );
+ $this->setCommonData();
+
+ $this->_deleteTemplates();
+ }
+
+ private function _deleteTemplates()
+ {
if( $this->_op == "deleteTemplate" ) {
$templateId = $this->_request->getValue( "templateId" );
$this->_templateIds = Array();
$this->_templateIds[] = $templateId;
}
else
- $this->_templateIds = $this->_request->getValue( "templateIds" );
-
- // carry out the
- $this->_deleteTemplates();
- }
-
- function _deleteTemplates()
- {
+ $this->_templateIds = $this->_request->getValue( "templateIds" );
+
$ts = new TemplateSetStorage();
$errorMessage = "";
$successMessage = "";
$totalOk = 0;
- $f = new HtmlFilter();
+ $f = new RegexpFilter( "/[^A-Za-z0-9_\-]/" );
// get the id of the default template
$defaultTemplate = $this->_config->getValue( "default_template" );
@@ -82,13 +88,17 @@
}
}
- // create the view and show some feedback
- $this->_view = new AdminSiteTemplatesListView( $this->_blogInfo );
- if( $errorMessage != "" ) $this->_view->setErrorMessage( $errorMessage );
- if( $successMessage != "" ) $this->_view->setSuccessMessage( $successMessage );
- $this->setCommonData();
+ return( Array( "errorMessage" => $errorMessage, "successMessage" => $successMessage ));
+ }
- return true;
- }
+ function performAjax()
+ {
+ $results = $this->_deleteTemplates();
+
+ lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+ $this->_view = new AdminAjaxView( $this->_blogInfo );
+ $this->_view->setMessage( $results );
+ $this->_view->setSuccess( true );
+ }
}
?>
Modified: plog/trunk/locale/admin/locale_en_UK.php
===================================================================
--- plog/trunk/locale/admin/locale_en_UK.php 2007-08-19 16:34:44 UTC (rev 5841)
+++ plog/trunk/locale/admin/locale_en_UK.php 2007-08-19 17:20:12 UTC (rev 5842)
@@ -1324,6 +1324,7 @@
$messages['error_template_set_already_exists'] = 'The destination template set already exists';
$messages['template_file_deleted_ok'] = 'Template file deleted successfully';
$messages['error_folder_already_exists'] = 'The destination folder already exists';
+$messages["copy"] = "Copy";
$messages['ok'] = 'Ok';
$messages['cancel'] = 'Cancel';
Modified: plog/trunk/templates/admin/sitetemplates.template
===================================================================
--- plog/trunk/templates/admin/sitetemplates.template 2007-08-19 16:34:44 UTC (rev 5841)
+++ plog/trunk/templates/admin/sitetemplates.template 2007-08-19 17:20:12 UTC (rev 5842)
@@ -14,12 +14,12 @@
<div id="list" style="margin-left:30px;">
{include file="$admintemplatepath/sitetemplates_table.template"}
</div>
-<div id="list_action_bar">
- {check_perms adminperm=update_template}
+<!-- div id="list_action_bar">
+ {check_perms adminperm=update_template}
<input type="hidden" name="op" value="deleteTemplates" class="submit" />
<input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>
{/check_perms}
-</div>
+</div -->
</form>
{include file="$blogtemplate/footernavigation.template"}
Modified: plog/trunk/templates/admin/sitetemplates_table.template
===================================================================
--- plog/trunk/templates/admin/sitetemplates_table.template 2007-08-19 16:34:44 UTC (rev 5841)
+++ plog/trunk/templates/admin/sitetemplates_table.template 2007-08-19 17:20:12 UTC (rev 5842)
@@ -8,8 +8,10 @@
</a>
{/if}
<br/>
- <a href="?op=editTemplate&templateId={$sitetemplate->getName()}">{$locale->tr("edit")}</a> |
- <a href="#" onClick="Lifetype.UI.Pages.TemplateEditor.showCopyTemplatePrompt('{$sitetemplate->getName()}');return(false);">{$locale->tr("copy")}</a> |
- <a href="?op=tbd">{$locale->tr("delete")}</a>
+ {check_perms adminperm=update_template}
+ <a href="?op=editTemplate&templateId={$sitetemplate->getName()}">{$locale->tr("edit")}</a> |
+ <a href="#" onClick="Lifetype.UI.Pages.TemplateEditor.showCopyTemplatePrompt('{$sitetemplate->getName()}');return(false);">{$locale->tr("copy")}</a> |
+ <a href="?op=deleteTemplate&templateId={$sitetemplate->getName()}" onClick="Lifetype.Forms.performRequest(this);return(false);">{$locale->tr("delete")}</a>
+ {/check_perms}
</div>
{/foreach}
\ No newline at end of file
More information about the pLog-svn
mailing list