diff --git a/site/4ed_site_render_main.cpp b/site/4ed_site_render_main.cpp index ee3d005d..14aaf257 100644 --- a/site/4ed_site_render_main.cpp +++ b/site/4ed_site_render_main.cpp @@ -49,172 +49,14 @@ char html_header[] = R"HTMLFOO( %.*s - - + -
)HTMLFOO"; char html_footer[] = R"HTMLFOO(
-
)HTMLFOO"; @@ -316,13 +158,11 @@ render_doc_page_to_html__table(Arena *scratch, Vec2_i32 dim, Doc_Content_List *v } function void -render_doc_page_to_html(Arena *scratch, Doc_Page *page, FILE *file){ +render_doc_page_to_html_no_header(Arena *scratch, Doc_Page *page, FILE *file){ + Temp_Memory_Block temp(scratch); - Doc_Cluster *cluster = page->owner; - fprintf(file, html_header, string_expand(page->title)); - fprintf(file, "
\n"); fprintf(file, "
> %.*s
\n", @@ -330,7 +170,7 @@ render_doc_page_to_html(Arena *scratch, Doc_Page *page, FILE *file){ string_expand(cluster->title)); fprintf(file, "
\n"); - + fprintf(file, "

%.*s

\n", string_expand(page->name)); fprintf(file, "
"); @@ -347,7 +187,7 @@ render_doc_page_to_html(Arena *scratch, Doc_Page *page, FILE *file){ block = block->next){ if (block->name.size > 0 && !string_match(block->name, string_u8_litexpr("brief"))){ - fprintf(file, "

%.*s

\n", string_expand(block->name)); + fprintf(file, "

%.*s

\n", string_expand(block->name)); } for (Doc_Paragraph *par = block->first_par; @@ -376,10 +216,18 @@ render_doc_page_to_html(Arena *scratch, Doc_Page *page, FILE *file){ } if (block->next != 0){ - fprintf(file, "
\n"); + fprintf(file, "
\n"); } } +} + +function void +render_doc_page_to_html(Arena *scratch, Doc_Page *page, FILE *file){ + fprintf(file, html_header, string_expand(page->title)); + fprintf(file, "
\n"); + render_doc_page_to_html_no_header(scratch, page, file); + fprintf(file, "
\n"); fprintf(file, html_footer); } @@ -426,7 +274,7 @@ render_doc_cluster_to_html(Arena *scratch, Doc_Cluster *cluster, Temp_Memory_Block temp(scratch); fprintf(file, html_header, string_expand(cluster->title)); - + fprintf(file, "
\n"); fprintf(file, "
\n"); fprintf(file, "

%.*s

\n", string_expand(cluster->title)); @@ -440,6 +288,7 @@ render_doc_cluster_to_html(Arena *scratch, Doc_Cluster *cluster, fprintf(file, "

Index

\n", string_expand(cluster->name)); + fprintf(file, "
\n"); fprintf(file, html_footer); } @@ -448,36 +297,59 @@ render_doc_cluster_to_html(Arena *scratch, Doc_Cluster *cluster, fprintf(file_index, html_header, string_expand(cluster->title)); - fprintf(file_index, "
\n"); - fprintf(file_index, "

%.*s Index

\n", string_expand(cluster->title)); - fprintf(file_index, "
\n"); - fprintf(file_index, "page_count); + i32 counter = 0; + for (Doc_Page *node = cluster->first_page; + node != 0; + node = node->next){ + ptrs[counter] = node; + counter += 1; + } + sort_doc_page_array(ptrs, 0, counter); + + // NOTE(rjf): List of API pages, with filter box. + { + fprintf(file_index, "
\n"); + + fprintf(file_index, "
\n"); + fprintf(file_index, "

%.*s Index

\n", string_expand(cluster->title)); + fprintf(file_index, "
\n"); + + fprintf(file_index, ""); fprintf(file_index, "
\n"); - Doc_Page **ptrs = push_array(scratch, Doc_Page*, cluster->page_count); - i32 counter = 0; - for (Doc_Page *node = cluster->first_page; - node != 0; - node = node->next){ - ptrs[counter] = node; - counter += 1; - } - - sort_doc_page_array(ptrs, 0, counter); - fprintf(file_index, "
"); - + fprintf(file_index, "
    \n"); for (i32 i = 0; i < counter; i += 1){ Doc_Page *node = ptrs[i]; - fprintf(file_index, "
  • %.*s
    • ", + fprintf(file_index, "
  • %.*s
    • ", string_expand(node->name), string_expand(node->name)); } fprintf(file_index, "
\n"); - fprintf(file_index, "
\n"); - + fprintf(file_index, "
\n"); + + fprintf(file_index, "
\n"); + } + + // NOTE(rjf): API pages. + { + for (i32 i = 0; i < counter; i += 1){ + Doc_Page *node = ptrs[i]; + fprintf(file_index, "
\n", + string_expand(node->name)); + render_doc_page_to_html_no_header(scratch, node, file_index); + + fprintf(file_index, "
\n"); + fprintf(file_index, "
Standalone Page
\n", + string_expand(node->name)); + + fprintf(file_index, "
"); + } + } + fprintf(file_index, html_footer); } } @@ -548,8 +420,8 @@ int main(){ Doc_Cluster *cluster = cluster_array[i]; for (Doc_Page *node = cluster->first_page; node != 0; - node = node->next){ - render_doc_page_to_html(&arena, node, docs_root); + node = node->next){ + render_doc_page_to_html(&arena, node, docs_root); } render_doc_cluster_to_html(&arena, cluster, docs_root); } diff --git a/site/docs/styles.css b/site/docs/styles.css new file mode 100644 index 00000000..e5c7c979 --- /dev/null +++ b/site/docs/styles.css @@ -0,0 +1,206 @@ + +* { + padding: 0; + margin: 0; + word-wrap: break-word; +} + +body { + font-family: 'Inconsolata', monospace; + background: #0C0C0C; + color: #FF00FF; +} + +h1 { + margin-top: 0; + margin-bottom: .4em; + font-size: 1.9em; + color: #00A000; +} + +h2 { + margin-top: 0; + margin-bottom: .666em; + font-size: 1.5em; + color: #00A000; +} + +h3 { + margin-top: 0; + margin-bottom: 0; + font-size: 1.17em; + color: #90B080; + background: #001300; + padding: 0 .25em 0 .25em; + display: inline; +} + +ul { + margin-top: 0; + margin-bottom: 0; +} + +li { + margin-top: 5px; +} + +li.firstli { + margin-top: 0px; +} + +pre { + margin: 0; +} + +.root { + width: 100%; + margin: auto; +} + +.center { + text-align: center; +} + +.normal { + font-size: 1em; + color: #90B080; + text-align: justify; +} + +.normal li { + text-align: left; +} + +.small { + font-size: .8em; + color: #90B080; + text-align: justify; +} + +.small li { + text-align: left; +} + +.normal a:link, .small a:link, h1 a:link, h2 a:link, a:link { + color: #D08F20; +} + +.normal a:visited, .small a:visited, h1 a:visited, h2 a:visited, a:visited { + color: #744F14; +} + +.normal a:hover, .small a:hover, h1 a:hover, h2 a:hover, a:hover { + color: #E0AF60; +} + +.sample_code { + font-size: 1em; + color: #90B080; + padding: 3px; + background: #323232; +} + +.sample_code div { + padding: .5em; + background: #181818; + overflow: auto; +} + +.comment { + margin-left: 14px; + margin-right: 14px; + font-size: 1.25em; + color: #2090F0; +} + +.emphasize { + color: #00A000; +} + +.spacer { + height: 2.5em; +} + +.small_spacer { + height: 1em; +} + +.very_small_spacer { + height: .5em; +} + +.bottom_spacer { + height: 20em; +} + +.sidebar { + position: absolute; + background: #0C0C0C; + border-right: 1px solid #90B080; + border-bottom: 1px solid #90B080; + width: 20rem; + padding: 2em 2em 2em 2em; + display: inline-block; + float: left; +} + +.docs_menu { + list-style-type:none; +} + +.filter_box { + border: 1px solid #90B080; + font-size: 1.5em; + color: #90B080; + background: none; + text-align: justify; + font-family: 'Inconsolata', monospace; + width: 100%; +} + +.api_page_preview { + display: block; + width: 45rem; + margin-left: 27rem; + padding-top: 2rem; +} + +.api_page { + display: block; + width: 45rem; + margin-left: auto; + margin-right: auto; +} + +.hidden { + display: none; +} + +@media only screen and (max-width: 75rem) { + .api_page_preview { + width: calc(100% - 29rem); + } +} + +@media only screen and (max-width: 50rem) { + .sidebar { + position: relative; + width: calc(100% - 5em); + display: block; + margin-bottom: 2em; + border: none; + } + + .api_page_preview { + width: calc(100% - 4em); + margin-left: auto; + margin-right: auto; + padding: 2em 2em 2em 2em; + } +} + +@media only screen and (max-width: 49rem) { + .api_page { + width: calc(100% - 4rem); + } +} \ No newline at end of file diff --git a/site/static/docs/search.js b/site/static/docs/search.js index 60cefa52..6c222f10 100644 --- a/site/static/docs/search.js +++ b/site/static/docs/search.js @@ -1,6 +1,11 @@ const menu_id = "docs_menu"; const filter_id = "search_input"; +window.onload = function() +{ + UpdateActiveDoc(window.location.hash.substr(1)); +}; + function StringMatch4coderFuzzy(a, b) { let match = true; @@ -29,24 +34,26 @@ function SearchKeyDown(event) { if(event.keyCode == 13) { + event.preventDefault(); let ul = document.getElementById(menu_id); let li = ul.getElementsByTagName("li"); for (let i = 0; i < li.length; i++) { - if(li[i].style.display == "") - { - window.location.href = li[i].getElementsByTagName("a")[0]; + if(li[i].style.display == "") + { + UpdateActiveDoc(li[i].getElementsByTagName("a")[0].innerHTML); + window.location.hash = li[i].getElementsByTagName("a")[0].innerHTML; break; - } + } } } } function SearchKeyUp(event) { - let ul = document.getElementById(menu_id); - let li = ul.getElementsByTagName("li"); + let ul = document.getElementById(menu_id); + let li = ul.getElementsByTagName("li"); let input = document.getElementById(filter_id); let filter = input.value.toUpperCase(); for(let i = 0; i < li.length; i++) @@ -68,4 +75,16 @@ function SearchKeyUp(event) li[i].style.display = ""; } } +} + +function UpdateActiveDoc(name) +{ + let active_hash = window.location.hash.substr(1); + let new_hash = name; + if(active_hash.length > 0) + { + document.getElementById(active_hash).classList.add("hidden"); + } + document.getElementById(new_hash).classList.remove("hidden"); + document.getElementById(filter_id).focus(); } \ No newline at end of file