This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch ms12_conversion_of_md_files in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c154b2ea79d99f56045d2d8ec468c9e6ea092eec Author: Christian Grobmeier <[email protected]> AuthorDate: Sun Feb 25 17:34:38 2024 +0100 added menus --- src/asciidoc/templates/document.html.erb | 126 +++++++++++++++++--- src/site/resources/css/logging-custom.css | 127 +++++++++++++++++++++ .../font-awesome-4.7.0/css/font-awesome.min.css | 2 +- 3 files changed, 235 insertions(+), 20 deletions(-) diff --git a/src/asciidoc/templates/document.html.erb b/src/asciidoc/templates/document.html.erb index bd19cb6fa1..ed18e64e2e 100644 --- a/src/asciidoc/templates/document.html.erb +++ b/src/asciidoc/templates/document.html.erb @@ -35,33 +35,59 @@ <link rel="stylesheet" href="/font-awesome-4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="/css/fonts.css"> + <%= Asciidoctor::Stylesheets.instance.embed_primary_stylesheet %> + <link rel="stylesheet" href="/css/logging-custom.css"> - <% - if Asciidoctor::DEFAULT_STYLESHEET_KEYS.include?(attr :stylesheet) - %><%= Asciidoctor::Stylesheets.instance.embed_primary_stylesheet %><% - elsif attr? :stylesheet %> - <link rel="stylesheet" href="<%= normalize_web_path((attr :stylesheet), attr(:stylesdir, '')) %>"> - <% - end - %> <!-- Code Highlighter --> <%= syntax_highlighter&.docinfo :head, self, {} %> <%= (docinfo_content = docinfo).empty? ? nil : %(#{docinfo_content}) %> + </head> -<body<%= @id && %( id="#{@id}") %> class="<%= [(attr :doctype),((attr? 'toc-class') && (attr? :toc) && (attr? 'toc-placement', 'auto') ? %(#{attr 'toc-class'} toc-#{attr 'toc-position', 'left'}) : nil)].compact * ' ' %>"<%= (attr? 'max-width') ? %( style="max-width: #{attr 'max-width'};") : nil %>> +<body> <div id="header"> - <h1><%= @header.title %></h1> - <% - if (attr? :toc) && (attr? 'toc-placement', 'auto') %> - <div id="toc" class="<%= attr 'toc-class', 'toc' %>"> - <div id="toctitle"><%= attr 'toc-title' %></div> - <%= converter.convert self, 'outline' %> - </div><% - end -%> + <div class="logo"> + <img src="/images/logo.png" /> + </div> + <nav class="main-menu"> + <ul> + <li><a href="#">About</a></li> + <li><a href="#">Downloads</a></li> + <li> + <a href="#">Learn <i class="fa fa-chevron-circle-down" aria-hidden="true"></i></a> + <ul class="menu-drop-down"> + <li><a href="#">Getting Started</a></li> + <li><a href="#">Manual</a></li> + <li><a href="#">Guides</a></li> + </ul> + </li> + <li><a href="#">Release Notes</a></li> + <li><a href="#">Support</a></li> + <li><a href="#">Security</a></li> + <li><a href="#">Contribute</a></li> + </ul> + </nav> + + <nav class="secondary-menu"> + <ul> + <li> + <a href="#">Apache <i class="fa fa-chevron-circle-down" aria-hidden="true"></i></a> + <ul class="menu-drop-down"> + <li><a target="_blank" href="https://www.apache.org/";>Home</a></li> + <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a target="_blank" href="https://www.apache.org/licenses/";>License</a></li> + <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a target="_blank" href="https://www.apache.org/events/current-event.html";>Current Events</a></li> + <li><a target="_blank" href="https://www.apache.org/security/";>Security</a></li> + <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li> + </ul> + </li> + <li><a href="https://logging.apache.org";>Logging</a></li> + </ul> + </nav> </div> <div id="content"> + <h1><%= doctitle %></h1> <%= content %> </div><% unless !footnotes? || attr?(:nofootnotes) %> @@ -76,7 +102,44 @@ end %><% unless nofooter %> <div id="footer"> - <div id="footer-text"><% + <div class="footer-blocks"> + <div> + <h3>Project</h3> + <ul> + <li><a href="https://github.com/apache/logging-log4j2";>Github</a></li> + <li><a href="hhttps://github.com/apache/logging-log4j2/issues";>Issues</a></li> + <li><a href="https://logging.apache.org/log4j/2.x/download.html";>Downloads</a></li> + <li><a href="#">Release Notes</a></li> + <li><a href="#">Support</a></li> + <li><a href="#">Security</a></li> + <li><a href="#">Contribute</a></li> + </ul> + </div> + <div> + <h3>Learn</h3> + <ul> + <li><a href="#">Getting Started</a></li> + <li><a href="#">Manual</a></li> + <li><a href="#">Guides</a></li> + </ul> + </div> + <div> + <h3>The ASF</h3> + <ul> + <li><a target="_blank" href="https://www.apache.org/";>Home</a></li> + <li><a target="_blank" href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a target="_blank" href="https://www.apache.org/licenses/";>License</a></li> + <li><a target="_blank" href="https://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a target="_blank" href="https://www.apache.org/events/current-event.html";>Current Events</a></li> + <li><a target="_blank" href="https://www.apache.org/security/";>Security</a></li> + <li><a target="_blank" href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li> + </ul> + </div> + </div> + + <div class="footer-text"> + <div> + <% if attr? :revnumber %> <%= %(#{attr 'version-label'} #{attr :revnumber}) %><br><% end @@ -84,8 +147,33 @@ <%= %(#{attr 'last-update-label'} #{attr :docdatetime}) %><% end %><%= (docinfo_content = (docinfo :footer)).empty? ? nil : %( #{docinfo_content}) %> + </div> + <div> + Copyright © 2017-2024 The Apache Software Foundation. Licensed under the Apache Software License, Version 2.0 Please read our privacy policy. + <br/> + Apache, Chainsaw, log4cxx, Log4j, Log4net, log4php and the Apache feather logo are trademarks or registered trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. + </div> </div> </div><% end %> +<script> + document.addEventListener('DOMContentLoaded', function() { + var menuItems = document.querySelectorAll('#header nav > ul > li'); + + for (var i = 0; i < menuItems.length; i++) { + menuItems[i].addEventListener('click', function(event) { + var subMenu = this.getElementsByClassName('menu-drop-down')[0]; + if (subMenu.style.display === 'flex') { + subMenu.style.display = 'none'; + } else { + subMenu.style.display = 'flex'; + } + + // Prevent navigating to '#' link on parent menu item + event.preventDefault(); + }); + } + }); +</script> </body> </html> \ No newline at end of file diff --git a/src/site/resources/css/logging-custom.css b/src/site/resources/css/logging-custom.css new file mode 100644 index 0000000000..ee2098cf64 --- /dev/null +++ b/src/site/resources/css/logging-custom.css @@ -0,0 +1,127 @@ +#header { + display: flex; + max-width: 100%; + height: 10vh; + align-items: center; +} + +#header .logo img { + max-height: 6vh; +} + +#header .logo { + margin-right: 3em; +} + +#header .main-menu { + flex-grow: 1; +} + +#header .main-menu > ul, +#header .secondary-menu > ul { + display: flex; + list-style: none; + margin: 0; +} + +#header .main-menu > ul li a, +#header .secondary-menu > ul li a { + font-family: 'Open Sans', serif; + font-size: 1em; + font-weight: bold; + text-decoration: none; +} + +#header .main-menu ul li, +#header .secondary-menu ul li { + margin-right: 1.5em; +} + +#header nav ul { + list-style: none; + margin: 0; + padding: 0; + overflow: hidden; +} + +#header nav ul li { + float: left; +} + +#header nav ul li a { + display: block; + text-align: center; + padding: 14px 16px; + text-decoration: none; +} + +#header .menu-drop-down { + display: none; + position: absolute; + flex-direction: column; + min-width: 160px; + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); + z-index: 1; + background-color: white; +} + +#header .menu-drop-down a { + padding: 12px 16px; + text-decoration: none; + display: block; + text-align: left; +} + +#header nav ul li:hover .menu-drop-down { + display: flex; +} + +#header .menu-drop-down a:hover { + background-color: #f1f1f1; +} + +/** Footer */ + +#footer .footer-blocks { + display: flex; + justify-content: center; + background-color: #333; +} + +#footer .footer-blocks div { + padding: 2em; + min-width: 30%; + color: white; +} + +#footer .footer-blocks div h3 { + color: lightgray; +} + +#footer .footer-blocks div ul { + list-style: none; + margin-left: 0; +} +#footer .footer-blocks div ul li a { + color: white; + font-family: 'Open Sans', serif; + font-size: 1em; + font-weight: bold; + text-decoration: none; +} + +#footer .footer-text { + width: 100%; +} + +#footer .footer-text div { + line-height: 1.4em; + font-family: 'Open Sans', serif; + font-size: 1em; + color: white; + width: 80%; + padding: 1em; +} + + + diff --git a/src/site/resources/font-awesome-4.7.0/css/font-awesome.min.css b/src/site/resources/font-awesome-4.7.0/css/font-awesome.min.css index 540440ce89..75821343eb 100644 --- a/src/site/resources/font-awesome-4.7.0/css/font-awesome.min.css +++ b/src/site/resources/font-awesome-4.7.0/css/font-awesome.min.css @@ -1,4 +1,4 @@ /*! * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:norma [...] + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2') format('woff2'),url('../fonts/fontawesome-webfont.woff') format('woff'),url('../fonts/fontawesome-webfont.ttf') format('truetype'),url('../fonts/fontawesome-webfont.svg?#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal [...]
