mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-14 17:42:10 +02:00
Code Issues Releases Wiki Activity

Improved active-link detection for SEF URL index.

Browse Source 
Issue #2318 - external URL issue.
Issue #2292
Issue #1604
This commit is contained in:
Cameron 2017-02-28 09:55:35 -08:00
parent 9b6b41c353
commit 9d546ce5d0
3 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
e107_core/templates/navigation_template.php
View File

@ -8,7 +8,7 @@
// TEMPLATE FOR {NAVIGATION=main}
$NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav">';
$NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav nav-main">';
// Main Link
$NAVIGATION_TEMPLATE['main']['item'] = '
@ -98,16 +98,16 @@ $NAVIGATION_TEMPLATE['main']['submenu_lowerend'] = '</ul>';
// TEMPLATE FOR {NAVIGATION=side}
$NAVIGATION_TEMPLATE['side']['start'] = '<ul class="nav nav-list"><li class="nav-header">Sidebar</li>
$NAVIGATION_TEMPLATE['side']['start'] = '<ul class="listgroup nav-side">
';
$NAVIGATION_TEMPLATE['side']['item'] = '<li><a href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
$NAVIGATION_TEMPLATE['side']['item'] = '<li class="list-group-item"><a href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
';
$NAVIGATION_TEMPLATE['side']['item_submenu'] = '<li class="nav-header">{LINK_ICON}{LINK_NAME}{LINK_SUB}</li>
';
$NAVIGATION_TEMPLATE['side']['item_active'] = '<li class="active"{LINK_OPEN}><a href="{LINK_URL}" title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
$NAVIGATION_TEMPLATE['side']['item_active'] = '<li class="list-group-item active"{LINK_OPEN}><a class="list-group-item active" href="{LINK_URL}" title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
';
$NAVIGATION_TEMPLATE['side']['end'] = '</ul>
@ -115,7 +115,7 @@ $NAVIGATION_TEMPLATE['side']['end'] = '</ul>
$NAVIGATION_TEMPLATE['side']['submenu_start'] = '';
$NAVIGATION_TEMPLATE['side']['submenu_item'] = '<li><a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>';
$NAVIGATION_TEMPLATE['side']['submenu_item'] = '<li class="list-group-item" ><a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>';
$NAVIGATION_TEMPLATE['side']['submenu_loweritem'] = '
<li role="menuitem" class="dropdown-submenu">
@ -143,10 +143,44 @@ $NAVIGATION_TEMPLATE["footer"]["submenu_item_active"] = "<li class='active'><a
$NAVIGATION_TEMPLATE["footer"]["submenu_end"] = "</ul>";
$NAVIGATION_TEMPLATE['alt']['start'] = '<ul class="nav nav-list">
';
$NAVIGATION_TEMPLATE['alt']['item'] = '<li><a href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
';
$NAVIGATION_TEMPLATE['alt']['item_submenu'] = '<li class="nav-header">{LINK_ICON}{LINK_NAME}{LINK_SUB}</li>
';
$NAVIGATION_TEMPLATE['alt']['item_active'] = '<li class="active"{LINK_OPEN}><a href="{LINK_URL}" title="{LINK_DESCRIPTION}">{LINK_ICON}{LINK_NAME}</a></li>
';
$NAVIGATION_TEMPLATE['alt']['end'] = '</ul>
';
$NAVIGATION_TEMPLATE['alt']['submenu_start'] = '';
$NAVIGATION_TEMPLATE['alt']['submenu_item'] = '<li><a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a></li>';
$NAVIGATION_TEMPLATE['alt']['submenu_loweritem'] = '
<li role="menuitem" class="dropdown-submenu">
<a href="{LINK_URL}"{LINK_OPEN}>{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB}
</li>
';
$NAVIGATION_TEMPLATE['alt']['submenu_item_active'] = '<li class="active"><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>';
$NAVIGATION_TEMPLATE['alt']['submenu_end'] = '';
$NAVIGATION_TEMPLATE['alt'] = $NAVIGATION_TEMPLATE['side'];
$NAVIGATION_TEMPLATE['alt5'] = $NAVIGATION_TEMPLATE['side'];
$NAVIGATION_TEMPLATE['alt6'] = $NAVIGATION_TEMPLATE['side'];
$NAVIGATION_TEMPLATE['alt5'] = $NAVIGATION_TEMPLATE['alt'];
$NAVIGATION_TEMPLATE['alt6'] = $NAVIGATION_TEMPLATE['alt'];
?>
$NAVIGATION_TEMPLATE['alt5']['start'] = '<ul class="nav nav-list nav-alt5">';
$NAVIGATION_TEMPLATE['alt6']['start'] = '<ul class="nav nav-list nav-alt6">';
?>

8
e107_handlers/sitelinks_class.php
View File

@ -319,7 +319,7 @@ class sitelinks
{
$linkInfo['link_url'] = $tp->parseTemplate($linkInfo['link_url'], TRUE); // shortcode in URL support - dynamic urls for multilanguage.
}
elseif($linkInfo['link_url'][0] != '/')
elseif($linkInfo['link_url'][0] != '/' && strpos($linkInfo['link_url'],'http') !== 0)
{
$linkInfo['link_url'] = e_HTTP.ltrim($linkInfo['link_url'],'/');
}
@ -1722,6 +1722,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
public function isActive(&$data='', $removeOnly = false, $exactMatch = false)
{
if(empty($data)) return;
### experimental active match added to the URL (and removed after parsing)
### Example of main link: {e_BASE}some/url/#?match/string1^match/string2
@ -1758,6 +1759,11 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
$dbLink = str_replace("//","/",$dbLink); // precaution for e_HTTP inclusion above.
if(!empty($data['link_owner']) && !empty($data['link_sefurl']))
{
$dbLink = e107::url($data['link_owner'],$data['link_sefurl']);
}
if(E107_DBG_PATH)
{
// e107::getDebug()->log("db=".$dbLink."<br />url=".e_REQUEST_URI."<br /><br />");

6
e107_web/css/e107.css
View File

@ -340,4 +340,8 @@ div.e-debug { margin-top:50px; background-color: white }
#login-template h2.caption { text-align:center; font-size:120%; opacity:0.8 }
#login-template .logo { padding-top:50px; margin-left:auto; margin-right: auto }
#login-template .login-page-footer { margin-bottom:100px; margin-right:auto;margin-left:auto }
div.login-page-signup-link, div.login-page-fpw-link { text-align:center }
div.login-page-signup-link, div.login-page-fpw-link { text-align:center }
/* Navigation */
.nav-side.listgroup { padding-left:0; }
.nav-side li.list-group-item.active { padding:0}