mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Issue #2032 May fix some pagination issues.

Browse Source
This commit is contained in:
Cameron
2017-02-06 10:50:19 -08:00
parent 4b3317ad18
commit e14a470951
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_core/shortcodes/single/nextprev.php
View File

@@ -68,7 +68,7 @@ function nextprev_shortcode($parm = '')
* New parameter requirements formatted as a GET string. * New parameter requirements formatted as a GET string.
* Template support. * Template support.
*/ */
if(is_string($parm) && strpos($parm, 'total=') !== false) if(strpos($parm, 'total=') !== false)
{ {
parse_str($parm, $parm); parse_str($parm, $parm);
@@ -363,10 +363,6 @@ function nextprev_shortcode($parm = '')
*/ */
else else
{ {
if(empty($parm))
{
$parm = '';
}
$parm_count = substr_count($parm, ','); $parm_count = substr_count($parm, ',');
while($parm_count < 5) while($parm_count < 5)
{ {

23
e107_core/templates/nextprev_template.php
View File

@@ -91,16 +91,16 @@ $NEXTPREV_TEMPLATE['bootstrap_separator'] = '';
// Basic template - as used in admin theme-manager - find themes. // Basic template - as used in admin theme-manager - find themes.
//XXX FIXME - use $NEXTPREV_TEMPLATE['basic']['start'] format.?? //XXX FIXME - use $NEXTPREV_TEMPLATE['basic']['start'] format.??
$NEXTPREV_TEMPLATE['basic_start'] = '<!-- Start of Next/Prev --><div class="btn-group ">'; $NEXTPREV_TEMPLATE['basic_start'] = '<!-- Start of Next/Prev --><div class="nextprev-basic btn-group ">';
$NEXTPREV_TEMPLATE['basic_end'] = '</div><!-- End of Next/Prev -->'; $NEXTPREV_TEMPLATE['basic_end'] = '</div><!-- End of Next/Prev -->';
$NEXTPREV_TEMPLATE['basic_nav_caption'] = ''; $NEXTPREV_TEMPLATE['basic_nav_caption'] = '';
$NEXTPREV_TEMPLATE['basic_nav_first'] = ''; $NEXTPREV_TEMPLATE['basic_nav_first'] = '';
$NEXTPREV_TEMPLATE['basic_nav_prev'] = '<a class="btn btn-primary nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="icon-backward"></i></a>'; $NEXTPREV_TEMPLATE['basic_nav_prev'] = '<a class="btn btn-default nextprev-item prev" href="{url}" title="{url_label}"><i class="fa fa-backward"></i></a>';
$NEXTPREV_TEMPLATE['basic_nav_last'] = ''; $NEXTPREV_TEMPLATE['basic_nav_last'] = '';
$NEXTPREV_TEMPLATE['basic_nav_next'] = '<a class="btn btn-primary nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="icon-forward"></i></a>'; $NEXTPREV_TEMPLATE['basic_nav_next'] = '<a class="btn btn-default nextprev-item next " href="{url}" title="{url_label}"><i class="fa fa-forward"></i></a>';
$NEXTPREV_TEMPLATE['basic_items_start'] = ''; $NEXTPREV_TEMPLATE['basic_items_start'] = '';
$NEXTPREV_TEMPLATE['basic_item'] = ''; $NEXTPREV_TEMPLATE['basic_item'] = '';
$NEXTPREV_TEMPLATE['basic_item_current'] = '<a class="btn btn-primary">{label}</a>'; $NEXTPREV_TEMPLATE['basic_item_current'] = '<a class="btn btn-default">{label}</a>';
$NEXTPREV_TEMPLATE['basic_items_end'] = ''; $NEXTPREV_TEMPLATE['basic_items_end'] = '';
$NEXTPREV_TEMPLATE['basic_separator'] = ''; $NEXTPREV_TEMPLATE['basic_separator'] = '';
@@ -110,15 +110,9 @@ $NEXTPREV_TEMPLATE['basic_separator'] = '';
// ADMIN TEMPLATE see admin-ui. // ADMIN TEMPLATE see admin-ui.
$NEXTPREV_TEMPLATE['admin_start'] = ' $NEXTPREV_TEMPLATE['admin_start'] = '<!-- Start of Next/Prev --><div class="pagination nextprev "><ul class="pagination">';
<!-- Start of Next/Prev -->
<div class="pagination nextprev ">
<ul class="pagination">';
$NEXTPREV_TEMPLATE['admin_end'] = ' $NEXTPREV_TEMPLATE['admin_end'] = '</ul></div><!-- End of Next/Prev -->';
</ul></div>
<!-- End of Next/Prev -->
';
//$NEXTPREV_TEMPLATE['admin_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates //$NEXTPREV_TEMPLATE['admin_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates
$NEXTPREV_TEMPLATE['admin_nav_caption'] = ''; // NP_3.'&nbsp;'; $NEXTPREV_TEMPLATE['admin_nav_caption'] = ''; // NP_3.'&nbsp;';
@@ -139,6 +133,11 @@ $NEXTPREV_TEMPLATE['admin_separator'] = '&nbsp;';
// ###################################### // ######################################
/* /*
* Dropdown page navigation, key prefix 'dropdown' * Dropdown page navigation, key prefix 'dropdown'
* Shortcodes are lowercase (simple parser) * Shortcodes are lowercase (simple parser)