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

Renamed {LINK_IMAGE} to {LINK_ICON} - more consistent with description in admin -> Site links.

Browse Source
This commit is contained in:
Cameron
2013-07-12 07:50:25 -07:00
parent b896227ab8
commit 475e46e748
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_core/templates/chapter_template.php
View File

@@ -51,7 +51,7 @@ $CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu'] = '
$CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu_active'] = ' $CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu_active'] = '
<li class="active"> <li class="active">
<a role="button" href="{LINK_URL}"> <a role="button" href="{LINK_URL}">
{LINK_IMAGE} {LINK_NAME} {LINK_ICON}{LINK_NAME}
</a> </a>
{LINK_SUB} {LINK_SUB}
</li> </li>
@@ -60,7 +60,7 @@ $CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu_active'] = '
$CHAPTER_TEMPLATE['nav']['listChapters']['item_active'] = ' $CHAPTER_TEMPLATE['nav']['listChapters']['item_active'] = '
<li class="active"> <li class="active">
<a crole="button" href="{LINK_URL}"> <a crole="button" href="{LINK_URL}">
{LINK_IMAGE} {LINK_NAME} {LINK_ICON}{LINK_NAME}
</a> </a>
</li> </li>
'; ';
@@ -73,27 +73,27 @@ $CHAPTER_TEMPLATE['nav']['listChapters']['submenu_start'] = '<ul class="page-
$CHAPTER_TEMPLATE['nav']['listChapters']['submenu_item'] = ' $CHAPTER_TEMPLATE['nav']['listChapters']['submenu_item'] = '
<li role="menuitem" > <li role="menuitem" >
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';
$CHAPTER_TEMPLATE['nav']['listChapters']['submenu_loweritem'] = ' $CHAPTER_TEMPLATE['nav']['listChapters']['submenu_loweritem'] = '
<li role="menuitem" > <li role="menuitem" >
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';
$CHAPTER_TEMPLATE['nav']['listChapters']['submenu_loweritem_active'] = ' $CHAPTER_TEMPLATE['nav']['listChapters']['submenu_loweritem_active'] = '
<li role="menuitem" class="active"> <li role="menuitem" class="active">
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';
$CHAPTER_TEMPLATE['nav']['listChapters']['submenu_item_active'] = ' $CHAPTER_TEMPLATE['nav']['listChapters']['submenu_item_active'] = '
<li role="menuitem" class="active"> <li role="menuitem" class="active">
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';

22
e107_core/templates/navigation_template.php
View File

@@ -23,7 +23,7 @@ $NAVIGATION_TEMPLATE['main']['item'] = '
$NAVIGATION_TEMPLATE['main']['item_submenu'] = ' $NAVIGATION_TEMPLATE['main']['item_submenu'] = '
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" > <a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_IMAGE}{LINK_NAME} {LINK_ICON}{LINK_NAME}
<b class="caret"></b> <b class="caret"></b>
</a> </a>
{LINK_SUB} {LINK_SUB}
@@ -33,7 +33,7 @@ $NAVIGATION_TEMPLATE['main']['item_submenu'] = '
$NAVIGATION_TEMPLATE['main']['item_submenu_active'] = ' $NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
<li class="dropdown active"> <li class="dropdown active">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}"> <a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
{LINK_IMAGE}{LINK_NAME} {LINK_ICON}{LINK_NAME}
<b class="caret"></b> <b class="caret"></b>
</a> </a>
{LINK_SUB} {LINK_SUB}
@@ -43,7 +43,7 @@ $NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
$NAVIGATION_TEMPLATE['main']['item_active'] = ' $NAVIGATION_TEMPLATE['main']['item_active'] = '
<li class="dropdown active"> <li class="dropdown active">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}"> <a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
{LINK_IMAGE} {LINK_NAME} {LINK_ICON} {LINK_NAME}
</a> </a>
</li> </li>
'; ';
@@ -58,28 +58,28 @@ $NAVIGATION_TEMPLATE['main']['submenu_start'] = '
$NAVIGATION_TEMPLATE['main']['submenu_item'] = ' $NAVIGATION_TEMPLATE['main']['submenu_item'] = '
<li role="menuitem" > <li role="menuitem" >
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';
$NAVIGATION_TEMPLATE['main']['submenu_loweritem'] = ' $NAVIGATION_TEMPLATE['main']['submenu_loweritem'] = '
<li role="menuitem" class="dropdown-submenu"> <li role="menuitem" class="dropdown-submenu">
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';
$NAVIGATION_TEMPLATE['main']['submenu_loweritem_active'] = ' $NAVIGATION_TEMPLATE['main']['submenu_loweritem_active'] = '
<li role="menuitem" class="dropdown-submenu active"> <li role="menuitem" class="dropdown-submenu active">
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';
$NAVIGATION_TEMPLATE['main']['submenu_item_active'] = ' $NAVIGATION_TEMPLATE['main']['submenu_item_active'] = '
<li role="menuitem" class="active"> <li role="menuitem" class="active">
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';
@@ -92,13 +92,13 @@ $NAVIGATION_TEMPLATE['main']['submenu_end'] = '</ul>';
$NAVIGATION_TEMPLATE['side']['start'] = '<ul class="nav nav-list"><li class="nav-header">Sidebar</li> $NAVIGATION_TEMPLATE['side']['start'] = '<ul class="nav nav-list"><li class="nav-header">Sidebar</li>
'; ';
$NAVIGATION_TEMPLATE['side']['item'] = '<li><a href="{LINK_URL}">{LINK_NAME}</a></li> $NAVIGATION_TEMPLATE['side']['item'] = '<li><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>
'; ';
$NAVIGATION_TEMPLATE['side']['item_submenu'] = '<li class="nav-header">{LINK_NAME}{LINK_SUB}</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"><a href="{LINK_URL}">{LINK_NAME}</a></li> $NAVIGATION_TEMPLATE['side']['item_active'] = '<li class="active"><a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a></li>
'; ';
$NAVIGATION_TEMPLATE['side']['end'] = '</ul> $NAVIGATION_TEMPLATE['side']['end'] = '</ul>
@@ -110,7 +110,7 @@ $NAVIGATION_TEMPLATE['side']['submenu_item'] = '<li><a href="{LINK_URL}">{LINK_
$NAVIGATION_TEMPLATE['side']['submenu_loweritem'] = ' $NAVIGATION_TEMPLATE['side']['submenu_loweritem'] = '
<li role="menuitem" class="dropdown-submenu"> <li role="menuitem" class="dropdown-submenu">
<a href="{LINK_URL}">{LINK_IMAGE}{LINK_NAME}</a> <a href="{LINK_URL}">{LINK_ICON}{LINK_NAME}</a>
{LINK_SUB} {LINK_SUB}
</li> </li>
'; ';

19
e107_handlers/sitelinks_class.php
View File

@@ -1609,12 +1609,21 @@ class navigation_shortcodes extends e_shortcode
return e107::getParser()->replaceConstants($url, 'full', TRUE); return e107::getParser()->replaceConstants($url, 'full', TRUE);
} }
/** /**
* Return the link image of the current link * @Deprecated - Use {LINK_ICON} instead.
* @return string
*/ */
function sc_link_image($parm='') function sc_link_image($parm='')
{
e107::getMessage()->addDebug("Using deprecated shortcode: {LINK_IMAGE} - use {LINK_ICON} instead.");
return $this->sc_link_icon($parm);
}
/**
* Return the link icon of the current link
* @return string
*/
function sc_link_icon($parm='')
{ {
$tp = e107::getParser(); $tp = e107::getParser();
@@ -1627,11 +1636,9 @@ class navigation_shortcodes extends e_shortcode
else else
{ {
$path = e107::getParser()->replaceConstants($this->var['link_button'], 'full', TRUE); $path = e107::getParser()->replaceConstants($this->var['link_button'], 'full', TRUE);
return "<img src='".$path."' alt='' />"; return "<img class='icon' src='".$path."' alt='' />";
} }
} }