1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00

Display more shortcodes in media-manager mode.

This commit is contained in:
Cameron 2015-04-14 15:26:26 -07:00
parent 6cd9e8770f
commit 7661394c04
3 changed files with 24 additions and 15 deletions

View File

@ -1236,21 +1236,25 @@ class e_menuManager {
$ns->setStyle($style); $ns->setStyle($style);
} }
elseif(strstr($str, "SITENAME")) /*elseif(strstr($str, "SITENAME"))
{ {
echo "[SiteName]"; echo "[SiteName]";
} }*/
elseif(strstr($str, "SITETAG")) /*elseif(strstr($str, "SITETAG"))
{ {
echo "<div style='padding: 2px'>[SiteTag]</div>"; echo "<div style='padding: 2px'>[SiteTag]</div>";
} }*/
elseif(strstr($str, "SITELINKS")) // elseif(strstr($str, "SITELINKS"))
{ // {
echo "[SiteLinks]"; // echo "[SiteLinks]";
} // }
elseif(strstr($str, "NAVIGATION")) elseif(strstr($str, "NAVIGATION"))
{ {
echo "[Navigation Area]"; echo "<span class='label label-info'>Navigation Area</span>";
}
elseif(strstr($str, "ALERT"))
{
//echo "[Navigation Area]";
} }
elseif(strstr($str, "LANGUAGELINKS")) elseif(strstr($str, "LANGUAGELINKS"))
{ {
@ -1386,9 +1390,13 @@ class e_menuManager {
$ns->tablerender('', $menuText); $ns->tablerender('', $menuText);
} }
else if(strstr($str, "SITEDISCLAIMER")) //. else if(strstr($str, "SITEDISCLAIMER"))
//{
// echo "[Sitedisclaimer]";
// }
else
{ {
echo "[Sitedisclaimer]"; echo $tp->parseTemplate($str,true);
} }
} }
//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// //------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//

View File

@ -58,7 +58,7 @@ class social_shortcodes extends e_shortcode
{ {
$social = array( $social = array(
'rss' => array('href'=> (e107::isInstalled('rss_menu') ? e107::url('rss_menu', 'index', array('rss_url'=>'news')) : ''), 'title'=>'Feed'), 'rss' => array('href'=> (e107::isInstalled('rss_menu') ? e107::url('rss_menu', 'index', array('rss_url'=>'news')) : ''), 'title'=>'RSS/Atom Feed'),
'facebook' => array('href'=> deftrue('XURL_FACEBOOK'), 'title'=>'Facebook'), 'facebook' => array('href'=> deftrue('XURL_FACEBOOK'), 'title'=>'Facebook'),
'twitter' => array('href'=> deftrue('XURL_TWITTER'), 'title'=>'Twitter'), 'twitter' => array('href'=> deftrue('XURL_TWITTER'), 'title'=>'Twitter'),
'google-plus' => array('href'=> deftrue('XURL_GOOGLE'), 'title'=>'Google Plus'), 'google-plus' => array('href'=> deftrue('XURL_GOOGLE'), 'title'=>'Google Plus'),
@ -83,7 +83,7 @@ class social_shortcodes extends e_shortcode
if($data['href'] != '') if($data['href'] != '')
{ {
$text .= '<a rel="external" href="'.$data['href'].'" class="e-tip social-icon social-'.$id.'"> $text .= '<a rel="external" href="'.$data['href'].'" class="e-tip social-icon social-'.$id.'" title="'.$data['title'].'">
<span class="fa fa-'.$id.' '.$class.'"></span> <span class="fa fa-'.$id.' '.$class.'"></span>
</a>'; </a>';

View File

@ -192,8 +192,9 @@ $LAYOUT['_footer_'] = '<hr>
<div> <div>
<div class="col-lg-6"> <div class="col-lg-6">
{MENU=105}
{NAVIGATION=footer} {NAVIGATION=footer}
{MENU=106}
</div> </div>
<div class="col-lg-6 text-right"> <div class="col-lg-6 text-right">
{XURL_ICONS: size=2x} {XURL_ICONS: size=2x}
@ -203,7 +204,7 @@ $LAYOUT['_footer_'] = '<hr>
<div> <div>
<div class="col-lg-12"> <div class="col-lg-12">
{MENU=105} {MENU=107}
</div> </div>
</div> </div>