summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2005-08-07 17:46:51 +0000
committerMax Kremmel <xing@synapse.plus.com>2005-08-07 17:46:51 +0000
commit84c9b11f4260b9add6dae43d098db6ba364ddf36 (patch)
tree4c1cca09213a184c4724ddf85e66a7ebc9dc8d31 /templates
parentaa1fc688af3a1b78a73369d378b0c5b3cdbd9bee (diff)
downloadwiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.tar.gz
wiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.tar.bz2
wiki-84c9b11f4260b9add6dae43d098db6ba364ddf36.zip
merge recent changes from R1 to HEAD
Diffstat (limited to 'templates')
-rw-r--r--templates/admin_external_wikis.tpl12
-rw-r--r--templates/admin_wiki.tpl8
-rw-r--r--templates/backlinks.tpl4
-rwxr-xr-xtemplates/book_toc_leaf.tpl2
-rwxr-xr-xtemplates/book_toc_level.tpl2
-rw-r--r--templates/center_wiki_page.tpl4
-rw-r--r--templates/copyrights.tpl6
-rwxr-xr-xtemplates/create_webhelp.tpl6
-rw-r--r--templates/edit_page.tpl6
-rw-r--r--templates/import_phpwiki.tpl2
-rw-r--r--templates/list_books.tpl16
-rw-r--r--templates/list_pages.tpl15
-rw-r--r--templates/menu_wiki.tpl24
-rw-r--r--templates/menu_wiki_admin.tpl4
-rw-r--r--templates/page.tpl6
-rw-r--r--templates/page_action_bar.tpl24
-rw-r--r--templates/page_date_bar.tpl2
-rw-r--r--templates/page_display.tpl2
-rw-r--r--templates/page_icons.tpl30
-rw-r--r--templates/page_permissions.tpl6
-rw-r--r--templates/page_select.tpl4
-rw-r--r--templates/print_pages.tpl6
-rw-r--r--templates/received_pages.tpl22
-rw-r--r--templates/rename_page.tpl2
-rw-r--r--templates/rollback.tpl2
-rw-r--r--templates/s5.tpl8
-rw-r--r--templates/show_page.tpl17
-rw-r--r--templates/slideshow.tpl18
-rw-r--r--templates/user_watch_wiki_page_changed.tpl26
-rw-r--r--templates/user_watch_wiki_page_comment.tpl2
-rw-r--r--templates/wiki_change_notification.tpl6
31 files changed, 152 insertions, 142 deletions
diff --git a/templates/admin_external_wikis.tpl b/templates/admin_external_wikis.tpl
index 4969259..cd12419 100644
--- a/templates/admin_external_wikis.tpl
+++ b/templates/admin_external_wikis.tpl
@@ -8,11 +8,11 @@
<div class="body">
<h2>{tr}Create/Edit External Wiki{/tr}</h2>
-<form action="{$gBitLoc.WIKI_PKG_URL}admin/admin_external_wikis.php" method="post">
+<form action="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php" method="post">
<input type="hidden" name="extwiki_id" value="{$extwiki_id|escape}" />
<table class="panel">
<tr><td>{tr}name{/tr}:</td><td><input type="text" maxlength="255" size="10" name="name" value="{$info.name|escape}" /></td></tr>
-<tr><td>{tr}URL (use $page to be replaced by the page name in the URL example: http://www.example.com/{$gBitLoc.WIKI_PKG_URL}index.php?page=$page){/tr}:</td><td><input type="text" maxlength="255" size="40" name="extwiki" value="{$info.extwiki|escape}" /></td></tr>
+<tr><td>{tr}URL (use $page to be replaced by the page name in the URL example: http://www.example.com/{$smarty.const.WIKI_PKG_URL}index.php?page=$page){/tr}:</td><td><input type="text" maxlength="255" size="40" name="extwiki" value="{$info.extwiki|escape}" /></td></tr>
<tr class="panelsubmitrow"><td colspan="2"><input type="submit" name="save" value="{tr}Save{/tr}" /></td></tr>
</table>
</form>
@@ -20,8 +20,8 @@
<h2>{tr}External Wiki{/tr}</h2>
<table class="data">
<tr>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}name{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'extwiki_desc'}extwiki_asc{else}extwiki_desc{/if}">{tr}extwiki{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}name{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'extwiki_desc'}extwiki_asc{else}extwiki_desc{/if}">{tr}extwiki{/tr}</a></th>
<th>{tr}action{/tr}</th>
</tr>
{cycle values="even,odd" print=false}
@@ -30,8 +30,8 @@
<td>{$channels[user].name}</td>
<td>{$channels[user].extwiki}</td>
<td>
- &nbsp;&nbsp;<a href="{$gBitLoc.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].extwiki_id}" onclick="return confirmTheLink(this,'{tr}Are you sure you want to delete this external wiki?{/tr}')" title="Click here to delete this external wiki">{biticon ipackage=liberty iname="delete" iexplain="remove"}</a>&nbsp;&nbsp;
- <a href="{$gBitLoc.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;extwiki_id={$channels[user].extwiki_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+ &nbsp;&nbsp;<a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].extwiki_id}" onclick="return confirmTheLink(this,'{tr}Are you sure you want to delete this external wiki?{/tr}')" title="Click here to delete this external wiki">{biticon ipackage=liberty iname="delete" iexplain="remove"}</a>&nbsp;&nbsp;
+ <a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;extwiki_id={$channels[user].extwiki_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
</td>
</tr>
{sectionelse}
diff --git a/templates/admin_wiki.tpl b/templates/admin_wiki.tpl
index b7e994b..3d05032 100644
--- a/templates/admin_wiki.tpl
+++ b/templates/admin_wiki.tpl
@@ -145,9 +145,9 @@
{legend legend="Dumps and Export"}
<div class="row">
{forminput}
- <a href="{$gBitLoc.KERNEL_PKG_URL}admin/index.php?page=wiki&amp;dump=1">{tr}Generate dump{/tr}</a><br />
- <a href="{$gBitLoc.BIT_ROOT_URL}dump/{$bitdomain}new.tar">{tr}Download last dump{/tr}</a><br />
- <a href="{$gBitLoc.WIKI_PKG_URL}export_wiki_pages.php">{tr}Export wiki pages{/tr}</a>
+ <a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=wiki&amp;dump=1">{tr}Generate dump{/tr}</a><br />
+ <a href="{$smarty.const.BIT_ROOT_URL}dump/{$bitdomain}new.tar">{tr}Download last dump{/tr}</a><br />
+ <a href="{$smarty.const.WIKI_PKG_URL}export_wiki_pages.php">{tr}Export wiki pages{/tr}</a>
{/forminput}
</div>
{/legend}
@@ -282,7 +282,7 @@
{if $gBitSystem->isPackageActive( 'tikiforums' )}
<div class="boxcontent">
- <form method="post" action="{$gBitLoc.KERNEL_PKG_URL}admin/index.php?page=wiki">
+ <form method="post" action="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=wiki">
<table class="panel"><tr>
<th colspan="2">{tr}Wiki Discussion{/tr}</th>
</tr><tr>
diff --git a/templates/backlinks.tpl b/templates/backlinks.tpl
index a3bbb75..0b6dea0 100644
--- a/templates/backlinks.tpl
+++ b/templates/backlinks.tpl
@@ -1,13 +1,13 @@
{strip}
<div class="listing wiki">
<div class="header">
- <h1>{tr}Backlinks to{/tr} <a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}" class="wiki">{$page}</a></h1>
+ <h1>{tr}Backlinks to{/tr} <a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}" class="wiki">{$page}</a></h1>
</div>
<div class="body">
<ul>
{foreach from=$backlinks key=content_id item=title}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?content_id={$content_id}" class="wiki">{$title}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}index.php?content_id={$content_id}" class="wiki">{$title}</a></li>
{foreachelse}
<div class="norecords">{tr}No backlinks to this page{/tr}</div>
{/foreach}
diff --git a/templates/book_toc_leaf.tpl b/templates/book_toc_leaf.tpl
index b2ca40a..2d23305 100755
--- a/templates/book_toc_leaf.tpl
+++ b/templates/book_toc_leaf.tpl
@@ -1 +1 @@
-<li>{if $numbering}{$structure_tree.prefix} {/if}<a href="{$gBitLoc.WIKI_PKG_URL}index.php?structure_id={$structure_tree.structure_id}">{$structure_tree.title}</a></li>
+<li>{if $numbering}{$structure_tree.prefix} {/if}<a href="{$smarty.const.WIKI_PKG_URL}index.php?structure_id={$structure_tree.structure_id}">{$structure_tree.title}</a></li>
diff --git a/templates/book_toc_level.tpl b/templates/book_toc_level.tpl
index b6134d4..713b8d6 100755
--- a/templates/book_toc_level.tpl
+++ b/templates/book_toc_level.tpl
@@ -1 +1 @@
-<li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?structure_id={$that.structure_id}">{$that.title}</a></li>{if $that.sub}<ul>{section name=xitem loop=$that.sub}{include file="structures_toc_level.tpl" that=$that.sub[xitem]}{/section}</ul>{/if}
+<li><a href="{$smarty.const.WIKI_PKG_URL}index.php?structure_id={$that.structure_id}">{$that.title}</a></li>{if $that.sub}<ul>{section name=xitem loop=$that.sub}{include file="structures_toc_level.tpl" that=$that.sub[xitem]}{/section}</ul>{/if}
diff --git a/templates/center_wiki_page.tpl b/templates/center_wiki_page.tpl
index 407b78f..e4bee91 100644
--- a/templates/center_wiki_page.tpl
+++ b/templates/center_wiki_page.tpl
@@ -46,13 +46,13 @@
<div class="actionicon"> <!-- Actions -->
{if $gBitUser->hasPermission( 'bit_p_edit' )}
- <a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
{/if}
{if $userOwnsPage}
<a href="{$PHP_SELF}?fHomepage={$fHomepage}&fEditCenterWikiPageSettings=1">{biticon ipackage=liberty iname="config" iexplain="configure"}</a>
{/if}
{if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'bit_p_pdf_generation' )}
- <a title="{tr}create PDF{/tr}" href="{$gBitLoc.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
+ <a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
{/if}
</div> <!-- End Actions -->
</div>
diff --git a/templates/copyrights.tpl b/templates/copyrights.tpl
index 1f29f37..577e244 100644
--- a/templates/copyrights.tpl
+++ b/templates/copyrights.tpl
@@ -35,9 +35,9 @@
<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
<input type="hidden" name="copyright_id" value="{$copyrights[i].copyright_id|escape}" />
<input type="submit" name="editcopyright" value="{tr}edit{/tr}" />
- <a href="{$gBitLoc.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=up&amp;copyright_id={$copyrights[i].copyright_id}">{biticon ipackage=liberty iname="nav_up" iexplain="move up"}</a>
- <a href="{$gBitLoc.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=down&amp;copyright_id={$copyrights[i].copyright_id}">{biticon ipackage=liberty iname="nav_down" iexplain="move down"}</a>
- <a title="{tr}Delete this copyright{/tr}" href="{$gBitLoc.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=delete&amp;copyright_id={$copyrights[i].copyright_id}"
+ <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=up&amp;copyright_id={$copyrights[i].copyright_id}">{biticon ipackage=liberty iname="nav_up" iexplain="move up"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=down&amp;copyright_id={$copyrights[i].copyright_id}">{biticon ipackage=liberty iname="nav_down" iexplain="move down"}</a>
+ <a title="{tr}Delete this copyright{/tr}" href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=delete&amp;copyright_id={$copyrights[i].copyright_id}"
onclick="return confirm('{tr}Are you sure you want to delete this copyright?{/tr}')">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
</div>
{/form}
diff --git a/templates/create_webhelp.tpl b/templates/create_webhelp.tpl
index cb4ba98..d7a63a0 100755
--- a/templates/create_webhelp.tpl
+++ b/templates/create_webhelp.tpl
@@ -1,13 +1,13 @@
-<a href="{$gBitLoc.WIKI_PKG_URL}create_webhelp.php" class="pagetitle">{tr}Create WebHelp{/tr}</a>
+<a href="{$smarty.const.WIKI_PKG_URL}create_webhelp.php" class="pagetitle">{tr}Create WebHelp{/tr}</a>
Here you can generate static HTML files from Wiki Book.
<br /><br />
{if $generated eq 'y'}
-<a href="{$gBitLoc.BITHELP_PKG_URL}{$dir}/index.html">{tr}You can browse the generated WebHelp here{/tr}</a><br /><br />
+<a href="{$smarty.const.BITHELP_PKG_URL}{$dir}/index.html">{tr}You can browse the generated WebHelp here{/tr}</a><br /><br />
{/if}
-<form method="post" action="{$gBitLoc.WIKI_PKG_URL}create_webhelp.php">
+<form method="post" action="{$smarty.const.WIKI_PKG_URL}create_webhelp.php">
<table class="panel">
<tr>
<td>{tr}Structure{/tr}</td>
diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl
index c9c2a32..7aae06e 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.5 2005/07/25 20:02:58 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/edit_page.tpl,v 1.6 2005/08/07 17:46:51 squareing Exp $ *}
<div class="floaticon">{bithelp}</div>
<div class="admin wiki">
@@ -228,7 +228,7 @@
<div class="row">
{formlabel label="License"}
{forminput}
- <a href="{$gBitLoc.WIKI_PKG_URL}index.php?page={$wikiLicensePage}">{tr}{$wikiLicensePage}{/tr}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}index.php?page={$wikiLicensePage}">{tr}{$wikiLicensePage}{/tr}</a>
{formhelp note=""}
{/forminput}
</div>
@@ -276,7 +276,7 @@
<tr><td>
{tr}Import file{/tr}:</td><td>
<input name="userfile1" type="file" />
- { * <a href="{$gBitLoc.WIKI_PKG_URL}export_wiki_pages.php?page_id={$pageInfo.page_id}&amp;all=1">{tr}export all versions{/tr}</a> * }
+ { * <a href="{$smarty.const.WIKI_PKG_URL}export_wiki_pages.php?page_id={$pageInfo.page_id}&amp;all=1">{tr}export all versions{/tr}</a> * }
</td></tr>
{/if} { * end upload file row * }
*}
diff --git a/templates/import_phpwiki.tpl b/templates/import_phpwiki.tpl
index 7c32d85..62593ee 100644
--- a/templates/import_phpwiki.tpl
+++ b/templates/import_phpwiki.tpl
@@ -7,7 +7,7 @@
<div class="body">
-<form method="post" action="{$gBitLoc.WIKI_PKG_URL}admin/import_phpwiki.php">
+<form method="post" action="{$smarty.const.WIKI_PKG_URL}admin/import_phpwiki.php">
<table class="panel">
<tr>
<td>{tr}Path to where the dumped files are (relative to tiki basedir with trailing slash ex: dump/):{/tr}</td>
diff --git a/templates/list_books.tpl b/templates/list_books.tpl
index 7ee0f3a..1fdf89e 100644
--- a/templates/list_books.tpl
+++ b/templates/list_books.tpl
@@ -18,29 +18,29 @@
<tr class="{cycle}">
<td>
- <a href="{$gBitLoc.WIKI_PKG_URL}index.php?structure_id={$channels[ix].structure_id}">
+ <a href="{$smarty.const.WIKI_PKG_URL}index.php?structure_id={$channels[ix].structure_id}">
{$channels[ix].title}
</a>
</td>
<td class="actionicon">
{if ($channels[ix].creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'bit_p_admin_books' )}
- <a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?structure_id={$channels[ix].structure_id}">{biticon ipackage=liberty iname="settings" iexplain="edit book"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$channels[ix].structure_id}">{biticon ipackage=liberty iname="settings" iexplain="edit book"}</a>
{/if}
{* remove for now because it's broken, and I can't find reason to fix - spiderr
- <a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?action=export&structure_id={$channels[ix].structure_id}">{biticon ipackage=liberty iname="export" iexplain="export pages"}</a>
- <a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?action=export_tree&structure_id={$channels[ix].structure_id}">{biticon ipackage="wiki" iname="tree" iexplain="dump tree"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=export&structure_id={$channels[ix].structure_id}">{biticon ipackage=liberty iname="export" iexplain="export pages"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=export_tree&structure_id={$channels[ix].structure_id}">{biticon ipackage="wiki" iname="tree" iexplain="dump tree"}</a>
*}
{if $gBitUser->isAdmin()}
{if $gBitSystem->isPackageActive( 'nexus' )}
- <a href="{$gBitLoc.NEXUS_PKG_URL}menus.php?structure_id={$channels[ix].structure_id}&amp;action=convert_structure">{biticon ipackage="liberty" iname="tree" iexplain="create menu from structure"}</a>
+ <a href="{$smarty.const.NEXUS_PKG_URL}menus.php?structure_id={$channels[ix].structure_id}&amp;action=convert_structure">{biticon ipackage="liberty" iname="tree" iexplain="create menu from structure"}</a>
{/if}
- <a href="{$gBitLoc.WIKI_PKG_URL}create_webhelp.php?structure_id={$channels[ix].structure_id}">{biticon ipackage="wiki" iname="webhelp" iexplain="create webhelp"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}create_webhelp.php?structure_id={$channels[ix].structure_id}">{biticon ipackage="wiki" iname="webhelp" iexplain="create webhelp"}</a>
{/if}
{if $channels[ix].webhelp eq 'y'}
- <a href="{$gBitLoc.BITHELP_PKG_URL}/{$channels[ix].title}/index.html">{biticon ipackage="wiki" iname="webhelp_toc" iexplain="view webhelp"}</a>
+ <a href="{$smarty.const.BITHELP_PKG_URL}/{$channels[ix].title}/index.html">{biticon ipackage="wiki" iname="webhelp_toc" iexplain="view webhelp"}</a>
{/if}
{if ($channels[ix].creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'bit_p_admin_books' )}
- <a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}">{biticon ipackage=liberty iname="delete" iexplain="remove"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}">{biticon ipackage=liberty iname="delete" iexplain="remove"}</a>
{/if}
</td>
</tr>
diff --git a/templates/list_pages.tpl b/templates/list_pages.tpl
index bca6738..4e3fc58 100644
--- a/templates/list_pages.tpl
+++ b/templates/list_pages.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/list_pages.tpl,v 1.3 2005/07/25 20:02:59 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/list_pages.tpl,v 1.4 2005/08/07 17:46:51 squareing Exp $ *}
<div class="floaticon">{bithelp}</div>
<div class="admin wiki">
@@ -9,6 +9,8 @@
{formfeedback error=$errors}
<div class="body">
+ {minifind sort_mode=$sort_mode}
+
{form id="checkform"}
{strip}
<div class="navbar">
@@ -29,12 +31,10 @@
</ul>
</div>
- <div class="clear"></div>
-
<input type="hidden" name="offset" value="{$offset}" />
<input type="hidden" name="sort_mode" value="{$sort_mode}" />
- <table class="data">
+ <table class="clear data">
<caption>{tr}WikiPages Listing{/tr} <span class="total">[ {$pagecount} ]</span></caption>
<tr>
{* at the moment, the only working option to use the checkboxes for is deleting pages. so for now the checkboxes are visible iff $bit_p_remove is set. Other applications make sense as well (categorize, convert to pdf, etc). Add necessary corresponding permission here: *}
@@ -93,7 +93,7 @@
{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
<h3><a href="{$listpages[changes].display_url}" title="{$listpages[changes].description}">{$listpages[changes].title}</a></h3>
{else}
- <a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$listpages[changes].page_id}" title="{$listpages[changes].page_id}">Page #{$listpages[changes].page_id}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$listpages[changes].page_id}" title="{$listpages[changes].page_id}">Page #{$listpages[changes].page_id}</a>
{/if}
{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
{tr}Created by{/tr} {displayname real_name=$listpages[changes].creator_real_name user=$listpages[changes].creator_user}
@@ -140,7 +140,7 @@
{/if}
{if $gBitSystem->isFeatureActive( 'wiki_list_backlinks' )}
{if $gBitSystem->isFeatureActive( 'feature_backlinks' ) && $listpages[changes].backlinks > 0}
- <td style="text-align:center;"><a href="{$gBitLoc.WIKI_PKG_URL}backlinks.php?page={$listpages[changes].title|escape:"url"}">{$listpages[changes].backlinks|default:"0"}</a></td>
+ <td style="text-align:center;"><a href="{$smarty.const.WIKI_PKG_URL}backlinks.php?page={$listpages[changes].title|escape:"url"}">{$listpages[changes].backlinks|default:"0"}</a></td>
{else}
<td style="text-align:center;">{$listpages[changes].backlinks|default:"0"}</td>
{/if}
@@ -153,7 +153,7 @@
{/if}
{if $gBitUser->hasPermission( 'bit_p_edit' )}
<td class="actionicon">
- <a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{biticon ipackage="liberty" iname="edit" iexplain="edit"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{biticon ipackage="liberty" iname="edit" iexplain="edit"}</a>
{if $checkboxes_on eq 'y'}
<input type="checkbox" name="checked[]" value="{$listpages[changes].page_id}" />
{/if}
@@ -201,6 +201,5 @@
{/form}
{pagination}
- {minifind sort_mode=$sort_mode}
</div><!-- end .body -->
</div><!-- end .wiki -->
diff --git a/templates/menu_wiki.tpl b/templates/menu_wiki.tpl
index 2b46547..5a4b31d 100644
--- a/templates/menu_wiki.tpl
+++ b/templates/menu_wiki.tpl
@@ -1,40 +1,40 @@
{strip}
<ul>
{if $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}index.php">{biticon ipackage=liberty iname=home iexplain="Wiki Home" iforce="icon"} {tr}Wiki Home{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}index.php">{biticon ipackage=liberty iname=home iexplain="Wiki Home" iforce="icon"} {tr}Wiki Home{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_listPages' ) and $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}list_pages.php">{biticon ipackage=liberty iname=list iexplain="List pages" iforce="icon"} {tr}List pages{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}list_pages.php">{biticon ipackage=liberty iname=list iexplain="List pages" iforce="icon"} {tr}List pages{/tr}</a></li>
{/if}
{if $gBitUser->hasPermission( 'bit_p_edit' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}edit.php">{biticon ipackage=liberty iname=new iexplain="Create page" iforce="icon"} {tr}Create page{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit.php">{biticon ipackage=liberty iname=new iexplain="Create page" iforce="icon"} {tr}Create page{/tr}</a></li>
{/if}
{if $gBitUser->hasPermission( 'bit_p_view' ) and $gBitSystem->isFeatureActive( 'feature_wiki_books' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}books.php">{biticon ipackage=wiki iname=book iexplain="Wiki Books" iforce="icon"} {tr}Wiki Books{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}books.php">{biticon ipackage=wiki iname=book iexplain="Wiki Books" iforce="icon"} {tr}Wiki Books{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_wiki_books' ) && $gBitUser->hasPermission( 'bit_p_edit_books' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}edit_book.php">{biticon ipackage=liberty iname=new iexplain="Create a new book" iforce="icon"} {tr}Create book{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit_book.php">{biticon ipackage=liberty iname=new iexplain="Create a new book" iforce="icon"} {tr}Create book{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_listPages' ) and $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}orphan_pages.php">{biticon ipackage=liberty iname=spacer iexplain="Orphan pages" iforce="icon"} {tr}Orphan pages{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}orphan_pages.php">{biticon ipackage=liberty iname=spacer iexplain="Orphan pages" iforce="icon"} {tr}Orphan pages{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_wiki_multiprint' ) and $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}print_pages.php">{biticon ipackage=liberty iname=print iexplain="Print" iforce="icon"} {tr}Print{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}print_pages.php">{biticon ipackage=liberty iname=print iexplain="Print" iforce="icon"} {tr}Print{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_wiki_rankings' ) and $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}rankings.php">{biticon ipackage=liberty iname=list iexplain="Wiki Rankings" iforce="icon"} {tr}Wiki Rankings{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}rankings.php">{biticon ipackage=liberty iname=list iexplain="Wiki Rankings" iforce="icon"} {tr}Wiki Rankings{/tr}</a></li>
{/if}
{if $gBitUser->hasPermission( 'bit_p_send_pages' ) and $gBitSystem->isFeatureActive( 'feature_comm' )}
- <li><a class="item" href="{$gBitLoc.XMLRPC_PKG_URL}send_objects.php">{biticon ipackage=liberty iname=spacer iexplain="Send pages" iforce="icon"} {tr}Send pages{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.XMLRPC_PKG_URL}send_objects.php">{biticon ipackage=liberty iname=spacer iexplain="Send pages" iforce="icon"} {tr}Send pages{/tr}</a></li>
{/if}
{if $gBitUser->hasPermission( 'bit_p_admin_received_pages' ) and $gBitSystem->isFeatureActive( 'feature_comm' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php">{biticon ipackage=liberty iname=spacer iexplain="Recieved pages" iforce="icon"} {tr}Received pages{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}received_pages.php">{biticon ipackage=liberty iname=spacer iexplain="Recieved pages" iforce="icon"} {tr}Received pages{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_dump' ) and $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.STORAGE_PKG_URL}dump/{$bitdomain}new.tar">{biticon ipackage=liberty iname=save iexplain="Backup" iforce="icon"} {tr}Backup{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.STORAGE_PKG_URL}dump/{$bitdomain}new.tar">{biticon ipackage=liberty iname=save iexplain="Backup" iforce="icon"} {tr}Backup{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_sandbox' ) and $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.WIKI_PKG_URL}edit.php?page=SandBox">{biticon ipackage=liberty iname=spacer iexplain="Sandbox" iforce="icon"} {tr}Sandbox{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit.php?page=SandBox">{biticon ipackage=liberty iname=spacer iexplain="Sandbox" iforce="icon"} {tr}Sandbox{/tr}</a></li>
{/if}
</ul>
{/strip}
diff --git a/templates/menu_wiki_admin.tpl b/templates/menu_wiki_admin.tpl
index 8ff4679..29e41a3 100644
--- a/templates/menu_wiki_admin.tpl
+++ b/templates/menu_wiki_admin.tpl
@@ -1,8 +1,8 @@
{strip}
<ul>
- <li><a class="item" href="{$gBitLoc.KERNEL_PKG_URL}admin/index.php?page=wiki">{tr}Wiki Settings{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=wiki">{tr}Wiki Settings{/tr}</a></li>
{if $gBitSystem->isFeatureActive( 'feature_dump' ) and $gBitUser->hasPermission( 'bit_p_view' )}
- <li><a class="item" href="{$gBitLoc.STORAGE_PKG_URL}dump/{$bitdomain}new.tar">{tr}Backup{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.STORAGE_PKG_URL}dump/{$bitdomain}new.tar">{tr}Backup{/tr}</a></li>
{/if}
</ul>
{/strip}
diff --git a/templates/page.tpl b/templates/page.tpl
index 3beb949..d354378 100644
--- a/templates/page.tpl
+++ b/templates/page.tpl
@@ -1,11 +1,11 @@
{if $type eq 'd'}
- <iframe width="0" height="0" border="0" src="{$gBitLoc.WIKI_PKG_URL}page_loader.php?refresh={$refresh}&amp;title={$title|escape:"url"}">Browser not supported</iframe>
+ <iframe width="0" height="0" border="0" src="{$smarty.const.WIKI_PKG_URL}page_loader.php?refresh={$refresh}&amp;title={$title|escape:"url"}">Browser not supported</iframe>
{/if}
{$parsed}
{if $gBitUser->hasPermission( 'bit_p_edit_html_pages' )}
- <a href="{$gBitLoc.HTML_PKG_URL}admin/admin_html_pages.php?title={$title|escape:"url"}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+ <a href="{$smarty.const.HTML_PKG_URL}admin/admin_html_pages.php?title={$title|escape:"url"}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
{if $type eq 'd'}
- <a href="{$gBitLoc.HTML_PKG_URL}admin/admin_html_page_content.php?title={$title|escape:"url"}">content</a>
+ <a href="{$smarty.const.HTML_PKG_URL}admin/admin_html_page_content.php?title={$title|escape:"url"}">content</a>
{/if}
{/if}
diff --git a/templates/page_action_bar.tpl b/templates/page_action_bar.tpl
index 7232b28..bb30f0d 100644
--- a/templates/page_action_bar.tpl
+++ b/templates/page_action_bar.tpl
@@ -7,10 +7,10 @@
{if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y'}
{if $gBitUser->hasPermission( 'bit_p_edit' ) or $page eq 'SandBox'}
{if $beingEdited eq 'y'}
- {*popup_init src="`$gBitLoc.THEMES_PKG_URL`js/overlib.js"*}
- <li><strong><a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {popup text="$semUser"}>{tr}Edit{/tr}</a></strong></li>
+ {*popup_init src="`$smarty.const.THEMES_PKG_URL`js/overlib.js"*}
+ <li><strong><a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {popup text="$semUser"}>{tr}Edit{/tr}</a></strong></li>
{else}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}">{tr}Edit{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}">{tr}Edit{/tr}</a></li>
{/if}
{/if}
{/if}
@@ -18,36 +18,36 @@
{if $page ne 'SandBox'}
{if $gBitUser->hasPermission( 'bit_p_admin_wiki' ) or ($gBitUser->mUserId and ($gBitUser->mUserId eq $pageInfo.modifier_user_id) and ($gBitUser->hasPermission( 'bit_p_lock' )) and ($gBitSystem->isFeatureActive( 'feature_wiki_usrlock' )))}
{if $lock}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=unlock">{tr}Unlock{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=unlock">{tr}Unlock{/tr}</a></li>
{else}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=lock">{tr}Lock{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;action=lock">{tr}Lock{/tr}</a></li>
{/if}
{/if}
{if $gBitUser->hasPermission( 'bit_p_admin_wiki' )}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}page_permissions.php?page_id={$pageInfo.page_id}">{tr}Permissions{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}page_permissions.php?page_id={$pageInfo.page_id}">{tr}Permissions{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_history' )}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}page_history.php?page_id={$pageInfo.page_id}">{tr}History{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}page_history.php?page_id={$pageInfo.page_id}">{tr}History{/tr}</a></li>
{/if}
{/if}
{if $gBitSystem->isFeatureActive( 'feature_likePages' )}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}like_pages.php?page_id={$pageInfo.page_id}">{tr}Similar{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}like_pages.php?page_id={$pageInfo.page_id}">{tr}Similar{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_wiki_undo' ) and $canundo eq 'y'}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;undo=1">{tr}Undo{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;undo=1">{tr}Undo{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'wiki_uses_slides' )}
{if $show_slideshow eq 'y'}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}slideshow.php?page_id={$pageInfo.page_id}">{tr}Slides{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}slideshow.php?page_id={$pageInfo.page_id}">{tr}Slides{/tr}</a></li>
{elseif $structure eq 'y'}
<li><a href="slideshow2.php?structure_id={$page_info.structure_id}">{tr}Slides{/tr}</a></li>
{/if}
{/if}
{if $gBitUser->hasPermission( 'bit_p_admin_wiki' )}
- <li><a href="{$gBitLoc.WIKI_PKG_URL}export_wiki_pages.php?page_id={$pageInfo.page_id}">{tr}Export{/tr}</a></li>
+ <li><a href="{$smarty.const.WIKI_PKG_URL}export_wiki_pages.php?page_id={$pageInfo.page_id}">{tr}Export{/tr}</a></li>
{/if}
{if $gBitSystem->isFeatureActive( 'feature_wiki_discuss' )}
- <li><a href="{$gBitLoc.BITFORUMS_PKG_URL}view_forum.php?forum_id={$wiki_forum_id}&amp;comments_postComment=post&amp;comments_title={$page|escape:"url"}&amp;comments_data={ "Use this thread to discuss the [index.php\?page=$page|$page page."|escape:"url"}&amp;comment_topictype=n">{tr}Discuss{/tr}</a></li>
+ <li><a href="{$smarty.const.BITFORUMS_PKG_URL}view_forum.php?forum_id={$wiki_forum_id}&amp;comments_postComment=post&amp;comments_title={$page|escape:"url"}&amp;comments_data={ "Use this thread to discuss the [index.php\?page=$page|$page page."|escape:"url"}&amp;comment_topictype=n">{tr}Discuss{/tr}</a></li>
{/if}
{/if}
</ul>
diff --git a/templates/page_date_bar.tpl b/templates/page_date_bar.tpl
index 1c24fe8..2795f6c 100644
--- a/templates/page_date_bar.tpl
+++ b/templates/page_date_bar.tpl
@@ -1,3 +1,3 @@
<div class="date">
- {tr}Created by{/tr} {displayname user=$pageInfo.creator_user user_id=$pageInfo.creator_user_id real_name=$pageInfo.creator_real_name}, {tr}Last modification by{/tr} {displayname user=$pageInfo.modifier_user user_id=$pageInfo.modifier_user_id real_name=$pageInfo.modifier_real_name} on {$pageInfo.last_modified|bit_short_datetime}
+ {tr}Created by {displayname user=$pageInfo.creator_user user_id=$pageInfo.creator_user_id real_name=$pageInfo.creator_real_name}, Last modification by {displayname user=$pageInfo.modifier_user user_id=$pageInfo.modifier_user_id real_name=$pageInfo.modifier_real_name} on {$pageInfo.last_modified|bit_short_datetime}{/tr}
</div>
diff --git a/templates/page_display.tpl b/templates/page_display.tpl
index 785f3ae..7b5958a 100644
--- a/templates/page_display.tpl
+++ b/templates/page_display.tpl
@@ -1,5 +1,5 @@
{strip}
-<div class="body"{if $user_dbl eq 'y' and $dblclickedit eq 'y' and $gBitUser->hasPermission( 'bit_p_edit' )} ondblclick="location.href='{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}';"{/if}>
+<div class="body"{if $user_dbl eq 'y' and $dblclickedit eq 'y' and $gBitUser->hasPermission( 'bit_p_edit' )} ondblclick="location.href='{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}';"{/if}>
<div class="content">
{if $gBitSystem->isFeatureActive( 'liberty_auto_display_attachment_thumbs' )}
{include file="bitpackage:liberty/storage_thumbs.tpl"}
diff --git a/templates/page_icons.tpl b/templates/page_icons.tpl
index f5587b8..a7bd839 100644
--- a/templates/page_icons.tpl
+++ b/templates/page_icons.tpl
@@ -5,7 +5,7 @@
<select name="page" onchange="go(this)">
<option value="">{tr}Wiki Books{/tr}...</option>
{section name=struct loop=$showstructs}
- <option value="{$gBitLoc.WIKI_PKG_URL}index.php?structure_id={$showstructs[struct].structure_id}">
+ <option value="{$smarty.const.WIKI_PKG_URL}index.php?structure_id={$showstructs[struct].structure_id}">
{$showstructs[struct].root_title}
</option>
{/section}
@@ -18,7 +18,7 @@
{assign var=format_guid value=$pageInfo.format_guid}
{if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y'}
{if $gBitUser->hasPermission( 'bit_p_edit' ) or $page eq 'SandBox'}
- <a href="{$gBitLoc.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {if $beingEdited eq 'y'}{*popup_init src="`$gBitLoc.THEMES_PKG_URL`js/overlib.js"*}{popup text="$semUser" width="-1"}{/if}>{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$pageInfo.page_id}" {if $beingEdited eq 'y'}{*popup_init src="`$smarty.const.THEMES_PKG_URL`js/overlib.js"*}{popup text="$semUser" width="-1"}{/if}>{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
{/if}
{/if}
{/if}
@@ -26,51 +26,51 @@
{if $gBitSystem->isPackageActive( 'stickies' ) && $gBitUser->hasPermission('bit_p_stickies_edit') }
{if ($structureInfo.structure_id)}{assign var='stickyRequest' value="structure_id=`$structureInfo.structure_id`"}
{else}{assign var='stickyRequest' value="notated_content_id=`$pageInfo.content_id`"}{/if}
- <a href="{$gBitLoc.STICKIES_PKG_URL}edit.php?{$stickyRequest}">{biticon ipackage=stickies iname="sticky_note" iexplain="add sticky note"}</a>
+ <a href="{$smarty.const.STICKIES_PKG_URL}edit.php?{$stickyRequest}">{biticon ipackage=stickies iname="sticky_note" iexplain="add sticky note"}</a>
{/if}
{if ($structureInfo.structure_id) && (($gStructure->mInfo.creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'bit_p_admin_books' )) }
- <a href="{$gBitLoc.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{biticon ipackage=liberty iname="settings" iexplain="edit book"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{biticon ipackage=liberty iname="settings" iexplain="edit book"}</a>
{/if}
{if $gBitSystem->isFeatureActive( 'wiki_uses_s5' )}
- <a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;s5=1" onclick="return confirm('this works best in gecko based browsers (mozilla, firefox) or opera (press F11)')">{biticon ipackage=wiki iname="s5" iexplain="s5 slideshow"}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;s5=1" onclick="return confirm('this works best in gecko based browsers (mozilla, firefox) or opera (press F11)')">{biticon ipackage=wiki iname="s5" iexplain="s5 slideshow"}</a>
{/if}
{if $cached_page eq 'y'}
- <a title="{tr}refresh{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;refresh=1">{biticon ipackage=liberty iname="refresh" iexplain="refresh"}</a>
+ <a title="{tr}refresh{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;refresh=1">{biticon ipackage=liberty iname="refresh" iexplain="refresh"}</a>
{/if}
{if $gBitUser->hasPermission( 'bit_p_print' )}
- <a title="{tr}print{/tr}" style="display:none;" href="{$gBitLoc.WIKI_PKG_URL}print.php?{if $structureInfo.root_structure_id}structure_id={$structureInfo.root_structure_id}{else}page_id={$pageInfo.page_id}{/if}">{biticon ipackage=liberty iname="print" iexplain="print"}</a>
+ <a title="{tr}print{/tr}" style="display:none;" href="{$smarty.const.WIKI_PKG_URL}print.php?{if $structureInfo.root_structure_id}structure_id={$structureInfo.root_structure_id}{else}page_id={$pageInfo.page_id}{/if}">{biticon ipackage=liberty iname="print" iexplain="print"}</a>
{/if}
{if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'bit_p_pdf_generation' )}
{if $structureInfo.root_structure_id}
- <a title="{tr}create PDF{/tr}" href="{$gBitLoc.PDF_PKG_URL}?structure_id={$structureInfo.root_structure_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
+ <a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}?structure_id={$structureInfo.root_structure_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
{else}
- <a title="{tr}create PDF{/tr}" href="{$gBitLoc.PDF_PKG_URL}?content_id={$pageInfo.content_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
+ <a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}?content_id={$pageInfo.content_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
{/if}
{/if}
{if $user and $gBitSystem->isPackageActive( 'notepad' ) and $gBitUser->hasPermission( 'bit_p_notepad' )}
- <a title="{tr}Save{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;savenotepad=1">{biticon ipackage="wiki" iname="save" iexplain="save"}</a>
+ <a title="{tr}Save{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;savenotepad=1">{biticon ipackage="wiki" iname="save" iexplain="save"}</a>
{/if}
{if $gBitUser->isRegistered() and $gBitUser->mUserId && $gBitSystem->isFeatureActive( 'feature_user_watches' ) }
{if $user_watching_page eq 'y'}
- <a title="{tr}stop monitoring this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=remove">{biticon ipackage="users" iname="unwatch" iexplain="stop monitoring"}</a>
+ <a title="{tr}stop monitoring this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=remove">{biticon ipackage="users" iname="unwatch" iexplain="stop monitoring"}</a>
{else}
- <a title="{tr}monitor this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=add">{biticon ipackage="users" iname="watch" iexplain="monitor"}</a>
+ <a title="{tr}monitor this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$pageInfo.page_id}&amp;watch_action=add">{biticon ipackage="users" iname="watch" iexplain="monitor"}</a>
{/if}
{/if}
{if $pageInfo.title ne 'SandBox'}
{if $gBitUser->hasPermission( 'bit_p_remove' )}
- <a title="{tr}remove this page{/tr}" href="{$gBitLoc.WIKI_PKG_URL}remove_page.php?page_id={$pageInfo.page_id}&amp;version=last">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
+ <a title="{tr}remove this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}remove_page.php?page_id={$pageInfo.page_id}&amp;version=last">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
{/if}
{/if}
{if $gBitSystem->isFeatureActive( 'feature_backlinks' ) and $backlinks}
<select name="page" onchange="go(this)">
- <option value="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}">{tr}backlinks{/tr}...</option>
+ <option value="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$pageInfo.page_id}">{tr}backlinks{/tr}...</option>
{foreach key=contentId item=backPage from=$backlinks}
- <option value="{$gBitLoc.BIT_ROOT_URL}index.php?content_id={$contentId}">{$backPage|truncate:30:"...":true}</option>
+ <option value="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$contentId}">{$backPage|truncate:30:"...":true}</option>
{/foreach}
</select>
{/if}
diff --git a/templates/page_permissions.tpl b/templates/page_permissions.tpl
index 278aba2..32396a7 100644
--- a/templates/page_permissions.tpl
+++ b/templates/page_permissions.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_permissions.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_permissions.tpl,v 1.2 2005/08/07 17:46:51 squareing Exp $ *}
{strip}
<div class="floaticon">{bithelp}</div>
@@ -53,7 +53,7 @@
<tr class="{cycle values="even,odd"}">
<td>{$page_perms[pg].group_name}</td>
<td>{$page_perms[pg].perm_name}</td>
- <td class="actionicon"><a href="{$gBitLoc.WIKI_PKG_URL}page_permissions.php?action=remove&amp;content_id={$gContent->mContentId}&amp;object_type={$gContent->mInfo.content_type_guid}&amp;perm={$page_perms[pg].perm_name}&amp;group_id={$page_perms[pg].group_id}">{biticon ipackage=liberty iname="delete" iexplain="remove from this page"}</a></td>
+ <td class="actionicon"><a href="{$smarty.const.WIKI_PKG_URL}page_permissions.php?action=remove&amp;content_id={$gContent->mContentId}&amp;object_type={$gContent->mInfo.content_type_guid}&amp;perm={$page_perms[pg].perm_name}&amp;group_id={$page_perms[pg].group_id}">{biticon ipackage=liberty iname="delete" iexplain="remove from this page"}</a></td>
</tr>
{sectionelse}
<tr class="norecords">
@@ -88,7 +88,7 @@
<h2>{tr}Existing requests for email notification{/tr}</h2>
<ul>
{section name=ix loop=$emails}
- <li>{$emails[ix]} <a href="{$gBitLoc.WIKI_PKG_URL}page_permissions.php?page_id={$pageInfo.page_id}&amp;removeemail={$emails[ix]}&amp;tab=email">{biticon ipackage=liberty iname="delete_small" iexplain="delete"}</a></li>
+ <li>{$emails[ix]} <a href="{$smarty.const.WIKI_PKG_URL}page_permissions.php?page_id={$pageInfo.page_id}&amp;removeemail={$emails[ix]}&amp;tab=email">{biticon ipackage=liberty iname="delete_small" iexplain="delete"}</a></li>
{/section}
</ul>
{/if}
diff --git a/templates/page_select.tpl b/templates/page_select.tpl
index d93153a..098da99 100644
--- a/templates/page_select.tpl
+++ b/templates/page_select.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_select.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_select.tpl,v 1.2 2005/08/07 17:46:51 squareing Exp $ *}
<div class="header">
<h1>Multiple pages match "{$choose}"</h1>
@@ -7,7 +7,7 @@
<ul class="data">
{foreach name=loc key=key item=item from=$dupePages}
<li class="item {cycle values='even,odd'}">
- <h3><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page_id={$item.page_id}">{$item.title}</a></h3>
+ <h3><a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$item.page_id}">{$item.title}</a></h3>
{if $item.description}{$item.description}<br/>{/if}
{tr}Last Modified{/tr}: {$item.last_modified|bit_long_datetime}
</li>
diff --git a/templates/print_pages.tpl b/templates/print_pages.tpl
index 926decf..2995747 100644
--- a/templates/print_pages.tpl
+++ b/templates/print_pages.tpl
@@ -59,7 +59,7 @@
<div class="other box">
<div class="boxtitle">{tr}Filter{/tr}</div>
<div class="boxcontent">
- <form action="{$gBitLoc.WIKI_PKG_URL}print_pages.php" method="post">
+ <form action="{$smarty.const.WIKI_PKG_URL}print_pages.php" method="post">
<input type="hidden" name="sendarticles" value="{$form_sendarticles|escape}" />
<input type="hidden" name="printpages" value="{$form_printpages|escape}" />
{tr}Filter{/tr}:&nbsp;<input type="text" name="find" value="{$find|escape}" />&nbsp;<input type="submit" name="filter" value="{tr}filter{/tr}" /><br />
@@ -70,7 +70,7 @@
<div class="other box">
<div class="boxtitle">{tr}Print Wiki Pages{/tr}</div>
<div class="boxcontent">
- <form action="{$gBitLoc.WIKI_PKG_URL}print_pages.php" method="post">
+ <form action="{$smarty.const.WIKI_PKG_URL}print_pages.php" method="post">
<input type="hidden" name="printpages" value="{$form_printpages|escape}" />
<input type="hidden" name="find" value="{$find|escape}" />
<select name="title">
@@ -93,7 +93,7 @@
</div>
<div class="boxcontent">
- <form method="post" action="{$gBitLoc.WIKI_PKG_URL}print_multi_pages.php">
+ <form method="post" action="{$smarty.const.WIKI_PKG_URL}print_multi_pages.php">
<input type="hidden" name="printpages" value="{$form_printpages|escape}" />
<input type="submit" name="print" value="{tr}print{/tr}" />
</form>
diff --git a/templates/received_pages.tpl b/templates/received_pages.tpl
index 228d85e..814cca4 100644
--- a/templates/received_pages.tpl
+++ b/templates/received_pages.tpl
@@ -13,7 +13,7 @@
{/if}
{if $received_page_id > 0}
<h2>{tr}Edit received page{/tr}</h2>
-<form action="{$gBitLoc.WIKI_PKG_URL}received_pages.php" method="post">
+<form action="{$smarty.const.WIKI_PKG_URL}received_pages.php" method="post">
<input type="hidden" name="received_page_id" value="{$received_page_id|escape}" />
<table class="panel">
<tr><td>
@@ -36,7 +36,7 @@
<table class="find">
<tr><td>{tr}Find{/tr}</td>
<td>
- <form method="get" action="{$gBitLoc.WIKI_PKG_URL}received_pages.php">
+ <form method="get" action="{$smarty.const.WIKI_PKG_URL}received_pages.php">
<input type="text" name="find" />
<input type="submit" name="search" value="{tr}find{/tr}" />
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
@@ -47,11 +47,11 @@
<table class="data">
<tr>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_page_id_desc'}received_page_id_asc{else}received_page_id_desc{/if}">{tr}ID{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}name{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_date_desc'}received_date_asc{else}received_date_desc{/if}">{tr}Date{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_site_desc'}received_from_site_asc{else}received_from_site_desc{/if}">{tr}Site{/tr}</a></th>
-<th><a href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_user_desc'}received_from_user_asc{else}received_from_user_desc{/if}">{tr}User{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_page_id_desc'}received_page_id_asc{else}received_page_id_desc{/if}">{tr}ID{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}name{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_date_desc'}received_date_asc{else}received_date_desc{/if}">{tr}Date{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_site_desc'}received_from_site_asc{else}received_from_site_desc{/if}">{tr}Site{/tr}</a></th>
+<th><a href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'received_from_user_desc'}received_from_user_asc{else}received_from_user_desc{/if}">{tr}User{/tr}</a></th>
<th>{tr}action{/tr}</th>
</tr>
{cycle values="even,odd" print=false}
@@ -67,10 +67,10 @@
<td>{$channels[user].received_from_site}</td>
<td>{$channels[user].received_from_user}</td>
<td>
- <a title="{tr}edit{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;received_page_id={$channels[user].received_page_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
- <a title="{tr}view{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;view={$channels[user].received_page_id}">{biticon ipackage=liberty iname="view" iexplain="view"}</a>
- <a title="{tr}accept{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;accept={$channels[user].received_page_id}">{biticon ipackage=liberty iname="accept" iexplain="accept"}</a>
- <a title="{tr}remove{/tr}" href="{$gBitLoc.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].received_page_id}">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
+ <a title="{tr}edit{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;received_page_id={$channels[user].received_page_id}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+ <a title="{tr}view{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;view={$channels[user].received_page_id}">{biticon ipackage=liberty iname="view" iexplain="view"}</a>
+ <a title="{tr}accept{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;accept={$channels[user].received_page_id}">{biticon ipackage=liberty iname="accept" iexplain="accept"}</a>
+ <a title="{tr}remove{/tr}" href="{$smarty.const.WIKI_PKG_URL}received_pages.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].received_page_id}">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
</td>
</tr>
{sectionelse}
diff --git a/templates/rename_page.tpl b/templates/rename_page.tpl
index 8183ec6..dd2a216 100644
--- a/templates/rename_page.tpl
+++ b/templates/rename_page.tpl
@@ -4,7 +4,7 @@
</div>
<div class="body">
-<form action="{$gBitLoc.WIKI_PKG_URL}rename_page.php" method="post">
+<form action="{$smarty.const.WIKI_PKG_URL}rename_page.php" method="post">
<input type="hidden" name="oldpage" value="{$page|escape}" />
<input type="hidden" name="page" value="{$page|escape}" />
<table class="panel">
diff --git a/templates/rollback.tpl b/templates/rollback.tpl
index 801a447..fcf41a3 100644
--- a/templates/rollback.tpl
+++ b/templates/rollback.tpl
@@ -1,7 +1,7 @@
<h2>{tr}Rollback page{/tr}: {$pageInfo.title} {tr}to_version{/tr}: {$version}</h2>
<div class="wikibody">{$preview.data}</div>
<div align="center">
-<form action="{$gBitLoc.WIKI_PKG_URL}rollback.php" method="post">
+<form action="{$smarty.const.WIKI_PKG_URL}rollback.php" method="post">
<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
<input type="hidden" name="version" value="{$version|escape}" />
<input type="submit" name="rollback" value="{tr}rollback{/tr}" />
diff --git a/templates/s5.tpl b/templates/s5.tpl
index d1f62ae..61bc60f 100644
--- a/templates/s5.tpl
+++ b/templates/s5.tpl
@@ -9,10 +9,10 @@
<meta name="presdate" content="20041007" />
<meta name="author" content="{displayname user_id=`$gContent->mInfo.user_id` nolink='yes'}" />
<meta name="company" content="" />
- <link rel="stylesheet" href="{$gBitLoc.THEMES_PKG_URL}s5/i18n/slides.css" type="text/css" media="projection" id="slideProj" />
- <link rel="stylesheet" href="{$gBitLoc.THEMES_PKG_URL}s5/i18n/print.css" type="text/css" media="print" id="slidePrint" />
- <link rel="stylesheet" href="{$gBitLoc.THEMES_PKG_URL}s5/opera.css" type="text/css" media="projection" id="operaFix" />
- <script src="{$gBitLoc.THEMES_PKG_URL}s5/slides.js" type="text/javascript"></script>
+ <link rel="stylesheet" href="{$smarty.const.THEMES_PKG_URL}s5/i18n/slides.css" type="text/css" media="projection" id="slideProj" />
+ <link rel="stylesheet" href="{$smarty.const.THEMES_PKG_URL}s5/i18n/print.css" type="text/css" media="print" id="slidePrint" />
+ <link rel="stylesheet" href="{$smarty.const.THEMES_PKG_URL}s5/opera.css" type="text/css" media="projection" id="operaFix" />
+ <script src="{$smarty.const.THEMES_PKG_URL}s5/slides.js" type="text/javascript"></script>
</head>
<body>
<div class="layout">
diff --git a/templates/show_page.tpl b/templates/show_page.tpl
index 4d46e11..f6486fa 100644
--- a/templates/show_page.tpl
+++ b/templates/show_page.tpl
@@ -42,7 +42,7 @@
{tr}The content on this page is licensed under the terms of the{/tr} <a href="{$wikiLicensePage}"><b>{tr}{$wikiSubmitNotice}{/tr}</b></a>.
{/if}
{if $gBitUser->hasPermission( 'bit_p_edit_copyrights' )}
- <br />{tr}To edit the copyright notices{/tr} <a href="{$gBitSystem.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}">{tr}click here{/tr}</a>.
+ <br />{tr}To edit the copyright notices{/tr} <a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}">{tr}click here{/tr}</a>.
{/if}
</p>
{/if}
@@ -50,17 +50,16 @@
{if $print_page ne 'y'}
{include file="bitpackage:wiki/page_action_bar.tpl"}
{/if}
-
- {if $gBitSystem->isPackageActive( 'pigeonholes' )}
- {include file="bitpackage:pigeonholes/display_members.tpl"}
- {/if}
-
- {if $gBitSystem->isPackageActive( 'categories' )}
- {include file="bitpackage:categories/categories_objects.tpl"}
- {/if}
</div><!-- end .wiki -->
{if $comments_at_top_of_page ne 'y' and $print_page ne 'y' and $feature_wiki_comments eq 'y' }
{include file="bitpackage:liberty/comments.tpl"}
{/if}
+{if $gBitSystem->isPackageActive( 'pigeonholes' )}
+ {include file="bitpackage:pigeonholes/display_members.tpl"}
+{/if}
+
+{if $gBitSystem->isPackageActive( 'categories' )}
+ {include file="bitpackage:categories/categories_objects.tpl"}
+{/if}
diff --git a/templates/slideshow.tpl b/templates/slideshow.tpl
index fdc006a..55a44f0 100644
--- a/templates/slideshow.tpl
+++ b/templates/slideshow.tpl
@@ -5,9 +5,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css">
<!--
- @import url({$gBitLoc.THEMES_PKG_URL}base.css);
- @import url({$gBitLoc.THEMES_PKG_URL}styles/{$slide_style}/{$slide_style}.css);
- @import url({$gBitLoc.THEMES_PKG_URL}styles/{$slide_style}/slideshow.css);
+ @import url({$smarty.const.THEMES_PKG_URL}base.css);
+ @import url({$smarty.const.THEMES_PKG_URL}styles/{$slide_style}/{$slide_style}.css);
+ @import url({$smarty.const.THEMES_PKG_URL}styles/{$slide_style}/slideshow.css);
-->
</style>
<title>{$page_info.pageName}</title>
@@ -29,18 +29,18 @@
<tr class="navigation">
{if $structure eq 'y'}
<td width="33%" align="left">
- <a href="{$gBitLoc.WIKI_PKG_URL}slideshow2.php?structure_id={$prev_info.structure_id}">{$prev_info.pageName}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}slideshow2.php?structure_id={$prev_info.structure_id}">{$prev_info.pageName}</a>
</td>
<td width="34%" align="center">
- <a href="{$gBitLoc.WIKI_PKG_URL}slideshow2.php?structure_id={$home_info.structure_id}">{$home_info.pageName}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}slideshow2.php?structure_id={$home_info.structure_id}">{$home_info.pageName}</a>
</td>
<td width="33%" align="right">
- <a href="{$gBitLoc.WIKI_PKG_URL}slideshow2.php?structure_id={$next_info.structure_id}">{$next_info.pageName}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}slideshow2.php?structure_id={$next_info.structure_id}">{$next_info.pageName}</a>
</td>
{else}
<td width="33%" align="left">
{if $slide_prev_title}
- <a href="{$gBitLoc.WIKI_PKG_URL}slideshow.php?page={$page}&amp;slide={$prev_slide}">{$slide_prev_title}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}slideshow.php?page={$page}&amp;slide={$prev_slide}">{$slide_prev_title}</a>
{else}
&nbsp;
{/if}
@@ -50,9 +50,9 @@
</td>
<td width="33%" align="right">
{if $slide_next_title}
- <a href="{$gBitLoc.WIKI_PKG_URL}slideshow.php?page={$page}&amp;slide={$next_slide}">{$slide_next_title}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}slideshow.php?page={$page}&amp;slide={$next_slide}">{$slide_next_title}</a>
{else}
- <a href="{$gBitLoc.WIKI_PKG_URL}index.php?page={$page_info.pageName}" title="{tr}back to{/tr} {$page_info.pageName}">{$page_info.pageName}</a>
+ <a href="{$smarty.const.WIKI_PKG_URL}index.php?page={$page_info.pageName}" title="{tr}back to{/tr} {$page_info.pageName}">{$page_info.pageName}</a>
{/if}
</td>
{/if}
diff --git a/templates/user_watch_wiki_page_changed.tpl b/templates/user_watch_wiki_page_changed.tpl
index dab62bd..59db5f1 100644
--- a/templates/user_watch_wiki_page_changed.tpl
+++ b/templates/user_watch_wiki_page_changed.tpl
@@ -1,12 +1,24 @@
-{tr}The page {$mail_page} was changed by {$mail_user} at {$mail_date|bit_short_datetime}{/tr}
-{tr}You can edit the page following this link:{/tr}
-{$mail_machine}?page={$mail_page|escape:"url"}
+{tr}The page {$mail_page} was changed at {$mail_date|bit_short_datetime}{/tr} by {$mail_user}
+
+{tr}You can view the page by following this link:
+ {$mail_machine}{$smarty.const.WIKI_PKG_URL}index.php?page={$mail_page|escape:"url"}{/tr}
+
+
+{tr}You can edit the page by following this link:
+ {$mail_machine}{$smarty.const.WIKI_PKG_URL}edit.php?page={$mail_page|escape:"url"}{/tr}
+
+
+{tr}You can view a diff back to the previous version by following
+this link:
+ {$mail_machine}{$smarty.const.WIKI_PKG_URL}page_history.php?page={$mail_page|escape:"url"}&diff2={$mail_last_version}{/tr}
+
+
{tr}Comment:{/tr} {$mail_comment}
-{tr}Diff:{/tr} {$mail_machine_raw}/{$gBitLoc.WIKI_PKG_URL}pagehistory.php?page={$mail_page|escape:"url"}&diff2={$mail_last_version}
-{tr}If you don't want to receive these notifications follow this link:{/tr}
-{$mail_machine_raw}/{$gBitLoc.USERS_PKG_URL}user_watches.php?hash={$mail_hash}
+{tr}The new page content follows below.{/tr}
+
+***********************************************************
-{tr}The new page content is:{/tr}
{$mail_pagedata}
+
diff --git a/templates/user_watch_wiki_page_comment.tpl b/templates/user_watch_wiki_page_comment.tpl
index 5dbc700..65ee787 100644
--- a/templates/user_watch_wiki_page_comment.tpl
+++ b/templates/user_watch_wiki_page_comment.tpl
@@ -6,4 +6,4 @@
{tr}Comment:{/tr} {$mail_comment}
{tr}If you don't want to receive these notifications follow this link:{/tr}
-{$mail_machine_raw}/{$gBitLoc.USERS_PKG_URL}user_watches.php?hash={$mail_hash}
+{$mail_machine_raw}/{$smarty.const.USERS_PKG_URL}user_watches.php?hash={$mail_hash}
diff --git a/templates/wiki_change_notification.tpl b/templates/wiki_change_notification.tpl
index c510062..64fb040 100644
--- a/templates/wiki_change_notification.tpl
+++ b/templates/wiki_change_notification.tpl
@@ -3,16 +3,16 @@
{tr}You can view the page by following this link:
- {$mail_machine}/{$gBitLoc.WIKI_PKG_URL}index.php?page={$mail_page|escape:"url"}{/tr}
+ {$mail_machine}{$smarty.const.WIKI_PKG_URL}index.php?page={$mail_page|escape:"url"}{/tr}
{tr}You can edit the page by following this link:
- {$mail_machine}/{$gBitLoc.WIKI_PKG_URL}edit.php?page={$mail_page|escape:"url"}{/tr}
+ {$mail_machine}{$smarty.const.WIKI_PKG_URL}edit.php?page={$mail_page|escape:"url"}{/tr}
{tr}You can view a diff back to the previous version by following
this link:
- {$mail_machine}/{$gBitLoc.WIKI_PKG_URL}page_history.php?page={$mail_page|escape:"url"}&amp;diff2={$mail_last_version}{/tr}
+ {$mail_machine}{$smarty.const.WIKI_PKG_URL}page_history.php?page={$mail_page|escape:"url"}&diff2={$mail_last_version}{/tr}
{tr}Comment:{/tr} {$mail_comment}