diff options
| author | Christian Fowler <spider@viovio.com> | 2005-06-28 07:46:29 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2005-06-28 07:46:29 +0000 |
| commit | 1ac5efd4760ea31cef14335c3ccb64ca256e75b5 (patch) | |
| tree | c24ae459842c48b00389a0e23057ddace5837faf /templates | |
| parent | 96a6e127788097951511b99264aa153b19b12f76 (diff) | |
| download | wiki-1ac5efd4760ea31cef14335c3ccb64ca256e75b5.tar.gz wiki-1ac5efd4760ea31cef14335c3ccb64ca256e75b5.tar.bz2 wiki-1ac5efd4760ea31cef14335c3ccb64ca256e75b5.zip | |
Merge recent changes from R1 into HEAD
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/edit_page.tpl | 4 | ||||
| -rw-r--r-- | templates/page_history.tpl | 16 | ||||
| -rw-r--r-- | templates/show_page.tpl | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl index 6b34f5c..d2157fd 100644 --- a/templates/edit_page.tpl +++ b/templates/edit_page.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/edit_page.tpl,v 1.2 2005/06/19 16:00:13 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/edit_page.tpl,v 1.3 2005/06/28 07:46:29 spiderr Exp $ *} <div class="floaticon">{bithelp}</div> <div class="admin wiki"> @@ -284,7 +284,7 @@ {/form} <br /><br /> - {include file="bitpackage:liberty/edit_help.tpl"} + {include file="bitpackage:liberty/edit_help_inc.tpl"} </div><!-- end .body --> </div><!-- end .admin --> diff --git a/templates/page_history.tpl b/templates/page_history.tpl index 863baad..6933295 100644 --- a/templates/page_history.tpl +++ b/templates/page_history.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_history.tpl,v 1.2 2005/06/19 10:01:33 jht001 Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_history.tpl,v 1.3 2005/06/28 07:46:29 spiderr Exp $ *} {strip} <div class="admin wiki"> <div class="header"> @@ -18,22 +18,24 @@ <div class="content">{$sourcev}</div> {/if} - {if $diff} + {if $compare eq 'y'} <table class="data"> <caption>{tr}Comparing versions{/tr}</caption> <tr> + <th width="50%">{tr}Version {$version_from}{/tr}</td> + <th></th> <th width="50%">{tr}Current version{/tr}</td> - <th width="50%">{tr}Version {$version}{/tr}</td> </tr> <tr valign="top"> - <td><div class="content">{$parsed}</div></td> - <td><div class="content">{$diff}</div></td> + <td><div class="content">{$diff_from}</div></td> + <td> </td> + <td><div class="content">{$diff_to}</div></td> </tr> </table> {/if} {if $diff2 eq 'y'} - <h2>{tr}Differences from version{/tr} {$version}</h2> + <h2>{tr}Differences from version{/tr} {$version_from} to {$version_to}</h2> {$diffdata} {/if} @@ -75,7 +77,7 @@ <tr class="{cycle values='even,odd'}"> <td colspan="3"> {smartlink ititle="View" page_id=`$gContent->mPageId` preview=`$item.version`} - • {smartlink ititle="Compare" page_id=`$gContent->mPageId` diff=`$item.version`} + • {smartlink ititle="Compare" page_id=`$gContent->mPageId` compare=`$item.version`} • {smartlink ititle="Difference" page_id=`$gContent->mPageId` diff2=`$item.version`} • {smartlink ititle="Source" page_id=`$gContent->mPageId` source=`$item.version`} {if $gBitUser->hasPermission( 'bit_p_rollback' )} diff --git a/templates/show_page.tpl b/templates/show_page.tpl index efd115e..7117fcf 100644 --- a/templates/show_page.tpl +++ b/templates/show_page.tpl @@ -1,4 +1,4 @@ -<div class="display wiki"> +<div class="display wiki {$pageInfo.title|lower|regex_replace:"[\s|_]":""}"> {include file="bitpackage:wiki/page_icons.tpl"} {include file="bitpackage:wiki/page_header.tpl"} {if $gBitSystem->isPackageActive( 'stickies' )} |