summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorspiderr <spiderr@bitweaver.org>2018-09-05 23:43:20 -0400
committerspiderr <spiderr@bitweaver.org>2018-09-05 23:43:20 -0400
commit717e652e7fb52d997c442d55823071b95a61ae58 (patch)
tree5a1c6e342698abf73c2602292c49f175ccbdc1d7 /templates
parent8a9a0a1aa93e04e75701078cea821e52ba190d54 (diff)
downloadkernel-717e652e7fb52d997c442d55823071b95a61ae58.tar.gz
kernel-717e652e7fb52d997c442d55823071b95a61ae58.tar.bz2
kernel-717e652e7fb52d997c442d55823071b95a61ae58.zip
add support for <link rel=prev/next> in <head> in with pagination
Diffstat (limited to 'templates')
-rw-r--r--templates/html_head_inc.tpl3
-rw-r--r--templates/pagination.tpl40
2 files changed, 23 insertions, 20 deletions
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 5da7235..f26955f 100644
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -21,6 +21,9 @@
{if $canonicalLink}
<link rel="canonical" href="{$canonicalLink|escape}"/>
{/if}
+{if $relTags}
+{$relTags}
+{/if}
{if $gBitSystem->isIndexed()}
<meta name="robots" content="index,follow">
{else}
diff --git a/templates/pagination.tpl b/templates/pagination.tpl
index 3e834eb..75b1b64 100644
--- a/templates/pagination.tpl
+++ b/templates/pagination.tpl
@@ -1,43 +1,43 @@
{strip}
{if $listInfo.query_string}
- {assign var=pageUrl value="`$smarty.server.SCRIPT_NAME`?`$listInfo.query_string`"}
+ {assign var=pageUrl value="`$smarty.server.SCRIPT_NAME`?`$listInfo.query_string`&amp;"}
{else}
{capture name=string}
{foreach from=$listInfo.parameters key=param item=value}
{if $value|is_array}
- {foreach from=$value item=v}{if $value ne ''}&amp;{$param}[]={$v}{/if}{/foreach}
+ {foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
{else}
- {if $value ne ''}&amp;{$param}={$value}{/if}
+ {if $value ne ''}{$param}={$value}&amp;{/if}
{/if}
{/foreach}
{foreach from=$listInfo.ihash key=param item=value}
{if $value|is_array}
- {foreach from=$value item=v}{if $value ne ''}&amp;{$param}[]={$v}{/if}{/foreach}
+ {foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
{else}
- {if $value ne ''}&amp;{$param}={$value}{/if}
+ {if $value ne ''}{$param}={$value}&amp;{/if}
{/if}
{/foreach}
{foreach from=$pgnHidden key=param item=value}
{if $value|is_array}
- {foreach from=$value item=v}{if $value ne ''}&amp;{$param}[]={$v}{/if}{/foreach}
+ {foreach from=$value item=v}{if $value ne ''}{$param}[]={$v}&amp;{/if}{/foreach}
{else}
- {if $value ne ''}&amp;{$param}={$value}{/if}
+ {if $value ne ''}{$param}={$value}&amp;{/if}
{/if}
{/foreach}
- {if $listInfo.sort_mode}
+ {*if $listInfo.sort_mode}
{if is_array($listInfo.sort_mode)}
{foreach from=$listInfo.sort_mode item=sort}
- &amp;sort_mode[]={$sort}
+ sort_mode[]={$sort}&amp;
{/foreach}
{else}
- &amp;sort_mode={$listInfo.sort_mode}
+ sort_mode={$listInfo.sort_mode}&amp;
{/if}
- {/if}
+ {/if*}
{if isset($listInfo.find) && $listInfo.find ne ''}
- &amp;find={$listInfo.find}
+ find={$listInfo.find}&amp;
{/if}
{/capture}
- {assign var=pageUrlVar value=$smarty.capture.string|regex_replace:"/^\&amp;/":""|regex_replace:'/"/':'%22'}
+ {assign var=pageUrlVar value=$smarty.capture.string|regex_replace:'/"/':'%22'}
{assign var=pageUrl value="`$pgnUrl`?`$pageUrlVar`"}
{/if}
{if $listInfo.total_pages > 1 && $listInfo.page_records}
@@ -45,7 +45,7 @@
<ul class="pagination pull-left">
{if $listInfo.current_page > 1}
{assign var=blockStart value=1}
- <li>{tr}<a href="{$pageUrl}&amp;page={$listInfo.current_page-1}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">&laquo;</a>{/tr}</li>
+ <li>{tr}<a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page-1}">&laquo;</a>{/tr}</li>
{/if}
{if $listInfo.current_page-$listInfo.block_pages > 0}
{assign var=blockStart value=$listInfo.current_page-$listInfo.block_pages}
@@ -53,27 +53,27 @@
{assign var=blockStart value=1}
{/if}
{if $blockStart > 1}
- <li><a href="{$pageUrl}&amp;page=1&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">1</a></li>
- <li><a href="{$pageUrl}&amp;page={$listInfo.current_page-$listInfo.block_pages}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">...</a></li>
+ <li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page=1">1</a></li>
+ <li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page-$listInfo.block_pages}">...</a></li>
{/if}
{section name=current_page start=$blockStart loop=$blockStart+$listInfo.block_pages*2+1}
{if $smarty.section.current_page.index <= $listInfo.total_pages}
{if $smarty.section.current_page.index != $listInfo.current_page}
- <li><a href="{$pageUrl}&amp;page={$smarty.section.current_page.index}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">{$smarty.section.current_page.index}</a></li>
+ <li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$smarty.section.current_page.index}">{$smarty.section.current_page.index}</a></li>
{else}
<li class="active"><span>{$listInfo.current_page}</span></li>
{/if}
{/if}
{/section}
{if $blockStart+$listInfo.block_pages*2 < $listInfo.total_pages}
- <li><a href="{$pageUrl}&amp;page={$listInfo.current_page+1}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">...</a></li>
- <li><a href="{$pageUrl}&amp;page={$listInfo.total_pages}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">{$listInfo.total_pages}</a></li>
+ <li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page+1}">...</a></li>
+ <li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.total_pages}">{$listInfo.total_pages}</a></li>
{/if}
{if $listInfo.current_page < $listInfo.total_pages}
- <li><a href="{$pageUrl}&amp;page={$listInfo.current_page+1}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">&raquo;</a></li>
+ <li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page+1}">&raquo;</a></li>
{/if}
</ul>
<div class="pagination pull-right">