bluesaxman/pcms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor menu issues and page name issues -fixed

Browse Source
This commit is contained in:
bluesaxman 2019-05-03 13:18:52 -06:00
parent 7e0b8be958
commit 656db9e87b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
index.pl
View File

@ -133,7 +133,8 @@ sub header {
undef, undef,
{attribute=>'http-equiv', value=>'Content-Type'}, {attribute=>'http-equiv', value=>'Content-Type'},
{attribute=>'content', value=>'text/html; charset=utf-8'}); {attribute=>'content', value=>'text/html; charset=utf-8'});
$header .= html_tag('title',$site_name); my $page = (split("/",$request[4]))[-1];
$header .= html_tag('title',$site_name . $page ne "" ? " - ".$page : "");
$header .= include(@header_includes); $header .= include(@header_includes);
$header .= html_tag( $header .= html_tag(
'meta', 'meta',
@ -176,7 +177,6 @@ sub get_page {
open(PAGE, "<", $pages_dir.$sub_page_name) or return page404($pageURL." we looked here:".$pages_dir.$sub_page_name); open(PAGE, "<", $pages_dir.$sub_page_name) or return page404($pageURL." we looked here:".$pages_dir.$sub_page_name);
my @content = <PAGE>; my @content = <PAGE>;
close(PAGE); close(PAGE);
$site_name .= " - ".$page_name;
return @content; return @content;
} }
} }
@ -232,14 +232,11 @@ sub menu {
while (my $file = readdir($dir)) { while (my $file = readdir($dir)) {
next if ($file =~ m/^\./); next if ($file =~ m/^\./);
next if ($file =~ m/_dir$/); next if ($file =~ m/_dir$/);
push (@{$menus{$current_page}}, $file); push (@{$menus{$current_page}}, $current_page."_dir/".$file);
} }
close($dir); close($dir);
} }
my $buffer = ""; my $buffer = "";
# main needs to be output first then the rest of the menus can be looped through
$buffer .= render_menu("menu",@{$menus{"menu"}});
delete($menus{"menu"});
for my $menu_name (sort keys %menus) { for my $menu_name (sort keys %menus) {
$buffer .= render_menu($menu_name,@{$menus{$menu_name}}); $buffer .= render_menu($menu_name,@{$menus{$menu_name}});
} }