diff options
| -rw-r--r-- | Pigeonholes.php | 6 | ||||
| -rw-r--r-- | admin/admin_pigeonholes_inc.php | 6 | ||||
| -rw-r--r-- | admin/schema_inc.php | 4 | ||||
| -rw-r--r-- | modules/mod_category_menu.tpl | 4 | ||||
| -rw-r--r-- | modules/mod_whats_related.tpl | 4 | ||||
| -rw-r--r-- | templates/admin_pigeonholes.tpl | 4 | ||||
| -rw-r--r-- | templates/display_members.tpl | 6 |
7 files changed, 17 insertions, 17 deletions
diff --git a/Pigeonholes.php b/Pigeonholes.php index 7721038..812ac6d 100644 --- a/Pigeonholes.php +++ b/Pigeonholes.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.51 2006/04/11 14:47:35 sylvieg Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.52 2006/04/14 20:25:52 squareing Exp $ * * +----------------------------------------------------------------------+ * | Copyright ( c ) 2004, bitweaver.org @@ -17,7 +17,7 @@ * Pigeonholes class * * @author xing <xing@synapse.plus.com> - * @version $Revision: 1.51 $ + * @version $Revision: 1.52 $ * @package pigeonholes */ @@ -808,7 +808,7 @@ function pigeonholes_alphabetiser($a, $b) { function pigeonholes_content_display( &$pObject ) { global $gBitSystem, $gBitSmarty, $gBitUser, $gPreviewStyle; - if( $gBitSystem->isFeatureActive( 'display_pigeonhole_members' ) || $gBitSystem->isFeatureActive( 'display_pigeonhole_path' ) ) { + if( $gBitSystem->isFeatureActive( 'pigeonholes_display_members' ) || $gBitSystem->isFeatureActive( 'display_pigeonhole_path' ) ) { $pigeonholes = new Pigeonholes(); if( $gBitUser->hasPermission( 'p_pigeonholes_view' ) ) { if( $pigeons = $pigeonholes->getPigeonholesFromContentId( $pObject->mContentId ) ) { diff --git a/admin/admin_pigeonholes_inc.php b/admin/admin_pigeonholes_inc.php index c900844..6b3c37b 100644 --- a/admin/admin_pigeonholes_inc.php +++ b/admin/admin_pigeonholes_inc.php @@ -1,12 +1,12 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.5 2006/02/08 13:17:41 lsces Exp $ +// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.6 2006/04/14 20:25:52 squareing Exp $ $pigeonholeSettings = array( 'display_pigeonhole_path' => array( 'label' => 'Display Path', 'note' => 'Display category paths above the page leading to the object.', ), - 'display_pigeonhole_members' => array( + 'pigeonholes_display_members' => array( 'label' => 'Display Members', 'note' => 'Show the other members of the same categories at the bottom of the page.', ), @@ -51,7 +51,7 @@ if( !empty( $_REQUEST['pigeonhole_settings'] ) ) { simple_set_toggle( $item, PIGEONHOLES_PKG_NAME ); } - simple_set_value( 'limit_member_number', PIGEONHOLES_PKG_NAME ); + simple_set_value( 'pigeonholes_limit_member_number', PIGEONHOLES_PKG_NAME ); simple_set_value( 'pigeonholes_list_style', PIGEONHOLES_PKG_NAME ); } ?> diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 84c6804..7a58853 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -40,8 +40,8 @@ $gBitInstaller->registerSchemaSequences( PIGEONHOLES_PKG_NAME, $sequences ); // ### Default Preferences $gBitInstaller->registerPreferences( PIGEONHOLES_PKG_NAME, array( - array( PIGEONHOLES_PKG_NAME, 'display_pigeonhole_members','y' ), - array( PIGEONHOLES_PKG_NAME, 'limit_member_number','100' ), + array( PIGEONHOLES_PKG_NAME, 'pigeonholes_display_members','y' ), + array( PIGEONHOLES_PKG_NAME, 'pigeonholes_limit_member_number','100' ), array( PIGEONHOLES_PKG_NAME, 'pigeonholes_list_style','table' ), //array( PIGEONHOLES_PKG_NAME, 'pigeonholes_themes','y' ), //array( PIGEONHOLES_PKG_NAME, 'pigeonholes_permissions','y' ), diff --git a/modules/mod_category_menu.tpl b/modules/mod_category_menu.tpl index f203fa0..af06ae2 100644 --- a/modules/mod_category_menu.tpl +++ b/modules/mod_category_menu.tpl @@ -1,6 +1,6 @@ -{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/modules/mod_category_menu.tpl,v 1.1 2006/02/04 17:47:24 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/modules/mod_category_menu.tpl,v 1.2 2006/04/14 20:25:52 squareing Exp $ *} {strip} -{if $gBitSystem->isFeatureActive( 'display_pigeonhole_members' ) and $modPigeonStructures} +{if $gBitSystem->isFeatureActive( 'pigeonholes_display_members' ) and $modPigeonStructures} {bitmodule title="$moduleTitle" name="whats_related"} {foreach from=$modPigeonStructures item=subtree} {include file="bitpackage:pigeonholes/view_structure_inc.tpl" no_details=true no_edit=true} diff --git a/modules/mod_whats_related.tpl b/modules/mod_whats_related.tpl index 3275a8f..3d1e31c 100644 --- a/modules/mod_whats_related.tpl +++ b/modules/mod_whats_related.tpl @@ -1,6 +1,6 @@ -{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/modules/mod_whats_related.tpl,v 1.4 2006/03/25 20:51:55 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/modules/mod_whats_related.tpl,v 1.5 2006/04/14 20:25:52 squareing Exp $ *} {strip} -{if $gBitSystem->isFeatureActive( 'display_pigeonhole_members' ) and $modRelatedPigeon} +{if $gBitSystem->isFeatureActive( 'pigeonholes_display_members' ) and $modRelatedPigeon} {bitmodule title="$moduleTitle" name="whats_related"} {foreach from=$modRelatedPigeon item=pigeonItem} <h4>{$pigeonItem.title|escape}</h4> diff --git a/templates/admin_pigeonholes.tpl b/templates/admin_pigeonholes.tpl index f0d0c7a..7549874 100644 --- a/templates/admin_pigeonholes.tpl +++ b/templates/admin_pigeonholes.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/templates/admin_pigeonholes.tpl,v 1.4 2006/03/01 21:12:30 spiderr Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/templates/admin_pigeonholes.tpl,v 1.5 2006/04/14 20:25:53 squareing Exp $ *} {strip} {form} {legend legend="Category Settings"} @@ -24,7 +24,7 @@ <div class="row"> {formlabel label="Number of Members" for="member_number"} {forminput} - {html_options name="limit_member_number" options=$memberLimit values=$memberLimit selected=`$gBitSystem->getConfig('limit_member_number')` id=member_number} + {html_options name="pigeonholes_limit_member_number" options=$memberLimit values=$memberLimit selected=`$gBitSystem->getConfig('pigeonholes_limit_member_number')` id=member_number} {formhelp note="Here you can specify what number of members are displayed at the bottom of a page."} {/forminput} </div> diff --git a/templates/display_members.tpl b/templates/display_members.tpl index f141f15..1563391 100644 --- a/templates/display_members.tpl +++ b/templates/display_members.tpl @@ -1,7 +1,7 @@ {strip} -{if $gBitSystem->isFeatureActive( 'display_pigeonhole_members' ) and $pigeonData} +{if $gBitSystem->isFeatureActive( 'pigeonholes_display_members' ) and $pigeonData} <div class="display pigeonholes"> - {if $gBitSystem->getConfig('limit_member_number') == 0} + {if $gBitSystem->getConfig('pigeonholes_limit_member_number') == 0} <h2>{tr}Categories{/tr}</h2> {foreach from=$pigeonData item=pigeonItem} {$pigeonItem.display_path} @@ -30,7 +30,7 @@ {if $ctg1 ne $ctg2}{if $ctg2}<br />{/if}{$gLibertySystem->mContentTypes.$ctg1.content_description}: {/if} - {if !$gBitSystem->getConfig('limit_member_number') or $member_count lt $gBitSystem->getConfig('limit_member_number')} + {if !$gBitSystem->getConfig('pigeonholes_limit_member_number') or $member_count lt $gBitSystem->getConfig('pigeonholes_limit_member_number')} {if $serviceHash.content_id == $member.content_id}<strong>{/if} {$member.display_link} {if $serviceHash.content_id == $member.content_id}</strong>{/if} |