diff options
| -rw-r--r-- | admin/admin_blogs_inc.php | 6 | ||||
| -rw-r--r-- | admin/schema_inc.php | 1 | ||||
| -rw-r--r-- | bit_setup_inc.php | 33 | ||||
| -rw-r--r-- | templates/admin_blogs.tpl | 10 | ||||
| -rw-r--r-- | templates/list_blogs.tpl | 4 |
5 files changed, 32 insertions, 22 deletions
diff --git a/admin/admin_blogs_inc.php b/admin/admin_blogs_inc.php index 07b39d5..3b270e1 100644 --- a/admin/admin_blogs_inc.php +++ b/admin/admin_blogs_inc.php @@ -1,5 +1,5 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_blogs/admin/admin_blogs_inc.php,v 1.9 2006/10/11 06:05:13 spiderr Exp $ +// $Header: /cvsroot/bitweaver/_bit_blogs/admin/admin_blogs_inc.php,v 1.10 2006/12/02 01:46:18 nickpalmer Exp $ // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. @@ -69,9 +69,9 @@ if( $processForm ) { $gBitSystem->storeConfig("blog_posts_comments", isset( $_REQUEST["blog_posts_comments"] ) ? 'y' : 'n', BLOGS_PKG_NAME ); $gBitSystem->storeConfig("blog_list_order", $_REQUEST["blog_list_order"], BLOGS_PKG_NAME ); - $gBitSystem->storeConfig("blog_list_user", $_REQUEST["blog_list_user"], BLOGS_PKG_NAME ); + $gBitSystem->storeConfig("blog_list_user_as", $_REQUEST["blog_list_user_as"], BLOGS_PKG_NAME ); $gBitSmarty->assign('blog_list_order', $_REQUEST["blog_list_order"]); - $gBitSmarty->assign('blog_list_user', $_REQUEST['blog_list_user']); + $gBitSmarty->assign('blog_list_user_as', $_REQUEST['blog_list_user_as']); if ($gBitSystem->isPackageActive( 'categories' )) { if (isset($_REQUEST["blog_categ"]) && $_REQUEST["blog_categ"] == "on") { diff --git a/admin/schema_inc.php b/admin/schema_inc.php index fdac3af..060233e 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -77,6 +77,7 @@ $gBitInstaller->registerPreferences( BLOGS_PKG_NAME, array( array( BLOGS_PKG_NAME, 'blog_parent_categ',0), array( BLOGS_PKG_NAME, 'blog_posts_comments','n'), array( BLOGS_PKG_NAME, 'blog_rankings','y'), + array( BLOGS_PKG_NAME, 'blog_list_user_as', 'text'), ) ); if(defined('RSS_PKG_NAME')) { $gBitInstaller->registerPreferences( BLOGS_PKG_NAME, array( diff --git a/bit_setup_inc.php b/bit_setup_inc.php index bd30e6c..c0e2121 100644 --- a/bit_setup_inc.php +++ b/bit_setup_inc.php @@ -12,6 +12,13 @@ $registerHash = array( ); $gBitSystem->registerPackage( $registerHash ); +/* Simple function to fetch and set all config values. */ +function assignConfigs($x) { + global $gBitSmarty, $gBitSystem; + foreach ($x as $key) + $gBitSmarty->assign($key, $gBitSystem->getConfig($key)); +} + if( $gBitSystem->isPackageActive( 'blogs' ) ) { if( $gBitUser->hasPermission( 'p_blogs_admin' ) ) { $gBitUser->setPreference( 'p_blogs_create', TRUE ); @@ -30,18 +37,20 @@ if( $gBitSystem->isPackageActive( 'blogs' ) ) { $gBitSystem->registerNotifyEvent( array( "blog_post" => tra("An entry is posted to a blog") ) ); - $gBitSmarty->assign('home_blog', 0); - $gBitSmarty->assign('blog_list_order', 'created_desc'); - $gBitSmarty->assign('blog_list_title', 'y'); - $gBitSmarty->assign('blog_list_description', 'y'); - $gBitSmarty->assign('blog_list_created', 'y'); - $gBitSmarty->assign('blog_list_lastmodif', 'y'); - $gBitSmarty->assign('blog_list_user', 'y'); - $gBitSmarty->assign('blog_list_posts', 'y'); - $gBitSmarty->assign('blog_list_visits', 'y'); - $gBitSmarty->assign('blog_list_activity', 'y'); - $gBitSmarty->assign('blog_list_user', 'text'); + $prefs = array( + 'home_blog', + 'blog_list_order', + 'blog_list_title', + 'blog_list_description', + 'blog_list_created', + 'blog_list_lastmodif', + 'blog_list_user', + 'blog_list_posts', + 'blog_list_visits', + 'blog_list_activity', + 'blog_list_user_as', + ); + assignConfigs($prefs); } - ?> diff --git a/templates/admin_blogs.tpl b/templates/admin_blogs.tpl index cd98e94..c24ff13 100644 --- a/templates/admin_blogs.tpl +++ b/templates/admin_blogs.tpl @@ -9,7 +9,7 @@ {forminput} <select name="homeBlog" id="homeBlog"> {section name=ix loop=$blogs} - <option value="{$blogs[ix].blog_id|escape}" {if $blogs[ix].blog_id eq $home_blog}selected="selected"{/if}>{$blogs[ix].title|escape|truncate:20:"...":true}</option> + <option value="{$blogs[ix].blog_id|escape}" {if $blogs[ix].blog_id eq $home_blog}selected="selected"{/if}>{$blogs[ix].title|escape html|truncate:20:"...":true}</option> {sectionelse} <option>{tr}No records found{/tr}</option> {/section} @@ -54,10 +54,10 @@ <div class="row"> {formlabel label="Display user as" for="blog_list_user_as"} {forminput} - <select name="blog_list_user" id="blog_list_user_as"> - <option value="text" {if $blog_list_user eq 'text'}selected="selected"{/if}>{tr}Plain text{/tr}</option> - <option value="link" {if $blog_list_user eq 'link'}selected="selected"{/if}>{tr}Link to user information{/tr}</option> - <option value="avatar" {if $blog_list_user eq 'avatar'}selected="selected"{/if}>{tr}User avatar{/tr}</option> + <select name="blog_list_user_as" id="blog_list_user_as"> + <option value="text" {if $blog_list_user_as eq 'text'}selected="selected"{/if}>{tr}Plain text{/tr}</option> + <option value="link" {if $blog_list_user_as eq 'link'}selected="selected"{/if}>{tr}Link to user information{/tr}</option> + <option value="avatar" {if $blog_list_user_as eq 'avatar'}selected="selected"{/if}>{tr}User avatar{/tr}</option> </select> {formhelp note="Decide how blog post author information is displayed."} {/forminput} diff --git a/templates/list_blogs.tpl b/templates/list_blogs.tpl index ef742eb..10b3e88 100644 --- a/templates/list_blogs.tpl +++ b/templates/list_blogs.tpl @@ -74,9 +74,9 @@ <div class="date"> {if $blog_list_user eq 'y'} - {if $blog_list_user eq 'link'} + {if $blog_list_user_as eq 'link'} {tr}Created by {$listpages[changes].user|userlink}{/tr} - {elseif $blog_list_user eq 'avatar'} + {elseif $blog_list_user_as eq 'avatar'} {$listpages[changes].user|avatarize} {else} {tr}Created by {$listpages[changes].user}{/tr} |