diff --git a/e107_admin/links.php b/e107_admin/links.php index fd3a6abf4..1ff38ac6f 100644 --- a/e107_admin/links.php +++ b/e107_admin/links.php @@ -156,7 +156,8 @@ class links_admin_ui extends e_admin_ui $ui = $this->getUI(); $found = false; foreach ($selected as $k => $id) - {var_dump($ui->_has_parent($value, $id, $this->getLinkArray())); + { + // var_dump($ui->_has_parent($value, $id, $this->getLinkArray())); if($ui->_has_parent($value, $id, $this->getLinkArray())) { unset($selected[$k]); diff --git a/e107_core/shortcodes/batch/comment_shortcodes.php b/e107_core/shortcodes/batch/comment_shortcodes.php index 05816488f..b17dcef66 100644 --- a/e107_core/shortcodes/batch/comment_shortcodes.php +++ b/e107_core/shortcodes/batch/comment_shortcodes.php @@ -91,7 +91,7 @@ class comment_shortcodes extends e_shortcode { if ($thisaction == "comment" && $pref['nested_comments']) { - $REPLY = "".COMLAN_326.""; + $REPLY = "".COMLAN_326.""; } } return $REPLY; @@ -179,7 +179,7 @@ class comment_shortcodes extends e_shortcode } // TODO put into a '; +// TEMPLATE FOR {NAVIGATION=side} + +$NAVIGATION_TEMPLATE['side']['start'] = ' + '; + +$NAVIGATION_TEMPLATE['side']['submenu_start'] = ''; + +$NAVIGATION_TEMPLATE['side']['submenu_item'] = '
  • {LINK_NAME}
    • + '; + +$NAVIGATION_TEMPLATE['side']['submenu_item_active'] = '
  • {LINK_NAME}
    • + '; + +$NAVIGATION_TEMPLATE['side']['submenu_end'] = ''; + + +$NAVIGATION_TEMPLATE['footer'] = $NAVIGATION_TEMPLATE['side']; +$NAVIGATION_TEMPLATE['alt'] = $NAVIGATION_TEMPLATE['side']; ?> \ No newline at end of file diff --git a/e107_themes/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php similarity index 100% rename from e107_themes/templates/nextprev_template.php rename to e107_core/templates/nextprev_template.php diff --git a/e107_themes/templates/page_template.php b/e107_core/templates/page_template.php similarity index 100% rename from e107_themes/templates/page_template.php rename to e107_core/templates/page_template.php diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php index 7d497e780..128f79e40 100644 --- a/e107_handlers/comment_class.php +++ b/e107_handlers/comment_class.php @@ -949,7 +949,7 @@ class comment { $modcomment = "
    "; // $modcomment .= "".COMLAN_314.""; - $modcomment .= "".COMLAN_314.""; + $modcomment .= "".COMLAN_314.""; $modcomment .= "
    "; } @@ -1088,9 +1088,9 @@ class comment // from calculations are done by eNav() js. return " - Previous + Previous - Next + Next "; diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index 7629009cd..7d4e59bc7 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -1231,22 +1231,22 @@ class e_navigation * @param template to use. * TODO Support for side-menu templates and others. */ - function render($data, $tmpl = 'navigation') - { + function render($data, $type = 'main') + { $sc = e107::getScBatch('navigation'); - $template = e107::getCoreTemplate($tmpl); + $template = e107::getCoreTemplate('navigation', $type); $sc->template = $template; // parse the template to the shortcodes. (sub menus) - $text = $template['START']; + $text = $template['start']; foreach($data as $lnk) { $sc->setVars($lnk); - $item = varset($lnk['link_sub']) ? $template['ITEM_SUBMENU'] : $template['ITEM']; + $item = varset($lnk['link_sub']) ? $template['item_submenu'] : $template['item']; $text .= e107::getParser()->parseTemplate($item,TRUE); } - $text .= $template['END']; + $text .= $template['end']; return $text; } @@ -1267,7 +1267,7 @@ class navigation_shortcodes extends e_shortcode function sc_link_name($parm='') { - return e107::getParser()->toHtml($this->var['link_name'],false,'TITLE'); + return e107::getParser()->toHtml($this->var['link_name'],false,'defs'); } function sc_link_url($parm='') @@ -1293,15 +1293,15 @@ class navigation_shortcodes extends e_shortcode return; } - $text = $this->template['SUBMENU_START']; - + $text = $this->template['submenu_start']; + foreach($this->var['link_sub'] as $val) { $this->setVars($val); - $text .= e107::getParser()->parseTemplate($this->template['SUBMENU_ITEM'],TRUE); + $text .= e107::getParser()->parseTemplate($this->template['submenu_item'],TRUE); } - $text .= $this->template['SUBMENU_END']; + $text .= $this->template['submenu_end']; return $text; } diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php index b734873e3..ccc4f7bf4 100644 --- a/e107_themes/bootstrap/theme.php +++ b/e107_themes/bootstrap/theme.php @@ -105,20 +105,19 @@ $HEADER['default'] = '

    Logged in as '.USERNAME.'

    - {NAVIGATION} + {NAVIGATION=main}
    -
    - {SETSTYLE=site_info} - - {MENU=2} - -
    -
    +
    +
    + {NAVIGATION=side} +
    +
    +
    '; $FOOTER['default'] = '
    diff --git a/e107_themes/jayya/theme.php b/e107_themes/jayya/theme.php index 10536dfdb..f62aa3f9d 100644 --- a/e107_themes/jayya/theme.php +++ b/e107_themes/jayya/theme.php @@ -282,6 +282,7 @@ $sc_style['RATING']['post'] = "

    "; $sc_style['COMMENT']['post'] = "
    "; + $COMMENTSTYLE = "
    ".LAN_THEME_5." {USERNAME} ".LAN_THEME_6." {TIMEDATE}