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

Navigation template work and bootstrap front-end navigation work. v2 templates moved to e107_core/templates

Browse Source
This commit is contained in:
Cameron
2012-12-11 19:42:55 -08:00
parent e623bc8d64
commit 033b6cddec
11 changed files with 103 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/links.php
View File

@@ -156,7 +156,8 @@ class links_admin_ui extends e_admin_ui
$ui = $this->getUI(); $ui = $this->getUI();
$found = false; $found = false;
foreach ($selected as $k => $id) 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())) if($ui->_has_parent($value, $id, $this->getLinkArray()))
{ {
unset($selected[$k]); unset($selected[$k]);

6
e107_core/shortcodes/batch/comment_shortcodes.php
View File

@@ -91,7 +91,7 @@ class comment_shortcodes extends e_shortcode
{ {
if ($thisaction == "comment" && $pref['nested_comments']) if ($thisaction == "comment" && $pref['nested_comments'])
{ {
$REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply' data-type='".$this->var['comment_type']."' data-target='".e_BASE."comment.php' href='".SITEURL."comment.php?reply.".$thistable.".".$this->var['comment_id'].".".$thisid."'>".COMLAN_326."</a>"; $REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply btn' data-type='".$this->var['comment_type']."' data-target='".e_BASE."comment.php' href='".SITEURL."comment.php?reply.".$thistable.".".$this->var['comment_id'].".".$thisid."'>".COMLAN_326."</a>";
} }
} }
return $REPLY; return $REPLY;
@@ -179,7 +179,7 @@ class comment_shortcodes extends e_shortcode
} }
// TODO put into a <ul> drop-down format. // TODO put into a <ul> drop-down format.
$text = "<a href='#' data-target='".e_BASE."comment.php' id='e-comment-delete-".$this->var['comment_id']."' class='e-comment-delete'>Delete</a> "; $text = "<a href='#' data-target='".e_BASE."comment.php' id='e-comment-delete-".$this->var['comment_id']."' class='e-comment-delete btn'>Delete</a> ";
if($this->var['comment_blocked'] == 2) // pending approval. if($this->var['comment_blocked'] == 2) // pending approval.
{ {
@@ -208,7 +208,7 @@ class comment_shortcodes extends e_shortcode
$value = (varset($this->var['eaction']) == "edit" ? COMLAN_320 : COMLAN_9); $value = (varset($this->var['eaction']) == "edit" ? COMLAN_320 : COMLAN_9);
$pid = ($this->var['action'] == 'reply') ? $this->var['pid'] : 0; $pid = ($this->var['action'] == 'reply') ? $this->var['pid'] : 0;
return "<input data-pid='{$pid}' data-sort='{$pref}' data-target='".e_BASE."comment.php' class='button e-comment-submit' type='submit' name='".$this->var['action']."submit' value='".$value."' />"; return "<input data-pid='{$pid}' data-sort='{$pref}' data-target='".e_BASE."comment.php' class='button btn e-comment-submit' type='submit' name='".$this->var['action']."submit' value='".$value."' />";
} }
} }

15
e107_core/shortcodes/single/navigation.php
View File

@@ -2,7 +2,18 @@
function navigation_shortcode($parm='') function navigation_shortcode($parm='')
{ {
$data = e107::getNav()->getData(1); $types = array(
return e107::getNav()->render($data); 'main' => 1,
'side' => 2,
'footer' => 3,
'alt' => 4
);
$cat = varset($types[$parm], 1);
$tmpl = vartrue($parm, 'main');
$data = e107::getNav()->getData($cat);
return e107::getNav()->render($data, $tmpl);
} }

35
e107_core/templates/comment_template.php
View File

@@ -83,24 +83,25 @@ $sc_style['COMMENT_BUTTON']['post'] = "";
$sc_style['COMMENT_SHARE']['pre'] = ""; $sc_style['COMMENT_SHARE']['pre'] = "";
$sc_style['COMMENT_SHARE']['post'] = ""; $sc_style['COMMENT_SHARE']['post'] = "";
$sc_style['COMMENT_RATE']['pre'] = '<div class="comment-rate">'; $sc_style['COMMENT_RATE']['pre'] = '<div class="comment-rate span2">';
$sc_style['COMMENT_RATE']['post'] = '</div>'; $sc_style['COMMENT_RATE']['post'] = '</div>';
//$sc_style['USER_AVATAR']['pre'] = '<div class="comment-avatar center">'; //$sc_style['USER_AVATAR']['pre'] = '<div class="comment-avatar center">';
//$sc_style['USER_AVATAR']['post'] = '</div>'; //$sc_style['USER_AVATAR']['post'] = '</div>';
$sc_style['COMMENT_MODERATE']['pre'] = '<span class="comment-moderate">'; $sc_style['COMMENT_MODERATE']['pre'] = '<span class="comment-moderate span2">';
$sc_style['COMMENT_MODERATE']['post'] = '</span>'; $sc_style['COMMENT_MODERATE']['post'] = '</span>';
$sc_style['MODERATE']['pre'] = '<span class="span2">';
$sc_style['MODERATE']['post'] = '</span>';
$COMMENT_TEMPLATE['FORM'] = " $COMMENT_TEMPLATE['FORM'] = "
<div class='comment-box comment-box-form clearfix'> <div class='comment-box comment-box-form clearfix'>
<div class='comment-box-left'> <div class='comment-box-left pull-left span1' >
{COMMENT_AVATAR} {COMMENT_AVATAR}
</div> </div>
<div class='comment-box-right' style='text-align:left'> <div class='comment-box-right pull-left span11' style='text-align:left'>
<div class='P10'> <div class='P10'>
{AUTHOR_INPUT} {AUTHOR_INPUT}
{COMMENT_INPUT} {COMMENT_INPUT}
@@ -115,25 +116,29 @@ $COMMENT_TEMPLATE['FORM'] = "
$COMMENT_TEMPLATE['ITEM'] = ' $COMMENT_TEMPLATE['ITEM'] = '
<div class="comment-box-left"> <div class="comment-box-left pull-left span1">
{COMMENT_AVATAR} {COMMENT_AVATAR}
</div> </div>
<div class="comment-box-right"> <div class="comment-box-right pull-left span10">
<div class="P10">
<span class="comment-box-username">{USERNAME}</span>
<span class="comment-box-date">{TIMEDATE}</span>
<span class="comment-status">{COMMENT_STATUS}</span> <span class="comment-box-username span1">{USERNAME}</span>
<div class="comment-user-badge-bar"> <span class="comment-box-date span2">{TIMEDATE}</span>
<span class="comment-status span2">{COMMENT_STATUS}</span>
<span class="comment-user-badge-bar span6">
{COMMENT_RATE} {REPLY} {COMMENTEDIT} {COMMENT_MODERATE} {COMMENT_RATE} {REPLY} {COMMENTEDIT} {COMMENT_MODERATE}
</div> </span>
<div class="clear_b H5"><!-- --></div> <div class="clear_b H5"><!-- --></div>
<div id="{COMMENT_ITEMID}-edit" contentEditable="false">{COMMENT}</div> <div id="{COMMENT_ITEMID}-edit" contentEditable="false" class="span12">
<p>
{COMMENT}
</p>
</div> </div>
</div>'; </div>';

52
e107_core/templates/navigation_template.php
View File

@@ -7,11 +7,11 @@
*/ */
// TEMPLATE FOR {NAVIGATION=main}
$NAVIGATION_TEMPLATE['START'] = '<ul class="nav nav-pills">'; $NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav nav-pills">';
// Main Link // Main Link
$NAVIGATION_TEMPLATE['ITEM'] = ' $NAVIGATION_TEMPLATE['main']['item'] = '
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" role="button" href="{LINK_URL}" > <a class="dropdown-toggle" role="button" href="{LINK_URL}" >
{LINK_NAME} {LINK_NAME}
@@ -20,7 +20,7 @@ $NAVIGATION_TEMPLATE['ITEM'] = '
'; ';
// Main Link which has a sub menu. // Main Link which has a sub menu.
$NAVIGATION_TEMPLATE['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_NAME} {LINK_NAME}
@@ -30,7 +30,7 @@ $NAVIGATION_TEMPLATE['ITEM_SUBMENU'] = '
</li> </li>
'; ';
$NAVIGATION_TEMPLATE['ITEM_SUBMENU_ACTIVE'] = ' $NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
<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_IMAGE} {LINK_NAME}
@@ -40,7 +40,7 @@ $NAVIGATION_TEMPLATE['ITEM_SUBMENU_ACTIVE'] = '
</li> </li>
'; ';
$NAVIGATION_TEMPLATE['ITEM_ACTIVE'] = ' $NAVIGATION_TEMPLATE['main']['item_active'] = '
<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_IMAGE} {LINK_NAME}
@@ -48,15 +48,15 @@ $NAVIGATION_TEMPLATE['ITEM_ACTIVE'] = '
</li> </li>
'; ';
$NAVIGATION_TEMPLATE['END'] = '</ul>'; $NAVIGATION_TEMPLATE['main']['end'] = '</ul>';
$NAVIGATION_TEMPLATE['SUBMENU_START'] = ' $NAVIGATION_TEMPLATE['main']['submenu_start'] = '
<ul class="dropdown-menu" role="menu" > <ul class="dropdown-menu" role="menu" >
'; ';
$NAVIGATION_TEMPLATE['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_IMAGE}{LINK_NAME}</a>
</li> </li>
@@ -64,14 +64,44 @@ $NAVIGATION_TEMPLATE['SUBMENU_ITEM'] = '
$NAVIGATION_TEMPLATE['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_IMAGE}{LINK_NAME}</a>
</li> </li>
'; ';
$NAVIGATION_TEMPLATE['SUBMENU_END'] = '</ul>'; $NAVIGATION_TEMPLATE['main']['submenu_end'] = '</ul>';
// TEMPLATE FOR {NAVIGATION=side}
$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_submenu'] = '<li class="nav-header">{LINK_NAME}</li>{LINK_SUB}
';
$NAVIGATION_TEMPLATE['side']['item_active'] = '<li><a href="{LINK_URL}">{LINK_NAME}</a></li>
';
$NAVIGATION_TEMPLATE['side']['end'] = '</ul>
';
$NAVIGATION_TEMPLATE['side']['submenu_start'] = '';
$NAVIGATION_TEMPLATE['side']['submenu_item'] = '<li><a href="{LINK_URL}">{LINK_NAME}</a></li>
';
$NAVIGATION_TEMPLATE['side']['submenu_item_active'] = '<li><a href="{LINK_URL}">{LINK_NAME}</a></li>
';
$NAVIGATION_TEMPLATE['side']['submenu_end'] = '';
$NAVIGATION_TEMPLATE['footer'] = $NAVIGATION_TEMPLATE['side'];
$NAVIGATION_TEMPLATE['alt'] = $NAVIGATION_TEMPLATE['side'];
?> ?>

0
e107_themes/templates/nextprev_template.php → e107_core/templates/nextprev_template.php
View File

0
e107_themes/templates/page_template.php → e107_core/templates/page_template.php
View File

6
e107_handlers/comment_class.php
View File

@@ -949,7 +949,7 @@ class comment
{ {
$modcomment = "<div class='comment-moderate'>"; $modcomment = "<div class='comment-moderate'>";
// $modcomment .= "<a href='".e_ADMIN_ABS."modcomment.php?$table.$id'>".COMLAN_314."</a>"; // $modcomment .= "<a href='".e_ADMIN_ABS."modcomment.php?$table.$id'>".COMLAN_314."</a>";
$modcomment .= "<a href='".e_ADMIN_ABS."comment.php?searchquery={$id}&filter_options=comment_type__".$this->getCommentType($table)."'>".COMLAN_314."</a>"; $modcomment .= "<a class='btn' href='".e_ADMIN_ABS."comment.php?searchquery={$id}&filter_options=comment_type__".$this->getCommentType($table)."'>".COMLAN_314."</a>";
$modcomment .= "</div>"; $modcomment .= "</div>";
} }
@@ -1088,9 +1088,9 @@ class comment
// from calculations are done by eNav() js. // from calculations are done by eNav() js.
return " return "
<a class='e-ajax' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='down' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Previous</a> <a class='e-ajax btn' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='down' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Previous</a>
<a class='e-ajax' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='up' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Next</a> <a class='e-ajax btn' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='up' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Next</a>
"; ";

18
e107_handlers/sitelinks_class.php
View File

@@ -1231,22 +1231,22 @@ class e_navigation
* @param template to use. * @param template to use.
* TODO Support for side-menu templates and others. * TODO Support for side-menu templates and others.
*/ */
function render($data, $tmpl = 'navigation') function render($data, $type = 'main')
{ {
$sc = e107::getScBatch('navigation'); $sc = e107::getScBatch('navigation');
$template = e107::getCoreTemplate($tmpl); $template = e107::getCoreTemplate('navigation', $type);
$sc->template = $template; // parse the template to the shortcodes. (sub menus) $sc->template = $template; // parse the template to the shortcodes. (sub menus)
$text = $template['START']; $text = $template['start'];
foreach($data as $lnk) foreach($data as $lnk)
{ {
$sc->setVars($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 .= e107::getParser()->parseTemplate($item,TRUE);
} }
$text .= $template['END']; $text .= $template['end'];
return $text; return $text;
} }
@@ -1267,7 +1267,7 @@ class navigation_shortcodes extends e_shortcode
function sc_link_name($parm='') 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='') function sc_link_url($parm='')
@@ -1293,15 +1293,15 @@ class navigation_shortcodes extends e_shortcode
return; return;
} }
$text = $this->template['SUBMENU_START']; $text = $this->template['submenu_start'];
foreach($this->var['link_sub'] as $val) foreach($this->var['link_sub'] as $val)
{ {
$this->setVars($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; return $text;
} }

15
e107_themes/bootstrap/theme.php
View File

@@ -105,20 +105,19 @@ $HEADER['default'] = '
<p class="navbar-text pull-right"> <p class="navbar-text pull-right">
Logged in as <a href="#" class="navbar-link">'.USERNAME.'</a> Logged in as <a href="#" class="navbar-link">'.USERNAME.'</a>
</p> </p>
{NAVIGATION} {NAVIGATION=main}
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span2"> <div class="span3">
{SETSTYLE=site_info} <div class="well sidebar-nav">
{NAVIGATION=side}
{MENU=2} </div><!--/.well -->
</div><!--/span-->
</div> <div class="span9">
<div class="span10">
'; ';
$FOOTER['default'] = ' $FOOTER['default'] = '
</div><!--/span--> </div><!--/span-->

1
e107_themes/jayya/theme.php
View File

@@ -282,6 +282,7 @@ $sc_style['RATING']['post'] = "<br /><br />";
$sc_style['COMMENT']['post'] = "<br />"; $sc_style['COMMENT']['post'] = "<br />";
$COMMENTSTYLE = "<div class='spacer' style='text-align:center'><table class='fborder' style='width: 95%'> $COMMENTSTYLE = "<div class='spacer' style='text-align:center'><table class='fborder' style='width: 95%'>
<tr> <tr>
<td class='fcaption' colspan='2'>".LAN_THEME_5." {USERNAME} ".LAN_THEME_6." {TIMEDATE} <td class='fcaption' colspan='2'>".LAN_THEME_5." {USERNAME} ".LAN_THEME_6." {TIMEDATE}