Implemented a nav link generating system so that extension power what shows up in the menus rather than being hard-coded in the themes.

This commit is contained in:
Matthew Barbour
2019-08-02 14:54:48 -05:00
committed by matthew
parent 972b68bdd3
commit 00464d2579
38 changed files with 583 additions and 344 deletions

View File

@@ -9,7 +9,7 @@
*/
class Layout
{
public function display_page(Page $page)
public function display_page(Page $page, array $nav_links, array $sub_links)
{
global $config, $user;
@@ -23,24 +23,11 @@ class Layout
<script type='text/javascript' src='{$data_href}/themes/{$theme_name}/wz_tooltip.js'></script>
<a href='".make_link()."' onmouseover='Tip(&#39;Home&#39;, BGCOLOR, &#39;#C3D2E0&#39;, FADEIN, 100)' onmouseout='UnTip()'><img src='{$data_href}/favicon.ico' style='position: relative; top: 3px;'></a>
<b>{$site_name}</b> ";
// Custom links: These appear on the menu.
$custom_links = "";
if ($user->is_anonymous()) {
$custom_links .= $this->navlinks(make_link('user_admin/login'), "Account", ["user", "user_admin", "setup", "admin", "profile"]);
} else {
$custom_links .= $this->navlinks(make_link('user'), "Account", ["user", "setup", "user_admin", "admin", "profile"]);
}
$custom_links .= $this->navlinks(make_link('post/list'), "Posts", ["post", "view"]);
$custom_links .= $this->navlinks(make_link('comment/list'), "Comments", ["comment"]);
$custom_links .= $this->navlinks(make_link('tags'), "Tags", ["tags"]);
if (class_exists("Pools")) {
$custom_links .= $this->navlinks(make_link('pool/list'), "Pools", ["pool"]);
}
$custom_links .= $this->navlinks(make_link('upload'), "Upload", ["upload"]);
if (class_exists("Wiki")) {
$custom_links .= $this->navlinks(make_link('wiki/rules'), "Rules", ["wiki/rules"]);
$custom_links .= $this->navlinks(make_link('wiki'), "Wiki", ["wiki"]);
foreach ($nav_links as $nav_link) {
$custom_links .= $this->navlinks($nav_link->link, $nav_link->description, $nav_link->active);
}
$menu .= "{$custom_links}</div>";
@@ -69,87 +56,13 @@ class Layout
}
}
$custom_sublinks = "<div class='sbar'>";
// hack
$username = url_escape($user->name);
// hack
$qp = explode("/", ltrim(_get_query(), "/"));
$cs = "";
// php sucks
switch ($qp[0]) {
default:
$cs = $user_block_html;
break;
case "":
# FIXME: this assumes that the front page is
# post/list; in 99% of case it will either be
# post/list or home, and in the latter case
# the subnav links aren't shown, but it would
# be nice to be correct
case "post":
if (class_exists("NumericScore")) {
$cs .= "<b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a><b>/</b><a href='".make_link('popular_by_month')."'>Month</a><b>/</b><a href='".make_link('popular_by_year')."'>Year</a> ";
}
$cs .= "<a class='tab' href='".make_link('post/list')."'>All</a>";
if (class_exists("Favorites")) {
$cs .= "<a class='tab' href='".make_link("post/list/favorited_by={$username}/1")."'>My Favorites</a>";
}
if (class_exists("RSS_Images")) {
$cs .= "<a class='tab' href='".make_link('rss/images')."'>Feed</a>";
}
if (class_exists("Random_Image")) {
$cs .= "<a class='tab' href='".make_link("random_image/view")."'>Random Image</a>";
}
if (class_exists("Wiki")) {
$cs .= "<a class='tab' href='".make_link("wiki/posts")."'>Help</a>";
} else {
$cs .= "<a class='tab' href='".make_link("ext_doc/index")."'>Help</a>";
}
break;
case "comment":
$cs .= "<a class='tab' href='".make_link('comment/list')."'>All</a>";
$cs .= "<a class='tab' href='".make_link('rss/comments')."'>Feed</a>";
$cs .= "<a class='tab' href='".make_link("ext_doc/comment")."'>Help</a>";
break;
case "pool":
$cs .= "<a class='tab' href='".make_link('pool/list')."'>List</a>";
$cs .= "<a class='tab' href='".make_link("pool/new")."'>Create</a>";
$cs .= "<a class='tab' href='".make_link("pool/updated")."'>Changes</a>";
$cs .= "<a class='tab' href='".make_link("ext_doc/pools")."'>Help</a>";
break;
case "wiki":
$cs .= "<a class='tab' href='".make_link('wiki')."'>Index</a>";
$cs .= "<a class='tab' href='".make_link("wiki/rules")."'>Rules</a>";
$cs .= "<a class='tab' href='".make_link("ext_doc/wiki")."'>Help</a>";
break;
case "tags":
case "alias":
$cs .= "<a class='tab' href='".make_link('tags/map')."'>Map</a>";
$cs .= "<a class='tab' href='".make_link('tags/alphabetic')."'>Alphabetic</a>";
$cs .= "<a class='tab' href='".make_link('tags/popularity')."'>Popularity</a>";
$cs .= "<a class='tab' href='".make_link('tags/categories')."'>Categories</a>";
$cs .= "<a class='tab' href='".make_link('alias/list')."'>Aliases</a>";
$cs .= "<a class='tab' href='".make_link("ext_doc/tag_edit")."'>Help</a>";
break;
case "upload":
if (class_exists("Wiki")) {
$cs .= "<a class='tab' href='".make_link("wiki/upload_guidelines")."'>Guidelines</a>";
}
break;
case "random":
$cs .= "<a class='tab' href='".make_link('random/view')."'>Shuffle</a>";
$cs .= "<a class='tab' href='".make_link('random/download')."'>Download</a>";
break;
case "featured":
$cs .= "<a class='tab' href='".make_link('featured/download')."'>Download</a>";
break;
}
if ($cs == "") {
$custom_sublinks = "";
} else {
$custom_sublinks .= "$cs</div>";
$custom_sublinks = "";
if(!empty($sub_links)) {
$custom_sublinks = "<div class='sbar'>";
foreach ($sub_links as $nav_link) {
$custom_sublinks .= $this->navlinks($nav_link->link, $nav_link->description, $nav_link->active);
}
$custom_sublinks .= "</div>";
}
$debug = get_debug_info();
@@ -240,31 +153,13 @@ EOD;
/**
* #param string[] $pages_matched
*/
public function navlinks(string $link, string $desc, array $pages_matched): ?string
public function navlinks(Link $link, string $desc, bool $active): ?string
{
/**
* Woo! We can actually SEE THE CURRENT PAGE!! (well... see it highlighted in the menu.)
*/
$html = null;
$url = ltrim(_get_query(), "/");
$re1='.*?';
$re2='((?:[a-z][a-z_]+))';
if (preg_match_all("/".$re1.$re2."/is", $url, $matches)) {
$url=$matches[1][0];
}
$count_pages_matched = count($pages_matched);
for ($i=0; $i < $count_pages_matched; $i++) {
if ($url == $pages_matched[$i]) {
$html = "<a class='tab-selected' href='{$link}'>{$desc}</a>";
}
}
if (is_null($html)) {
$html = "<a class='tab' href='{$link}'>{$desc}</a>";
if ($active) {
$html = "<a class='tab-selected' href='{$link->make_link()}'>{$desc}</a>";
} else {
$html = "<a class='tab' href='{$link->make_link()}'>{$desc}</a>";
}
return $html;