From c46da866eb1a6396ae1d670436dd6d87b4b8e442 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Fri, 21 Oct 2016 16:44:28 +0100 Subject: improve applications and modules list styles --- system/doc/top/src/erl_html_tools.erl | 47 +++++--------------- system/doc/top/src/otp_man_index.erl | 61 +++++++++++++------------- system/doc/top/templates/applications.html.src | 54 ++++++++++++++++------- 3 files changed, 78 insertions(+), 84 deletions(-) diff --git a/system/doc/top/src/erl_html_tools.erl b/system/doc/top/src/erl_html_tools.erl index d55c2e1164..28a0649658 100644 --- a/system/doc/top/src/erl_html_tools.erl +++ b/system/doc/top/src/erl_html_tools.erl @@ -387,9 +387,7 @@ subst("#copyright#", _Info, _Group) -> "copyright Copyright © 1991-2004"; subst("#groups#", Info, _Group) -> [ - "\n", - subst_groups(Info), - "
\n" + subst_groups(Info) ]; subst("#applinks#", Info, Group) -> subst_applinks(Info, Group); @@ -476,16 +474,10 @@ subst_unknown_groups([{_Group,Heading,Apps} | Groups], Text0, Left) -> group_table(Heading,Apps) -> - [ - " \n", - " \n", - " ",Heading,"\n", - " \n", - " \n", + ["

",Heading,"

", + "\n", subst_apps(Apps), - " \n", - " \n", - " \n" + "
 
\n" ]. % Count and split the applications in half to get the right sort @@ -500,17 +492,11 @@ subst_apps([]) -> subst_app(App, [{VSN,_Path,Link,Text}]) -> [ " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
\n", + " \n", " ",uc(App),"\n", " ",VSN,"\n", - "
\n" " \n", - " \n", + " \n", Text,"\n", " \n", " \n" @@ -518,27 +504,14 @@ subst_app(App, [{VSN,_Path,Link,Text}]) -> subst_app(App, [{VSN,_Path,Link,Text} | VerInfos]) -> [ " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - "
\n", + " \n", " ",uc(App), - "  
\n", + "\n", " ",VSN,"\n", - "
\n", - " \n", - " \n", - " \n", - " \n", - "
\n", + " \n", subst_vsn(VerInfos), - "
\n" - "
\n" " \n", - " \n", + " \n", Text,"\n", " \n", " \n" diff --git a/system/doc/top/src/otp_man_index.erl b/system/doc/top/src/otp_man_index.erl index 12aaba1423..655d7265f7 100644 --- a/system/doc/top/src/otp_man_index.erl +++ b/system/doc/top/src/otp_man_index.erl @@ -154,10 +154,10 @@ gen_html(RefPages, OutFile)-> SortedPages = lists:sort(RefPages), lists:foreach(fun({_,Module, App, AppDocDir, RefPagePath}) -> - io:fwrite(Out, " \n",[]), - io:fwrite(Out, " ~s\n", + io:fwrite(Out, " \n",[]), + io:fwrite(Out, " ~s\n", [RefPagePath, Module]), - io:fwrite(Out, " ~s\n", + io:fwrite(Out, " ~s\n", [filename:join(AppDocDir, "index.html"), App]), io:fwrite(Out, " \n",[]) @@ -175,41 +175,40 @@ gen_html(RefPages, OutFile)-> html_header() -> "\n" "\n" - "\n" - "\n" + "\n" + "\n" " \n" - " Erlang/OTP Manual Page Index\n" - "\n" - "\n" - "
\n" + " Erlang/OTP Manual Page Index\n" + "\n" + "\n" + "
\n" "\n" - "\n" - "[Up | Erlang]\n" - "
\n" - "

OTP Reference Page Index
\n" - "

\n" - "
\n" - "

\n" - "\n" - "\n" - " \n" - "\n". + "
\n" + "\n" + "[ Up | Homepage ]\n" + "
\n" + "

OTP Reference Page Index

\n" + "\n" + "
\n" + "
Manual PageApplication
\n" + "\n" + " \n" + "\n". html_footer(Year) -> - "
Manual PageApplication
\n" - "

\n" - "

\n" - "

\n" - "
\n" - "\n" + "\n" + "
\n" + "

\n" + "

\n" + "
\n" + "\n" "Copyright © 1991-" ++ Year ++ "\n" "\n" "Ericsson AB\n" - "\n" - "
\n" - "\n" - "\n". + "
\n" + "
\n" + "\n" + "\n". diff --git a/system/doc/top/templates/applications.html.src b/system/doc/top/templates/applications.html.src index 1f73c44d69..001234ad32 100644 --- a/system/doc/top/templates/applications.html.src +++ b/system/doc/top/templates/applications.html.src @@ -24,31 +24,53 @@ limitations under the License. Erlang/OTP #version# Applications - -
+ +

Erlang/OTP Applications

#groups# -
-- cgit v1.2.3