[pLog-svn] r6005 - in plog/trunk: . bin-devel class/controller class/data/pager class/data/validator class/template class/test/tests/misc locale/admin templates/admin
mark at devel.lifetype.net
mark at devel.lifetype.net
Tue Oct 23 05:31:01 EDT 2007
Author: mark
Date: 2007-10-23 05:31:01 -0400 (Tue, 23 Oct 2007)
New Revision: 6005
Modified:
plog/trunk/bin-devel/build-svn.sh
plog/trunk/class/controller/admincontrollermap.properties.php
plog/trunk/class/data/pager/pager.class.php
plog/trunk/class/data/validator/uploadvalidator.class.php
plog/trunk/class/template/template.class.php
plog/trunk/class/test/tests/misc/version_test.class.php
plog/trunk/locale/admin/locale_ca_ES.php
plog/trunk/locale/admin/locale_de_DE.php
plog/trunk/locale/admin/locale_en_UK.php
plog/trunk/locale/admin/locale_es_ES.php
plog/trunk/locale/admin/locale_fr_FR.php
plog/trunk/locale/admin/locale_gl_ES.php
plog/trunk/locale/admin/locale_it_IT.php
plog/trunk/locale/admin/locale_nl_NL.php
plog/trunk/locale/admin/locale_ru_RU.php
plog/trunk/locale/admin/locale_tt_RU.php
plog/trunk/locale/admin/locale_zh_CN.php
plog/trunk/locale/admin/locale_zh_TW.php
plog/trunk/templates/admin/blogcategories.template
plog/trunk/templates/admin/blogtemplates.template
plog/trunk/templates/admin/dashboard.template
plog/trunk/templates/admin/editarticlecategories.template
plog/trunk/templates/admin/editcomments.template
plog/trunk/templates/admin/editposts.template
plog/trunk/templates/admin/globalarticlecategories.template
plog/trunk/templates/admin/poststats.template
plog/trunk/templates/admin/resources.template
plog/trunk/templates/admin/siteblogs.template
plog/trunk/templates/admin/siteusers.template
plog/trunk/templates/admin/statistics_table.template
plog/trunk/wizard.php
Log:
Merge from LifeType 1.2 development branches rev. 5750:5800
Modified: plog/trunk/bin-devel/build-svn.sh
===================================================================
--- plog/trunk/bin-devel/build-svn.sh 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/bin-devel/build-svn.sh 2007-10-23 09:31:01 UTC (rev 6005)
@@ -159,6 +159,32 @@
message "Creating .tar.bz2 package..."
tar cjvf $BUILDLABEL.tar.bz2 $WORKDIR > /dev/null
+
+# calculate branche and version
+LTBRANCHE=`echo $VERNAME | sed 's_lifetype-\(.*\..*\)\.\(.*\)_\1_'`
+LTVERSION=`echo $VERNAME | sed 's_lifetype-\(.*\)_\1_'`
+
+# create the lifetype core version feed xml file
+echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>
+<rss version=\"2.0\" xmlns:lt=\"http://www.lifetype.net\">
+<channel>
+<title>Lifetype version feed</title>
+<link>http://www.lifetype.net</link>
+<description>This feed contains the latest Lifetype version available</description>
+<item>
+<title>lifetype-${LTVERSION}_r${REV}</title>
+<link>http://downloads.sourceforge.net/lifetype/lifetype-${LTVERSION}.zip</link>
+<author>The Lifetype project</author>
+<description>Lifetype ${LTVERSION}</description>
+<lt:version>${LTVERSION}_r${REV}</lt:version>
+<lt:development>0</lt:development>
+<lt:branch>${LTBRANCHE}</lt:branch>
+<lt:relnotes>http://wiki.lifetype.net/index.php/Release_notes_Lifetype_${LTVERSION}</lt:relnotes>
+</item>
+</channel>
+</rss>" > lifetype.xml
+
+
# clean up the temporary folders
message "Cleaning up..."
cleanup_exit -1
Modified: plog/trunk/class/controller/admincontrollermap.properties.php
===================================================================
--- plog/trunk/class/controller/admincontrollermap.properties.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/class/controller/admincontrollermap.properties.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -316,7 +316,7 @@
$actions["changeBlogStatus"] = "AdminChangeBlogStatusAction";
// bulk update of users
$actions["changeUserStatus"] = "AdminChangeUserStatusAction";
- // perform an md5 check of some core files
+ // perform an md5 check of some core files or LT Core Version Check
$actions["Versions"] = "AdminVersionCheckAction";
// location
$actions['locationChooser'] = 'AdminLocationChooserAction';
@@ -377,4 +377,4 @@
$actions["uploadBlogTemplateFile"] = "AdminUploadBlogTemplateFileAction";
// returns some javascript code containing the locale strings needed by the javascript classes
$actions["js"] = "AdminJsAction";
-?>
\ No newline at end of file
+?>
Modified: plog/trunk/class/data/pager/pager.class.php
===================================================================
--- plog/trunk/class/data/pager/pager.class.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/class/data/pager/pager.class.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -233,6 +233,14 @@
}
/**
+ * @return Returns a link to current page
+ */
+ function getCurrentPageLink()
+ {
+ return $this->_pageLinks[$this->getCurrentPage()];
+ }
+
+ /**
* @return returns the link to the first page
*/
function getFirstPageLink()
@@ -313,4 +321,4 @@
);
}
}
-?>
\ No newline at end of file
+?>
Modified: plog/trunk/class/data/validator/uploadvalidator.class.php
===================================================================
--- plog/trunk/class/data/validator/uploadvalidator.class.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/class/data/validator/uploadvalidator.class.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -100,7 +100,7 @@
$fileName = basename($upload->getFileName());
foreach( explode( " ", $allowedFilesStr ) as $file ) {
if( Glob::myFnmatch( $file, $fileName )) {
- print("it's a valid file!");
+// print("it's a valid file!");
return true;
}
}
Modified: plog/trunk/class/template/template.class.php
===================================================================
--- plog/trunk/class/template/template.class.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/class/template/template.class.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -222,4 +222,4 @@
return false;
}
}
-?>
\ No newline at end of file
+?>
Modified: plog/trunk/class/test/tests/misc/version_test.class.php
===================================================================
--- plog/trunk/class/test/tests/misc/version_test.class.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/class/test/tests/misc/version_test.class.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -29,7 +29,14 @@
Array( "lifetype-1.2.3-r5443", "lifetype-1.2.3-r5444", -1 ),
Array( "lifetype-1.2.3-r5444", "lifetype-1.2.3-r5443", 1 ),
Array( "1.2.4-dev", "lifetype-1.2.3-r5444", 1 ),
- Array( "1.2.3-dev", "lifetype-1.2.4-r6665", -1 )
+ Array( "1.2.3-dev", "lifetype-1.2.4-r6665", -1 ),
+ Array( "lifetype-1.2.4", "lifetype-1.2.4_r5443", -1 ), // with svn revision is not older, maybe equal
+ Array( "lifetype-1.2.4_r5444", "lifetype-1.2.4", 1 ),
+ Array( "lifetype-1.2.4_r5444", "lifetype-1.2.4_r5443", 1 ),
+ Array( "lifetype-1.2.4", "lifetype-1.2.4-r5443", -1 ), // same 3 tests as above but with dash (-)
+ Array( "lifetype-1.2.4-r5444", "lifetype-1.2.4", 1 ),
+ Array( "lifetype-1.2.4-r5444", "lifetype-1.2.4-r5443", 1 ),
+ Array( "lifetype-1.2.4-r5444", "lifetype-1.2.4-r5444", 0 )
);
}
@@ -51,4 +58,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: plog/trunk/locale/admin/locale_ca_ES.php
===================================================================
--- plog/trunk/locale/admin/locale_ca_ES.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_ca_ES.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1209,4 +1209,8 @@
$messages['mb'] = 'Mb';
$messages['gb'] = 'Gb';
$messages['edit'] = 'Edit';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_de_DE.php
===================================================================
--- plog/trunk/locale/admin/locale_de_DE.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_de_DE.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1193,4 +1193,8 @@
$messages['mb'] = 'Mb';
$messages['gb'] = 'Gb';
$messages['edit'] = 'ändern';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
Modified: plog/trunk/locale/admin/locale_en_UK.php
===================================================================
--- plog/trunk/locale/admin/locale_en_UK.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_en_UK.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1172,6 +1172,10 @@
$messages['gb'] = 'Gb';
$messages['edit'] = 'Edit';
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
+
/// new strings in LT 1.3 ///
// friend management
$messages['friendManagement'] = 'Friends';
@@ -1366,4 +1370,4 @@
$messages['swfu_error_server_error'] = 'Server (I/O) error while uploading the file';
$messages['swfu_error_upload_failed'] = 'The upload failed while uploading the file';
$messages['swfu_error_http_error'] = 'There was an error while uploading the file';
-?>
\ No newline at end of file
+?>
Modified: plog/trunk/locale/admin/locale_es_ES.php
===================================================================
--- plog/trunk/locale/admin/locale_es_ES.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_es_ES.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1200,4 +1200,8 @@
$messages['mb'] = 'Mb';
$messages['gb'] = 'Gb';
$messages['edit'] = 'Editar';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_fr_FR.php
===================================================================
--- plog/trunk/locale/admin/locale_fr_FR.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_fr_FR.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -992,4 +992,8 @@
$messages['mb'] = 'Mo';
$messages['gb'] = 'Go';
$messages['edit'] = 'Éditer';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_gl_ES.php
===================================================================
--- plog/trunk/locale/admin/locale_gl_ES.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_gl_ES.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1209,4 +1209,8 @@
$messages['mb'] = 'Mb';
$messages['gb'] = 'Xb';
$messages['edit'] = 'Editar';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_it_IT.php
===================================================================
--- plog/trunk/locale/admin/locale_it_IT.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_it_IT.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1187,4 +1187,8 @@
$messages['mb'] = 'MB';
$messages['gb'] = 'GB';
$messages['edit'] = 'Modifica';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_nl_NL.php
===================================================================
--- plog/trunk/locale/admin/locale_nl_NL.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_nl_NL.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1266,4 +1266,8 @@
$messages['mb'] = 'Mb';
$messages['gb'] = 'Gb';
$messages['edit'] = 'Edit';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_ru_RU.php
===================================================================
--- plog/trunk/locale/admin/locale_ru_RU.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_ru_RU.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1174,4 +1174,8 @@
$messages['mb'] = 'Mb';
$messages['gb'] = 'Gb';
$messages['edit'] = 'Правка';
+
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_tt_RU.php
===================================================================
--- plog/trunk/locale/admin/locale_tt_RU.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_tt_RU.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1177,5 +1177,7 @@
$messages['gb'] = 'Гб';
$messages['edit'] = 'Үзгәртү';
-
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
?>
\ No newline at end of file
Modified: plog/trunk/locale/admin/locale_zh_CN.php
===================================================================
--- plog/trunk/locale/admin/locale_zh_CN.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_zh_CN.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1189,6 +1189,10 @@
$messages['gb'] = 'DB';
$messages['edit'] = '编辑';
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
+
/// new strings in LT 1.3 ///
// friend management
$messages['friendManagement'] = '好友管理';
@@ -1260,4 +1264,4 @@
$messages['error_incorrect_friend_id'] = '好友 ID 不正确';
$messages['friend_deleted_ok'] = '好友“%s”已顺利删除。';
$messages['friends_deleted_ok'] = '好友“%s”已顺利删除。';
-?>
\ No newline at end of file
+?>
Modified: plog/trunk/locale/admin/locale_zh_TW.php
===================================================================
--- plog/trunk/locale/admin/locale_zh_TW.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/locale/admin/locale_zh_TW.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1189,6 +1189,10 @@
$messages['gb'] = 'DB';
$messages['edit'] = '編輯';
+/// new strings for LT 1.2.5 ///
+$messages['bookmark_this_filter'] = 'Bookmark this filter';
+$messages['help_trim_whitespace_output'] = 'Removes all unnecessary blank spaces from rendered templates, which can make pages up to 40% smaller. It is adivsable to keep this enabled, unless you are concerned with performance [ Default = Yes ]';
+
/// new strings in LT 1.3 ///
// friend management
$messages['friendManagement'] = '好友管理';
@@ -1299,4 +1303,4 @@
$messages['reply_text'] = '回覆內容';
$messages['reply_text_help'] = '要回覆的簡訊內容,不可為空白。';
$messages['error_empty_reply_text']= '你必須輸入回覆簡訊的內容。';
-?>
\ No newline at end of file
+?>
Modified: plog/trunk/templates/admin/blogcategories.template
===================================================================
--- plog/trunk/templates/admin/blogcategories.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/blogcategories.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -19,6 +19,13 @@
<input type="hidden" name="op" value="editBlogCategories" />
<input type="submit" name="Show" value="{$locale->tr("show")}" />
</div>
+
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
</fieldset>
</form>
</div>
Modified: plog/trunk/templates/admin/blogtemplates.template
===================================================================
--- plog/trunk/templates/admin/blogtemplates.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/blogtemplates.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -23,4 +23,4 @@
</div -->
</form>
{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}
Modified: plog/trunk/templates/admin/dashboard.template
===================================================================
--- plog/trunk/templates/admin/dashboard.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/dashboard.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -158,7 +158,7 @@
</td>
<td>
<div class="list_action_button">
- <a href="?op=blogSelect&blogId={$blog->getId()}&action=deleteTrackback&articleId={$article->getId()}&trackbackId={$trackback->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete_trackback")}" /></a>
+ <a href="?op=blogSelect&blogId={$blog->getId()}&action=deleteTrackback&articleId={$article->getId()}&trackbackId={$trackback->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
{if $bayesian_filter_enabled}
{if $trackback->getStatus() == 0}
<a href="?op=blogSelect&blogId={$blog->getId()}&action=markTrackback&mode=1&articleId={$trackback->getArticleId()}&trackbackId={$trackback->getId()}">
Modified: plog/trunk/templates/admin/editarticlecategories.template
===================================================================
--- plog/trunk/templates/admin/editarticlecategories.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/editarticlecategories.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -19,6 +19,14 @@
<input type="hidden" name="op" value="editArticleCategories" />
<input type="submit" name="Show" value="{$locale->tr("show")}" />
</div>
+
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
+
</fieldset>
</form>
</div>
Modified: plog/trunk/templates/admin/editcomments.template
===================================================================
--- plog/trunk/templates/admin/editcomments.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/editcomments.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -41,6 +41,13 @@
<input type="hidden" name="articleId" value="{if $post}{$post->getId()}{else}0{/if}" />
<input type="submit" name="show" value="{$locale->tr("show")}" class="submit" />
</div>
+
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
</fieldset>
</form>
</div>
@@ -63,6 +70,9 @@
</div>
<a name="bulkEdit"></a>
<div id="list_action_bar">
+ {check_perms adminperm=purge_data}
+ <input type="submit" name="purgeSpam" class="submit" value="{$locale->tr("cleanup_spam")}" onClick="javascript:submitCommentsList('doCleanUp');" />
+ {/check_perms}
{check_perms perm=update_comment}
<input type="hidden" name="articleId" value="{if $post}{$post->getId()}{else}0{/if}" />
<input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
Modified: plog/trunk/templates/admin/editposts.template
===================================================================
--- plog/trunk/templates/admin/editposts.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/editposts.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -27,7 +27,6 @@
<form id="showBy" action="admin.php" method="post">
<fieldset>
<legend>{$locale->tr("show_by")}</legend>
-
<div class="list_nav_option">
<label for="showCategory">{$locale->tr("category")}</label>
<br />
@@ -91,6 +90,13 @@
<input type="submit" name="Show" value="{$locale->tr("show")}" class="submit" />
</div>
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
+
</fieldset>
</form>
</div>
Modified: plog/trunk/templates/admin/globalarticlecategories.template
===================================================================
--- plog/trunk/templates/admin/globalarticlecategories.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/globalarticlecategories.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -18,6 +18,13 @@
<input type="hidden" name="op" value="editGlobalArticleCategories" />
<input type="submit" name="Show" value="{$locale->tr("show")}" />
</div>
+
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
</fieldset>
</form>
</div>
Modified: plog/trunk/templates/admin/poststats.template
===================================================================
--- plog/trunk/templates/admin/poststats.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/poststats.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -41,7 +41,7 @@
</td>
<td>
<div class="list_action_button">
- <a href="?op=deleteReferrer&referrerId={$referrer->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete_trackback")}" /></a>
+ <a href="?op=deleteReferrer&referrerId={$referrer->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
</div>
</td>
</tr>
Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/resources.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -41,6 +41,13 @@
<input type="hidden" name="op" value="resources" />
<input type="submit" name="Show" value="{$locale->tr("show")}" />
</div>
+
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
</fieldset>
</form>
</div>
Modified: plog/trunk/templates/admin/siteblogs.template
===================================================================
--- plog/trunk/templates/admin/siteblogs.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/siteblogs.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -28,6 +28,13 @@
<input type="hidden" name="op" value="editSiteBlogs" />
<input type="submit" name="Show" value="{$locale->tr("show")}" />
</div>
+
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
</fieldset>
</form>
</div>
Modified: plog/trunk/templates/admin/siteusers.template
===================================================================
--- plog/trunk/templates/admin/siteusers.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/siteusers.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -38,6 +38,14 @@
<input type="hidden" name="op" value="editSiteUsers" />
<input type="submit" name="Show" value="{$locale->tr("show")}" />
</div>
+
+ <div class="list_nav_option">
+ <br/>
+ <a href="{$pager->getCurrentPageLink()}" title="{$locale->tr("bookmark_this_filter")}">
+ <img style="border:0px" src="imgs/admin/icon_link-16.png" alt="{$locale->tr("bookmark_this_filter")}" />
+ </a>
+ </div>
+
</fieldset>
</form>
</div>
Modified: plog/trunk/templates/admin/statistics_table.template
===================================================================
--- plog/trunk/templates/admin/statistics_table.template 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/templates/admin/statistics_table.template 2007-10-23 09:31:01 UTC (rev 6005)
@@ -28,7 +28,7 @@
<div class="list_action_button">
{check_perms perm=update_blog_stats}
<a href="?op=deleteReferrer&referrerId={$referrer->getId()}" onClick="Lifetype.Forms.performRequest(this);return(false)">
- <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete_trackback")}" />
+ <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
</a>
{/check_perms}
</div>
Modified: plog/trunk/wizard.php
===================================================================
--- plog/trunk/wizard.php 2007-10-23 09:02:41 UTC (rev 6004)
+++ plog/trunk/wizard.php 2007-10-23 09:31:01 UTC (rev 6005)
@@ -1696,7 +1696,7 @@
//while( $row = $res3->FetchRow()) {
foreach( $allUsers as $user ) {
- print("Processing user: ".$user->getUsername()."<br/>");
+ //print("Processing user: ".$user->getUsername()."<br/>");
//if( $row["site_admin"] > 0 ) {
if( $user->isSiteAdmin()) {
// it's an admin, let's grant all the appropriate permissions
@@ -2296,4 +2296,4 @@
//// main part ////
$controller = new Controller( $_actionMap, "nextStep" );
$controller->process( HttpVars::getRequest());
-?>
\ No newline at end of file
+?>
More information about the pLog-svn
mailing list