[pLog-svn] r5659 - in plog/branches/lifetype-1.3-ajax: class/action/admin templates/admin
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sun Jul 15 11:37:44 EDT 2007
Author: oscar
Date: 2007-07-15 11:37:43 -0400 (Sun, 15 Jul 2007)
New Revision: 5659
Modified:
plog/branches/lifetype-1.3-ajax/class/action/admin/adminaddlinkcategoryaction.class.php
plog/branches/lifetype-1.3-ajax/templates/admin/customfields.template
plog/branches/lifetype-1.3-ajax/templates/admin/editarticlecategories.template
plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategories.template
plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategory.template
plog/branches/lifetype-1.3-ajax/templates/admin/editlinks.template
plog/branches/lifetype-1.3-ajax/templates/admin/newlinkcategory.template
plog/branches/lifetype-1.3-ajax/templates/admin/resources.template
Log:
Fixed some issues in the previous commit
Modified: plog/branches/lifetype-1.3-ajax/class/action/admin/adminaddlinkcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.3-ajax/class/action/admin/adminaddlinkcategoryaction.class.php 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/class/action/admin/adminaddlinkcategoryaction.class.php 2007-07-15 15:37:43 UTC (rev 5659)
@@ -3,6 +3,7 @@
lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
@@ -38,7 +39,7 @@
function addLinkCategory()
{
// add the new link category to the database
- $this->_linkCategoryName = Textfilter::filterAllHTML($this->_request->getValue( "linkCategoryName" ));
+ $this->_linkCategoryName = $this->_request->getFilteredValue( "linkCategoryName", new HtmlFilter());
$mylinksCategories = new MyLinksCategories();
$this->_mylinksCategory = new MyLinksCategory( $this->_linkCategoryName,
$this->_blogInfo->getId(),
@@ -65,7 +66,6 @@
*/
function perform()
{
-
// the view is the same for both conditions
if( $this->userHasPermission( "view_link_categories" ))
$this->_view = new AdminLinkCategoriesListView( $this->_blogInfo );
Modified: plog/branches/lifetype-1.3-ajax/templates/admin/customfields.template
===================================================================
--- plog/branches/lifetype-1.3-ajax/templates/admin/customfields.template 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/templates/admin/customfields.template 2007-07-15 15:37:43 UTC (rev 5659)
@@ -13,7 +13,7 @@
</script>
<div class="optionIcon">
- <a id="newCustomField" href="?op=newCustomField" rel="overlay">New Custom Field</a>
+ <a id="newCustomFieldButton" href="?op=newCustomField" rel="overlay">New Custom Field</a>
</div>
<form id="customFields" action="admin.php" method="post">
Modified: plog/branches/lifetype-1.3-ajax/templates/admin/editarticlecategories.template
===================================================================
--- plog/branches/lifetype-1.3-ajax/templates/admin/editarticlecategories.template 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/templates/admin/editarticlecategories.template 2007-07-15 15:37:43 UTC (rev 5659)
@@ -34,7 +34,7 @@
</div>
<div class="optionIcon">
- <a id="newArticleCategory" href="?op=newArticleCategory" rel="overlay">New Article Category</a>
+ <a id="newArticleCategoryButton" href="?op=newArticleCategory" rel="overlay">New Article Category</a>
</div>
<form id="deleteCategories" action="admin.php" method="post">
Modified: plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategories.template
===================================================================
--- plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategories.template 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategories.template 2007-07-15 15:37:43 UTC (rev 5659)
@@ -9,19 +9,16 @@
});
{/literal}
</script>
- <div id="list_nav_bar">
- <div id="list_nav_select">
-
+<div id="list_nav_bar">
+ <div id="list_nav_select">
<form id="viewLinkCategories" action="admin.php" method="post">
<fieldset>
<legend>{$locale->tr("show_by")}</legend>
-
<div class="list_nav_option">
<label for="search">{$locale->tr("search_terms")}</label>
<br />
<input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
</div>
-
<div class="list_nav_option">
<br />
<input type="hidden" name="op" value="editLinkCategories" />
@@ -32,11 +29,9 @@
</div>
<br style="clear:both" />
</div>
-
<div class="optionIcon">
- <a id="newLinkCategory" href="?op=newLinkCategory" rel="overlay">New Link Category</a>
+ <a id="newLinkCategoryButton" href="?op=newLinkCategory" rel="overlay">New Link Category</a>
</div>
-
<form id="linkCategories" action="admin.php" method="post">
<div id="list">
{include file="$admintemplatepath/successmessage.template"}
Modified: plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategory.template
===================================================================
--- plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategory.template 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/templates/admin/editlinkcategory.template 2007-07-15 15:37:43 UTC (rev 5659)
@@ -1,4 +1,4 @@
-<form id="editLinkCategory" method="post" action="admin.php" onSubmit="Lifetype.Forms.AjaxFormProcessor(this.id,'?admin.php?output=json');return(false);">
+<form id="editLinkCategory" method="post" action="admin.php" onSubmit="Lifetype.Forms.AjaxFormProcessor(this.id,'admin.php?op=updateLinkCategory&output=json');return(false);">
<fieldset class="inputField">
{include file="$admintemplatepath/formvalidateajax.template"}
<legend>{$locale->tr("editLinkCategory")}</legend>
Modified: plog/branches/lifetype-1.3-ajax/templates/admin/editlinks.template
===================================================================
--- plog/branches/lifetype-1.3-ajax/templates/admin/editlinks.template 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/templates/admin/editlinks.template 2007-07-15 15:37:43 UTC (rev 5659)
@@ -51,7 +51,7 @@
<form id="links" action="admin.php" method="post">
{check_perms perm="update_link"}
<div class="optionIcon">
- <a id="newLink" href="?op=newLink" rel="overlay">New Link</a> |
+ <a id="newLinkButton" href="?op=newLink" rel="overlay">New Link</a> |
<a id="optionIconLink" href="#bulkEdit" title="{$locale->tr("show_massive_change_option")}" onclick="Lifetype.UI.Pages.Global.switchMassiveOption()">{$locale->tr("show_massive_change_option")}</a>
</div>
{/check_perms}
Modified: plog/branches/lifetype-1.3-ajax/templates/admin/newlinkcategory.template
===================================================================
--- plog/branches/lifetype-1.3-ajax/templates/admin/newlinkcategory.template 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/templates/admin/newlinkcategory.template 2007-07-15 15:37:43 UTC (rev 5659)
@@ -1,4 +1,4 @@
-<form name="newLinkCategory" action="admin.php" method="post" id="newLinkCategory" onSubmit="Lifetype.Forms.AjaxFormProcessor(this.id,'?output=json');return(false);">
+<form id="newLinkCategory" name="newLinkCategory" action="admin.php" method="post" onSubmit="Lifetype.Forms.AjaxFormProcessor(this.id,'?output=json');return(false);">
<fieldset class="inputField">
<legend>{$locale->tr("newLinkCategory")}</legend>
{include file="$admintemplatepath/formvalidateajax.template"}
@@ -15,4 +15,4 @@
<input type="hidden" name="op" value="addLinkCategory"/>
<input type="submit" name="Add" value="{$locale->tr("add")}"/>
</div>
- </form>
\ No newline at end of file
+</form>
\ No newline at end of file
Modified: plog/branches/lifetype-1.3-ajax/templates/admin/resources.template
===================================================================
--- plog/branches/lifetype-1.3-ajax/templates/admin/resources.template 2007-07-15 14:48:48 UTC (rev 5658)
+++ plog/branches/lifetype-1.3-ajax/templates/admin/resources.template 2007-07-15 15:37:43 UTC (rev 5659)
@@ -63,8 +63,8 @@
<form id="Resources" method="post" action="admin.php">
<div class="optionIcon">
- <a {if $album}href="?op=newResourceAlbum&parentId={$album->getId()}"{else}href="?op=newResourceAlbum"{/if} id="addAlbum" rel="overlay">Add Album</a> |
- <a {if $album}href="?op=newResource&albumId={$album->getId()}"{else}href="?op=newResource"{/if} id="addResource" rel="overlay">Add Resource</a> |
+ <a {if $album}href="?op=newResourceAlbum&parentId={$album->getId()}"{else}href="?op=newResourceAlbum"{/if} id="addAlbumButton" rel="overlay">Add Album</a> |
+ <a {if $album}href="?op=newResource&albumId={$album->getId()}"{else}href="?op=newResource"{/if} id="addResourceButton" rel="overlay">Add Resource</a> |
<a href="#" id="selectAll" onClick="Lifetype.UI.Pages.Resources.selectAll('Resources')">{$locale->tr("select_all")}</a> |
<a id="optionIconLink" href="#bulkEdit" title="{$locale->tr("show_massive_change_option")}" onclick="Lifetype.UI.Pages.Global.switchMassiveOption()">{$locale->tr("show_massive_change_option")}</a>
</div>
More information about the pLog-svn
mailing list