Skip to content
Snippets Groups Projects
Commit d995e889 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Merge branch 'mlong/xtrnheadtail' into 'master'

add global head and tail for both section menu and external program menu

See merge request !49
parents 6d9a2728 bab4a668
No related branches found
No related tags found
No related merge requests found
...@@ -123,11 +123,15 @@ function external_program_menu(xsec) ...@@ -123,11 +123,15 @@ function external_program_menu(xsec)
var secnum = xtrn_area.sec_list[xsec].number+1; var secnum = xtrn_area.sec_list[xsec].number+1;
var seccode = xtrn_area.sec_list[xsec].code; var seccode = xtrn_area.sec_list[xsec].code;
if(!bbs.menu("xtrn" + secnum + "_head", P_NOERROR)) if(!bbs.menu("xtrn" + secnum + "_head", P_NOERROR) &&
bbs.menu("xtrn" + seccode + "_head", P_NOERROR); !bbs.menu("xtrn" + seccode + "_head", P_NOERROR)) {
bbs.menu("xtrn_head", P_NOERROR);
}
if(bbs.menu("xtrn" + secnum, P_NOERROR) || bbs.menu("xtrn" + seccode, P_NOERROR)) { if(bbs.menu("xtrn" + secnum, P_NOERROR) || bbs.menu("xtrn" + seccode, P_NOERROR)) {
if(!bbs.menu("xtrn" + secnum + "_tail", P_NOERROR)) if(!bbs.menu("xtrn" + secnum + "_tail", P_NOERROR) &&
bbs.menu("xtrn" + seccode + "_tail", P_NOERROR); !bbs.menu("xtrn" + seccode + "_tail", P_NOERROR)) {
bbs.menu("xtrn_tail", P_NOERROR);
}
} }
else { else {
var multicolumn = options.multicolumn && prog_list.length > options.singlecolumn_height; var multicolumn = options.multicolumn && prog_list.length > options.singlecolumn_height;
...@@ -176,8 +180,10 @@ function external_program_menu(xsec) ...@@ -176,8 +180,10 @@ function external_program_menu(xsec)
} }
console.crlf(); console.crlf();
} }
if(!bbs.menu("xtrn" + secnum + "_tail", P_NOERROR)) if(!bbs.menu("xtrn" + secnum + "_tail", P_NOERROR)
bbs.menu("xtrn" + seccode + "_tail", P_NOERROR); && !bbs.menu("xtrn" + seccode + "_tail", P_NOERROR)) {
bbs.menu("xtrn_tail", P_NOERROR);
}
bbs.node_sync(); bbs.node_sync();
console.mnemonics(options.which); console.mnemonics(options.which);
} }
...@@ -216,35 +222,36 @@ function external_section_menu() ...@@ -216,35 +222,36 @@ function external_section_menu()
bbs.node_action=NODE_XTRN; bbs.node_action=NODE_XTRN;
bbs.node_sync(); bbs.node_sync();
if(options.clear_screen)
console.clear(LIGHTGRAY);
bbs.menu("xtrn_sec_head", P_NOERROR);
if(bbs.menu_exists("xtrn_sec")) { if(bbs.menu_exists("xtrn_sec")) {
bbs.menu("xtrn_sec"); bbs.menu("xtrn_sec");
xsec=console.getnum(sec_list.length); bbs.menu("xtrn_sec_tail", P_NOERROR);
if(xsec<=0)
break;
xsec--;
} }
else { else {
if(options.clear_screen)
console.clear(LIGHTGRAY);
if(options.sort) if(options.sort)
sec_list.sort(sort_by_name); sec_list.sort(sort_by_name);
printf(options.section_header_fmt, options.section_header_title); printf(options.section_header_fmt.replace('\x01l', ''), options.section_header_title);
for (i = 0; i < sec_list.length; i++) { for (i = 0; i < sec_list.length; i++) {
console.add_hotspot(i+1); console.add_hotspot(i+1);
printf(options.section_fmt, i + 1, sec_list[i].name); printf(options.section_fmt, i + 1, sec_list[i].name);
} }
bbs.menu("xtrn_sec_tail", P_NOERROR);
bbs.node_sync(); bbs.node_sync();
console.mnemonics(format(options.section_which, xsec + 1)); console.mnemonics(format(options.section_which, xsec + 1));
}
xsec = console.getnum(sec_list.length, xsec + 1); bbs.node_sync();
if(xsec < 1) xsec=console.getnum(sec_list.length);
if(xsec<=0)
break; break;
xsec--; xsec--;
}
external_program_menu(sec_list[xsec].index); external_program_menu(sec_list[xsec].index);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment