diff options
| -rw-r--r-- | LibertyStructure.php | 9 | ||||
| -rw-r--r-- | templates/comments.tpl | 4 | ||||
| -rw-r--r-- | templates/menu_liberty_admin.tpl | 4 | ||||
| -rw-r--r-- | templates/service_content_icon_inc.tpl | 8 |
4 files changed, 12 insertions, 13 deletions
diff --git a/LibertyStructure.php b/LibertyStructure.php index d389935..86283dc 100644 --- a/LibertyStructure.php +++ b/LibertyStructure.php @@ -943,18 +943,19 @@ class LibertyStructure extends LibertyBase { $ret=''; if ($structure_tree != '') { $gBitSmarty->verifyCompileDir(); - $ret.=$gBitSmarty->fetch( "bitpackage:wiki/book_toc_startul.tpl"); + $ret.=$gBitSmarty->fetch( "bitpackage:liberty/structure_toc_startul.tpl"); foreach($structure_tree as $leaf) { //echo "<br />";print_r($leaf);echo "<br />"; $gBitSmarty->assign_by_ref('structure_tree',$leaf); $gBitSmarty->assign('showdesc',$showdesc); $gBitSmarty->assign('numbering',$numbering); - $ret.=$gBitSmarty->fetch( "bitpackage:wiki/book_toc_leaf.tpl"); + $ret.=$gBitSmarty->fetch( "bitpackage:liberty/structure_toc_leaf.tpl"); if(isset($leaf["sub"]) && is_array($leaf["sub"])) { - $ret.=$this->fetchToc($leaf["sub"],$showdesc,$numbering); + // recurse down in - li tags are for w3c standard + $ret.= '<li>'.$this->fetchToc($leaf["sub"],$showdesc,$numbering).'</li>'; } } - $ret.=$gBitSmarty->fetch( "bitpackage:wiki/book_toc_endul.tpl"); + $ret.=$gBitSmarty->fetch( "bitpackage:liberty/structure_toc_endul.tpl"); } return $ret; } diff --git a/templates/comments.tpl b/templates/comments.tpl index 707889a..1df97a6 100644 --- a/templates/comments.tpl +++ b/templates/comments.tpl @@ -1,4 +1,4 @@ -{if $gBitUser->hasPermission( 'p_liberty_post_comments' ) || $gBitUser->hasPermission( 'p_liberty_read_comments' ) } +{if $comments && ($gBitUser->hasPermission( 'p_liberty_post_comments' ) || $gBitUser->hasPermission( 'p_liberty_read_comments' ))} {strip} <div class="display comment"> <div class="header"> @@ -14,7 +14,7 @@ {if $comments_ajax && $gBitUser->hasPermission( 'p_liberty_post_comments' )} <div class="control-group"> - <input type="submit" name="post_comment_request" value="{tr}Add Comment{/tr}" onclick="LibertyComment.attachForm('comment_{$gContent->mContentId}', '{$gContent->mContentId}', {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if})"/> + <input type="submit" class="btn" name="post_comment_request" value="{tr}Add Comment{/tr}" onclick="LibertyComment.attachForm('comment_{$gContent->mContentId}', '{$gContent->mContentId}', {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if})"/> </div> {/if} diff --git a/templates/menu_liberty_admin.tpl b/templates/menu_liberty_admin.tpl index 3963b36..b9b3831 100644 --- a/templates/menu_liberty_admin.tpl +++ b/templates/menu_liberty_admin.tpl @@ -1,6 +1,6 @@ {strip} -<li class="dropdown-submenu"> - <a href="#" onclick="return(false);" tabindex="-1" class="sub-menu-root">{tr}{$smarty.const.LIBERTY_PKG_NAME|capitalize}{/tr}</a> +<li class="dropdown-submenu favorite"> + <a href="#" onclick="return(false);" tabindex="-1" class="sub-menu-root">{tr}{$smarty.const.LIBERTY_PKG_DIR|capitalize}{/tr}</a> <ul class="dropdown-menu sub-menu"> <li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=liberty">{tr}Liberty Settings{/tr}</a></li> <li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}admin/plugins.php">{tr}Plugins{/tr}</a></li> diff --git a/templates/service_content_icon_inc.tpl b/templates/service_content_icon_inc.tpl index 5796d75..64ef5e4 100644 --- a/templates/service_content_icon_inc.tpl +++ b/templates/service_content_icon_inc.tpl @@ -12,14 +12,12 @@ {/if} {if $gBitUser->hasPermission( 'p_liberty_assign_content_perms' ) and $serviceHash.content_id} {if $gContent->hasUserPermissions()} - {assign var=perm_icon value="icons/emblem-readonly"} - {else} - {assign var=perm_icon value="icons/emblem-shared"} + {assign var=iconClass value="highlight"} {/if} {if $role_model } - {smartlink ipackage=liberty ifile=content_role_permissions.php ititle="Assign Permissions" ibiticon=$perm_icon ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id} + {smartlink ipackage=liberty ifile=content_role_permissions.php ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id} {else} - {smartlink ipackage=liberty ifile=content_permissions.php ititle="Assign Permissions" ibiticon=$perm_icon ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id} + {smartlink ipackage=liberty ifile=content_permissions.php ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id} {/if} {/if} {* This should always be last so it is right most in the icons! *} |