diff options
| -rw-r--r-- | Pigeonholes.php | 6 | ||||
| -rw-r--r-- | admin/admin_pigeonholes_inc.php | 6 | ||||
| -rw-r--r-- | templates/display_members.tpl | 4 | ||||
| -rw-r--r-- | templates/display_paths.tpl | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Pigeonholes.php b/Pigeonholes.php index a16c054..7fa6004 100644 --- a/Pigeonholes.php +++ b/Pigeonholes.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.61 2006/06/05 23:54:05 bitweaver Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.62 2006/06/06 07:25:47 squareing Exp $ * * +----------------------------------------------------------------------+ * | Copyright ( c ) 2004, bitweaver.org @@ -17,7 +17,7 @@ * Pigeonholes class * * @author xing <xing@synapse.plus.com> - * @version $Revision: 1.61 $ + * @version $Revision: 1.62 $ * @package pigeonholes */ @@ -822,7 +822,7 @@ function pigeonholes_alphabetiser($a, $b) { function pigeonholes_content_display( &$pObject ) { global $gBitSystem, $gBitSmarty, $gBitUser, $gPreviewStyle; - if( $gBitSystem->isFeatureActive( 'pigeonholes_display_members' ) || $gBitSystem->isFeatureActive( 'display_pigeonhole_path' ) ) { + if( $gBitSystem->isFeatureActive( 'pigeonholes_display_members' ) || $gBitSystem->isFeatureActive( 'pigeonholes_display_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 106a954..8d3609a 100644 --- a/admin/admin_pigeonholes_inc.php +++ b/admin/admin_pigeonholes_inc.php @@ -1,8 +1,8 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.8 2006/04/26 11:02:08 bitweaver Exp $ +// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.9 2006/06/06 07:25:47 squareing Exp $ $pigeonholeSettings = array( - 'display_pigeonhole_path' => array( + 'pigeonholes_display_path' => array( 'label' => 'Display Path', 'note' => 'Display category paths above the page leading to the object.', ), @@ -10,7 +10,7 @@ $pigeonholeSettings = array( 'label' => 'Display Members', 'note' => 'Show the other members of the same categories at the bottom of the page.', ), - 'display_pigeonhole_description' => array( + 'pigeonholes_display_description' => array( 'label' => 'Display Description', 'note' => 'When showing the category members, you can display the category description as well.', ), diff --git a/templates/display_members.tpl b/templates/display_members.tpl index 1563391..c42ba4b 100644 --- a/templates/display_members.tpl +++ b/templates/display_members.tpl @@ -5,7 +5,7 @@ <h2>{tr}Categories{/tr}</h2> {foreach from=$pigeonData item=pigeonItem} {$pigeonItem.display_path} - {if $pigeonItem.data and $gBitSystem->isFeatureActive( 'display_pigeonhole_description' )} + {if $pigeonItem.data and $gBitSystem->isFeatureActive( 'pigeonholes_display_description' )} : {$pigeonItem.data} {/if} • @@ -17,7 +17,7 @@ <h3>{$pigeonItem.display_path}</h3> <div class="boxcontent"> - {if $pigeonItem.data and $gBitSystem->isFeatureActive( 'display_pigeonhole_description' )} + {if $pigeonItem.data and $gBitSystem->isFeatureActive( 'pigeonholes_display_description' )} {$pigeonItem.data}<br /> {/if} diff --git a/templates/display_paths.tpl b/templates/display_paths.tpl index 1c6be3c..3c41c14 100644 --- a/templates/display_paths.tpl +++ b/templates/display_paths.tpl @@ -1,5 +1,5 @@ {strip} -{if $gBitSystem->isFeatureActive( 'display_pigeonhole_path' ) && $pigeonData} +{if $gBitSystem->isFeatureActive( 'pigeonholes_display_path' ) && $pigeonData} <div class="structurebar pigeonholesbar"> {foreach from=$pigeonData item=pigeonItem} <span class="path">{$pigeonItem.display_path}</span> |