</small></h1> </div>  - <div class="mainmenu"> + <nav class="mainmenu"> <ul> <th1> html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a></li>\n" builtin_request_js hbmenu.js set once 1 @@ -35,16 +35,16 @@ html "<li class='$class'>" if {[string match /* $url]} {set url $home$url} html "<a href='$url'>$name</a></li>\n" } </th1></ul> - </div>  - <div id="hbdrop"></div> + </nav>  + <nav id='hbdrop' title="Sitemap"></nav> </div>  - </div>  + </header>  <div class="middle max-full-width"> <div class="container"> <th1> if {[string first artifact $current_page] == 0 || [string first hexdump $current_page] == 0} { html "<div class=\"artifact_content\">" } </th1> Index: skins/black_and_white/css.txt ================================================================== --- skins/black_and_white/css.txt +++ skins/black_and_white/css.txt @@ -49,11 +49,11 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { margin:10px 0px 10px 0px; padding:1px 0px 0px 20px; border-style:solid; border-color:black; border-width:1px 0px; @@ -60,11 +60,11 @@ background-color:#eee; } /* The main menu bar that appears at the top left of the page beneath ** the header. Width must be co-ordinated with the container below */ -div.mainmenu { +nav.mainmenu { float: left; margin-left: 10px; margin-right: 20px; font-size: 0.9em; font-weight: bold; @@ -73,20 +73,20 @@ border:1px solid #999; width:6em; } /* Main menu is now a list */ -div.mainmenu ul { +nav.mainmenu ul { padding: 0; list-style:none; } -div.mainmenu a, div.mainmenu a:visited{ +nav.mainmenu a, nav.mainmenu a:visited{ padding: 1px 10px 1px 10px; color: #333; text-decoration: none; } -div.mainmenu a:hover { +nav.mainmenu a:hover { color: #eee; background-color: #333; } /* Container for the sub-menu and content so they don't spread @@ -94,33 +94,33 @@ #container { padding-left: 9em; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 10px; font-size: 0.9em; text-align: center; border:1px solid #999; border-width:1px 0px; background-color: #eee; color: #333; } -div.submenu a, div.submenu a:visited, div.sectionmenu>a.button:link, -div.sectionmenu>a.button:visited, div.submenu label { +nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, +div.sectionmenu>a.button:visited, nav.submenu label { padding: 3px 10px 3px 10px; color: #333; text-decoration: none; } -div.submenu a:hover, div.sectionmenu>a.button:hover, div.submenu label:hover { +nav.submenu a:hover, div.sectionmenu>a.button:hover, nav.submenu label:hover { color: #eee; background-color: #333; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 2ex 1ex 0ex 2ex; } /* Some pages have section dividers */ div.section { @@ -149,11 +149,11 @@ color: #333; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; background-color: #eee; Index: skins/black_and_white/footer.txt ================================================================== --- skins/black_and_white/footer.txt +++ skins/black_and_white/footer.txt @@ -1,3 +1,3 @@ -<div class="footer"> +<footer class="footer"> Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/black_and_white/header.txt ================================================================== --- skins/black_and_white/header.txt +++ skins/black_and_white/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <img src="$logo_image_url" alt="logo"> <br />$<project_name> </div> <div class="title">$<title></div> @@ -9,12 +9,12 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu"> <th1> set sitemap 0 foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} @@ -22,6 +22,6 @@ if {[string match /sitemap $url]} {set sitemap 1} } if {!$sitemap} { html "<a href='$home/sitemap'>Sitemap</a>\n" } -</th1></div> +</th1></nav> Index: skins/blitz/css.txt ================================================================== --- skins/blitz/css.txt +++ skins/blitz/css.txt @@ -866,25 +866,25 @@ background-repeat: no-repeat; background-position: center bottom; } .mainmenu li a, -div#hbdrop a { +nav#hbdrop a { color: #3b5c6b; padding: 10px 15px; } .mainmenu li.active a { font-weight: bold; } .mainmenu li:hover -div#hbdrop a:hover { +nav#hbdrop a:hover { background-color: #eee; } -div#hbdrop { +nav#hbdrop { background-color: white; border: 2px solid #ccc; display: none; width: 100%; position: absolute; Index: skins/blitz/footer.txt ================================================================== --- skins/blitz/footer.txt +++ skins/blitz/footer.txt @@ -1,10 +1,10 @@ </div>  </div>  -<div class="footer"> +<footer class="footer"> <div class="container"> <div class="pull-right"> <a href="https://www.fossil-scm.org/">Fossil $release_version $manifest_version $manifest_date</a> </div> This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s </div> -</div> +</footer> Index: skins/blitz/header.txt ================================================================== --- skins/blitz/header.txt +++ skins/blitz/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="container">  <div class="login pull-right"> <th1> @@ -20,11 +20,11 @@ </th1> <small> $<title></small></h1> </div>  - <div class="mainmenu"> + <nav class="mainmenu"> <ul><th1> html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a></li>\n" builtin_request_js hbmenu.js set once 1 foreach {name url expr class} $mainmenu { @@ -36,11 +36,11 @@ html "<li class='$class'>" if {[string match /* $url]} {set url $home$url} html "<a href='$url'>$name</a></li>\n" } </th1></ul> - </div>  - <div id="hbdrop"></div> + </nav>  + <nav id='hbdrop' title="Sitemap"></nav> </div>  - </div>  + </header>  <div class="middle max-full-width"> <div class="container"> Index: skins/darkmode/css.txt ================================================================== --- skins/darkmode/css.txt +++ skins/darkmode/css.txt @@ -34,28 +34,28 @@ div.leftoftitle { visibility: hidden; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 0.25em 0.5em; font-size: 0.9em; font-weight: bold; text-align: center; border-top-left-radius: 0.5em; border-top-right-radius: 0.5em; border-bottom: 1px dotted rgba(200,200,200,0.3); z-index: 21; /* just above hbdrop */ } -div#hbdrop { +nav#hbdrop { background-color: #1f1f1f; border: 2px solid #303536; border-radius: 0 0 0.5em 0.5em; display: none; left: 2em; @@ -62,16 +62,16 @@ width: calc(100% - 4em); position: absolute; z-index: 20; /* just below mainmenu, but above timeline bubbles */ } -div.mainmenu, div.submenu, div.sectionmenu { +nav.mainmenu, nav.submenu, div.sectionmenu { color: #ffffffcc; background-color: #303536/*#0000ff60*/; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 0.15em 0.5em 0.15em 0; font-size: 0.9em; text-align: center; border-bottom-left-radius: 0.5em; border-bottom-right-radius: 0.5em; @@ -80,16 +80,16 @@ color: rgba(127, 201, 255, 0.9); display: inline; text-decoration: none; } a:visited {opacity: 0.8} -div.mainmenu a, div.submenu a, -div.sectionmenu>a.button, div.submenu label, -div.footer a { +nav.mainmenu a, nav.submenu a, +div.sectionmenu>a.button, nav.submenu label, +footer.footer a { padding: 0.15em 0.5em; } -div.mainmenu a.active { +nav.mainmenu a.active { border-bottom: 1px solid #FF4500f0; } a:hover, a:visited:hover { background-color: #FF4500f0; @@ -137,11 +137,11 @@ border-color: #888; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 1ex 1ex 1ex; } /* Some pages have section dividers */ div.section { @@ -168,11 +168,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { clear: both; font-size: 0.8em; padding: 0.15em 0.5em; text-align: right; background-color: #303536/*#0000ff60*/; Index: skins/darkmode/footer.txt ================================================================== --- skins/darkmode/footer.txt +++ skins/darkmode/footer.txt @@ -1,8 +1,8 @@ -<div class="footer"> +<footer class="footer"> <div class="container"> <div class="pull-right"> <a href="https://www.fossil-scm.org/">Fossil $release_version $manifest_version $manifest_date</a> </div> This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s </div> -</div> +</footer> Index: skins/darkmode/header.txt ================================================================== --- skins/darkmode/header.txt +++ skins/darkmode/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="status leftoftitle"><th1> if {[info exists login]} { set logintext "<a href='$home/login'>$login</a>\n" } else { set logintext "<a href='$home/login'>Login</a>\n" @@ -9,12 +9,12 @@ </th1></div> <div class="title">$<title></div> <div class="status"><nobr><th1> html $logintext </th1></nobr></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu"> <th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue @@ -24,7 +24,7 @@ } set url $home$url } html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/default/css.txt ================================================================== --- skins/default/css.txt +++ skins/default/css.txt @@ -9,31 +9,31 @@ -mx-text-size-adjust: none; -webkit-text-size-adjust: none; } a { - color: #4183C4; + color: #2D5486; text-decoration: none; } a:hover { - color: #4183C4; + color: #2D5486; text-decoration: underline; } /* Page title, above menu bars */ .title { - color: #4183C4; + color: #3A76BB; float: left; } .title h1 { display: inline; } .title h1:after { content: " / "; - color: #777; + color: #6B6B6B; font-weight: normal; } .status { float: right; font-size: 0.7em; @@ -53,19 +53,19 @@ white-space: nowrap; z-index: 21; /* just above hbdrop */ } .mainmenu a { text-decoration: none; - color: #777; + color: #6B6B6B; border-right: 1px solid #eaeaea; } .mainmenu a.active, .mainmenu a:hover { color: #000; border-bottom: 2px solid #D26911; } -div#hbdrop { +nav#hbdrop { background-color: white; border: 1px solid black; border-top: white; border-radius: 0 0 0.5em 0.5em; display: none; @@ -83,11 +83,11 @@ border-bottom: 1px solid #ccc; } .submenu a, .submenu label { padding: 10px 11px; text-decoration: none; - color: #777; + color: #6B6B6B; } .submenu label { white-space: nowrap; } .submenu a:hover, .submenu label:hover { @@ -95,16 +95,35 @@ border: 1px solid #ccc; border-radius: 5px; color: #000; } span.submenuctrl, span.submenuctrl input, select.submenuctrl { - color: #777; + color: #6B6B6B; } span.submenuctrl { white-space: nowrap; } +div.searchForm { + text-align: left; +} +.searchForm { + padding: 10px; + border-bottom: 1px solid #ccc; +} +.searchForm label { + padding: 10px 11px; + text-decoration: none; + color: #6B6B6B; + white-space: nowrap; +} +.searchForm label:hover { + padding: 6px 10px; + border: 1px solid #ccc; + border-radius: 5px; + color: #000; +} /* Main document area; elements common to most pages. */ .content { padding-top: 10px; @@ -156,11 +175,11 @@ .footer { border-top: 1px solid #ccc; padding: 10px; font-size: 0.7em; margin-top: 10px; - color: #ccc; + color: #757575; } /* Forum */ .forum a:visited { Index: skins/default/footer.txt ================================================================== --- skins/default/footer.txt +++ skins/default/footer.txt @@ -1,5 +1,5 @@ -<div class="footer"> +<footer class="footer"> This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/default/header.txt ================================================================== --- skins/default/header.txt +++ skins/default/header.txt @@ -1,18 +1,18 @@ -<div class="header"> +<header class="header"> <div class="title"><h1>$<project_name></h1>$<title></div> <div class="status"><th1> if {[info exists login]} { - html "<a href='$home/login'>$login</a>\n" + html "<a href='$home/login' title='Logout'>$login</a>\n" } else { html "<a href='$home/login'>Login</a>\n" } </th1></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu" title="Main Menu"> <th1> -html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" +html "<a id='hbbtn' href='$home/sitemap' title='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} { if {[string match $url\[/?#\]* /$current_page/]} { @@ -20,7 +20,7 @@ } set url $home$url } html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/eagle/css.txt ================================================================== --- skins/eagle/css.txt +++ skins/eagle/css.txt @@ -47,18 +47,18 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px 10px 5px 10px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; @@ -66,11 +66,11 @@ border-top-left-radius: 8px; border-top-right-radius: 8px; color: white; } -div#hbdrop { +nav#hbdrop { background-color: #485D7B; border-radius: 0 0 15px 15px; border-left: 0.5em solid #76869d; border-bottom: 1.2em solid #76869d; display: none; @@ -79,33 +79,33 @@ z-index: 20; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; font-weight: bold; text-align: center; background-color: #485D7B; color: white; } -div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited, +nav.mainmenu a, nav.mainmenu a:visited, nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover { +nav.mainmenu a:hover, nav.submenu a:hover, div.sectionmenu>a.button:hover, +nav.submenu label:hover { text-decoration: underline; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 1ex 0ex 2ex; } /* Some pages have section dividers */ div.section { @@ -131,11 +131,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { clear: both; font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; Index: skins/eagle/footer.txt ================================================================== --- skins/eagle/footer.txt +++ skins/eagle/footer.txt @@ -1,6 +1,6 @@ -<div class="footer"> +<footer class="footer"> <th1> proc getTclVersion {} { if {[catch {tclEval info patchlevel} tclVersion] == 0} { return "<a href=\"https://www.tcl.tk/\">Tcl</a> version $tclVersion" } @@ -19,6 +19,6 @@ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by <a href="$fossilUrl/">Fossil</a> version $release_version $tclVersion <a href="$fossilUrl/index.html/info/$version">$manifest_version</a> <a href="$fossilUrl/index.html/timeline?c=$fossilDate&y=ci">$manifest_date</a> -</div> +</footer> Index: skins/eagle/header.txt ================================================================== --- skins/eagle/header.txt +++ skins/eagle/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <th1> ## ## NOTE: The purpose of this procedure is to take the base URL of the ## Fossil project and return the root of the entire web site using @@ -76,11 +76,11 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></nobr><small><div id="clock"></div></small></div> -</div> +</header> <th1>html "<script nonce='$nonce'>"</th1> (function updateClock(){ var e = document.getElementById("clock"); if(!e) return; if(!updateClock.fmt){ @@ -95,15 +95,15 @@ updateClock.fmt(d.getUTCHours()) + ':' + updateClock.fmt(d.getUTCMinutes()); setTimeout(updateClock,(60-d.getUTCSeconds())*1000); })(); </script> -<div class="mainmenu"><th1> +<nav class="mainmenu"><th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>\n" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id="hbdrop"></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/khaki/css.txt ================================================================== --- skins/khaki/css.txt +++ skins/khaki/css.txt @@ -41,28 +41,28 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px 10px 5px 10px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; background-color: #a09048; color: black; z-index: 21; /* just above hbdrop */ } -div#hbdrop { +nav#hbdrop { background-color: #fef3bc; border: 2px solid #a09048; border-radius: 0 0 0.5em 0.5em; display: none; left: 2em; @@ -72,39 +72,39 @@ z-index: 20; /* just below mainmenu, but above timeline bubbles */ } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; text-align: center; background-color: #c0af58; color: white; } -div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited, +nav.mainmenu a, nav.mainmenu a:visited, nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover, div#hbdrop a:hover { +nav.mainmenu a:hover, nav.submenu a:hover, div.sectionmenu>a.button:hover, +nav.submenu label:hover, nav#hbdrop a:hover { color: #a09048; background-color: white; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 1ex 5px; } -div.content a, div#hbdrop a { color: #706532; } -div.content a:link, div#hbdrop a:link { color: #706532; } -div.content a:visited, div#hbdrop a:visited { color: #704032; } -div.content a:hover, div#hbdrop a:hover { +main.content a, nav#hbdrop a { color: #706532; } +main.content a:link, nav#hbdrop a:link { color: #706532; } +main.content a:visited, nav#hbdrop a:visited { color: #704032; } +main.content a:hover, nav#hbdrop a:hover { background-color: white; color: #706532; } a, a:visited { text-decoration: none; } @@ -133,24 +133,24 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; background-color: #a09048; color: white; } /* Hyperlink colors */ -div.footer a { color: white; } -div.footer a:link { color: white; } -div.footer a:visited { color: white; } -div.footer a:hover { background-color: white; color: #558195; } +footer.footer a { color: white; } +footer.footer a:link { color: white; } +footer.footer a:visited { color: white; } +footer.footer a:hover { background-color: white; color: #558195; } /* <verbatim> blocks */ pre.verbatim { background-color: #f5f5f5; padding: 0.5em; Index: skins/khaki/footer.txt ================================================================== --- skins/khaki/footer.txt +++ skins/khaki/footer.txt @@ -1,3 +1,3 @@ -<div class="footer"> +<footer class="footer"> Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/khaki/header.txt ================================================================== --- skins/khaki/header.txt +++ skins/khaki/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="title">$<title></div> <div class="status"> <div class="logo">$<project_name></div><br/> <th1> if {[info exists login]} { @@ -7,16 +7,16 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></div> -</div> -<div class="mainmenu"><th1> +</header> +<nav class="mainmenu"><th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/original/css.txt ================================================================== --- skins/original/css.txt +++ skins/original/css.txt @@ -42,18 +42,18 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; @@ -62,33 +62,33 @@ border-top-right-radius: 8px; color: white; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; text-align: center; background-color: #456878; color: white; } -div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited, +nav.mainmenu a, nav.mainmenu a:visited, nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover { +nav.mainmenu a:hover, nav.submenu a:hover, div.sectionmenu>a.button:hover, +nav.submenu label:hover { color: #558195; background-color: white; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 1ex 1ex 1ex; border: solid #aaa; border-width: 1px; } @@ -115,11 +115,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { clear: both; font-size: 0.8em; padding: 5px 10px 5px 10px; text-align: right; background-color: #558195; @@ -127,14 +127,14 @@ border-bottom-right-radius: 8px; color: white; } /* Hyperlink colors in the footer */ -div.footer a { color: white; } -div.footer a:link { color: white; } -div.footer a:visited { color: white; } -div.footer a:hover { background-color: white; color: #558195; } +footer.footer a { color: white; } +footer.footer a:link { color: white; } +footer.footer a:visited { color: white; } +footer.footer a:hover { background-color: white; color: #558195; } /* verbatim blocks */ pre.verbatim { background-color: #f5f5f5; padding: 0.5em; Index: skins/original/footer.txt ================================================================== --- skins/original/footer.txt +++ skins/original/footer.txt @@ -1,6 +1,6 @@ -<div class="footer"> +<footer class="footer"> <th1> proc getTclVersion {} { if {[catch {tclEval info patchlevel} tclVersion] == 0} { return "<a href=\"https://www.tcl.tk/\">Tcl</a> version $tclVersion" } @@ -19,6 +19,6 @@ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by <a href="$fossilUrl/">Fossil</a> version $release_version $tclVersion <a href="$fossilUrl/index.html/info/$version">$manifest_version</a> <a href="$fossilUrl/index.html/timeline?c=$fossilDate&y=ci">$manifest_date</a> -</div> +</footer> Index: skins/original/header.txt ================================================================== --- skins/original/header.txt +++ skins/original/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <th1> ## ## NOTE: The purpose of this procedure is to take the base URL of the ## Fossil project and return the root of the entire web site using @@ -70,11 +70,11 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></nobr><small><div id="clock"></div></small></div> -</div> +</header> <th1>html "<script nonce='$nonce'>"</th1> function updateClock(){ var e = document.getElementById("clock"); if(e){ var d = new Date(); @@ -89,11 +89,11 @@ setTimeout(updateClock,(60-d.getUTCSeconds())*1000); } } updateClock(); </script> -<div class="mainmenu"><th1> +<nav class="mainmenu"><th1> set sitemap 0 foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" @@ -100,6 +100,6 @@ if {[string match */sitemap $url]} {set sitemap 1} } if {!$sitemap} { html "<a href='$home/sitemap'>...</a>" } -</th1></div> +</th1></nav> Index: skins/plain_gray/css.txt ================================================================== --- skins/plain_gray/css.txt +++ skins/plain_gray/css.txt @@ -28,18 +28,18 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px 10px 5px 10px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; @@ -54,54 +54,54 @@ display: none; width: 95%; position: absolute; z-index: 20; /* just below mainmenu, but above timeline bubbles */ } -div.hbdrop a { color: #604000; } -div.hbdrop a:link { color: #604000;} -div.hbdrop a:visited { color: #600000; } +nav.hbdrop a { color: #604000; } +nav.hbdrop a:link { color: #604000;} +nav.hbdrop a:visited { color: #600000; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; text-align: center; background-color: #606060; color: white; } -div.mainmenu a, -div.mainmenu a:visited, -div.submenu a, -div.submenu a:visited, +nav.mainmenu a, +nav.mainmenu a:visited, +nav.submenu a, +nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, -div.submenu a:hover, +nav.mainmenu a:hover, +nav.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover { +nav.submenu label:hover { color: #404040; background-color: white; } a, a:visited { text-decoration: none; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 0ex 0ex 0ex; } /* Hyperlink colors */ -div.content a { color: #604000; } -div.content a:link { color: #604000;} -div.content a:visited { color: #600000; } +main.content a { color: #604000; } +main.content a:link { color: #604000;} +main.content a:visited { color: #600000; } /* <verbatim> blocks */ pre.verbatim { background-color: #ffffff; padding: 0.5em; @@ -131,11 +131,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; background-color: #404040; Index: skins/plain_gray/footer.txt ================================================================== --- skins/plain_gray/footer.txt +++ skins/plain_gray/footer.txt @@ -1,3 +1,3 @@ -<div class="footer"> +<footer class="footer"> Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/plain_gray/header.txt ================================================================== --- skins/plain_gray/header.txt +++ skins/plain_gray/header.txt @@ -1,14 +1,14 @@ -<div class="header"> +<header class="header"> <div class="title">$<project_name>: $<title></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu"> <th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop' class='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' class='hbdrop' title="Sitemap"></nav> Index: skins/xekri/css.txt ================================================================== --- skins/xekri/css.txt +++ skins/xekri/css.txt @@ -75,11 +75,11 @@ /************************************** * Main Area */ -div.header, div.mainmenu, div.submenu, div.content, div.footer { +header.header, nav.mainmenu, nav.submenu, main.content, footer.footer { clear: both; margin: 0 auto; max-width: 90%; padding: 0.25rem 1rem; } @@ -87,11 +87,11 @@ /************************************** * Main Area: Header */ -div.header { +header.header { margin: 0.5rem auto 0 auto; display: flex; flex-direction: row; align-items: center; flex-wrap: wrap; @@ -146,73 +146,73 @@ /************************************** * Main Area: Global Menu */ -div.mainmenu, div.submenu { +nav.mainmenu, nav.submenu { background-color: #080; border-radius: 1rem 1rem 0 0; box-shadow: 3px 4px 1px #000; color: #000; font-weight: bold; font-size: 1.1rem; text-align: center; } -div.mainmenu { +nav.mainmenu { padding-top: 0.33rem; padding-bottom: 0.25rem; } -div.submenu { +nav.submenu { border-top: 1px solid #0a0; border-radius: 0; display: block; } -div.mainmenu a, div.submenu a, div.submenu label { +nav.mainmenu a, nav.submenu a, nav.submenu label { color: #000; padding: 0 0.75rem; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.submenu label:hover { +nav.mainmenu a:hover, nav.submenu a:hover, nav.submenu label:hover { color: #fff; text-shadow: 0px 0px 6px #0f0; } -div.submenu * { +nav.submenu * { margin: 0 0.5rem; vertical-align: middle; } -div.submenu select, div.submenu input { +nav.submenu select, nav.submenu input { background-color: #222; border: 1px inset #080; color: #eee; cursor: pointer; font-size: 0.9rem; } -div.submenu select { +nav.submenu select { height: 1.75rem; } /************************************** * Main Area: Content */ -div.content { +main.content { background-color: #222; border-radius: 0 0 1rem 1rem; box-shadow: 3px 3px 1px #000; min-height:40%; padding-bottom: 1rem; padding-top: 0.5rem; } -div.content table[bgcolor="white"] { +main.content table[bgcolor="white"] { color: #000; } .piechartLabel { fill: white; @@ -223,40 +223,40 @@ /************************************** * Main Area: Footer */ -div.footer { +footer.footer { color: #ee0; font-size: 0.75rem; padding: 0; text-align: right; width: 75%; } -div.footer div { +footer.footer div { background-color: #222; box-shadow: 3px 3px 1px #000; border-radius: 0 0 1rem 1rem; margin: 0 0 10px 0; padding: 0.25rem 0.75rem; } -div.footer div.page-time { +footer.footer div.page-time { float: left; } -div.footer div.fossil-info { +footer.footer div.fossil-info { float: right; } -div.footer a, div.footer a:link, div.footer a:visited { +footer.footer a, footer.footer a:link, footer.footer a:visited { color: #ee0; } -div.footer a:hover { +footer.footer a:hover { color: #fff; text-shadow: 0px 0px 6px #ee0; } @@ -1152,18 +1152,18 @@ body.branch .brlist > table > tbody > tr:hover:not(.selected), body.branch .brlist > table > tbody > tr.selected { background-color: #444; } -body.chat div.header, body.chat div.footer, -body.chat div.mainmenu, body.chat div.submenu, -body.chat div.content { +body.chat header.header, body.chat footer.footer, +body.chat nav.mainmenu, body.chat nav.submenu, +body.chat main.content { margin-left: 0.5em; margin-right: 0.5em; margin-top: auto/*eliminates unnecessary scrollbars*/; } -body.chat.chat-only-mode div.content { +body.chat.chat-only-mode main.content { max-width: revert; } body.chat #chat-user-list .chat-user{ color: white; } Index: skins/xekri/footer.txt ================================================================== --- skins/xekri/footer.txt +++ skins/xekri/footer.txt @@ -1,9 +1,9 @@ </div> -<div class="footer"> +<footer class="footer"> <div class="page-time"> Generated in <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s </div> <div class="fossil-info"> Fossil v$release_version $manifest_version </div> -</div> +</footer> Index: skins/xekri/header.txt ================================================================== --- skins/xekri/header.txt +++ skins/xekri/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <th1> ## ## NOTE: The purpose of this procedure is to take the base URL of the ## Fossil project and return the root of the entire web site using @@ -76,11 +76,11 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></nobr><small><div id="clock"></div></small></div> -</div> +</header> <th1>html "<script nonce='$nonce'>"</th1> function updateClock(){ var e = document.getElementById("clock"); if(e){ var d = new Date(); @@ -95,11 +95,11 @@ setTimeout(updateClock,(60-d.getUTCSeconds())*1000); } } updateClock(); </script> -<div class="mainmenu"><th1> +<nav class="mainmenu"><th1> set sitemap 0 foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} { if {[string match $url\[/?#\]* /$current_page/]} { @@ -111,6 +111,6 @@ if {[string match */sitemap $url]} {set sitemap 1} } if {!$sitemap} { html "<a href='$home/sitemap'>...</a>\n" } -</th1></div> +</th1></nav> Index: src/accordion.js ================================================================== --- src/accordion.js +++ src/accordion.js @@ -40,10 +40,11 @@ img.className = "accordion_btn accordion_btn_plus"; a[i].insertBefore(img,a[i].firstChild); img = document.createElement("img"); img.src = acc_svgdata[0]+acc_svgdata[3]+acc_svgdata[1]; img.className = "accordion_btn accordion_btn_minus"; + img.alt = "Open/Close Section"; a[i].insertBefore(img,a[i].firstChild); a[i].addEventListener("click",function(){ var x = this.nextElementSibling; if( this.classList.contains("accordion_closed") ){ x.style.maxHeight = x.scrollHeight + "px"; Index: src/add.c ================================================================== --- src/add.c +++ src/add.c @@ -362,11 +362,10 @@ ** The --case-sensitive option determines whether or not filenames should ** be treated case sensitive or not. If the option is not given, the default ** depends on the global setting, or the operating system default, if not set. ** ** Options: -** ** --case-sensitive BOOL Override the case-sensitive setting ** --dotfiles Include files beginning with a dot (".") ** -f|--force Add files without prompting ** --ignore CSG Ignore unmanaged files matching patterns from ** the Comma Separated Glob (CSG) pattern list Index: src/alerts.c ================================================================== --- src/alerts.c +++ src/alerts.c @@ -291,11 +291,11 @@ @ <h1>Status</h1> @ <table class="label-value"> if( alert_enabled() ){ stats_for_email(); }else{ - @ <th>Disabled</th> + @ <td>Disabled</td> } @ </table> @ <hr> @ <h1> Configuration </h1> @ <form action="%R/setup_notification" method="post"><div> @@ -1112,47 +1112,40 @@ ** COMMAND: alerts* ** ** Usage: %fossil alerts SUBCOMMAND ARGS... ** ** Subcommands: -** ** pending Show all pending alerts. Useful for debugging. -** ** reset Hard reset of all email notification tables ** in the repository. This erases all subscription ** information. ** Use with extreme care ** -** ** send Compose and send pending email alerts. ** Some installations may want to do this via ** a cron-job to make sure alerts are sent ** in a timely manner. -** Options: ** +** Options: ** --digest Send digests ** --renewal Send subscription renewal ** notices ** --test Write to standard output -** ** settings [NAME VALUE] With no arguments, list all email settings. ** Or change the value of a single email setting. -** ** status Report on the status of the email alert ** subsystem -** ** subscribers [PATTERN] List all subscribers matching PATTERN. Either ** LIKE or GLOB wildcards can be used in PATTERN. -** ** test-message TO [OPTS] Send a single email message using whatever ** email sending mechanism is currently configured. ** Use this for testing the email notification -** configuration. Options: +** configuration. ** +** Options: ** --body FILENAME Content from FILENAME ** --smtp-trace Trace SMTP processing ** --stdout Send msg to stdout ** -S|--subject SUBJECT Message "subject:" -** ** unsubscribe EMAIL Remove a single subscriber with the given EMAIL. */ void alert_cmd(void){ const char *zCmd; int nCmd; @@ -1603,12 +1596,12 @@ @ <p>To receive email notifications for changes to this @ repository, fill out the form below and press the "Submit" button.</p> form_begin(0, "%R/subscribe"); @ <table class="subscribe"> @ <tr> - @ <td class="form_label">Email Address:</td> - @ <td><input type="text" name="e" value="%h(PD("e",""))" size="30"></td> + @ <td class="form_label"><label for="e">Email Address:</label></td> + @ <td><input type="text" id="e" name="e" value="%h(PD("e",""))" size="30"></td> @ <tr> if( eErr==1 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ </tr> @@ -1621,12 +1614,12 @@ uSeed = captcha_seed(); } zDecoded = captcha_decode(uSeed); zCaptcha = captcha_render(zDecoded); @ <tr> - @ <td class="form_label">Security Code:</td> - @ <td><input type="text" name="captcha" value="%h(zInit)" size="30"> + @ <td class="form_label"><label for="captcha">Security Code:</label></td> + @ <td><input type="text" id="captcha" name="captcha" value="%h(zInit)" size="30"> captcha_speakit_button(uSeed, "Speak the code"); @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td> @ </tr> if( eErr==2 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> @@ -1633,13 +1626,13 @@ } @ </tr> } if( g.perm.Admin ){ @ <tr> - @ <td class="form_label">User:</td> - @ <td><input type="text" name="suname" value="%h(PD("suname",g.zLogin))" \ - @ size="30"></td> + @ <td class="form_label"><label for="suname">User:</label></td> + @ <td><input type="text" id="suname" name="suname" \ + @ value="%h(PD("suname",g.zLogin))" size="30"></td> @ </tr> if( eErr==3 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ </tr> @@ -1667,12 +1660,12 @@ @ Wiki</label><br> } di = PB("di"); @ </td></tr> @ <tr> - @ <td class="form_label">Delivery:</td> - @ <td><select size="1" name="di"> + @ <td class="form_label"><label for="di">Delivery:</label></td> + @ <td><select size="1" id="di" name="di"> @ <option value="0" %s(di?"":"selected")>Individual Emails</option> @ <option value="1" %s(di?"selected":"")>Daily Digest</option> @ </select></td> @ </tr> if( g.perm.Admin ){ @@ -1972,13 +1965,13 @@ zHalfCode = db_text("x","SELECT hex(substr(subscriberCode,1,16))" " FROM subscriber WHERE subscriberId=%d", sid); @ <input type="hidden" name="name" value="%h(zHalfCode)"> @ <table class="subscribe"> @ <tr> - @ <td class="form_label">Email Address:</td> + @ <td class="form_label"><label for="semail">Email Address:</label></td> if( isLogin ){ - @ <td><input type="text" name="semail" value="%h(semail)" size="30">\ + @ <td><input type="text" id="semail" name="semail" value="%h(semail)" size="30">\ if( eErr==8 ){ @ <span class='loginError'>← not a valid email address!</span> }else if( g.perm.Admin ){ @ <a href="%R/announce?to=%t(semail)">\ @ (Send a message to %h(semail))</a>\ @@ -2009,13 +2002,13 @@ @ <tr> @ <td class='form_label'>Last Contact:</td> @ <td>%h(db_column_text(&q,10)) ← \ @ %,d(db_column_int(&q,11)) days ago</td> @ </tr> - @ <td class="form_label">User:</td> - @ <td><input type="text" name="suname" value="%h(suname?suname:"")" \ - @ size="30">\ + @ <td class="form_label"><label for="suname">User:</label></td> + @ <td><input type="text" id="suname" name="suname" \ + @ value="%h(suname?suname:"")" size="30">\ uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", suname); if( uid ){ @ <a href='%R/setup_uedit?id=%d(uid)'>\ @ (login info for %h(suname))</a>\ } @@ -2043,12 +2036,12 @@ @ <label><input type="checkbox" name="sw" %s(sw?"checked":"")>\ @ Wiki</label> } @ </td></tr> @ <tr> - @ <td class="form_label">Delivery:</td> - @ <td><select size="1" name="sdigest"> + @ <td class="form_label"><label for="sdigest">Delivery:</label></td> + @ <td><select size="1" id="sdigest" name="sdigest"> @ <option value="0" %s(sdigest?"":"selected")>Individual Emails</option> @ <option value="1" %s(sdigest?"selected":"")>Daily Digest</option> @ </select></td> @ </tr> if( g.perm.Admin ){ @@ -2276,22 +2269,22 @@ @ explain how to unsubscribe and/or change your subscription settings.</p> @ form_begin(0, "%R/unsubscribe"); @ <table class="subscribe"> @ <tr> - @ <td class="form_label">Email Address:</td> - @ <td><input type="text" name="e" value="%h(zEAddr)" size="30"></td> + @ <td class="form_label"><label for="e">Email Address:</label></td> + @ <td><input type="text" id="e" name="e" value="%h(zEAddr)" size="30"></td> if( eErr==1 ){ @ <td><span class="loginError">← %h(zErr)</span></td> } @ </tr> uSeed = captcha_seed(); zDecoded = captcha_decode(uSeed); zCaptcha = captcha_render(zDecoded); @ <tr> - @ <td class="form_label">Security Code:</td> - @ <td><input type="text" name="captcha" value="" size="30"> + @ <td class="form_label"><label for="captcha">Security Code:</label></td> + @ <td><input type="text" id="captcha" name="captcha" value="" size="30"> captcha_speakit_button(uSeed, "Speak the code"); @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td> if( eErr==2 ){ @ <td><span class="loginError">← %h(zErr)</span></td> } @@ -2698,11 +2691,10 @@ ** for check-in, forum, ticket, or wiki. The remaining text is a ** integer that references the EVENT.OBJID value for the event. ** Run /timeline?showid to see these OBJID values. ** ** Options: -** ** --digest Generate digest alert text ** --needmod Assume all events are pending moderator approval */ void test_alert_cmd(void){ Blob out; @@ -2759,19 +2751,16 @@ ** for check-in, forum, ticket, or wiki. The remaining text is a ** integer that references the EVENT.OBJID value for the event. ** Run /timeline?showid to see these OBJID values. ** ** Options: -** ** --backoffice Run alert_backoffice() after all alerts have ** been added. This will cause the alerts to be ** sent out with the SENDALERT_TRACE option. -** ** --debug Like --backoffice, but add the SENDALERT_STDOUT ** so that emails are printed to standard output ** rather than being sent. -** ** --digest Process emails using SENDALERT_DIGEST */ void test_add_alert_cmd(void){ int i; int doAuto = find_option("backoffice",0,0)!=0; @@ -3231,28 +3220,28 @@ form_begin(0, "%R/contact_admin"); @ <p>Enter a message to the repository administrator below:</p> @ <table class="subscribe"> if( zCaptcha ){ @ <tr> - @ <td class="form_label">Security Code:</td> - @ <td><input type="text" name="captcha" value="" size="10"> + @ <td class="form_label"><label for="captcha">Security Code:</label></td> + @ <td><input type="text" id="captcha" name="captcha" value="" size="10"> captcha_speakit_button(uSeed, "Speak the code"); @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td> @ </tr> } @ <tr> - @ <td class="form_label">Your Email Address:</td> - @ <td><input type="text" name="from" value="%h(PT("from"))" size="30"></td> + @ <td class="form_label"><label for="from">Your Email Address:</label></td> + @ <td><input type="text" id="from" name="from" value="%h(PT("from"))" size="30"></td> @ </tr> @ <tr> - @ <td class="form_label">Subject:</td> - @ <td><input type="text" name="subject" value="%h(PT("subject"))"\ + @ <td class="form_label"><label for="subject">Subject:</label></td> + @ <td><input type="text" id="subject" name="subject" value="%h(PT("subject"))"\ @ size="80"></td> @ </tr> @ <tr> - @ <td class="form_label">Message:</td> - @ <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\ + @ <td class="form_label"><label for="msg">Message:</label></td> + @ <td><textarea id="msg" name="msg" cols="80" rows="10" wrap="virtual">\ @ %h(PT("msg"))</textarea> @ </tr> @ <tr> @ <td></td> @ <td><input type="submit" name="submit" value="Send Message"> @@ -3402,12 +3391,12 @@ int aMod = PB("mods"); const char *aack = aa ? "checked" : ""; const char *allck = all ? "checked" : ""; const char *modck = aMod ? "checked" : ""; @ <tr> - @ <td class="form_label">To:</td> - @ <td><input type="text" name="to" value="%h(PT("to"))" size="30"><br> + @ <td class="form_label"><label for="to">To:</label></td> + @ <td><input type="text" id="to" name="to" value="%h(PT("to"))" size="30"><br> @ <label><input type="checkbox" name="aa" %s(aack)> \ @ All "announcement" subscribers</label> \ @ <a href="%R/subscribers?only=a" target="_blank">(list)</a><br> @ <label><input type="checkbox" name="all" %s(allck)> \ @ All subscribers</label> \ @@ -3416,17 +3405,17 @@ @ All moderators</label> \ @ <a href="%R/setup_ulist?with=5" target="_blank">(list)</a><br></td> @ </tr> } @ <tr> - @ <td class="form_label">Subject:</td> - @ <td><input type="text" name="subject" value="%h(PT("subject"))"\ + @ <td class="form_label"><label for="subject">Subject:</label></td> + @ <td><input type="text" id="subject" name="subject" value="%h(PT("subject"))"\ @ size="80"></td> @ </tr> @ <tr> - @ <td class="form_label">Message:</td> - @ <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\ + @ <td class="form_label"><label for="msg">Message:</label></td> + @ <td><textarea id="msg" name="msg" cols="80" rows="10" wrap="virtual">\ @ %h(PT("msg"))</textarea> @ </tr> @ <tr> @ <td></td> if( fossil_strcmp(P("name"),"test2")==0 ){ Index: src/allrepo.c ================================================================== --- src/allrepo.c +++ src/allrepo.c @@ -61,88 +61,66 @@ ** ** On Win32 systems, the file is named "_fossil" and is located in ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%. ** ** Available operations are: -** ** backup Backup all repositories. The argument must be the name of ** a directory into which all backup repositories are written. -** ** cache Manages the cache used for potentially expensive web ** pages. Any additional arguments are passed on verbatim ** to the cache command. -** ** changes Shows all local checkouts that have uncommitted changes. ** This operation has no additional options. -** ** clean Delete all "extra" files in all local checkouts. Extreme ** caution should be exercised with this command because its ** effects cannot be undone. Use of the --dry-run option to ** carefully review the local checkouts to be operated upon ** and the --whatif option to carefully review the files to ** be deleted beforehand is highly recommended. The command ** line options supported by the clean command itself, if any ** are present, are passed along verbatim. -** ** config Only the "config pull AREA" command works. -** ** dbstat Run the "dbstat" command on all repositories. -** ** extras Shows "extra" files from all local checkouts. The command ** line options supported by the extra command itself, if any ** are present, are passed along verbatim. -** ** fts-config Run the "fts-config" command on all repositories. -** ** git CMD Do the "git export" or "git status" command (whichever ** is specified by CMD) on all repositories for which ** a Git mirror has been previously established. -** ** info Run the "info" command on all repositories. -** ** pull Run a "pull" operation on all repositories. Only the ** --verbose and --share-links options are supported. -** ** push Run a "push" on all repositories. Only the --verbose ** option is supported. -** ** rebuild Rebuild on all repositories. The command line options ** supported by the rebuild command itself, if any are ** present, are passed along verbatim. The --force and ** --randomize options are not supported. -** ** sync Run a "sync" on all repositories. Only the --verbose ** and --unversioned and --share-links options are supported. -** ** set Run the "setting" or "set" commands on all ** repositories. These command are particularly useful in ** conjunction with the "max-loadavg" setting which cannot ** otherwise be set globally. -** ** unset Run the "unset" command on all repositories -** ** server Run the "server" commands on all repositories. ** The root URI gives a listing of all repos. -** ** ui Run the "ui" command on all repositories. Like "server" ** but bind to the loopback TCP address only, enable ** the --localauth option and automatically launch a ** web-browser ** -** ** In addition, the following maintenance operations are supported: -** ** add Add all the repositories named to the set of repositories ** tracked by Fossil. Normally Fossil is able to keep up with ** this list by itself, but sometimes it can benefit from this ** hint if you rename repositories. -** ** ignore Arguments are repositories that should be ignored by ** subsequent clean, extras, list, pull, push, rebuild, and ** sync operations. The -c|--ckout option causes the listed ** local checkouts to be ignored instead. -** ** list | ls Display the location of all repositories. The -c|--ckout ** option causes all local checkouts to be listed instead. ** ** Repositories are automatically added to the set of known repositories ** when one of the following commands are run against the repository: Index: src/attach.c ================================================================== --- src/attach.c +++ src/attach.c @@ -398,12 +398,12 @@ @ <h2>Add Attachment To %s(zTargetType)</h2> form_begin("enctype='multipart/form-data'", "%R/attachadd"); @ <div> @ File to Attach: @ <input type="file" name="f" size="60" /><br /> - @ Description:<br /> - @ <textarea name="comment" cols="80" rows="5" wrap="virtual"></textarea><br /> + @ <label>Description:<br /> + @ <textarea name="comment" cols="80" rows="5" wrap="virtual"></textarea></label><br /> if( zTkt ){ @ <input type="hidden" name="tkt" value="%h(zTkt)" /> }else if( zTechNote ){ @ <input type="hidden" name="technote" value="%h(zTechNote)" /> }else{ @@ -678,18 +678,17 @@ ** COMMAND: attachment* ** ** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS? ** ** Add an attachment to an existing wiki page or tech note. -** Options: ** +** Options: ** -t|--technote DATETIME Specifies the timestamp of ** the technote to which the attachment ** is to be made. The attachment will be ** to the most recently modified tech note ** with the specified timestamp. -** ** -t|--technote TECHNOTE-ID Specifies the technote to be ** updated by its technote id. ** ** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified. ** @@ -792,11 +791,10 @@ ** name arguments are glob prefixes for the attachment.target ** field. If no names are provided then a prefix of [a-zA-Z] is used, ** which will match most wiki page names and some ticket hashes. ** ** Options: -** ** -latest List only the latest version of a given attachment. ** */ void test_list_attachments(void){ Stmt q; Index: src/backoffice.c ================================================================== --- src/backoffice.c +++ src/backoffice.c @@ -679,34 +679,27 @@ ** backoffice work is done in-process. But if there are multiple repositories ** or if --poll is used, a separate sub-process is started for each poll of ** each repository. ** ** Standard options: -** ** --debug Show what this command is doing. -** ** --logfile FILE Append a log of backoffice actions onto FILE. -** ** --min N When polling, invoke backoffice at least ** once every N seconds even if the repository ** never changes. 0 or negative means disable ** this feature. Default: 3600 (once per hour). -** ** --poll N Repeat backoffice calls for repositories that ** change in appoximately N-second intervals. ** N less than 1 turns polling off (the default). ** Recommended polling interval: 60 seconds. -** ** --trace Enable debugging output on stderr ** ** Options intended for internal use only which may change or be ** discontinued in future releases: -** ** --nodelay Do not queue up or wait for a backoffice job ** to complete. If no work is available or if ** backoffice has run recently, return immediately. -** ** --nolease Always run backoffice, even if there is a lease ** conflict. This option implies --nodelay. This ** option is added to secondary backoffice commands ** that are invoked by the --poll option. */ Index: src/bisect.c ================================================================== --- src/bisect.c +++ src/bisect.c @@ -470,71 +470,50 @@ ** ** Usage: %fossil bisect SUBCOMMAND ... ** ** Run various subcommands useful for searching back through the change ** history for a particular checkin that causes or fixes a problem. -** ** > fossil bisect bad ?VERSION? -** ** Identify version VERSION as non-working. If VERSION is omitted, ** the current checkout is marked as non-working. -** ** > fossil bisect good ?VERSION? -** ** Identify version VERSION as working. If VERSION is omitted, ** the current checkout is marked as working. -** ** > fossil bisect log ** > fossil bisect chart -** ** Show a log of "good", "bad", and "skip" versions. "bisect log" ** shows the events in the order that they were tested. ** "bisect chart" shows them in order of check-in. -** ** > fossil bisect next -** ** Update to the next version that is halfway between the working and ** non-working versions. -** ** > fossil bisect options ?NAME? ?VALUE? -** ** List all bisect options, or the value of a single option, or set the ** value of a bisect option. -** ** > fossil bisect reset -** ** Reinitialize a bisect session. This cancels prior bisect history ** and allows a bisect session to start over from the beginning. -** ** > fossil bisect run [OPTIONS] COMMAND -** ** Invoke COMMAND repeatedly to run the bisect. The exit code for ** COMMAND should be 0 for "good", 125 for "skip", and any other value -** for "bad". Options: +** for "bad". ** +** Options: ** -i|--interactive Prompt the user for the good/bad/skip decision ** after each step, rather than using the exit ** code from COMMAND -** ** > fossil bisect skip ?VERSION? -** ** Cause VERSION (or the current checkout if VERSION is omitted) to ** be ignored for the purpose of the current bisect. This might ** be done, for example, because VERSION does not compile correctly ** or is otherwise unsuitable to participate in this bisect. -** ** > fossil bisect vlist|ls|status ?-a|--all? -** ** List the versions in between the inner-most "bad" and "good". -** ** > fossil bisect ui -** ** Like "fossil ui" except start on a timeline that shows only the ** check-ins that are part of the current bisect. -** ** > fossil bisect undo -** ** Undo the most recent "good", "bad", or "skip" command. */ void bisect_cmd(void){ int n; const char *zCmd; Index: src/blob.c ================================================================== --- src/blob.c +++ src/blob.c @@ -1635,22 +1635,18 @@ ** result. Append each argument to "fossil test-echo" and run that ** using fossil_system() to verify that it really does get escaped ** correctly. ** ** Other options: -** ** --filename-args BOOL Subsequent arguments are assumed to be ** filenames if BOOL is true, or not if BOOL ** is false. Defaults on. -** ** --hex HEX Skip the --hex flag and instead decode HEX ** into ascii. This provides a way to insert ** unusual characters as an argument for testing. -** ** --compare HEX ASCII Verify that argument ASCII is identical to ** to decoded HEX. -** ** --fuzz N Run N fuzz cases. Each cases is a call ** to "fossil test-escaped-arg --compare HEX ARG" ** where HEX and ARG are the same argument. ** The argument is chosen at random. */ Index: src/branch.c ================================================================== --- src/branch.c +++ src/branch.c @@ -584,41 +584,35 @@ ** ** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS? ** ** Run various subcommands to manage branches of the open repository or ** of the repository identified by the -R or --repository option. -** ** > fossil branch close|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES? -** ** Adds or cancels the "closed" tag to one or more branches. ** It accepts arbitrary unambiguous symbolic names but ** will only resolve checkin names and skips any which resolve -** to non-leaf checkins. Options: +** to non-leaf checkins. +** +** Options: ** -n|--dry-run do not commit changes and dump artifact ** to stdout ** -v|--verbose output more information ** --date-override DATE DATE to use instead of 'now' ** --user-override USER USER to use instead of the current default -** ** > fossil branch current -** ** Print the name of the branch for the current check-out -** ** > fossil branch hide|unhide ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES? -** ** Adds or cancels the "hidden" tag for the specified branches or ** or checkin IDs. Accepts the same options as the close ** subcommand. -** ** > fossil branch info BRANCH-NAME -** ** Print information about a branch -** ** > fossil branch list|ls ?OPTIONS? ?GLOB? ** > fossil branch lsh ?OPTIONS? ?LIMIT? +** List all branches. ** -** List all branches. Options: +** Options: ** -a|--all List all branches. Default show only open branches ** -c|--closed List closed branches. ** -p List only private branches. ** -r Reverse the sort order ** -t Show recently changed branches first @@ -630,13 +624,11 @@ ** ** The "lsh" variant of this subcommand shows recently changed branches, ** and accepts an optional LIMIT argument (defaults to 5) to cap output, ** but no GLOB argument. All other options are supported, with -t being ** an implied no-op. -** ** > fossil branch new BRANCH-NAME BASIS ?OPTIONS? -** ** Create a new branch BRANCH-NAME off of check-in BASIS. ** Supported options for this subcommand include: ** --private branch is private (i.e., remains local) ** --bgcolor COLOR use COLOR instead of automatic background ** ("auto" lets Fossil choose it automatically, @@ -650,11 +642,10 @@ ** replaced by a space, and it may also name a timezone offset ** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward). ** Either no timezone suffix or "Z" means UTC. ** ** Options valid for all subcommands: -** ** -R|--repository REPO Run commands on repository REPO */ void branch_cmd(void){ int n; const char *zCmd = "list"; @@ -809,12 +800,12 @@ if( zBgClr && zBgClr[0] && show_colors ){ @ <tr style="background-color:%s(zBgClr)"> }else{ @ <tr> } - @ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input - @ type="checkbox" disabled="disabled"/></td> + @ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input type="checkbox" + @ title="%h(zBranch)" aria-label="%h(zBranch)" disabled="disabled"/></td> @ <td data-sortkey="%016llx(iMtime)">%s(zAge)</td> @ <td>%d(nCkin)</td> fossil_free(zAge); @ <td>%s(isClosed?"closed":"")</td> if( zMergeTo ){ @@ -837,11 +828,10 @@ ** Show a list of branches. With no query parameters, a sortable table ** is used to show all branches. If query parameters are present a ** fixed bullet list is shown. ** ** Query parameters: -** ** all Show all branches ** closed Show only closed branches ** open Show only open branches ** colortest Show all branches with automatic color ** @@ -968,11 +958,10 @@ ** WEBPAGE: brtimeline ** ** Show a timeline of all branches ** ** Query parameters: -** ** ng No graph ** nohidden Hide check-ins with "hidden" tag ** onlyhidden Show only check-ins with "hidden" tag ** brbg Background color by branch name ** ubg Background color by user name Index: src/browse.c ================================================================== --- src/browse.c +++ src/browse.c @@ -126,11 +126,10 @@ ** source tree. Only files for a single check-in are shown if the ci= ** query parameter is present. If ci= is missing, the union of files ** across all check-ins is shown. ** ** Query parameters: -** ** ci=LABEL Show only files in this check-in. Optional. ** name=PATH Directory to display. Optional. Top-level if missing ** re=REGEXP Show only files matching REGEXP ** type=TYPE TYPE=flat: use this display ** TYPE=tree: use the /tree display instead @@ -640,11 +639,10 @@ ** ** The type=tree query parameter is required or else the /dir format is ** used. ** ** Query parameters: -** ** type=tree Required to prevent use of /dir format ** name=PATH Directory to display. Optional ** ci=LABEL Show only files in this check-in. Optional. ** re=REGEXP Show only files matching REGEXP. Optional. ** expand Begin with the tree fully expanded. @@ -764,11 +762,11 @@ style_submenu_element("Top-Level", "%s", url_render(&sURI, "name", 0, 0, 0)); }else if( zRE ){ blob_appendf(&dirname, "matching \"%s\"", zRE); } - style_submenu_binary("mtime","Sort By Time","Sort By Filename", 0); + style_submenu_binary("mtime","Sort By","Time","Filename", 0); if( zCI ){ style_submenu_element("All", "%s", url_render(&sURI, "ci", 0, 0, 0)); if( nD==0 && !showDirOnly ){ style_submenu_element("File Ages", "%R/fileage?name=%T", zCI); } Index: src/builtin.c ================================================================== --- src/builtin.c +++ src/builtin.c @@ -157,12 +157,13 @@ } /* ** WEBPAGE: builtin loadavg-exempt ** -** Return one of many built-in content files. Query parameters: +** Return one of many built-in content files. ** +** Query parameters: ** name=FILENAME Return the single file whose name is FILENAME. ** mimetype=TYPE Override the mimetype in the returned file to ** be TYPE. If this query parameter is omitted ** (the usual case) then the mimetype is inferred ** from the suffix on FILENAME Index: src/bundle.c ================================================================== --- src/bundle.c +++ src/bundle.c @@ -719,55 +719,40 @@ /* ** COMMAND: bundle* ** ** Usage: %fossil bundle SUBCOMMAND ARGS... -** ** > fossil bundle append BUNDLE FILE... -** ** Add files named on the command line to BUNDLE. This subcommand has ** little practical use and is mostly intended for testing. -** ** > fossil bundle cat BUNDLE HASH... -** ** Extract one or more artifacts from the bundle and write them ** consecutively on standard output. This subcommand was designed ** for testing and introspection of bundles and is not something ** commonly used. -** ** > fossil bundle export BUNDLE ?OPTIONS? -** ** Generate a new bundle, in the file named BUNDLE, that contains a ** subset of the check-ins in the repository (usually a single branch) ** described by the --branch, --from, --to, and/or --checkin options, ** at least one of which is required. If BUNDLE already exists, the ** specified content is added to the bundle. -** ** --branch BRANCH Package all check-ins on BRANCH ** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2 ** --checkin TAG Package the single check-in TAG ** --standalone Do no use delta-encoding against ** artifacts not in the bundle -** ** > fossil bundle extend BUNDLE -** ** The BUNDLE must already exist. This subcommand adds to the bundle ** any check-ins that are descendants of check-ins already in the bundle, ** and any tags that apply to artifacts in the bundle. -** ** > fossil bundle import BUNDLE ?--publish? -** ** Import all content from BUNDLE into the repository. By default, the ** imported files are private and will not sync. Use the --publish ** option to make the import public. -** ** > fossil bundle ls BUNDLE -** ** List the contents of BUNDLE on standard output -** ** > fossil bundle purge BUNDLE -** ** Remove from the repository all files that are used exclusively ** by check-ins in BUNDLE. This has the effect of undoing a ** "fossil bundle import". ** ** See also: [[publish]] Index: src/cache.c ================================================================== --- src/cache.c +++ src/cache.c @@ -260,21 +260,18 @@ ** COMMAND: cache* ** ** Usage: %fossil cache SUBCOMMAND ** ** Manage the cache used for potentially expensive web pages such as -** /zip and /tarball. SUBCOMMAND can be: +** /zip and /tarball. ** +** SUBCOMMAND can be: ** clear Remove all entries from the cache. -** ** init Create the cache file if it does not already exist. -** ** list|ls List the keys and content sizes and other stats for ** all entries currently in the cache. -** ** size ?N? Query or set the maximum number of entries in the cache. -** ** status Show a summary of the cache status. ** ** The cache is stored in a file that is distinct from the repository ** but that is held in the same directory as the repository. The cache ** file can be deleted in order to completely disable the cache. Index: src/capabilities.c ================================================================== --- src/capabilities.c +++ src/capabilities.c @@ -393,11 +393,11 @@ " WHERE cap GLOB '*[as]*'" " ORDER BY 3 ASC", zSelfCap, hasPubPages, zSelfCap ); @ <table id='capabilitySummary' cellpadding="0" cellspacing="0" border="1"> - @ <tr><th> <th>Code<th>Forum<th>Tickets<th>Wiki<th>Chat\ + @ <tr><th>Role<th>Code<th>Forum<th>Tickets<th>Wiki<th>Chat\ @ <th>Unversioned Content</th></tr> while( db_step(&q)==SQLITE_ROW ){ const char *zId = db_column_text(&q, 0); const char *zCap = db_column_text(&q, 1); int n = db_column_int(&q, 3); Index: src/captcha.c ================================================================== --- src/captcha.c +++ src/captcha.c @@ -543,13 +543,13 @@ zDecoded = captcha_decode(uSeed); zCaptcha = captcha_render(zDecoded); @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha"> @ %h(zCaptcha) @ </pre> - @ Enter security code shown above: + @ <label for="captcha">Enter security code shown above:</label> @ <input type="hidden" name="captchaseed" value="%u(uSeed)" /> - @ <input type="text" name="captcha" size=8 /> + @ <input type="text" id="captcha" name="captcha" size=8 /> if( showButton ){ @ <input type="submit" value="Submit"> } @ <br/>\ captcha_speakit_button(uSeed, 0); @@ -559,11 +559,11 @@ /* ** Add a "Speak the captcha" button. */ void captcha_speakit_button(unsigned int uSeed, const char *zMsg){ if( zMsg==0 ) zMsg = "Speak the text"; - @ <input aria-label="%h(zMsg)" type="button" value="%h(zMsg)" \ + @ <input aria-label="%h(zMsg)" title="%h(zMsg)" type="button" value="%h(zMsg)" \ @ id="speakthetext"> @ <script nonce="%h(style_nonce())">/* captcha_speakit_button() */ @ document.getElementById("speakthetext").onclick = function(){ @ var audio = window.fossilAudioCaptcha \ @ || new Audio("%R/captcha-audio/%u(uSeed)"); @@ -574,10 +574,11 @@ @ </script> } /* ** WEBPAGE: test-captcha +** ** Test the captcha-generator by rendering the value of the name= query ** parameter using ascii-art. If name= is omitted, show a random 16-digit ** hexadecimal number. */ void captcha_test(void){ Index: src/chat.c ================================================================== --- src/chat.c +++ src/chat.c @@ -701,11 +701,10 @@ ** /chat-fetch-one/N ** ** Fetches a single message with the given ID, if available. ** ** Options: -** ** raw = the xmsg field will be returned unparsed. ** ** Response is either a single object in the format returned by ** /chat-poll (without the wrapper array) or a JSON-format error ** response, as documented for ajax_route_error(). @@ -971,45 +970,35 @@ ** specified by the --remote option. If there is no default remote ** Fossil repository and the --remote option is omitted, then this ** command fails with an error. ** ** Subcommands: -** ** > fossil chat -** ** When there is no SUBCOMMAND (when this command is simply "fossil chat") ** the response is to bring up a web-browser window to the chatroom ** on the default system web-browser. You can accomplish the same by ** typing the appropriate URL into the web-browser yourself. This ** command is merely a convenience for command-line oriented people. -** ** > fossil chat pull -** ** Copy chat content from the server down into the local clone, ** as a backup or archive. Setup privilege is required on the server. -** ** --all Download all chat content. Normally only ** previously undownloaded content is retrieved. ** --debug Additional debugging output. ** --out DATABASE Store CHAT table in separate database file ** DATABASE rather that adding to local clone ** --unsafe Allow the use of unencrypted http:// -** ** > fossil chat send [ARGUMENTS] -** ** This command sends a new message to the chatroom. The message ** to be sent is determined by arguments as follows: -** ** -f|--file FILENAME File to attach to the message ** --as FILENAME2 Causes --file FILENAME to be sent with ** the attachment name FILENAME2 ** -m|--message TEXT Text of the chat message ** --remote URL Send to this remote URL ** --unsafe Allow the use of unencrypted http:// -** ** > fossil chat url -** ** Show the default URL used to access the chat server. ** ** Additional subcommands may be added in the future. */ void chat_command(void){ Index: src/color.c ================================================================== --- src/color.c +++ src/color.c @@ -169,11 +169,13 @@ @ <p>Enter candidate branch names below and see them displayed in their @ default background colors above.</p> for(i=0; i<10; i++){ sqlite3_snprintf(sizeof(zNm),zNm,"b%d",i); zBr = P(zNm); - @ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br /> + @ <label>Branch %s(zNm): + @ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'> + @ </label><br /> } @ <input type="submit" value="Submit"> @ <input type="submit" name="rand" value="Random"> @ </form> style_finish_page(); Index: src/configure.c ================================================================== --- src/configure.c +++ src/configure.c @@ -724,50 +724,36 @@ ** COMMAND: configuration* ** ** Usage: %fossil configuration METHOD ... ?OPTIONS? ** ** Where METHOD is one of: export import merge pull push reset. -** ** > fossil configuration export AREA FILENAME -** ** Write to FILENAME exported configuration information for AREA. -** AREA can be one of: ** +** AREA can be one of: ** all email interwiki project shun skin ** ticket user alias subscriber -** ** > fossil configuration import FILENAME -** ** Read a configuration from FILENAME, overwriting the current ** configuration. -** ** > fossil configuration merge FILENAME -** ** Read a configuration from FILENAME and merge its values into ** the current configuration. Existing values take priority over ** values read from FILENAME. -** ** > fossil configuration pull AREA ?URL? -** ** Pull and install the configuration from a different server ** identified by URL. If no URL is specified, then the default ** server is used. Use the --overwrite flag to completely ** replace local settings with content received from URL. -** ** > fossil configuration push AREA ?URL? -** ** Push the local configuration into the remote server identified ** by URL. Admin privilege is required on the remote server for ** this to work. When the same record exists both locally and on ** the remote end, the one that was most recently changed wins. -** ** > fossil configuration reset AREA -** ** Restore the configuration to the default. AREA as above. -** ** > fossil configuration sync AREA ?URL? -** ** Synchronize configuration changes in the local repository with ** the remote repository at URL. ** ** Options: ** -R|--repository REPO Affect repository REPO with changes Index: src/content.c ================================================================== --- src/content.c +++ src/content.c @@ -957,17 +957,14 @@ ** Verify that all content can be extracted from the BLOB table correctly. ** If the BLOB table is correct, then the repository can always be ** successfully reconstructed using "fossil rebuild". ** ** Options: -** ** -d|--db-only Run "PRAGMA integrity_check" on the database only. ** No other validation is performed. -** ** --parse Parse all manifests, wikis, tickets, events, and ** so forth, reporting any errors found. -** ** -q|--quick Run "PRAGMA quick_check" on the database only. ** No other validation is performed. */ void test_integrity(void){ Stmt q; @@ -1197,11 +1194,10 @@ ** Look at every artifact in the repository and verify that ** all references are satisfied. Report any referenced artifacts ** that are missing or shunned. ** ** Options: -** ** --notshunned Do not report shunned artifacts ** --quiet Only show output if there are errors */ void test_missing(void){ Stmt q; Index: src/db.c ================================================================== --- src/db.c +++ src/db.c @@ -867,11 +867,10 @@ /* ** COMMAND: test-db-prepare ** Usage: %fossil test-db-prepare ?OPTIONS? SQL-STATEMENT ** ** Options: -** ** --auth-report Enable the ticket report query authorizer. ** --auth-ticket Enable the ticket schema query authorizer. ** ** Invoke db_prepare() on the SQL input. Report any errors encountered. ** This command is used to verify error detection logic in the db_prepare() @@ -4623,11 +4622,10 @@ ** on the local settings. Use the --global option to change global settings. ** ** Options: ** --global set or unset the given property globally instead of ** setting or unsetting it for the open repository only. -** ** --exact only consider exact name matches. ** ** See also: [[configuration]] */ void setting_cmd(void){ Index: src/default.css ================================================================== --- src/default.css +++ src/default.css @@ -86,11 +86,10 @@ } .timelineModernDetail { font-size: 80%; text-align: right; float: right; - opacity: 0.75; margin-top: 0.5em; margin-left: 1em; } .tl-canvas { margin: 0 6px 0 10px; @@ -461,11 +460,11 @@ } td.tktTlOpen { color: #800; } td.tktTlClosed { - color: #888; + color: #757575; } span.tktError { color: red; font-weight: bold; } @@ -563,11 +562,11 @@ /* ^^^ attempt to keep mobile from inflating some text */; } table.diff pre > ins, table.diff pre > del { /* Fill platform-dependent color gaps caused by - inflated line-height */; + inflated line-height */ padding: 0.062em 0 0.062em 0; } table.diff pre > ins > *, table.diff pre > del > *{ /* Avoid odd-looking color swatches in conjunction with @@ -707,18 +706,18 @@ td.difftxt ins > ins.edit { background-color: #c0c0ff; text-decoration: none; font-weight: bold; } -body.tkt div.content li > table.udiff { +body.tkt main.content li > table.udiff { margin-left: 1.5em; margin-top: 0.5em; } -body.tkt div.content ol.tkt-changes > li:target > p > span { +body.tkt main.content ol.tkt-changes > li:target > p > span { border-bottom: 3px solid gold; } -body.tkt div.content ol.tkt-changes > li:target > ol { +body.tkt main.content ol.tkt-changes > li:target > ol { border-left: 1px solid gold; } span.modpending { color: #b03800; Index: src/descendants.c ================================================================== --- src/descendants.c +++ src/descendants.c @@ -536,11 +536,10 @@ ** A "leaf" is a check-in with no children in the same branch. A ** "closed leaf" is a leaf that has a "closed" tag. An "open leaf" ** is a leaf without a "closed" tag. ** ** Query parameters: -** ** all Show all leaves ** closed Show only closed leaves ** ng No graph ** nohidden Hide check-ins with "hidden" tag ** onlyhidden Show only check-ins with "hidden" tag Index: src/diff.c ================================================================== --- src/diff.c +++ src/diff.c @@ -3539,11 +3539,10 @@ ** that alternative origin. Thus using "origin=trunk" on an historical ** version of the file shows the first time each line in the file was changed ** or removed by any subsequent check-in. ** ** Query parameters: -** ** checkin=ID The check-in at which to start the annotation ** filename=FILENAME The filename. ** filevers=BOOLEAN Show file versions rather than check-in versions ** limit=LIMIT Limit the amount of analysis. LIMIT can be one of: ** none No limit Index: src/dispatch.c ================================================================== --- src/dispatch.c +++ src/dispatch.c @@ -798,18 +798,16 @@ ** WEBPAGE: help ** URL: /help?name=CMD ** ** Show the built-in help text for CMD. CMD can be a command-line interface ** command or a page name from the web interface or a setting. -** Query parameters: ** +** Query parameters: ** name=CMD Show help for CMD where CMD is a command name or ** webpage name or setting name. -** ** plaintext Show the help within <pre>...</pre>, as if it were ** displayed using the "fossil help" command. -** ** raw Show the raw help text without any formatting. ** (Used for debugging.) */ void help_page(void){ const char *zCmd = P("cmd"); @@ -1141,11 +1139,10 @@ ** Display information on how to use TOPIC, which may be a command, webpage, or ** setting. Webpage names begin with "/". If TOPIC is omitted, a list of ** topics is returned. ** ** The following options can be used when TOPIC is omitted: -** ** -a|--all List both common and auxiliary commands ** -o|--options List command-line options common to all commands ** -s|--setting List setting names ** -t|--test List unsupported "test" commands ** -v|--verbose List both names and help text @@ -1155,11 +1152,10 @@ ** and unsupported "test" commands), options, ** settings, and web pages ** -e|--everything List all help on all topics ** ** These options can be used when TOPIC is present: -** ** -h|--html Format output as HTML rather than plain text ** -c|--commands Restrict TOPIC search to commands */ void help_cmd(void){ int rc; Index: src/doc.c ================================================================== --- src/doc.c +++ src/doc.c @@ -866,16 +866,13 @@ ** URL: /doc/CHECKIN/FILE ** ** CHECKIN can be either tag or hash prefix or timestamp identifying a ** particular check-in, or the name of a branch (meaning the most recent ** check-in on that branch) or one of various magic words: -** ** "tip" means the most recent check-in -** ** "ckout" means the current check-out, if the server is run from ** within a check-out, otherwise it is the same as "tip" -** ** "latest" means use the most recent check-in for the document ** regardless of what branch it occurs on. ** ** FILE is the name of a file to delivered up as a webpage. FILE is relative ** to the root of the source tree of the repository. The FILE must @@ -1228,15 +1225,14 @@ ** Search for documents that match a user-supplied full-text search pattern. ** If no pattern is specified (by the s= query parameter) then the user ** is prompted to enter a search string. ** ** Query parameters: -** ** s=PATTERN Search for PATTERN */ void doc_search_page(void){ const int isSearch = P("s")!=0; login_check_credentials(); style_header("Document Search%s", isSearch ? " Results" : ""); search_screen(SRCH_DOC, 0); style_finish_page(); } Index: src/etag.c ================================================================== --- src/etag.c +++ src/etag.c @@ -252,11 +252,10 @@ ** Usage: fossil test-etag -key KEY-NUMBER -hash HASH ** ** Generate an etag given a KEY-NUMBER and/or a HASH. ** ** KEY-NUMBER is some combination of: -** ** 1 ETAG_CONFIG The config table version number ** 2 ETAG_DATA The event table version number ** 4 ETAG_COOKIE The display cookie */ void test_etag_cmd(void){ Index: src/event.c ================================================================== --- src/event.c +++ src/event.c @@ -52,11 +52,10 @@ ** WEBPAGE: event ** ** Display a technical note (formerly called an "event"). ** ** PARAMETERS: -** ** name=ID Identify the technical note to display. ID must be ** complete. ** aid=ARTIFACTID Which specific version of the tech-note. Optional. ** v=BOOLEAN Show details if TRUE. Default is FALSE. Optional. ** @@ -346,16 +345,14 @@ ** WEBPAGE: eventedit ** ** Revise or create a technical note (formerly called an "event"). ** ** Required query parameter: -** ** name=ID Hex hash ID of the technote. If omitted, a new ** tech-note is created. ** ** POST parameters from the "Cancel", "Preview", or "Submit" buttons: -** ** w=TEXT Complete text of the technote. ** t=TEXT Time of the technote on the timeline (ISO 8601) ** c=TEXT Timeline comment ** g=TEXT Tags associated with this technote ** mimetype=TEXT Mimetype for w= text @@ -526,42 +523,45 @@ @ <form method="post" action="%R/technoteedit"><div> login_insert_csrf_secret(); @ <input type="hidden" name="name" value="%h(zId)" /> @ <table border="0" cellspacing="10"> - @ <tr><th align="right" valign="top">Timestamp (UTC):</th> + @ <tr><th align="right" valign="top"><label for="t">Timestamp (UTC):</label></th> @ <td valign="top"> - @ <input type="text" name="t" size="25" value="%h(zETime)" /> + @ <input type="text" id="t" name="t" size="25" value="%h(zETime)" /> @ </td></tr> - @ <tr><th align="right" valign="top">Timeline Comment:</th> + @ <tr><th align="right" valign="top"><label for="c">Timeline Comment:</label></th> @ <td valign="top"> - @ <textarea name="c" class="technoteedit" cols="80" + @ <textarea id="c" name="c" class="technoteedit" cols="80" @ rows="3" wrap="virtual">%h(zComment)</textarea> @ </td></tr> - @ <tr><th align="right" valign="top">Timeline Background Color:</th> + @ <tr><th align="right" valign="top"> + @ <label for='newclr'%s(zClrFlag)>Timeline Background Color:</label></th> @ <td valign="top"> - @ <input type='checkbox' name='newclr'%s(zClrFlag) /> - @ Use custom color: \ - @ <input type='color' name='clr' value='%s(zClr[0]?zClr:"#c0f0ff")'> + @ <input type='checkbox' id='newclr'%s(zClrFlag) name='newclr'%s(zClrFlag) /> + @ <label>Use custom color: \ + @ <input type='color' name='clr' value='%s(zClr[0]?zClr:"#c0f0ff")'></label> @ </td></tr> - @ <tr><th align="right" valign="top">Tags:</th> + @ <tr><th align="right" valign="top"><label for="g">Tags:</label></th> @ <td valign="top"> - @ <input type="text" name="g" size="40" value="%h(zTags)" /> + @ <input type="text" id="g" name="g" size="40" value="%h(zTags)" /> @ </td></tr> @ <tr><th align="right" valign="top">\ - @ %z(href("%R/markup_help"))Markup Style</a>:</th> + @ <label for="mimetype">Markup style</label> + @ %z(href("%R/markup_help")) + @ <span class="help-buttonlet processed" title="Help"></span></a>: @ <td valign="top"> mimetype_option_menu(zMimetype); @ </td></tr> - @ <tr><th align="right" valign="top">Page Content:</th> + @ <tr><th align="right" valign="top"><label for="w">Page Content:</label></th> @ <td valign="top"> - @ <textarea name="w" class="technoteedit" cols="80" + @ <textarea id="w" name="w" class="technoteedit" cols="80" @ rows="%d(n)" wrap="virtual">%h(zBody)</textarea> @ </td></tr> @ <tr><td colspan="2"> @ <input type="submit" name="cancel" value="Cancel" /> Index: src/export.c ================================================================== --- src/export.c +++ src/export.c @@ -1816,13 +1816,11 @@ ** ** Usage: %fossil git SUBCOMMAND ** ** Do incremental import or export operations between Fossil and Git. ** Subcommands: -** ** > fossil git export [MIRROR] [OPTIONS] -** ** Write content from the Fossil repository into the Git repository ** in directory MIRROR. The Git repository is created if it does not ** already exist. If the Git repository does already exist, then ** new content added to fossil since the previous export is appended. ** @@ -1852,19 +1850,14 @@ ** The "trunk" branch of the Fossil repository is ** mapped into this name. "master" is used if ** this option is omitted. ** -q|--quiet Reduce output. Repeat for even less output. ** -v|--verbose More output. -** ** > fossil git import MIRROR -** ** TBD... -** ** > fossil git status -** ** Show the status of the current Git mirror, if there is one. -** ** -q|--quiet No output if there is nothing to report */ void gitmirror_command(void){ char *zCmd; int nCmd; Index: src/file.c ================================================================== --- src/file.c +++ src/file.c @@ -1475,11 +1475,10 @@ ** ** Display the effective file handling subsystem "settings" and then ** display file system information about the files specified, if any. ** ** Options: -** ** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off ** --open-config Open the configuration database first. ** --reset Reset cached stat() info for each file. ** --root ROOT Use ROOT as the root of the checkout ** --slash Trailing slashes, if any, are retained. Index: src/fileedit.c ================================================================== --- src/fileedit.c +++ src/fileedit.c @@ -698,11 +698,10 @@ ** ** where FILENAME is a repo-relative name as it would appear in the ** vfile table. ** ** Options: -** ** -R|--repository REPO The repository file to commit to. ** --as FILENAME The repository-side name of the input ** file, relative to the top of the ** repository. Default is the same as the ** input file name. @@ -1538,11 +1537,10 @@ ** Note that fileedit-glob, by design, is a local-only setting. ** It does not sync across repository clones, and must be explicitly ** set on any repositories where this page should be activated. ** ** Optional query parameters: -** ** filename=FILENAME Repo-relative path to the file. ** checkin=VERSION Checkin version, using any unambiguous ** symbolic version name. ** ** If passed a filename but no checkin then it will attempt to @@ -1728,11 +1726,11 @@ "150%", 150, "175%", 175, "200%", 200, NULL); CX("</div>"); CX("<div class='flex-container flex-column stretch'>"); CX("<textarea name='content' id='fileedit-content-editor' " - "class='fileedit' rows='25'>"); + "class='fileedit' rows='25' aria-label='Content' title='Content'>"); CX("</textarea>"); CX("</div>"/*textarea wrapper*/); CX("</div>"/*#tab-file-content*/); } @@ -1906,11 +1904,11 @@ CX("</div>"/*checkboxes*/); } { /******* Commit comment, button, and result manifest *******/ CX("<fieldset class='fileedit-options commit-message'>" - "<legend>Message (required)</legend><div>\n"); + "<legend><label for='fileedit-comment'>Message (required)</label></legend><div>\n"); /* We have two comment input fields, defaulting to single-line ** mode. JS code sets up the ability to toggle between single- ** and multi-line modes. */ CX("<input type='text' name='comment' " "id='fileedit-comment'></input>"); Index: src/finfo.c ================================================================== --- src/finfo.c +++ src/finfo.c @@ -302,10 +302,11 @@ /* Values for the debug= query parameter to finfo */ #define FINFO_DEBUG_MLINK 0x01 /* ** WEBPAGE: finfo +** ** Usage: ** * /finfo?name=FILENAME ** * /finfo?name=FILENAME&ci=HASH ** ** Show the change history for a single file. The name=FILENAME query @@ -316,11 +317,10 @@ ** If only the name=FILENAME parameter is supplied (if ci=HASH is omitted) ** then the graph shows all changes to any file while it happened ** to be called FILENAME and changes are not tracked across renames. ** ** Additional query parameters: -** ** a=DATETIME Only show changes after DATETIME ** b=DATETIME Only show changes before DATETIME ** ci=HASH identify a particular version of a file and then ** track changes to that file across renames ** m=HASH Mark this particular file version. Index: src/forum.c ================================================================== --- src/forum.c +++ src/forum.c @@ -501,11 +501,11 @@ zDate = db_text(0, "SELECT datetime(%.17g,toLocal())", p->rDate); if( p->pEditPrev ){ zPosterName = forum_post_display_name(p->pEditHead, 0); zEditorName = forum_post_display_name(p, pManifest); zHist = bHist ? "" : zQuery[0]==0 ? "?hist" : "&hist"; - @ <h3 class='forumPostHdr'>(%d(p->sid)\ + @ <h2 class='forumPostHdr'>(%d(p->sid)\ @ .%0*d(fossil_num_digits(p->nEdit))(p->rev)) \ if( fossil_strcmp(zPosterName, zEditorName)==0 ){ @ By %s(zPosterName) on %h(zDate) edited from \ @ %z(href("%R/forumpost/%S?%s%s",p->pEditPrev->zUuid,zQuery,zHist))\ @ %d(p->sid).%0*d(fossil_num_digits(p->nEdit))(p->pEditPrev->rev)</a> @@ -515,11 +515,11 @@ @ %z(href("%R/forumpost/%S%s%s",p->pEditPrev->zUuid,zQuery,zHist))\ @ %d(p->sid).%0*d(fossil_num_digits(p->nEdit))(p->pEditPrev->rev)</a> } }else{ zPosterName = forum_post_display_name(p, pManifest); - @ <h3 class='forumPostHdr'>(%d(p->sid)) \ + @ <h2 class='forumPostHdr'>(%d(p->sid)) \ @ By %s(zPosterName) on %h(zDate) } fossil_free(zDate); @@ -553,11 +553,11 @@ /* Provide a link to the raw source code. */ if( !bUnf ){ @ %z(href("%R/forumpost/%!S?raw",p->zUuid))[source]</a> } - @ </h3> + @ </h2> } /* Check if this post is approved, also if it's by the current user. */ bPrivate = content_is_private(p->fpid); bSameUser = login_is_individual() @@ -793,11 +793,10 @@ ** its entire thread. The selected posting is enclosed within ** <div class='forumSel'>...</div>. Javascript is used to move the ** selected posting into view after the page loads. ** ** Query parameters: -** ** name=X REQUIRED. The hash of the post to display. ** t=a Automatic display mode, i.e. hierarchical for ** desktop and chronological for mobile. This is the ** default if the "t" query parameter is omitted. ** t=c Show posts in the order they were written. @@ -820,11 +819,10 @@ ** Show all forum messages associated with a particular message thread. ** The result is basically the same as /forumpost except that none of ** the postings in the thread are selected. ** ** Query parameters: -** ** name=X REQUIRED. The hash of any post of the thread. ** t=a Automatic display mode, i.e. hierarchical for ** desktop and chronological for mobile. This is the ** default if the "t" query parameter is omitted. ** t=c Show posts in the order they were written. @@ -1055,17 +1053,19 @@ const char *zTitle, const char *zMimetype, const char *zContent ){ if( zTitle ){ - @ Title: <input type="input" name="title" value="%h(zTitle)" size="50" - @ maxlength="125"><br> + @ <label>Title: <input type="input" name="title" value="%h(zTitle)" size="50" + @ maxlength="125"></label><br> } - @ %z(href("%R/markup_help"))Markup style</a>: + @ <label>Markup style + @ %z(href("%R/markup_help")) + @ <span class="help-buttonlet processed" title="Help"></span></a>: mimetype_option_menu(zMimetype); - @ <br><textarea aria-label="Content:" name="content" class="wikiedit" \ - @ cols="80" rows="25" wrap="virtual">%h(zContent)</textarea><br> + @ </label><br><textarea aria-label="Content" title="Content" name="content" \ + @ class="wikiedit" cols="80" rows="25" wrap="virtual">%h(zContent)</textarea><br> } /* ** WEBPAGE: forumnew ** WEBPAGE: forumedit @@ -1189,12 +1189,12 @@ /* ** WEBPAGE: forume2 ** ** Edit an existing forum message. -** Query parameters: ** +** Query parameters: ** fpid=X Hash of the post to be edited. REQUIRED */ void forumedit_page(void){ int fpid; int froot; @@ -1379,11 +1379,10 @@ ** The main page for the forum feature. Show a list of recent forum ** threads. Also show a search box at the top if search is enabled, ** and a button for creating a new thread, if enabled. ** ** Query parameters: -** ** n=N The number of threads to show on each page ** x=X Skip the first X threads ** s=Y Search for term Y. */ void forum_main_page(void){ Index: src/fossil.diff.js ================================================================== --- src/fossil.diff.js +++ src/fossil.diff.js @@ -10,10 +10,12 @@ const D = window.fossil.dom; const addToggle = function(diffElem){ const sib = diffElem.previousElementSibling, btn = sib ? D.addClass(D.checkbox(true), 'diff-toggle') : 0; if(!sib) return; + D.attr(btn,'aria-label','Toggle Diff') + D.attr(btn,'title','Toggle Diff') D.append(sib,btn); btn.addEventListener('click', function(){ diffElem.classList.toggle('hidden'); }, false); }; @@ -638,11 +640,11 @@ const SCROLL_LEN = 25; const F = window.fossil, D = F.dom, Diff = F.diff; var lastWidth; Diff.checkTableWidth = function f(force){ if(undefined === f.contentNode){ - f.contentNode = document.querySelector('div.content'); + f.contentNode = document.querySelector('main.content'); } force = true; const parentCS = window.getComputedStyle(f.contentNode); const parentWidth = ( //document.body.clientWidth; Index: src/fossil.dom.js ================================================================== --- src/fossil.dom.js +++ src/fossil.dom.js @@ -262,30 +262,44 @@ element added to it. If legendText is an HTMLElement then is is assumed to be a LEGEND and is appended as-is, else it is assumed (if truthy) to be a value suitable for passing to dom.append(aLegendElement,...). */ - dom.fieldset = function(legendText){ + dom.fieldset = function(legendText, labelFor){ const fs = this.create('fieldset'); if(legendText){ - this.append( - fs, - (legendText instanceof HTMLElement) - ? legendText - : this.append(this.legend(legendText)) - ); + if(labelFor){ + this.append( + fs, + (legendText instanceof HTMLElement) + ? legendText + : this.append(this.legend(legendText, labelFor)) + ); + } else { + this.append( + fs, + (legendText instanceof HTMLElement) + ? legendText + : this.append(this.legend(legendText)) + ); + } } return fs; }; /** Returns a new LEGEND legend element. The given argument, if not falsy, is append()ed to the element (so it may be a string or DOM element. */ - dom.legend = function(legendText){ + dom.legend = function(legendText, labelFor){ const rc = this.create('legend'); - if(legendText) this.append(rc, legendText); + if(legendText) { + if(labelFor){ + legendText = this.label(labelFor,legendText) + } + this.append(rc, legendText); + } return rc; }; /** Appends each argument after the first to the first argument @@ -318,12 +332,16 @@ parent.appendChild(e); } return parent; }; - dom.input = function(type){ - return this.attr(this.create('input'), 'type', type); + dom.input = function(type, id){ + if(id){ + return this.attr(this.create('input'), 'type', type, 'id', id); + } else { + return this.attr(this.create('input'), 'type', type); + } }; /** Returns a new CHECKBOX input element. Usages: Index: src/fossil.page.brlist.js ================================================================== --- src/fossil.page.brlist.js +++ src/fossil.page.brlist.js @@ -10,11 +10,11 @@ * For the time being, continueing without 'const' and 'indexOf' * (but that may be reconsidered later). */ window.addEventListener( 'load', function() { -var submenu = document.querySelector("div.submenu"); +var submenu = document.querySelector("nav.submenu"); var anchor = document.createElement("A"); var brlistDataObj = document.getElementById("brlist-data"); var brlistDataTxt = brlistDataObj.textContent || brlistDataObj.innerText; var brlistData = JSON.parse(brlistDataTxt); anchor.classList.add("label"); Index: src/fossil.page.chat.js ================================================================== --- src/fossil.page.chat.js +++ src/fossil.page.chat.js @@ -64,10 +64,18 @@ /* This can inadvertently influence our flexbox layouts, so move it out of the way. */ D.append(document.body,dbg); } })(); + + /** + Selectors for elements which are direct children of the BODY + element but not part of the /chat UI. + */ + const selectorsOutsideChat = [ + 'body > *:not(.content)' + ]; const ForceResizeKludge = (function(){ /* Workaround for Safari mayhem regarding use of vh CSS units.... We tried to use vh units to set the content area size for the chat layout, but Safari chokes on that, so we calculate that height here: 85% when in "normal" mode and 95% in chat-only @@ -75,17 +83,14 @@ causing the input area to move off-screen. While we're here, we also use this to cap the max-height of the input field so that pasting huge text does not scroll the upper area of the input widget off-screen. */ - const elemsToCount = [ - document.querySelector('body > div.header'), - document.querySelector('body > div.mainmenu'), - document.querySelector('body > #hbdrop'), - document.querySelector('body > div.footer') - ]; - const contentArea = E1('div.content'); + const elemsToCount = document.querySelectorAll( + selectorsOutsideChat.join(',') + ); + const contentArea = E1('main.content'); const bcl = document.body.classList; const resized = function f(){ if(f.$disabled) return; const wh = window.innerHeight, com = bcl.contains('chat-only-mode'); @@ -137,11 +142,11 @@ btnAttach: E1('#chat-button-attach'), inputX: E1('#chat-input-field-x'), input1: E1('#chat-input-field-single'), inputM: E1('#chat-input-field-multi'), inputFile: E1('#chat-input-file'), - contentDiv: E1('div.content'), + contentDiv: E1('main.content'), viewConfig: E1('#chat-config'), viewPreview: E1('#chat-preview'), previewContent: E1('#chat-preview-content'), btnPreview: E1('#chat-button-preview'), views: document.querySelectorAll('.chat-view'), @@ -322,18 +327,11 @@ footer, leaving only the chat application visible to the user. */ chatOnlyMode: function f(yes){ if(undefined === f.elemsToToggle){ - f.elemsToToggle = []; - document.querySelectorAll( - ["body > div.header", - "body > div.mainmenu", - "body > div.footer", - "#debugMsg" - ].join(',') - ).forEach((e)=>f.elemsToToggle.push(e)); + f.elemsToToggle = document.querySelectorAll(selectorsOutsideChat.join(',')); } if(!arguments.length) yes = true; if(yes === this.isChatOnlyMode()) return this; if(yes){ D.addClass(f.elemsToToggle, 'hidden'); @@ -1724,16 +1722,18 @@ const label = op.label ? D.append(D.label(),op.label) : undefined; const labelWrapper = D.addClass(D.div(), 'label-wrapper'); var hint; if(op.hint){ - hint = D.append(D.addClass(D.label(),'hint'),op.hint); + hint = D.append(D.addClass(D.span(),'hint'),op.hint); } if(op.hasOwnProperty('select')){ const col0 = D.addClass(D.span(/*empty, but for spacing*/), 'toggle-wrapper'); D.append(menuEntry, labelWrapper, col0); + D.attr(op.select,'aria-label',op.hint); + D.attr(op.select,'title',op.hint); D.append(labelWrapper, op.select); if(hint) D.append(labelWrapper, hint); if(label) D.append(label); if(op.callback){ op.select.addEventListener('change', (ev)=>op.callback(ev), false); @@ -1745,12 +1745,11 @@ const key = op.boolValue; op.boolValue = ()=>Chat.settings.getBool(key); op.persistentSetting = key; } const check = op.checkbox - = D.attr(D.checkbox(1, op.boolValue()), - 'aria-label', op.label); + = D.attr(D.checkbox(1, op.boolValue())); const id = 'cfgopt'+f.$id; const col0 = D.addClass(D.span(), 'toggle-wrapper'); check.checked = op.boolValue(); op.checkbox = check; D.attr(check, 'id', id); Index: src/fossil.page.fileedit.js ================================================================== --- src/fossil.page.fileedit.js +++ src/fossil.page.fileedit.js @@ -392,24 +392,26 @@ selFiles = this.e.selectFiles = D.addClass(D.select(), 'file-list'), btnLoad = this.e.btnLoadFile = D.addClass(D.button("Load file"), "flex-shrink"), filesLabel = this.e.fileListLabel = - D.addClass(D.div(),'flex-shrink','file-list-label'), + D.addClass(D.label('editable-file-list'),'flex-shrink','file-list-label'), ciLabelWrapper = D.addClass( D.div(), 'flex-container','flex-row', 'flex-shrink', 'stretch', 'child-gap-small' ), btnReload = D.addClass( D.button('Reload'), 'flex-shrink' ), - ciLabel = this.e.ciListLabel = - D.addClass(D.span(),'flex-shrink','checkin-list-label') + ciLabel = this.e.ciListLabel = + D.addClass(D.label('open-leaf-list'),'flex-shrink','checkin-list-label') ; + D.attr(selCi, 'id',"open-leaf-list"); D.attr(selCi, 'title',"The list of opened leaves."); D.attr(selFiles, 'title', "The list of editable files for the selected checkin."); + D.attr(selFiles, 'id',"editable-file-list"); D.attr(btnLoad, 'title', "Load the selected file into the editor."); D.disable(selCi, selFiles, btnLoad); D.attr(selFiles, 'size', 12); D.append( @@ -472,13 +474,14 @@ 'Locally-edited files. Timestamps are the last local edit time. ', 'Only the ',P.config.defaultMaxStashSize,' most recent files ', 'are retained. Saving or reloading a file removes it from this list. ', D.append(D.code(),F.storage.storageImplName()), ' = ',F.storage.storageHelpDescription() - ); - - D.append(wrapper, "Local edits (", + ), + label = D.label('local-edits', "Local edits"); + D.attr(sel, 'id', 'local-edits'); + D.append(wrapper, label, " (", D.append(D.code(), F.storage.storageImplName()), "):", btnHelp, sel, btnClear); F.helpButtonlets.setup(btnHelp); Index: src/fossil.page.pikchrshow.js ================================================================== --- src/fossil.page.pikchrshow.js +++ src/fossil.page.pikchrshow.js @@ -146,10 +146,12 @@ const selectScript = P.e.selectScript = D.select(), cbAutoPreview = P.e.cbAutoPreview = D.attr(D.checkbox(true),'id', 'cb-auto-preview'), cbWrap = D.addClass(D.div(),'input-with-label') ; + D.attr(selectScript, 'aria-label', 'Example Scripts'); + D.attr(selectScript, 'title', 'Example Scripts'); D.append( cbWrap, selectScript, cbAutoPreview, D.label(cbAutoPreview,"Auto-preview?"), Index: src/fossil.page.pikchrshowasm.js ================================================================== --- src/fossil.page.pikchrshowasm.js +++ src/fossil.page.pikchrshowasm.js @@ -371,10 +371,12 @@ //////////////////////////////////////////////////////////// // Set up selection list of predefined scripts... if(true){ const selectScript = PS.e.selectScript = D.select(); + D.attr(selectScript, 'aria-label', 'Example Scripts'); + D.attr(selectScript, 'title', 'Example Scripts'); D.append(PS.e.zoneInputButtons, selectScript); PS.predefinedPiks.forEach(function(script,ndx){ const opt = D.option(script.code ? script.code.trim() :'', script.name); D.append(selectScript, opt); if(!ndx) selectScript.selectedIndex = 0 /*timing/ordering workaround*/; @@ -479,21 +481,17 @@ off-screen. */ const appViews = EAll('.app-view'); const elemsToCount = [ /* Elements which we need to always count in the visible body size. */ - E('body > div.header'), - E('body > div.mainmenu'), - E('body > div.footer') + ...EAll('body > *:not(.content)') ]; const resized = function f(){ if(f.$disabled) return; const wh = window.innerHeight; - var ht; - var extra = 0; - elemsToCount.forEach((e)=>e ? extra += F.dom.effectiveHeight(e) : false); - ht = wh - extra; + let ht = wh; + elemsToCount.forEach((e)=>ht -= F.dom.effectiveHeight(e)); appViews.forEach(function(e){ e.style.height = e.style.maxHeight = [ "calc(", (ht>=100 ? ht : 100), "px", " - 2em"/*fudge value*/,")" Index: src/fossil.page.wikiedit.js ================================================================== --- src/fossil.page.wikiedit.js +++ src/fossil.page.wikiedit.js @@ -550,14 +550,15 @@ this.e.select = sel; D.addClass(parentElem, 'WikiList'); D.clearElement(parentElem); D.append( parentElem, - D.append(D.fieldset("Select a page to edit"), + D.append(D.fieldset("Select a page to edit", 'select-page'), sel) ); D.attr(sel, 'size', 12); + D.attr(sel, 'id', 'select-page'); D.option(D.disable(D.clearElement(sel)), undefined, "Loading..."); /** Set up filter checkboxes for the various types of wiki pages... */ const fsFilter = D.addClass(D.fieldset("Page types"),"page-types-list"), @@ -627,13 +628,13 @@ D.append(D.span(), getEditMarker(getEditMarker.NEW,false)," = new/unsaved"), D.append(D.span(), getEditMarker(getEditMarker.MODIFIED,false)," = has local edits"), D.append(D.span(), getEditMarker(getEditMarker.DELETED,false)," = is empty (deleted)") ); - const fsNewPage = D.fieldset("Create new page"), + const fsNewPage = D.fieldset("Create new page", 'new-page'), fsNewPageBody = D.div(), - newPageName = D.input('text'), + newPageName = D.input('text', 'new-page'), newPageBtn = D.button("Add page locally") ; D.append(parentElem, fsNewPage); D.append(fsNewPage, fsNewPageBody); D.addClass(fsNewPageBody, 'flex-container', 'flex-column', 'new-page'); @@ -697,12 +698,14 @@ 'Locally-edited wiki pages. Timestamps are the last local edit time. ', 'Only the ',P.config.defaultMaxStashSize,' most recent pages ', 'are retained. Saving or reloading a file removes it from this list. ', D.append(D.code(),F.storage.storageImplName()), ' = ',F.storage.storageHelpDescription() - ); - D.append(wrapper, "Local edits (", + ), + label = D.label('local-edits', "Local edits"); + D.attr(sel, 'id', 'local-edits'); + D.append(wrapper, label, " (", D.append(D.code(), F.storage.storageImplName()), "):", btnHelp, sel, btnClear); F.helpButtonlets.setup(btnHelp); Index: src/hbmenu.js ================================================================== --- src/hbmenu.js +++ src/hbmenu.js @@ -24,11 +24,11 @@ ** Operation: ** ** This script request that the HTML contain two elements: ** ** <a id="hbbtn"> <--- The hamburger menu button -** <div id="hbdrop"> <--- Container for the hamburger menu +** <nav id="hbdrop"> <--- Container for the hamburger menu ** ** Bindings are made on hbbtn so that when it is clicked, the following ** happens: ** ** 1. An XHR is made to /sitemap?popup to fetch the HTML for the Index: src/hname.c ================================================================== --- src/hname.c +++ src/hname.c @@ -234,23 +234,18 @@ ** ** Usage: fossil hash-policy ?NEW-POLICY? ** ** Query or set the hash policy for the current repository. Available hash ** policies are as follows: -** ** sha1 New artifact names are created using SHA1 -** ** auto New artifact names are created using SHA1, but ** automatically change the policy to "sha3" when ** any SHA3 artifact enters the repository. -** ** sha3 New artifact names are created using SHA3, but ** older artifacts with SHA1 names may be reused. -** ** sha3-only Use only SHA3 artifact names. Do not reuse legacy ** SHA1 names. -** ** shun-sha1 Shun any SHA1 artifacts received by sync operations ** other than clones. Older legacy SHA1 artifacts are ** allowed during a clone. ** ** The default hash policy for existing repositories is "auto", which will Index: src/hook.c ================================================================== --- src/hook.c +++ src/hook.c @@ -197,49 +197,36 @@ ** COMMAND: hook* ** ** Usage: %fossil hook COMMAND ... ** ** Commands include: -** ** > fossil hook add --command COMMAND --type TYPE --sequence NUMBER -** ** Create a new hook. The --command and --type arguments are ** required. --sequence is optional. -** ** > fossil hook delete ID ... -** ** Delete one or more hooks by their IDs. ID can be "all" ** to delete all hooks. Caution: There is no "undo" for ** this operation. Deleted hooks are permanently lost. -** ** > fossil hook edit --command COMMAND --type TYPE --sequence NUMBER ID ... -** ** Make changes to one or more existing hooks. The ID argument ** is either a hook-id, or a list of hook-ids, or the keyword ** "all". For example, to disable hook number 2, use: ** ** fossil hook edit --type disabled 2 -** ** > fossil hook list -** ** Show all current hooks -** ** > fossil hook status -** ** Print the values of CONFIG table entries that are relevant to ** hook processing. Used for debugging. -** ** > fossil hook test [OPTIONS] ID +** Run the hook script given by ID for testing purposes. ** -** Run the hook script given by ID for testing purposes. ** Options: -** ** --dry-run Print the script on stdout rather than run it ** --base-rcvid N Pretend that the hook-last-rcvid value is N ** --new-rcvid M Pretend that the last rcvid valud is M ** --aux-file NAME NAME is substituted for %A in the script -** ** The --base-rcvid and --new-rcvid options are silently ignored if ** the hook type is not "after-receive". The default values for ** --base-rcvid and --new-rcvid cause the last receive to be processed. */ void hook_cmd(void){ Index: src/http.c ================================================================== --- src/http.c +++ src/http.c @@ -540,11 +540,10 @@ ** is written into that second file instead of being written on standard ** output. Use the "--out OUTPUT" option to specify an output file for ** a GET request where there is no PAYLOAD. ** ** Options: -** ** --compress Use ZLIB compression on the payload ** --mimetype TYPE Mimetype of the payload ** --out FILE Store the reply in FILE ** -v Verbose output ** --xfer PAYLOAD in a Fossil xfer protocol message Index: src/http_ssl.c ================================================================== --- src/http_ssl.c +++ src/http_ssl.c @@ -905,19 +905,16 @@ ** This command is used to view or modify the TLS (Transport Layer ** Security) configuration for Fossil. TLS (formerly SSL) is the ** encryption technology used for secure HTTPS transport. ** ** Sub-commands: -** ** remove-exception DOMAINS Remove TLS cert exceptions for the domains ** listed. Or remove them all if the --all ** option is specified. -** ** scrub ?--force? Remove all SSL configuration data from the ** repository. Use --force to omit the ** confirmation. -** ** show ?-v? Show the TLS configuration. Add -v to see ** additional explaination */ void test_tlsconfig_info(void){ const char *zCmd; Index: src/import.c ================================================================== --- src/import.c +++ src/import.c @@ -1661,26 +1661,26 @@ ** construct a new Fossil repository named by the NEW-REPOSITORY ** argument. If no input file is supplied the interchange format ** data is read from standard input. ** ** The following formats are currently understood by this command -** ** --git Import from the git-fast-export file format (default) +** ** Options: ** --import-marks FILE Restore marks table from FILE ** --export-marks FILE Save marks table to FILE ** --rename-master NAME Renames the master branch to NAME ** --use-author Uses author as the committer ** --attribute "EMAIL USER" Attribute commits to USER ** instead of Git committer EMAIL address -** ** --svn Import from the svnadmin-dump file format. The default ** behaviour (unless overridden by --flat) is to treat 3 ** folders in the SVN root as special, following the ** common layout of SVN repositories. These are (by ** default) trunk/, branches/ and tags/. The SVN --deltas ** format is supported but not required. +** ** Options: ** --trunk FOLDER Name of trunk folder ** --branches FOLDER Name of branches folder ** --tags FOLDER Name of tags folder ** --base PATH Path to project root in repository @@ -1687,11 +1687,10 @@ ** --flat The whole dump is a single branch ** --rev-tags Tag each revision, implied by -i ** --no-rev-tags Disables tagging effect of -i ** --rename-rev PAT Rev tag names, default "svn-rev-%" ** --ignore-tree DIR Ignores subtree rooted at DIR -** ** Common Options: ** -i|--incremental allow importing into an existing repository ** -f|--force overwrite repository if already exists ** -q|--quiet omit progress output ** --no-rebuild skip the "rebuilding metadata" step Index: src/info.c ================================================================== --- src/info.c +++ src/info.c @@ -187,11 +187,10 @@ ** ** Use the "finfo" command to get information about a specific ** file in a checkout. ** ** Options: -** ** -R|--repository REPO Extract info from repository REPO ** -v|--verbose Show extra information about repositories ** ** See also: [[annotate]], [[artifact]], [[finfo]], [[timeline]] */ @@ -1154,11 +1153,10 @@ ** ** Show the difference between two check-ins identified by the from= and ** to= query parameters. ** ** Query parameters: -** ** from=TAG Left side of the comparison ** to=TAG Right side of the comparison ** branch=TAG Show all changes on a particular branch ** diff=INTEGER 0: none, 1: unified, 2: side-by-side ** glob=STRING only diff files matching this glob @@ -1656,11 +1654,10 @@ ** SETTING: preferred-diff-type width=16 default=0 ** ** The preferred-diff-type setting determines the preferred diff format ** for web pages if the format is not otherwise specified, for example ** by a query parameter or cookie. Allowed values: -** ** 1 Unified diff ** 2 Side-by-side diff ** ** If this setting is omitted or has a value of 0 or less, then it ** is ignored. @@ -1707,11 +1704,10 @@ ** the names of two files within the check-in "ci" that are diffed. If the ** "ci" parameter is omitted, then the most recent check-in ("tip") is ** used. ** ** Additional parameters: -** ** dc=N Show N lines of context around each diff ** patch Use the patch diff format ** regex=REGEX Only show differences that match REGEX ** sbs=BOOLEAN Turn side-by-side diffs on and off (default: on) ** verbose=BOOLEAN Show more detail when describing artifacts @@ -1834,11 +1830,10 @@ ** WEBPAGE: raw ** URL: /raw/ARTIFACTID ** URL: /raw?ci=BRANCH&filename=NAME ** ** Additional query parameters: -** ** m=MIMETYPE The mimetype is MIMETYPE ** at=FILENAME Content-disposition; attachment; filename=FILENAME; ** ** Return the uninterpreted content of an artifact. Used primarily ** to view artifacts that are images. @@ -2093,11 +2088,10 @@ ** ** Show the complete content of a file identified by ARTIFACTID ** as preformatted text. ** ** Other parameters: -** ** verbose Show more detail when describing the object */ void hexdump_page(void){ int rid; Blob content; @@ -2358,23 +2352,22 @@ ** /artifact/HASH ** /whatis/HASH ** /file/NAME ** ** Additional query parameters: -** -** ln - show line numbers -** ln=N - highlight line number N -** ln=M-N - highlight lines M through N inclusive -** ln=M-N+Y-Z - highlight lines M through N and Y through Z (inclusive) -** verbose - show more detail in the description -** download - redirect to the download (artifact page only) -** name=NAME - filename or hash as a query parameter -** filename=NAME - alternative spelling for "name=" -** fn=NAME - alternative spelling for "name=" -** ci=VERSION - The specific check-in to use with "name=" to -** identify the file. -** txt - Force display of unformatted source text +** ln show line numbers +** ln=N highlight line number N +** ln=M-N highlight lines M through N inclusive +** ln=M-N+Y-Z highlight lines M through N and Y through Z (inclusive) +** verbose show more detail in the description +** download redirect to the download (artifact page only) +** name=NAME filename or hash as a query parameter +** filename=NAME alternative spelling for "name=" +** fn=NAME alternative spelling for "name=" +** ci=VERSION The specific check-in to use with "name=" to +** identify the file. +** txt Force display of unformatted source text ** ** The /artifact page show the complete content of a file ** identified by HASH. The /whatis page shows only a description ** of how the artifact is used. The /file page shows the most recent ** version of the file or directory called NAME, or a list of the @@ -3105,15 +3098,13 @@ ** Edit a check-in. (Check-ins are immutable and do not really change. ** This page really creates supplemental tags that affect the display ** of the check-in.) ** ** Query parameters: -** ** rid=INTEGER Record ID of the check-in to edit (REQUIRED) ** ** POST parameters after pressing "Preview", "Cancel", or "Apply": -** ** c=TEXT New check-in comment ** u=TEXT New user name ** newclr Apply a background color ** clr=TEXT New background color (only if newclr) ** pclr Propagate new background color (only if newclr) @@ -3123,11 +3114,10 @@ ** newbr Put the check-in on a new branch ** brname=TEXT Name of the new branch (only if newbr) ** close Close this check-in ** hide Hide this check-in ** cNNN Cancel tag with tagid=NNN -** ** cancel Cancel the edit. Return to the check-in view ** preview Show a preview of the edited check-in comment ** apply Apply changes */ void ci_edit_page(void){ @@ -3280,29 +3270,30 @@ form_begin(0, "%R/ci_edit"); login_insert_csrf_secret(); @ <div><input type="hidden" name="r" value="%s(zUuid)" /> @ <table border="0" cellspacing="10"> - @ <tr><th align="right" valign="top">User:</th> + @ <tr><th align="right" valign="top"><label for="u">User:</label></th> @ <td valign="top"> - @ <input type="text" name="u" size="20" value="%h(zNewUser)" /> + @ <input type="text" id="u" name="u" size="20" value="%h(zNewUser)" /> @ </td></tr> - @ <tr><th align="right" valign="top">Comment:</th> + @ <tr><th align="right" valign="top"><label for="c">Comment:</label></th> @ <td valign="top"> - @ <textarea name="c" rows="10" cols="80">%h(zNewComment)</textarea> + @ <textarea id="c" name="c" rows="10" cols="80">%h(zNewComment)</textarea> @ </td></tr> - @ <tr><th align="right" valign="top">Check-in Time:</th> + @ <tr><th align="right" valign="top"><label for="dt">Check-in Time:</label></th> @ <td valign="top"> - @ <input type="text" name="dt" size="20" value="%h(zNewDate)" /> + @ <input type="text" id="dt" name="dt" size="20" value="%h(zNewDate)" /> @ </td></tr> if( zChngTime ){ - @ <tr><th align="right" valign="top">Timestamp of this change:</th> + @ <tr><th align="right" valign="top"> + @ <label for="chngtime">Timestamp of this change:</label></th> @ <td valign="top"> - @ <input type="text" name="chngtime" size="20" value="%h(zChngTime)" /> + @ <input type="text" id="chngtime" name="chngtime" size="20" value="%h(zChngTime)" /> @ </td></tr> } @ <tr><th align="right" valign="top">Background Color:</th> @ <td valign="top"> @@ -3325,13 +3316,13 @@ @ </td></tr> @ <tr><th align="right" valign="top">Tags:</th> @ <td valign="top"> @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) /> - @ Add the following new tag name to this check-in:</label> + @ Add the following</label> <label>new tag name to this check-in: @ <input type="text" size='15' name="tagname" value="%h(zNewTag)" \ - @ id='tagname' /> + @ id='tagname' /></label> zBranchName = db_text(0, "SELECT value FROM tagxref, tag" " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" " AND tagxref.tagid=%d", rid, TAG_BRANCH); db_prepare(&q, "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag" @@ -3380,13 +3371,13 @@ } @ <tr><th align="right" valign="top">Branching:</th> @ <td valign="top"> @ <label><input id="newbr" type="checkbox" name="newbr" \ @ data-branch='%h(zBranchName)'%s(zNewBrFlag) /> - @ Make this check-in the start of a new branch named:</label> + @ Make this check-in the start of a</label> <label>new branch named: @ <input id="brname" type="text" style="width:15;" name="brname" \ - @ value="%h(zNewBranch)" /></td></tr> + @ value="%h(zNewBranch)" /></label></td></tr> if( !fHasHidden ){ @ <tr><th align="right" valign="top">Branch Hiding:</th> @ <td valign="top"> @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag) /> @ Hide branch @@ -3471,11 +3462,10 @@ ** Usage: %fossil amend HASH OPTION ?OPTION ...? ** ** Amend the tags on check-in HASH to change how it displays in the timeline. ** ** Options: -** ** --author USER Make USER the author for check-in ** -m|--comment COMMENT Make COMMENT the check-in comment ** -M|--message-file FILE Read the amended comment from FILE ** -e|--edit-comment Launch editor to revise comment ** --date DATETIME Make DATETIME the check-in time @@ -3813,11 +3803,10 @@ ** If VERSION and the found ancestor refer to the same commit, the last two ** components are omitted, unless --long is provided. When no fitting tagged ** ancestor is found, show only the short hash of VERSION. ** ** Options: -** ** --digits Display so many hex digits of the hash ** (default: the larger of 6 and the 'hash-digit' setting) ** -d|--dirty Show whether there are changes to be committed ** --long Always show all three components ** --match GLOB Consider only non-propagating tags matching GLOB Index: src/interwiki.c ================================================================== --- src/interwiki.c +++ src/interwiki.c @@ -160,25 +160,19 @@ ** ** Usage: %fossil interwiki COMMAND ... ** ** Manage the "intermap" that defines the mapping from interwiki tags ** to complete URLs for interwiki links. -** ** > fossil interwiki delete TAG ... -** ** Delete one or more interwiki maps. -** ** > fossil interwiki edit TAG --base URL --hash PATH --wiki PATH -** ** Create an interwiki referenced call TAG. The base URL is ** the --base option, which is required. The --hash and --wiki ** paths are optional. The TAG must be lower-case alphanumeric ** and must be unique. A new entry is created if it does not ** already exit. -** ** > fossil interwiki list -** ** Show all interwiki mappings. */ void interwiki_cmd(void){ const char *zCmd; int nCmd; @@ -397,26 +391,26 @@ @ <p class="error">%h(zErr)</p> } @ <form method="POST" action="%R/intermap"> login_insert_csrf_secret(); @ <table border="0"> - @ <tr><td class="form_label" id="imtag">Tag:</td> - @ <td><input type="text" id="tag" aria-labeledby="imtag" name="tag" \ + @ <tr><td class="form_label"><label for="tag">Tag:</label></td> + @ <td><input type="text" id="tag" name="tag" \ @ size="15" value="%h(zTag)"></td></tr> - @ <tr><td class="form_label" id="imbase">Base URL:</td> - @ <td><input type="text" id="base" aria-labeledby="imbase" name="base" \ + @ <tr><td class="form_label"><label for="base">Base URL:</label></td> + @ <td><input type="text" id="base" name="base" \ @ size="70" value="%h(zBase)"></td></tr> - @ <tr><td class="form_label" id="imhash">Hash-path:</td> - @ <td><input type="text" id="hash" aria-labeledby="imhash" name="hash" \ + @ <tr><td class="form_label"><label for="hash">Hash-path:</label></td> + @ <td><input type="text" id="hash" name="hash" \ @ size="20" value="%h(zHash)"> @ (use "<tt>/info/</tt>" when the target is Fossil)</td></tr> - @ <tr><td class="form_label" id="imwiki">Wiki-path:</td> - @ <td><input type="text" id="wiki" aria-labeledby="imwiki" name="wiki" \ + @ <tr><td class="form_label"><label for="wiki">Wiki-path:</label></td> + @ <td><input type="text" id="wiki" name="wiki" \ @ size="20" value="%h(zWiki)"> @ (use "<tt>/wiki?name=</tt>" when the target is Fossil)</td></tr> @ <tr><td></td> @ <td><input type="submit" name="submit" value="Apply Changes"></td></tr> @ </table> @ </form> style_finish_page(); } Index: src/login.c ================================================================== --- src/login.c +++ src/login.c @@ -534,11 +534,10 @@ ** WEBPAGE: login ** WEBPAGE: logout ** WEBPAGE: my ** ** The login/logout page. Parameters: -** ** g=URL Jump back to this URL after login completes ** anon The g=URL is not accessible by "nobody" but is ** accessible by "anonymous" */ void login_page(void){ @@ -736,17 +735,17 @@ @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead. } @ </span></td></tr> } @ <tr> - @ <td class="form_label" id="userlabel1">User ID:</td> - @ <td><input type="text" id="u" aria-labelledby="userlabel1" name="u" \ + @ <td class="form_label" id="userlabel1"><label for="u">User ID:</label></td> + @ <td><input type="text" id="u" id="u" name="u" \ @ size="30" value="%s(anonFlag?"anonymous":"")"></td> @ </tr> @ <tr> - @ <td class="form_label" id="pswdlabel">Password:</td> - @ <td><input aria-labelledby="pswdlabel" type="password" id="p" \ + @ <td class="form_label" id="pswdlabel"><label for="p">Password:</label></td> + @ <td><input type="password" id="p" \ @ name="p" value="" size="30" />\ if( zAnonPw && !noAnon ){ captcha_speakit_button(uSeed, "Speak password for \"anonymous\""); } @ </td> @@ -805,18 +804,19 @@ char *zRPW = fossil_random_password(12); @ <hr> @ <p>Change Password for user <b>%h(g.zLogin)</b>:</p> form_begin(0, "%R/login"); @ <table> - @ <tr><td class="form_label" id="oldpw">Old Password:</td> - @ <td><input aria-labelledby="oldpw" type="password" name="p" \ + @ <tr><td class="form_label" id="oldpw"><label for="p">Old Password:</label></td> + @ <td><input type="password" id="p" name="p" \ @ size="30"/></td></tr> - @ <tr><td class="form_label" id="newpw">New Password:</td> - @ <td><input aria-labelledby="newpw" type="password" name="n1" \ + @ <tr><td class="form_label" id="newpw"><label for="n1">New Password:</label></td> + @ <td><input type="password" id="n1" name="n1" \ @ size="30" /> Suggestion: %z(zRPW)</td></tr> - @ <tr><td class="form_label" id="reppw">Repeat New Password:</td> - @ <td><input aria-labledby="reppw" type="password" name="n2" \ + @ <tr><td class="form_label" id="reppw"> + @ <label for="n2">Repeat New Password:</label></td> + @ <td><input type="password" id="n2" name="n2" \ @ size="30" /></td></tr> @ <tr><td></td> @ <td><input type="submit" value="Change Password" /></td></tr> @ </table> @ </form> @@ -1781,46 +1781,49 @@ @ <input type="hidden" name="g" value="%h(P("g"))" /> } @ <p><input type="hidden" name="captchaseed" value="%u(uSeed)" /> @ <table class="login_out"> @ <tr> - @ <td class="form_label" align="right" id="uid">User ID:</td> - @ <td><input aria-labelledby="uid" type="text" name="u" \ + @ <td class="form_label" align="right" id="uid"><label for="u">User ID:</label></td> + @ <td><input type="text" id="u" name="u" \ @ value="%h(zUserID)" size="30"></td> @ if( iErrLine==1 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="dpyname">Display Name:</td> - @ <td><input aria-labelledby="dpyname" type="text" name="dn" \ + @ <td class="form_label" align="right" id="dpyname"> + @ <label for="dn">Display Name:</label></td> + @ <td><input type="text" id="dn" name="dn" \ @ value="%h(zDName)" size="30"></td> @ </tr> if( iErrLine==2 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ </tr> @ <tr> - @ <td class="form_label" align="right" id="emaddr">Email Address:</td> - @ <td><input aria-labelledby="emaddr" type="text" name="ea" \ + @ <td class="form_label" align="right" id="emaddr"> + @ <label for="ea">Email Address:</label></td> + @ <td><input type="text" id="ea" name="ea" \ @ value="%h(zEAddr)" size="30"></td> @ </tr> if( iErrLine==3 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } if( canDoAlerts ){ int a = atoi(PD("alerts","1")); @ <tr> - @ <td class="form_label" align="right" id="emalrt">Email Alerts?</td> - @ <td><select aria-labelledby="emalrt" size='1' name='alerts'> + @ <td class="form_label" align="right" id="emalrt"> + @ <label for="alerts">Email Alerts?</label></td> + @ <td><select size='1' id='alerts' name='alerts'> @ <option value="1" %s(a?"selected":"")>Yes</option> @ <option value="0" %s(!a?"selected":"")>No</option> @ </select></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="pswd">Password:</td> - @ <td><input aria-labelledby="pswd" type="password" name="p" \ + @ <td class="form_label" align="right" id="pswd"><label for="p">Password:</label></td> + @ <td><input type="password" id="p" name="p" \ @ value="%h(zPasswd)" size="30"> \ if( zPasswd[0]==0 ){ char *zRPW = fossil_random_password(12); @ Password suggestion: %z(zRPW)</td> }else{ @@ -1829,20 +1832,20 @@ @ <tr> if( iErrLine==4 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="pwcfrm">Confirm:</td> - @ <td><input aria-labelledby="pwcfrm" type="password" name="cp" \ + @ <td class="form_label" align="right" id="pwcfrm"><label for="cp">Confirm:</label></td> + @ <td><input type="password" id="cp" name="cp" \ @ value="%h(zConfirm)" size="30"></td> @ </tr> if( iErrLine==5 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="cptcha">Captcha:</td> - @ <td><input type="text" name="captcha" aria-labelledby="cptcha" \ + @ <td class="form_label" align="right" id="cptcha"><label for="captcha">Captcha:</label></td> + @ <td><input type="text" id="captcha" name="captcha" \ @ value="%h(captchaIsCorrect?zDecoded:"")" size="30"> captcha_speakit_button(uSeed, "Speak the captcha text"); @ </td> @ </tr> if( iErrLine==6 ){ @@ -2122,31 +2125,24 @@ ** ** Usage: %fossil login-group ?SUBCOMMAND? ?OPTIONS? ** ** Run various subcommands to manage login-group related settings of the open ** repository or of the repository identified by the -R or --repository option. -** ** > fossil login-group ?-R REPO? -** ** Show the login-group to which REPO, or if invoked from within a checkout ** the repository on which the current checkout is based, belongs. -** ** > fossil login-group join ?-R? REPO ?--name NAME? -** ** This subcommand must be invoked from within a checkout to either: add ** the open repository to the login group that REPO is a member, in which ** case the optional "--name" argument is not required; or create a new ** login group between the open repository and REPO, in which case the new ** group NAME is determined by the mandatory "--name" option. REPO may be ** specified with or without the -R flag. -** ** > fossil login-group leave ?-R REPO? -** ** Take the repository REPO, or if invoked from within a checkout the ** repository on which the current checkout is based, out of whatever ** login group it is a member. -** ** About Login Groups: ** ** A login-group is a set of repositories that share user credentials. ** If a user is logged into one member of the group, then that user can ** access any other group member as long as they have an entry in the USER Index: src/main.c ================================================================== --- src/main.c +++ src/main.c @@ -1324,11 +1324,10 @@ ** WEBPAGE: version ** ** Show the version information for Fossil. ** ** Query parameters: -** ** verbose Show details */ void test_version_page(void){ Blob versionInfo; int verboseFlag; @@ -2224,65 +2223,49 @@ ** environment variable is set to "CGI", which should always be the ** case for CGI scripts run by a webserver. Fossil ignores any lines ** that begin with "#". ** ** The following control lines are recognized: -** ** repository: PATH Name of the Fossil repository -** ** directory: PATH Name of a directory containing many Fossil ** repositories whose names all end with ".fossil". ** There should only be one of "repository:" ** or "directory:" -** ** notfound: URL When in "directory:" mode, redirect to ** URL if no suitable repository is found. -** ** repolist When in "directory:" mode, display a page ** showing a list of available repositories if ** the URL is "/". -** ** localauth Grant administrator privileges to connections ** from 127.0.0.1 or ::1. -** ** skin: LABEL Use the built-in skin called LABEL rather than ** the default. If there are no skins called LABEL ** then this line is a no-op. -** ** files: GLOBLIST GLOBLIST is a comma-separated list of GLOB ** patterns that specify files that can be ** returned verbatim. This feature allows Fossil ** to act as a web server returning static ** content. -** ** setenv: NAME VALUE Set environment variable NAME to VALUE. Or ** if VALUE is omitted, unset NAME. -** ** HOME: PATH Shorthand for "setenv: HOME PATH" -** ** cgi-debug: FILE Causing debugging information to be written ** into FILE. -** ** errorlog: FILE Warnings, errors, and panics written to FILE. -** ** timeout: SECONDS Do not run for longer than SECONDS. The default ** timeout is FOSSIL_DEFAULT_TIMEOUT (600) seconds. -** ** extroot: DIR Directory that is the root of the sub-CGI tree ** on the /ext page. -** ** redirect: REPO URL Extract the "name" query parameter and search ** REPO for a check-in or ticket that matches the ** value of "name", then redirect to URL. There ** can be multiple "redirect:" lines that are ** processed in order. If the REPO is "*", then ** an unconditional redirect to URL is taken. -** ** jsmode: VALUE Specifies the delivery mode for JavaScript ** files. See the help text for the --jsmode ** flag of the http command. -** ** mainmenu: FILE Override the mainmenu config setting with the ** contents of the given file. ** ** Most CGI files contain only a "repository:" line. It is uncommon to ** use any other option. @@ -2609,11 +2592,10 @@ ** WEBPAGE: test-pid ** ** Return the process identifier of the running Fossil server instance. ** ** Query parameters: -** ** usepidkey When present and available, also return the ** address and size, within this server process, ** of the saved database encryption key. This ** is only supported when using SEE on Windows. */ @@ -3424,11 +3406,10 @@ /* ** WEBPAGE: test-warning ** ** Test error and warning log operation. This webpage is accessible to ** the administrator only. -** ** case=1 Issue a fossil_warning() while generating the page. ** case=2 Extra db_begin_transaction() ** case=3 Extra db_end_transaction() ** case=4 Error during SQL processing ** case=5 Call the segfault handler Index: src/manifest.c ================================================================== --- src/manifest.c +++ src/manifest.c @@ -1290,11 +1290,10 @@ ** artifacts and report any errors. Run this test command on historical ** repositories after making any changes to the manifest_parse() ** implementation to confirm that the changes did not break anything. ** ** Options: -** ** --limit N Parse no more than N artifacts before stopping ** --wellformed Use all BLOB table entries as input, not just ** those entries that are believed to be valid ** artifacts, and verify that the result the ** manifest_is_well_formed() agrees with the Index: src/merge.c ================================================================== --- src/merge.c +++ src/merge.c @@ -295,41 +295,31 @@ ** Only file content is merged. The result continues to use the ** file and directory names from the current checkout even if those ** names might have been changed in the branch being merged in. ** ** Options: -** ** --backout Do a reverse cherrypick merge against VERSION. ** In other words, back out the changes that were ** added by VERSION. -** ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead ** of the nearest common ancestor. This allows ** a sequence of changes in a branch to be merged ** without having to merge the entire branch. -** ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary ** and do not try to merge parallel changes. This ** option overrides the "binary-glob" setting. -** ** --cherrypick Do a cherrypick merge VERSION into the current ** checkout. A cherrypick merge pulls in the changes ** of the single check-in VERSION, rather than all ** changes back to the nearest common ancestor. -** ** -f|--force Force the merge even if it would be a no-op. -** ** --force-missing Force the merge even if there is missing content. -** ** --integrate Merged branch will be closed when committing. -** ** -K|--keep-merge-files On merge conflict, retain the temporary files ** used for merging, named *-baseline, *-original, ** and *-merge. -** ** -n|--dry-run If given, display instead of run actions -** ** -v|--verbose Show additional details of the merge */ void merge_cmd(void){ int vid; /* Current version "V" */ int mid; /* Version we are merging from "M" */ Index: src/name.c ================================================================== --- src/name.c +++ src/name.c @@ -1026,11 +1026,10 @@ ** Resolve the symbol NAME into its canonical artifact hash ** artifact name and provide a description of what role that artifact ** plays. ** ** Options: -** ** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't', ** 'w', 'g', or 'e') ** -v|--verbose Provide extra information (such as the RID) */ void whatis_cmd(void){ @@ -1442,12 +1441,13 @@ } /* ** WEBPAGE: bloblist ** -** Return a page showing all artifacts in the repository. Query parameters: +** Return a page showing all artifacts in the repository. ** +** Query parameters: ** n=N Show N artifacts ** s=S Start with artifact number S ** priv Show only unpublished or private artifacts ** phan Show only phantom artifacts ** hclr Color code hash types (SHA1 vs SHA3) @@ -1660,11 +1660,10 @@ /* ** WEBPAGE: bigbloblist ** ** Return a page showing the largest artifacts in the repository in order ** of decreasing size. -** ** n=N Show the top N artifacts */ void bigbloblist_page(void){ Stmt q; int n = atoi(PD("n","250")); Index: src/patch.c ================================================================== --- src/patch.c +++ src/patch.c @@ -837,71 +837,54 @@ ** ** This command is used to create, view, and apply Fossil binary patches. ** A Fossil binary patch is a single (binary) file that captures all of the ** uncommitted changes of a check-out. Use Fossil binary patches to transfer ** proposed or incomplete changes between machines for testing or analysis. -** ** > fossil patch create [DIRECTORY] FILENAME -** ** Create a new binary patch in FILENAME that captures all uncommitted ** changes in the check-out at DIRECTORY, or the current directory if ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch ** is written to standard output. -** -** -f|--force Overwrite an existing patch with the same name. -** -** > fossil patch apply [DIRECTORY] FILENAME -** -** Apply the changes in FILENAME to the check-out at DIRECTORY, or -** in the current directory if DIRECTORY is omitted. Options: -** +** -f|--force Overwrite an existing patch with the same name. +** > fossil patch apply [DIRECTORY] FILENAME +** Apply the changes in FILENAME to the check-out at DIRECTORY, or +** in the current directory if DIRECTORY is omitted. +** +** Options: ** -f|--force Apply the patch even though there are unsaved ** changes in the current check-out. Unsaved changes ** are reverted and permanently lost. ** -n|--dry-run Do nothing, but print what would have happened. ** -v|--verbose Extra output explaining what happens. -** ** > fossil patch diff [DIRECTORY] FILENAME -** ** Show a human-readable diff for the patch. All the usual ** diff flags described at "fossil help diff" apply. In addition: -** ** -f|--force Continue trying to perform the diff even if ** baseline information is missing from the current ** repository -** ** > fossil patch push REMOTE-CHECKOUT -** ** Create a patch for the current check-out, transfer that patch to ** a remote machine (using ssh) and apply the patch there. The ** REMOTE-CHECKOUT is in one of the following formats: -** ** * DIRECTORY ** * HOST:DIRECTORY ** * USER@HOST:DIRECTORY ** ** Command-line options: -** ** -f|--force Apply the patch even though there are unsaved ** changes in the current check-out. Unsaved ** changes will be reverted and then the patch is ** applied. ** --fossilcmd EXE Name of the "fossil" executable on the remote ** -n|--dry-run Do nothing, but print what would have happened. ** -v|--verbose Extra output explaining what happens. -** -** ** > fossil patch pull REMOTE-CHECKOUT -** ** Like "fossil patch push" except that the transfer is from remote ** to local. All the same command-line options apply. -** ** > fossil patch view FILENAME -** ** View a summary of the changes in the binary patch FILENAME. ** Use "fossil patch diff" for detailed patch content. -** ** -v|--verbose Show extra detail about the patch. ** */ void patch_cmd(void){ const char *zCmd; Index: src/piechart.c ================================================================== --- src/piechart.c +++ src/piechart.c @@ -315,14 +315,14 @@ piechart_render(width,height, PIE_OTHER|PIE_PERCENT); @ </svg> @ <hr /> } @ <form method="POST" action='%R/test-piechart'> - @ <p>Comma-separated list of slice widths:<br /> - @ <input type='text' name='data' size='80' value='%h(zData)'/><br /> - @ Width: <input type='text' size='8' name='width' value='%d(width)'/> - @ Height: <input type='text' size='8' name='height' value='%d(height)'/><br /> + @ <p><label>Comma-separated list of slice widths:<br /> + @ <input type='text' name='data' size='80' value='%h(zData)'/></label><br /> + @ <label>Width: <input type='text' size='8' name='width' value='%d(width)'/></label> + @ <label>Height: <input type='text' size='8' name='height' value='%d(height)'/></label><br /> @ <input type='submit' value='Draw The Pie Chart'/> @ </form> @ <p>Interesting test cases: @ <ul> @ <li> <a href='test-piechart?data=44,2,2,2,2,2,3,2,2,2,2,2,44'>Case 1</a> Index: src/pikchrshow.c ================================================================== --- src/pikchrshow.c +++ src/pikchrshow.c @@ -287,11 +287,11 @@ "arrow <-> down from last box.s\n" "box same \"Pikchr\" \"Formatter\" \"(pikchr.c)\" fit\n"; } style_header("PikchrShow Client/Server"); CX("<style>"); { - CX("div.content { padding-top: 0.5em }\n"); + CX("main.content { padding-top: 0.5em }\n"); CX("#sbs-wrapper {" "display: flex; flex-direction: column;" "}\n"); CX("#sbs-wrapper > * {" "margin: 0 0.25em 0.5em 0; flex: 1 10 auto;" @@ -341,12 +341,12 @@ CX("body.pikchrshow .v-align-middle{" "vertical-align: middle" "}\n"); CX(".dragover {border: 3px dotted rgba(0,255,0,0.6)}\n"); } CX("</style>"); - CX("<div>Input pikchr code and tap Preview (or Shift-Enter) to render " - "it. <a href='?wasm'>Switch to WASM mode</a>.</div>"); + CX("<div><label for='content'>Input pikchr code</label> and tap Preview (or " + "Shift-Enter) to render it. <a href='?wasm'>Switch to WASM mode</a>.</div>"); CX("<div id='sbs-wrapper'>"); { CX("<div id='pikchrshow-form'>"); { CX("<textarea id='content' name='content' rows='15'>" "%s</textarea>",zContent/*safe-for-%s*/); CX("<div id='pikchrshow-controls'>"); { @@ -525,46 +525,32 @@ ** an SVG graphic. The INFILE and OUTFILE options default to stdin ** resp. stdout, and the names "-" can be used as aliases for those ** streams. ** ** Options: -** ** -div On success, add a DIV wrapper around the ** resulting SVG output which limits its max-width to ** its computed maximum ideal size. -** ** -div-indent Like -div but indent the div. -** ** -div-center Like -div but center the div. -** ** -div-left Like -div but float the div left. -** ** -div-right Like -div but float the div right. -** ** -div-toggle Set the 'toggle' CSS class on the div (used by the ** JavaScript-side post-processor). -** ** -div-source Set the 'source' CSS class on the div, which tells ** CSS to hide the SVG and reveal the source by default. -** ** -src Store the input pikchr's source code in the output as ** a separate element adjacent to the SVG one. Implied ** by -div-source. -** -** ** -th Process the input using TH1 before passing it to pikchr. -** ** -th-novar Disable $var and $<var> TH1 processing. Use this if the ** pikchr script uses '$' for its own purposes and that ** causes issues. This only affects parsing of '$' outside ** of TH1 script blocks. Code in such blocks is unaffected. -** ** -th-nosvg When using -th, output the post-TH1'd script ** instead of the pikchr-rendered output. -** ** -th-trace Trace TH1 execution (for debugging purposes). -** ** ** The -div-indent/center/left/right flags may not be combined. ** ** TH1-related Notes and Caveats: ** Index: src/purge.c ================================================================== --- src/purge.c +++ src/purge.c @@ -455,60 +455,41 @@ ** leave your repository in a goofy state. Know what you are doing! ** Make a backup of your repository before using this command! ** ** FURTHER WARNING: This command is a work-in-progress and may yet ** contain bugs. -** ** > fossil purge artifacts HASH... ?OPTIONS? -** ** Move arbitrary artifacts identified by the HASH list into the ** graveyard. -** ** > fossil purge cat HASH... -** ** Write the content of one or more artifacts in the graveyard onto ** standard output. -** ** > fossil purge checkins TAGS... ?OPTIONS? -** ** Move the check-ins or branches identified by TAGS and all of ** their descendants out of the repository and into the graveyard. ** If TAGS includes a branch name then it means all the check-ins ** on the most recent occurrence of that branch. -** ** > fossil purge files NAME ... ?OPTIONS? -** ** Move all instances of files called NAME into the graveyard. ** NAME should be the name of the file relative to the root of the ** repository. If NAME is a directory, then all files within that ** directory are moved. -** ** > fossil purge list|ls ?-l? -** ** Show the graveyard of prior purges. The -l option gives more ** detail in the output. -** ** > fossil purge obliterate ID... ?--force? -** ** Remove one or more purge events from the graveyard. Once a purge ** event is obliterated, it can no longer be undone. The --force ** option suppresses the confirmation prompt. -** ** > fossil purge tickets NAME ... ?OPTIONS? -** ** TBD... -** ** > fossil purge undo ID -** ** Restore the content previously removed by purge ID. -** ** > fossil purge wiki NAME ... ?OPTIONS? -** ** TBD... ** ** COMMON OPTIONS: -** ** --explain Make no changes, but show what would happen ** --dry-run An alias for --explain */ void purge_cmd(void){ int purgeFlags = PURGE_MOVETO_GRAVEYARD | PURGE_PRINT_SUMMARY; Index: src/regexp.c ================================================================== --- src/regexp.c +++ src/regexp.c @@ -809,11 +809,10 @@ ** ** Run a regular expression match over the named disk files, or against ** standard input if no disk files are named on the command-line. ** ** Options: -** ** -i|--ignore-case Ignore case */ void re_test_grep(void){ ReCompiled *pRe; const char *zErr; @@ -853,11 +852,10 @@ ** ** For details of the supported regular expression dialect, see ** https://fossil-scm.org/fossil/doc/trunk/www/grep.md ** ** Options: -** ** -c|--count Suppress normal output; instead print a count ** of the number of matching files ** -i|--ignore-case Ignore case ** -l|--files-with-matches List only hash for each match ** --once Stop searching after the first match Index: src/report.c ================================================================== --- src/report.c +++ src/report.c @@ -380,12 +380,12 @@ /* ** WEBPAGE: rptnew ** WEBPAGE: rptedit ** ** Create (/rptnew) or edit (/rptedit) a ticket report format. -** Query parameters: ** +** Query parameters: ** rn=N Ticket report number. (required) ** t=TITLE Title of the report format ** w=USER Owner of the report format ** s=SQL SQL text used to implement the report ** k=KEY Color key @@ -511,28 +511,30 @@ if( zErr ){ @ <blockquote class="reportError">%h(zErr)</blockquote> } @ <form action="rptedit" method="post"><div> @ <input type="hidden" name="rn" value="%d(rn)" /> - @ <p>Report Title:<br /> - @ <input type="text" name="t" value="%h(zTitle)" size="60" /></p> - @ <p>Enter a complete SQL query statement against the "TICKET" table:<br /> - @ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea> + @ <p><label for="t">Report Title:</label><br /> + @ <input type="text" id="t" name="t" value="%h(zTitle)" size="60" /></p> + @ <p><label for="s"> + @ Enter a complete SQL query statement against the "TICKET" table:</label><br /> + @ <textarea id="s" name="s" rows="20" cols="80">%h(zSQL)</textarea> @ </p> login_insert_csrf_secret(); if( g.perm.Admin ){ - @ <p>Report owner: - @ <input type="text" name="w" size="20" value="%h(zOwner)" /> + @ <p><label for="w">Report owner:</label> + @ <input type="text" id="w" name="w" size="20" value="%h(zOwner)" /> @ </p> } else { @ <input type="hidden" name="w" value="%h(zOwner)" /> } - @ <p>Enter an optional color key in the following box. (If blank, no + @ <p><label for="k"> + @ Enter an optional color key in the following box.</label> (If blank, no @ color key is displayed.) Each line contains the text for a single @ entry in the key. The first token of each line is the background @ color for that line.<br /> - @ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea> + @ <textarea id="k" name="k" rows="8" cols="50">%h(zClrKey)</textarea> @ </p> @ <p><label><input type="checkbox" name="dflt" %s(dflt?"checked":"")> \ @ Make this the default report</label></p> if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){ @ <p>This report format is owned by %h(zOwner). You are not allowed @@ -560,11 +562,11 @@ zSchema = db_text(0,"SELECT sql FROM sqlite_schema WHERE name='ticket'"); if( zSchema==0 ){ zSchema = db_text(0,"SELECT sql FROM repository.sqlite_schema" " WHERE name='ticket'"); } - @ <hr /><h3>TICKET Schema</h3> + @ <hr /><h2>TICKET Schema</h2> @ <blockquote><pre> @ <code class="language-sql">%h(zSchema)</code> @ </pre></blockquote> @ <h3>Notes</h3> @ <ul> @@ -773,11 +775,11 @@ for(i=0; i<nArg; i++){ const char *zName = azName[i]; if( i==pState->iBg ) continue; if( pState->iNewRow>=0 && i>=pState->iNewRow ){ if( g.perm.Write && zTid ){ - @ <th> </th> + @ <td> </td> zTid = 0; } if( zName[0]=='_' ) zName++; @ </tr><tr><th colspan=%d(pState->nCol)>%h(zName)</th> }else{ @@ -786,11 +788,11 @@ } @ <th>%h(zName)</th> } } if( g.perm.Write && zTid ){ - @ <th> </th> + @ <td> </td> } @ </tr></thead><tbody> } if( azArg==0 ){ @ <tr><td colspan="%d(pState->nCol)"> Index: src/rss.c ================================================================== --- src/rss.c +++ src/rss.c @@ -230,29 +230,24 @@ ** COMMAND: rss* ** ** Usage: %fossil rss ?OPTIONS? ** ** The CLI variant of the /timeline.rss page, this produces an RSS -** feed of the timeline to stdout. Options: +** feed of the timeline to stdout. ** +** Options: ** -type|y FLAG May be: all (default), ci (show check-ins only), ** t (show tickets only), w (show wiki only). -** ** -limit|n LIMIT The maximum number of items to show. -** ** -tkt HASH Filter for only those events for the specified ticket. -** ** -tag TAG Filter for a tag -** ** -wiki NAME Filter on a specific wiki page. ** ** Only one of -tkt, -tag, or -wiki may be used. -** ** -name FILENAME Filter for a specific file. This may be combined ** with one of the other filters (useful for looking ** at a specific branch). -** ** -url STRING Set the RSS feed's root URL to the given string. ** The default is "URL-PLACEHOLDER" (without quotes). */ void cmd_timeline_rss(void){ Stmt q; Index: src/search.c ================================================================== --- src/search.c +++ src/search.c @@ -334,11 +334,10 @@ ** ** Run the full-scan search algorithm using SEARCHSTRING against ** the text of the files listed. Output matches and snippets. ** ** Options: -** ** --begin TEXT Text to insert before each match ** --end TEXT Text to insert after each match ** --gap TEXT Text to indicate elided content ** --html Input is HTML ** --static Use the static Search object @@ -583,11 +582,10 @@ ** score. The -limit option can be used to limit the number of entries ** returned. The -width option can be used to set the output width used ** when printing matches. ** ** Options: -** ** -a|--all Output all matches, not just best matches. ** -n|--limit N Limit output to N matches. ** -W|--width WIDTH Set display width to WIDTH columns, 0 for ** unlimited. Defaults the terminal's width. */ @@ -1141,11 +1139,12 @@ if( zClass ){ @ <div class='searchForm searchForm%s(zClass)'> }else{ @ <div class='searchForm'> } - @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)> + @ <label>Search for: + @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)></label> if( (mFlags & 0x01)!=0 && (srchFlags & (srchFlags-1))!=0 ){ static const struct { const char *z; const char *zNm; unsigned m; } aY[] = { { "all", "All", SRCH_ALL }, { "c", "Check-ins", SRCH_CKIN }, { "d", "Docs", SRCH_DOC }, @@ -1155,21 +1154,21 @@ { "f", "Forum", SRCH_FORUM }, }; const char *zY = PD("y","all"); unsigned newFlags = srchFlags; int i; - @ <select size='1' name='y'> + @ <label> Elements: <select size='1' name='y'> for(i=0; i<count(aY); i++){ if( (aY[i].m & srchFlags)==0 ) continue; cgi_printf("<option value='%s'", aY[i].z); if( fossil_strcmp(zY,aY[i].z)==0 ){ newFlags &= aY[i].m; cgi_printf(" selected"); } cgi_printf(">%s</option>\n", aY[i].zNm); } - @ </select> + @ </select></label> srchFlags = newFlags; } if( fDebug ){ @ <input type="hidden" name="debug" value="1"> } @@ -1197,11 +1196,10 @@ /* ** WEBPAGE: search ** ** Search for check-in comments, documents, tickets, or wiki that ** match a user-supplied pattern. -** ** s=PATTERN Specify the full-text pattern to search for ** y=TYPE What to search. ** c -> check-ins ** d -> documentation ** t -> tickets @@ -1850,22 +1848,19 @@ ** COMMAND: fts-config* ** ** Usage: fossil fts-config ?SUBCOMMAND? ?ARGUMENT? ** ** The "fossil fts-config" command configures the full-text search capabilities -** of the repository. Subcommands: +** of the repository. ** +** Subcommands: ** reindex Rebuild the search index. This is a no-op if ** index search is disabled -** ** index (on|off) Turn the search index on or off -** ** enable cdtwe Enable various kinds of search. c=Check-ins, ** d=Documents, t=Tickets, w=Wiki, e=Tech Notes. -** ** disable cdtwe Disable various kinds of search -** ** stemmer (on|off) Turn the Porter stemmer on or off for indexed ** search. (Unindexed search is never stemmed.) ** ** The current search settings are displayed after any changes are applied. ** Run this command with no arguments to simply see the settings. Index: src/setup.c ================================================================== --- src/setup.c +++ src/setup.c @@ -209,19 +209,28 @@ admin_log("Set option [%q] to [%q].", zVar, iQ ? "on" : "off"); iVal = iQ; } } - @ <label><input type="checkbox" name="%s(zQParm)" \ - @ aria-label="%h(zLabel[0]?zLabel:zQParm)" \ + if( zLabel[0] ) { + @ <label> + } + @ <input type="checkbox" name="%s(zQParm)" \ + if( !zLabel[0] ) { + @ aria-label="%h(zLabel[0]?zLabel:zQParm)" \ + } + @ title="%h(zLabel[0]?zLabel:zQParm)" \ if( iVal ){ @ checked="checked" \ } if( disabled ){ @ disabled="disabled" \ } - @ /> <b>%s(zLabel)</b></label> + @ /> + if( zLabel[0] ) { + @ <b>%s(zLabel)</b></label> + } } /* ** Generate an entry box for an attribute. */ @@ -244,16 +253,26 @@ db_protect_pop(); admin_log("Set entry_attribute %Q to: %.*s%s", zVar, 20, zQ, (nZQ>20 ? "..." : "")); zVal = zQ; } - @ <input aria-label="%h(zLabel[0]?zLabel:zQParm)" type="text" \ + if( zLabel[0] ) { + @ <label> + } + @ <input + if( !zLabel[0] ) { + @ aria-label="%h(zLabel[0]?zLabel:zQParm)" + } + @ title="%h(zLabel[0]?zLabel:zQParm)" type="text" \ @ id="%s(zQParm)" name="%s(zQParm)" value="%h(zVal)" size="%d(width)" \ if( disabled ){ @ disabled="disabled" \ } - @ /> <b>%s(zLabel)</b> + @ /> + if( zLabel[0] ) { + @ <b>%s(zLabel)</b></label> + } } /* ** Generate a text box for an attribute. */ @@ -278,18 +297,24 @@ admin_log("Set textarea_attribute %Q to: %.*s%s", zVar, 20, zQ, (nZQ>20 ? "..." : "")); z = zQ; } if( rows>0 && cols>0 ){ + if( *zLabel ){ + @ <label> + } @ <textarea id="id%s(zQP)" name="%s(zQP)" rows="%d(rows)" \ - @ aria-label="%h(zLabel[0]?zLabel:zQP)" \ + if( !*zLabel ){ + @ aria-label="%h(zLabel[0]?zLabel:zQP)" \ + } + @ title="%h(zLabel[0]?zLabel:zQP)" \ if( disabled ){ @ disabled="disabled" \ } @ cols="%d(cols)">%h(z)</textarea> if( *zLabel ){ - @ <span class="textareaLabel">%s(zLabel)</span> + @ <span class="textareaLabel">%s(zLabel)</span></label> } } return z; } @@ -316,16 +341,16 @@ db_protect_pop(); admin_log("Set multiple_choice_attribute %Q to: %.*s%s", zVar, 20, zQ, (nZQ>20 ? "..." : "")); z = zQ; } - @ <select aria-label="%h(zLabel)" size="1" name="%s(zQP)" id="id%s(zQP)"> + @ <label><select title="%h(zLabel)" size="1" name="%s(zQP)" id="id%s(zQP)"> for(i=0; i<nChoice*2; i+=2){ const char *zSel = fossil_strcmp(azChoice[i],z)==0 ? " selected" : ""; @ <option value="%h(azChoice[i])"%s(zSel)>%h(azChoice[i+1])</option> } - @ </select> <b>%h(zLabel)</b> + @ </select> <b>%h(zLabel)</b></label> } /* ** Insert code into the current page that allows the user to configure ** auto-hyperlink related robot defense settings. @@ -694,30 +719,30 @@ @ @ <form action="%R/setup_login_group" method="post"><div> login_insert_csrf_secret(); @ <blockquote><table border="0"> @ - @ <tr><th align="right" id="rfigtj">Repository filename \ - @ in group to join:</th> - @ <td width="5"></td><td> - @ <input aria-labelledby="rfigtj" type="text" size="50" \ - @ value="%h(zRepo)" name="repo"></td></tr> - @ - @ <tr><th align="right" id="lotar">Login on the above repo:</th> - @ <td width="5"></td><td> - @ <input aria-labelledby="lotar" type="text" size="20" \ - @ value="%h(zLogin)" name="login"></td></tr> - @ - @ <tr><th align="right" id="lgpw">Password:</th> - @ <td width="5"></td><td> - @ <input aria-labelledby="lgpw" type="password" size="20" name="pw">\ + @ <tr><th align="right" id="rfigtj"><label for="repo">Repository filename \ + @ in group to join:</label></th> + @ <td width="5"></td><td> + @ <input type="text" size="50" \ + @ value="%h(zRepo)" id="repo" name="repo"></td></tr> + @ + @ <tr><th align="right" id="lotar"><label for="login">Login on the above repo:</label></th> + @ <td width="5"></td><td> + @ <input type="text" size="20" \ + @ value="%h(zLogin)" id="login" name="login"></td></tr> + @ + @ <tr><th align="right" id="lgpw"><label for="pw">Password:</label></th> + @ <td width="5"></td><td> + @ <input type="password" size="20" id="pw" name="pw">\ @ </td></tr> @ - @ <tr><th align="right" id="nolg">Name of login-group:</th> + @ <tr><th align="right" id="nolg"><label for="newname">Name of login-group:</label></th> @ <td width="5"></td><td> - @ <input aria-labelledby="nolg" type="text" size="30" \ - @ value="%h(zNewName)" name="newname"> + @ <input type="text" size="30" \ + @ value="%h(zNewName)" id="newname" name="newname"> @ (only used if creating a new login-group).</td></tr> @ @ <tr><td colspan="3" align="center"> @ <input type="submit" value="Join" name="join"></td></tr> @ </table></blockquote></div></form> @@ -1653,12 +1678,12 @@ @ The logo may or may not appear on each @ page depending on the <a href="setup_skinedit?w=0">CSS</a> and @ <a href="setup_skinedit?w=2">header setup</a>. @ To change the logo image, use the following form:</p> login_insert_csrf_secret(); - @ Logo Image file: - @ <input type="file" name="logoim" size="60" accept="image/*" /> + @ <label>Logo Image file: + @ <input type="file" name="logoim" size="60" accept="image/*" /></label> @ <p align="center"> @ <input type="submit" name="setlogo" value="Change Logo" /> @ <input type="submit" name="clrlogo" value="Revert To Default" /></p> @ <p>(Properties: "logo-image" and "logo-mimetype") @ </div></form> @@ -1677,12 +1702,12 @@ @ The background image may or may not appear on each @ page depending on the <a href="setup_skinedit?w=0">CSS</a> and @ <a href="setup_skinedit?w=2">header setup</a>. @ To change the background image, use the following form:</p> login_insert_csrf_secret(); - @ Background image file: - @ <input type="file" name="bgim" size="60" accept="image/*" /> + @ <label>Background image file: + @ <input type="file" name="bgim" size="60" accept="image/*" /></label> @ <p align="center"> @ <input type="submit" name="setbg" value="Change Background" /> @ <input type="submit" name="clrbg" value="Revert To Default" /></p> @ </div></form> @ <p>(Properties: "background-image" and "background-mimetype") @@ -1701,12 +1726,12 @@ @ The icon image may or may not appear on each @ page depending on the web browser in use and the MIME-Types that it @ supports for icon images. @ To change the icon image, use the following form:</p> login_insert_csrf_secret(); - @ Icon image file: - @ <input type="file" name="iconim" size="60" accept="image/*" /> + @ <label>Icon image file: + @ <input type="file" name="iconim" size="60" accept="image/*" /></label> @ <p align="center"> @ <input type="submit" name="seticon" value="Change Icon" /> @ <input type="submit" name="clricon" value="Revert To Default" /></p> @ </div></form> @ <p>(Properties: "icon-image" and "icon-mimetype") @@ -1793,12 +1818,12 @@ go = 1; } @ @ <form method="post" action="%R/admin_sql"> login_insert_csrf_secret(); - @ SQL:<br /> - @ <textarea name="q" rows="8" cols="80">%h(zQ)</textarea><br /> + @ <label>SQL:<br /> + @ <textarea name="q" rows="8" cols="80">%h(zQ)</textarea></label><br /> @ <input type="submit" name="go" value="Run SQL"> @ <input type="submit" name="schema" value="Show Schema"> @ <input type="submit" name="tablelist" value="List Tables"> @ <input type="submit" name="configtab" value="CONFIG Table Query"> @ </form> @@ -1902,12 +1927,12 @@ @ run by this page. If Tcl integration was enabled at compile-time and @ the "tcl" setting is enabled, Tcl commands may be run as well.</p> @ @ <form method="post" action="%R/admin_th1"> login_insert_csrf_secret(); - @ TH1:<br /> - @ <textarea name="q" rows="5" cols="80">%h(zQ)</textarea><br /> + @ <label>TH1:<br /> + @ <textarea name="q" rows="5" cols="80">%h(zQ)</textarea></label><br /> @ <input type="submit" name="go" value="Run TH1"> @ </form> if( go ){ const char *zR; int rc; @@ -2174,13 +2199,13 @@ blob_init(&namelist, 0, 0); while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); const char *zValue = db_column_text(&q, 1); @ <tr><td> - @ <input type='text' size='20' value='%h(zName)' name='n%d(cnt)'> + @ <input type='text' size='20' value='%h(zName)' name='n%d(cnt)' title='Alias %d(cnt)'> @ </td><td> - @ <input type='text' size='80' value='%h(zValue)' name='v%d(cnt)'> + @ <input type='text' size='80' value='%h(zValue)' name='v%d(cnt)' title='URI %d(cnt)'> @ </td></tr> cnt++; if( blob_size(&namelist)>0 ) blob_append(&namelist, " ", 1); blob_append(&namelist, zName, -1); } Index: src/setupuser.c ================================================================== --- src/setupuser.c +++ src/setupuser.c @@ -31,11 +31,10 @@ ** ** Show a list of users. Clicking on any user jumps to the edit ** screen for that user. Requires Admin privileges. ** ** Query parameters: -** ** with=CAP Only show users that have one or more capabilities in CAP. ** ubg Color backgrounds by username hash */ void setup_ulist(void){ Stmt s; @@ -604,26 +603,26 @@ @ <input type="hidden" name="pw" value="*"> } @ <input type="hidden" name="referer" value="%h(cgi_referer("setup_ulist"))"> @ <table width="100%%"> @ <tr> - @ <td class="usetupEditLabel" id="suuid">User ID:</td> + @ <td class="usetupEditLabel" id="suuid"><label for="id">User ID:</label></td> if( uid ){ - @ <td>%d(uid) <input aria-labelledby="suuid" type="hidden" \ + @ <td>%d(uid) <input type="hidden" \ @ name="id" value="%d(uid)"/>\ @ </td> }else{ - @ <td>(new user)<input aria-labelledby="suuid" type="hidden" name="id" \ + @ <td>(new user)<input type="hidden" name="id" \ @ value="0" /></td> } @ </tr> @ <tr> - @ <td class="usetupEditLabel" id="sulgn">Login:</td> + @ <td class="usetupEditLabel" id="sulgn"><label for="login">Login:</label></td> if( login_is_special(zLogin) ){ @ <td><b>%h(zLogin)</b></td> }else{ - @ <td><input aria-labelledby="sulgn" type="text" name="login" \ + @ <td><input type="text" id="login" name="login" \ @ value="%h(zLogin)" /> if( alert_tables_exist() ){ int sid; sid = db_int(0, "SELECT subscriberId FROM subscriber" " WHERE suname=%Q", zLogin); @@ -632,12 +631,13 @@ @ (subscription info for %h(zLogin))</a>\ } } @ </td></tr> @ <tr> - @ <td class="usetupEditLabel" id="sucnfo">Contact Info:</td> - @ <td><textarea aria-labelledby="sucnfo" name="info" cols="40" \ + @ <td class="usetupEditLabel" id="sucnfo"> + @ <label for="info">Contact Info:</label></td> + @ <td><textarea id="info" name="info" cols="40" \ @ rows="2">%h(zInfo)</textarea></td> } @ </tr> @ <tr> @ <td class="usetupEditLabel">Capabilities:</td> @@ -729,19 +729,19 @@ @ <a href="%R/setup_ucap_list">(key)</a> @ </td> @ </tr> if( !login_is_special(zLogin) ){ @ <tr> - @ <td align="right" id="supw">Password:</td> + @ <td align="right" id="supw"><label for="pw">Password:</label></td> if( zPw[0] ){ /* Obscure the password for all users */ - @ <td><input aria-labelledby="supw" type="password" autocomplete="off" \ - @ name="pw" value="**********" /></td> + @ <td><input type="password" autocomplete="off" \ + @ id="pw" name="pw" value="**********" /></td> }else{ /* Show an empty password as an empty input field */ char *zRPW = fossil_random_password(12); - @ <td><input aria-labelledby="supw" type="password" name="pw" \ + @ <td><input type="password" id="pw" name="pw" \ @ autocomplete="off" value="" /> Password suggestion: %z(zRPW)</td> } @ </tr> } zGroup = login_group_name(); Index: src/sha1.c ================================================================== --- src/sha1.c +++ src/sha1.c @@ -501,12 +501,12 @@ ** ** Usage: %fossil sha1sum FILE... ** ** Compute an SHA1 checksum of all files named on the command-line. ** If a file is named "-" then take its content from standard input. -** Options: ** +** Options: ** -h|--dereference If FILE is a symbolic link, compute the hash ** on the object that the link points to. Normally, ** the hash is over the name of the object that ** the link points to. ** Index: src/sha3.c ================================================================== --- src/sha3.c +++ src/sha3.c @@ -628,11 +628,10 @@ ** ** To be clear: The official NIST FIPS-202 implementation of SHA3 ** with the added 01 padding is used, not the original Keccak submission. ** ** Options: -** ** --224 Compute a SHA3-224 hash ** --256 Compute a SHA3-256 hash (the default) ** --384 Compute a SHA3-384 hash ** --512 Compute a SHA3-512 hash ** --size N An N-bit hash. N must be a multiple of 32 between Index: src/shun.c ================================================================== --- src/shun.c +++ src/shun.c @@ -168,13 +168,13 @@ @ artifact content will be purged from the repository the next time the @ repository is rebuilt. A list of shunned artifacts can be seen at the @ bottom of this page.</p> @ @ <a name="addshun"></a> - @ <p>To shun artifacts, enter their artifact hashes (the 40- or + @ <p><label for="shun-uuid">To shun artifacts, enter their artifact hashes (the 40- or @ 64-character lowercase hexadecimal hash of the artifact content) in the - @ following box and press the "Shun" button. This will cause the artifacts + @ following box and press the "Shun" button.</label> This will cause the artifacts @ to be removed from the repository and will prevent the artifacts from being @ readded to the repository by subsequent sync operation.</p> @ @ <p>Note that you must enter full artifact hashes, not abbreviations @ or symbolic tags.</p> @@ -187,11 +187,11 @@ @ sight - set the "hidden" tag on such artifacts instead.</p> @ @ <blockquote> @ <form method="post" action="%R/%s(g.zPath)"><div> login_insert_csrf_secret(); - @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid"> + @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid" id="shun-uuid"> if( zShun ){ if( strlen(zShun) ){ @ %h(zShun) }else if( nRcvid ){ db_prepare(&q, "SELECT uuid FROM blob WHERE rcvid=%d", nRcvid); @@ -205,20 +205,20 @@ @ <input type="submit" name="add" value="Shun" /> @ </div></form> @ </blockquote> @ @ <a name="delshun"></a> - @ <p>Enter the UUIDs of previously shunned artifacts to cause them to be - @ accepted again in the repository. The artifacts content is not + @ <p><label for="accept-uuid">Enter the UUIDs of previously shunned artifacts to cause them to be + @ accepted again in the repository.</label> The artifacts content is not @ restored because the content is unknown. The only change is that @ the formerly shunned artifacts will be accepted on subsequent sync @ operations.</p> @ @ <blockquote> @ <form method="post" action="%R/%s(g.zPath)"><div> login_insert_csrf_secret(); - @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid"> + @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid" id="accept-uuid"> if( zAccept ){ if( strlen(zAccept) ){ @ %h(zAccept) }else if( nRcvid ){ db_prepare(&q, "SELECT uuid FROM blob WHERE rcvid=%d", nRcvid); Index: src/sitemap.c ================================================================== --- src/sitemap.c +++ src/sitemap.c @@ -165,11 +165,11 @@ @ Trunk Check-in</a></li> @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li> @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li> @ <li>%z(href("%R/uvlist"))Unversioned Files</a> if( g.perm.Write && zEditGlob[0]!=0 ){ - @ <li>%z(href("%R/fileedit"))On-line File Editor</li> + @ <li>%z(href("%R/fileedit"))On-line File Editor</a></li> } @ </ul> } if( g.perm.Read ){ @ <li>%z(href("%R/timeline"))Project Timeline</a> Index: src/skins.c ================================================================== --- src/skins.c +++ src/skins.c @@ -441,12 +441,12 @@ @ named "%h(zNewName)". Choose a different name.</span></p> } @ <form action="%R/setup_skin_admin" method="post"><div> @ <table border="0"><tr> @ <tr><td align="right">Current name:<td align="left"><b>%h(zOldName)</b> - @ <tr><td align="right">New name:<td align="left"> - @ <input type="text" size="35" name="newname" value="%h(zNewName)"> + @ <tr><td align="right"><label for="newname">New name:</label><td align="left"> + @ <input type="text" size="35" id="newname" name="newname" value="%h(zNewName)"> @ <tr><td><td> @ <input type="hidden" name="sn" value="%h(zOldName)"> @ <input type="submit" name="rename" value="Rename"> @ <input type="submit" name="canren" value="Cancel"> @ </table> @@ -483,12 +483,12 @@ @ <p><span class="generalError">There is already another skin @ named "%h(zNewName)". Choose a different name.</span></p> } @ <form action="%R/setup_skin_admin" method="post"><div> @ <table border="0"><tr> - @ <tr><td align="right">Name for this skin:<td align="left"> - @ <input type="text" size="35" name="svname" value="%h(zNewName)"> + @ <tr><td align="right"><label for="svname">Name for this skin:</label><td align="left"> + @ <input type="text" size="35" id="svname" name="svname" value="%h(zNewName)"> @ <tr><td><td> @ <input type="submit" name="save" value="Save"> @ <input type="submit" name="cansave" value="Cancel"> @ </table> login_insert_csrf_secret(); @@ -774,11 +774,10 @@ /* ** WEBPAGE: setup_skinedit ** ** Edit aspects of a skin determined by the w= query parameter. ** Requires Admin or Setup privileges. -** ** w=NUM -- 0=CSS, 1=footer, 2=header, 3=details, 4=js ** sk=NUM -- the draft skin number */ void setup_skinedit(void){ static const struct sSkinAddr { @@ -853,26 +852,27 @@ } @ <form action="%R/setup_skinedit" method="post"><div> login_insert_csrf_secret(); @ <input type='hidden' name='w' value='%d(ii)'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ <h2>Edit %s(zTitle):</h2> + @ <h2><label for="%s(zFile)">Edit %s(zTitle):</label></h2> if( P("submit") && cgi_csrf_safe(0) && (zOrig==0 || strcmp(zOrig,zContent)!=0) ){ db_set_mprintf(zContent, 0, "draft%d-%s",iSkin,zFile); } - @ <textarea name="%s(zFile)" rows="10" cols="80">\ + @ <textarea id="%s(zFile)" name="%s(zFile)" rows="10" cols="80">\ @ %h(zContent)</textarea> @ <br /> @ <input type="submit" name="submit" value="Apply Changes" /> if( isRevert ){ @ ← Press to complete reversion to "%s(zBasis)" }else if( fossil_strcmp(zContent,zDflt)!=0 ){ @ <input type="submit" name="revert" value='Revert To "%s(zBasis)"' /> } @ <hr /> - @ Baseline: \ + @ <label>Baseline: \ skin_emit_skin_selector("basis", zBasis, zDraft); + @ </label> @ <input type="submit" name="diff" value="Unified Diff" /> @ <input type="submit" name="sbsdiff" value="Side-by-Side Diff" /> if( P("diff")!=0 || P("sbsdiff")!=0 ){ Blob from, to, out; DiffConfig DCfg; @@ -1032,20 +1032,20 @@ @ edits are made to one of nine draft skins. A draft skin can then @ be published to become the default skin. @ Nine separate drafts are available to facilitate A/B testing.</p> @ @ <form method='POST' action='%R/setup_skin#step2' id='f01'> - @ <p class='skinInput'>Draft skin to edit: + @ <p class='skinInput'><label>Draft skin to edit: @ <select size='1' name='sk' id='skStep1'> for(i=1; i<=9; i++){ if( i==iSkin ){ @ <option value='%d(i)' selected>draft%d(i)</option> }else{ @ <option value='%d(i)'>draft%d(i)</option> } } - @ </select> + @ </select></label> @ </p> @ @ <a name='step2'></a> @ <h1>Step 2: Authenticate</h1> @ @@ -1057,13 +1057,13 @@ @ the draft%d(iSkin) skin: @ @ <form method='POST' action='%R/setup_skin#step2' id='f02'> @ <p class='skinInput'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ Authorized editors for skin draft%d(iSkin): + @ <label>Authorized editors for skin draft%d(iSkin): @ <input type='text' name='editors' value='%h(zAllowedEditors)'\ - @ width='40'> + @ width='40'></label> @ <input type='submit' name='submit2' value='Change'> @ </p> @ </form> }else if( isEditor ){ @ <p>You are authorized to make changes to the draft%d(iSkin) skin. @@ -1085,13 +1085,13 @@ @ or a preexisting skin, to use as a baseline.</p> @ @ <form method='POST' action='%R/setup_skin#step4' id='f03'> @ <p class='skinInput'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ Initialize skin <b>draft%d(iSkin)</b> using + @ <label>Initialize skin <b>draft%d(iSkin)</b> using skin_emit_skin_selector("initskin", "current", 0); - @ <input type='submit' name='init3' value='Go'> + @ </label><input type='submit' name='init3' value='Go'> @ </p> @ </form> } @ @ <a name='step4'></a> @@ -1155,14 +1155,14 @@ @ pressing the button below:</p> @ @ <form method='POST' action='%R/setup_skin#step7'> @ <p class='skinInput'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ <input type='checkbox' name='pub7ck1' value='yes'>\ - @ Skin draft%d(iSkin) has been tested and found ready for production.<br> - @ <input type='checkbox' name='pub7ck2' value='yes'>\ - @ The current skin should be overwritten with draft%d(iSkin).<br> + @ <label><input type='checkbox' name='pub7ck1' value='yes'>\ + @ Skin draft%d(iSkin) has been tested and found ready for production.</label><br> + @ <label><input type='checkbox' name='pub7ck2' value='yes'>\ + @ The current skin should be overwritten with draft%d(iSkin).</label><br> @ <input type='submit' name='pub7' value='Publish Draft%d(iSkin)'> @ </p></form> @ @ <p>You will probably need to press Reload on your browser after @ publishing the new skin.</p> Index: src/smtp.c ================================================================== --- src/smtp.c +++ src/smtp.c @@ -423,11 +423,10 @@ ** Interact with the SMTP server for DOMAIN by setting up a connection ** and then immediately shutting it back down. Log all interaction ** on the console. Use ME as the domain name of the sender. ** ** Options: -** ** --direct Use DOMAIN directly without going through MX ** --port N Talk on TCP port N */ void test_smtp_probe(void){ SmtpSession *p; @@ -596,11 +595,10 @@ ** ** Use SMTP to send the email message contained in the file named EMAIL ** to the list of users TO. FROM is the sender of the email. ** ** Options: -** ** --direct Go directly to the TO domain. Bypass MX lookup ** --relayhost R Use R as relay host directly for delivery. ** --port N Use TCP port N instead of 25 ** --trace Show the SMTP conversation on the console */ Index: src/sqlcmd.c ================================================================== --- src/sqlcmd.c +++ src/sqlcmd.c @@ -330,78 +330,58 @@ ** in ways that are unrecoverable. Be sure you know what you are doing before ** running any SQL commands that modify the repository database. Use the ** --readonly option to prevent accidental damage to the repository. ** ** Options: -** ** --no-repository Skip opening the repository database. -** ** --readonly Open the repository read-only. No changes ** are allowed. This is a recommended safety ** precaution to prevent repository damage. -** ** -R REPOSITORY Use REPOSITORY as the repository database -** ** --test Enable some testing and analysis features ** that are normally disabled. ** ** All of the standard sqlite3 command-line shell options should also ** work. ** ** The following SQL extensions are provided with this Fossil-enhanced ** version of the sqlite3 command-line shell: -** ** builtin A virtual table that contains one row for ** each datafile that is built into the Fossil ** binary. -** ** checkin_mtime(X,Y) Return the mtime for the file Y (a BLOB.RID) ** found in check-in X (another BLOB.RID value). -** ** compress(X) Compress text X with the same algorithm used ** to compress artifacts in the BLOB table. -** ** content(X) Return the content of artifact X. X can be an ** artifact hash or hash prefix or a tag. Artifacts ** are stored compressed and deltaed. This function ** does all necessary decompression and undeltaing. -** ** decompress(X) Decompress text X. Undoes the work of ** compress(X). -** ** delta_apply(X,D) Apply delta D to source blob X and return ** the result. -** ** delta_create(X,Y) Create and return a delta that will convert ** X into Y. -** ** delta_output_size(D) Return the number of bytes of output to expect ** when applying delta D -** ** delta_parse(D) A table-valued function that deconstructs ** delta D and returns rows for each element of ** that delta. -** ** files_of_checkin(X) A table-valued function that returns info on ** all files contained in check-in X. Example: -** ** SELECT * FROM files_of_checkin('trunk'); -** ** helptext A virtual table with one row for each command, ** webpage, and setting together with the built-in ** help text. -** ** now() Return the number of seconds since 1970. -** ** obscure(T) Obfuscate the text password T so that its ** original value is not readily visible. Fossil ** uses this same algorithm when storing passwords ** of remote URLs. -** ** regexp The REGEXP operator works, unlike in ** standard SQLite. -** ** symbolic_name_to_rid(X) Return the BLOB.RID corresponding to symbolic ** name X. */ void cmd_sqlite3(void){ int noRepository; Index: src/stash.c ================================================================== --- src/stash.c +++ src/stash.c @@ -503,57 +503,43 @@ /* ** COMMAND: stash ** ** Usage: %fossil stash SUBCOMMAND ARGS... -** ** > fossil stash ** > fossil stash save ?-m|--comment COMMENT? ?FILES...? ** > fossil stash snapshot ?-m|--comment COMMENT? ?FILES...? -** ** Save the current changes in the working tree as a new stash. ** Then revert the changes back to the last check-in. If FILES ** are listed, then only stash and revert the named files. The ** "save" verb can be omitted if and only if there are no other ** arguments. The "snapshot" verb works the same as "save" but ** omits the revert, keeping the checkout unchanged. -** ** > fossil stash list|ls ?-v|--verbose? ?-W|--width NUM? -** ** List all changes sets currently stashed. Show information about ** individual files in each changeset if -v or --verbose is used. -** ** > fossil stash show|cat ?STASHID? ?DIFF-OPTIONS? ** > fossil stash gshow|gcat ?STASHID? ?DIFF-OPTIONS? -** ** Show the contents of a stash as a diff against its baseline. ** With gshow and gcat, gdiff-command is used instead of internal ** diff logic. -** ** > fossil stash pop ** > fossil stash apply ?STASHID? -** ** Apply STASHID or the most recently created stash to the current ** working checkout. The "pop" command deletes that changeset from ** the stash after applying it but the "apply" command retains the ** changeset. -** ** > fossil stash goto ?STASHID? -** ** Update to the baseline checkout for STASHID then apply the ** changes of STASHID. Keep STASHID so that it can be reused ** This command is undoable. -** ** > fossil stash drop|rm ?STASHID? ?-a|--all? -** ** Forget everything about STASHID. Forget the whole stash if the ** -a|--all flag is used. Individual drops are undoable but -a|--all ** is not. -** ** > fossil stash diff ?STASHID? ?DIFF-OPTIONS? ** > fossil stash gdiff ?STASHID? ?DIFF-OPTIONS? -** ** Show diffs of the current working directory and what that ** directory would be if STASHID were applied. With gdiff, ** gdiff-command is used instead of internal diff logic. */ void stash_cmd(void){ Index: src/stat.c ================================================================== --- src/stat.c +++ src/stat.c @@ -333,11 +333,10 @@ ** ** Shows statistics and global information about the repository and/or ** verify the integrity of a repository. ** ** Options: -** ** -b|--brief Only show essential elements. ** --db-check Run "PRAGMA quick_check" on the repository database. ** --db-verify Run a full verification of the repository integrity. ** This involves decoding and reparsing all artifacts ** and can take significant time. Index: src/statrep.c ================================================================== --- src/statrep.c +++ src/statrep.c @@ -223,11 +223,11 @@ @ class='statistics-report-table-events'> } @ <thead> @ <th>%s(zTimeLabel)</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </thead><tbody> /* Run the query twice. The first time we calculate the maximum number of events for a given row. Maybe someone with better SQL Fu can re-implement this with a single query. @@ -362,11 +362,11 @@ @ <table class='statistics-report-table-events sortable' border='0' \ @ cellpadding='2' cellspacing='0' data-column-types='tkx' data-init-sort='2'> @ <thead><tr> @ <th>User</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> db_prepare(&query, "SELECT ifnull(euser,user), " "COUNT(*) AS eventCount " "FROM v_reports " @@ -438,11 +438,11 @@ @ <table class='statistics-report-table-events sortable' border='0' \ @ cellpadding='2' cellspacing='0' data-column-types='tNx' data-init-sort='2'> @ <thead><tr> @ <th>File</th> @ <th>Check-ins</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> while( SQLITE_ROW == db_step(&query) ){ const char *zFile = db_column_text(&query, 0); const int n = db_column_int(&query, 1); int sz; @@ -519,11 +519,11 @@ @ cellpadding='2' cellspacing='0' data-column-types='ntnx' data-init-sort='1'> @ <thead><tr> @ <th>DoW</th> @ <th>Day</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> while( SQLITE_ROW == db_step(&query) ){ const int nCount = db_column_int(&query, 1); if(nCount>nMaxEvents){ nMaxEvents = nCount; @@ -595,11 +595,11 @@ @ <table class='statistics-report-table-events sortable' border='0' \ @ cellpadding='2' cellspacing='0' data-column-types='nnx' data-init-sort='1'> @ <thead><tr> @ <th>Hour</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> while( SQLITE_ROW == db_step(&query) ){ const int nCount = db_column_int(&query, 1); if(nCount>nMaxEvents){ nMaxEvents = nCount; @@ -643,11 +643,11 @@ int iterations = 0; /* # of active time periods. */ int rowCount = 0; int total = 0; stats_report_init_view(); - style_submenu_sql("y", "Year:", + style_submenu_sql("y", "Year", "WITH RECURSIVE a(b) AS (" " SELECT substr(date('now'),1,4) UNION ALL" " SELECT b-1 FROM a" " WHERE b>0+(SELECT substr(date(min(mtime)),1,4) FROM event)" ") SELECT b, b FROM a ORDER BY b DESC"); @@ -674,11 +674,11 @@ "border='0' cellpadding='2' width='100%%' " "cellspacing='0' data-column-types='tnx' data-init-sort='0'>"); cgi_printf("<thead><tr>" "<th>Week</th>" "<th>Events</th>" - "<th width='90%%'></th>" + "<th width='90%%'>Graph</th>" "</tr></thead>" "<tbody>"); while( SQLITE_ROW == db_step(&q) ){ const int nCount = db_column_int(&q, 1); if(nCount>nMaxEvents){ @@ -784,21 +784,19 @@ ** WEBPAGE: reports ** ** Shows activity reports for the repository. ** ** Query Parameters: -** ** view=REPORT_NAME Valid values: bymonth, byyear, byuser ** user=NAME Restricts statistics to the given user ** type=TYPE Restricts the report to a specific event type: ** ci (check-in), f (forum), w (wiki), t (ticket), g (tag) ** Defaulting to all event types. ** ** The view-specific query parameters include: ** ** view=byweek: -** ** y=YYYY The year to report (default is the server's ** current year). */ void stats_report_page(){ const char *zView = P("view"); /* Which view/report to show. */ @@ -811,16 +809,16 @@ const char *zVal; /* Value of view= query parameter */ int eType; /* Corresponding RPT_* define */ } aViewType[] = { { "File Changes","byfile", RPT_BYFILE }, { "Last Change", "lastchng", RPT_LASTCHNG }, - { "By Month", "bymonth", RPT_BYMONTH }, - { "By User", "byuser", RPT_BYUSER }, - { "By Week", "byweek", RPT_BYWEEK }, - { "By Weekday", "byweekday", RPT_BYWEEKDAY }, - { "By Year", "byyear", RPT_BYYEAR }, - { "By Hour", "byhour", RPT_BYHOUR }, + { "Month", "bymonth", RPT_BYMONTH }, + { "User", "byuser", RPT_BYUSER }, + { "Week", "byweek", RPT_BYWEEK }, + { "Weekday", "byweekday", RPT_BYWEEKDAY }, + { "Year", "byyear", RPT_BYYEAR }, + { "Hour", "byhour", RPT_BYHOUR }, }; static const char *const azType[] = { "a", "All Changes", "ci", "Check-ins", "f", "Forum Posts", @@ -850,15 +848,15 @@ for(i=0; i<count(aViewType); i++){ azView[nView++] = aViewType[i].zVal; azView[nView++] = aViewType[i].zName; } if( eType!=RPT_BYFILE ){ - style_submenu_multichoice("type", count(azType)/2, azType, 0); + style_submenu_multichoice("type", "Type", count(azType)/2, azType, 0); } - style_submenu_multichoice("view", nView/2, azView, 0); + style_submenu_multichoice("view", "Group By", nView/2, azView, 0); if( eType!=RPT_BYUSER && eType!=RPT_LASTCHNG ){ - style_submenu_sql("user","User:", + style_submenu_sql("user","User", "SELECT '', 'All Users' UNION ALL " "SELECT x, x FROM (" " SELECT DISTINCT trim(coalesce(euser,user)) AS x FROM event %s" " ORDER BY 1 COLLATE nocase) WHERE x!=''", eType==RPT_BYFILE ? "WHERE type='ci'" : "" Index: src/style.c ================================================================== --- src/style.c +++ src/style.c @@ -44,15 +44,16 @@ const char *zLink; /* Jump to this link when button is pressed */ } aSubmenu[30]; static int nSubmenu = 0; /* Number of buttons */ static struct SubmenuCtrl { const char *zName; /* Form query parameter */ - const char *zLabel; /* Label. Might be NULL for FF_MULTI */ + const char *zLabel; /* Label */ unsigned char eType; /* FF_ENTRY, FF_MULTI, FF_CHECKBOX */ unsigned char eVisible; /* STYLE_NORMAL or STYLE_DISABLED */ short int iSize; /* Width for FF_ENTRY. Count for FF_MULTI */ const char *const *azChoice; /* value/display pairs for FF_MULTI */ + const char *zTrue; /* FF_BINARY label when true */ const char *zFalse; /* FF_BINARY label when false */ const char *zJS; /* Javascript to run on toggle */ } aSubmenuCtrl[20]; static int nSubmenuCtrl = 0; #define FF_ENTRY 1 /* Text entry box */ @@ -307,30 +308,34 @@ aSubmenuCtrl[nSubmenuCtrl].eType = FF_CHECKBOX; nSubmenuCtrl++; } void style_submenu_binary( const char *zName, /* Query parameter name */ + const char *zLabel, /* Label of parameter */ const char *zTrue, /* Label to show when parameter is true */ const char *zFalse, /* Label to show when the parameter is false */ int eVisible /* Visible or disabled */ ){ assert( nSubmenuCtrl < count(aSubmenuCtrl) ); aSubmenuCtrl[nSubmenuCtrl].zName = zName; - aSubmenuCtrl[nSubmenuCtrl].zLabel = zTrue; + aSubmenuCtrl[nSubmenuCtrl].zLabel = zLabel; + aSubmenuCtrl[nSubmenuCtrl].zTrue = zTrue; aSubmenuCtrl[nSubmenuCtrl].zFalse = zFalse; aSubmenuCtrl[nSubmenuCtrl].eVisible = eVisible; aSubmenuCtrl[nSubmenuCtrl].eType = FF_BINARY; nSubmenuCtrl++; } void style_submenu_multichoice( const char *zName, /* Query parameter name */ + const char *zLabel, /* Label of parameter */ int nChoice, /* Number of options */ const char *const *azChoice, /* value/display pairs. 2*nChoice entries */ int eVisible /* Visible or disabled */ ){ assert( nSubmenuCtrl < count(aSubmenuCtrl) ); aSubmenuCtrl[nSubmenuCtrl].zName = zName; + aSubmenuCtrl[nSubmenuCtrl].zLabel = zLabel; aSubmenuCtrl[nSubmenuCtrl].iSize = nChoice; aSubmenuCtrl[nSubmenuCtrl].azChoice = azChoice; aSubmenuCtrl[nSubmenuCtrl].eVisible = eVisible; aSubmenuCtrl[nSubmenuCtrl].eType = FF_MULTI; nSubmenuCtrl++; @@ -645,11 +650,11 @@ ** Default HTML page header text through <body>. If the repository-specific ** header template lacks a <body> tag, then all of the following is ** prepended. */ static const char zDfltHeader[] = -@ <html> +@ <html lang="en"> @ <head> @ <meta charset="UTF-8"> @ <base href="$baseurl/$current_page" /> @ <meta http-equiv="Content-Security-Policy" content="$default_csp" /> @ <meta name="viewport" content="width=device-width, initial-scale=1.0"> @@ -987,11 +992,11 @@ if( nSubmenuCtrl ){ @ <form id='f01' method='GET' action='%R/%s(g.zPath)'> @ <input type='hidden' name='udc' value='1'> cgi_tag_query_parameter("udc"); } - @ <div class="submenu"> + @ <nav id="submenu" class="submenu"> if( nSubmenu>0 ){ qsort(aSubmenu, nSubmenu, sizeof(aSubmenu[0]), submenuCompare); for(i=0; i<nSubmenu; i++){ struct Submenu *p = &aSubmenu[i]; style_derive_classname(p->zLabel, zClass, sizeof zClass); @@ -1018,29 +1023,27 @@ } style_derive_classname(zQPN, zClass+4, sizeof(zClass)-4); switch( aSubmenuCtrl[i].eType ){ case FF_ENTRY: @ <span class='submenuctrl%s(zXtraClass) %s(zClass)'>\ - @ %h(aSubmenuCtrl[i].zLabel)\ + @ <label>%h(aSubmenuCtrl[i].zLabel): \ @ <input type='text' name='%s(zQPN)' value='%h(PD(zQPN, ""))' \ if( aSubmenuCtrl[i].iSize<0 ){ @ size='%d(-aSubmenuCtrl[i].iSize)' \ }else if( aSubmenuCtrl[i].iSize>0 ){ @ size='%d(aSubmenuCtrl[i].iSize)' \ @ maxlength='%d(aSubmenuCtrl[i].iSize)' \ } - @ id='submenuctrl-%d(i)'%s(zDisabled)></span> + @ id='submenuctrl-%d(i)'%s(zDisabled)></label></span> break; case FF_MULTI: { int j; const char *zVal = P(zQPN); if( zXtraClass[0] ){ @ <span class='%s(zXtraClass+1) %s(zClass)'> } - if( aSubmenuCtrl[i].zLabel ){ - @ %h(aSubmenuCtrl[i].zLabel)\ - } + @ <label>%h(aSubmenuCtrl[i].zLabel): \ @ <select class='submenuctrl %s(zClass)' size='1' name='%s(zQPN)' \ @ id='submenuctrl-%d(i)'%s(zDisabled)> for(j=0; j<aSubmenuCtrl[i].iSize*2; j+=2){ const char *zQPV = aSubmenuCtrl[i].azChoice[j]; @ <option value='%h(zQPV)'\ @@ -1048,30 +1051,33 @@ @ selected\ } @ >%h(aSubmenuCtrl[i].azChoice[j+1])</option> } @ </select> + @ </label> if( zXtraClass[0] ){ @ </span> } break; } case FF_BINARY: { int isTrue = PB(zQPN); + @ <label for='submenuctrl-%d(i)'>%h(aSubmenuCtrl[i].zLabel): @ <select class='submenuctrl%s(zXtraClass)' size='1' \ @ name='%s(zQPN)' id='submenuctrl-%d(i)'%s(zDisabled)> @ <option value='1'\ if( isTrue ){ @ selected\ } - @ >%h(aSubmenuCtrl[i].zLabel)</option> + @ >%h(aSubmenuCtrl[i].zTrue)</option> @ <option value='0'\ if( !isTrue ){ @ selected\ } @ >%h(aSubmenuCtrl[i].zFalse)</option> @ </select> + @ </label> break; } case FF_CHECKBOX: { @ <label class='submenuctrl submenuckbox%s(zXtraClass) %s(zClass)'>\ @ <input type='checkbox' name='%s(zQPN)' id='submenuctrl-%d(i)' \ @@ -1086,11 +1092,11 @@ @ %h(aSubmenuCtrl[i].zLabel)</label> break; } } } - @ </div> + @ </nav> if( nSubmenuCtrl ){ cgi_query_parameters_to_hidden(); cgi_tag_query_parameter(0); @ </form> builtin_request_js("menu.js"); @@ -1107,17 +1113,17 @@ @ <div class="adunit_banner"> cgi_append_content(zAd, -1); @ </div> } - @ <div class="content"><span id="debugMsg"></span> + @ <main class="content"><span id="debugMsg"></span> cgi_destination(CGI_BODY); if( sideboxUsed ){ @ <div class="endContent"></div> } - @ </div> + @ </main> /* Put the footer at the bottom of the page. */ zFooter = skin_get("footer"); if( sqlite3_strlike("%</body>%", zFooter, 0)==0 ){ style_load_all_js_files(); @@ -1265,18 +1271,15 @@ /* ** WEBPAGE: style.css loadavg-exempt ** ** Return the style sheet. The style sheet is assemblied from ** multiple sources, in order: -** ** (1) The built-in "default.css" style sheet containing basic defaults. -** ** (2) The page-specific style sheet taken from the built-in ** called "PAGENAME.css" where PAGENAME is the value of the name= ** or page= query parameters. If neither name= nor page= exist, ** then this section is a no-op. -** ** (3) The skin-specific "css.txt" file, if there one. ** ** All of (1), (2), and (3) above (or as many as exist) are concatenated. ** The result is then run through TH1 with the following variables set: ** Index: src/style.chat.css ================================================================== --- src/style.chat.css +++ src/style.chat.css @@ -199,11 +199,11 @@ } body.chat #chat-messages-wrapper.loading > * { /* An attempt at reducing flicker when loading lots of messages. */ visibility: hidden; } -body.chat div.content { +body.chat main.content { margin: 0; padding: 0; display: flex; flex-direction: column-reverse; /* ^^^^ In order to get good automatic scrolling of new messages on Index: src/sync.c ================================================================== --- src/sync.c +++ src/sync.c @@ -319,11 +319,10 @@ ** If URL is not specified, then the URL from the most recent clone, push, ** pull, remote, or sync command is used. See "fossil help clone" for ** details on the URL formats. ** ** Options: -** ** --all Pull from all remotes, not just the default ** -B|--httpauth USER:PASS Credentials for the simple HTTP auth protocol, ** if required by the remote website ** --from-parent-project Pull content from the parent project ** --ipv4 Use only IPv4, not IPv6 @@ -374,11 +373,10 @@ ** If URL is not specified, then the URL from the most recent clone, push, ** pull, remote, or sync command is used. See "fossil help clone" for ** details on the URL formats. ** ** Options: -** ** --all Push to all remotes, not just the default ** -B|--httpauth USER:PASS Credentials for the simple HTTP auth protocol, ** if required by the remote website ** --ipv4 Use only IPv4, not IPv6 ** --no-http-compression Do not compress HTTP traffic @@ -423,11 +421,10 @@ ** If URL is not specified, then the URL from the most recent clone, push, ** pull, remote, or sync command is used. See "fossil help clone" for ** details on the URL formats. ** ** Options: -** ** --all Sync with all remotes, not just the default ** -B|--httpauth USER:PASS Credentials for the simple HTTP auth protocol, ** if required by the remote website ** --ipv4 Use only IPv4, not IPv6 ** --no-http-compression Do not compress HTTP traffic @@ -485,49 +482,35 @@ ** View or modify the URLs of remote repositories used for syncing. ** The "default" remote is specially named by Fossil and corresponds to ** the URL used in the most recent "sync", "push", "pull", "clone", or ** similar command. As such, the default remote can be updated by ** Fossil with each sync command. Other named remotes are persistent. -** ** > fossil remote -** ** With no arguments, this command shows the current default remote ** URL. If there is no default, it shows "off". -** ** > fossil remote add NAME URL -** ** Add a new named URL. Afterwards, NAME can be used as a short ** symbolic name for URL in contexts where a URL is required. The ** URL argument can be "default" or a prior symbolic name to make ** a copy of an existing URL under the new NAME. The "default" ** remote cannot be defined with this subcommand; instead, ** use 'fossil remote REF' as documented below. -** ** > fossil remote config-data -** ** DEBUG USE ONLY - Show the name and value of every CONFIG table ** entry in the repository that is associated with the remote URL store. ** Passwords are obscured in the output. -** ** > fossil remote delete NAME -** ** Delete a named URL previously created by the "add" subcommand. -** ** > fossil remote hyperlink ?FILENAME? ?LINENUM? ?LINENUM? -** ** Print a URL that will access the current checkout on the remote ** repository. Or if the FILENAME argument is included, print the ** URL to access that particular file within the current checkout. ** If one or two linenumber arguments are provided after the filename, ** then the URL is for the line or range of lines specified. -** ** > fossil remote list|ls -** ** Show all remote repository URLs. -** ** > fossil remote off -** ** Forget the default URL. This disables autosync. ** ** This is a convenient way to enter "airplane mode". To enter ** airplane mode, first save the current default URL, then turn the ** default off. Perhaps like this: @@ -536,28 +519,22 @@ ** fossil remote off ** ** To exit airplane mode and turn autosync back on again: ** ** fossil remote main -** ** > fossil remote scrub -** ** Forget any saved passwords for remote repositories, but continue ** to remember the URLs themselves. You will be prompted for the ** password the next time it is needed. -** ** > fossil remote ui ?FILENAME? ?LINENUM? ?LINENUM? -** ** Bring up a web browser pointing at the remote repository, and ** specifically to the page that describes the current checkout ** on that remote repository. Or if FILENAME and/or LINENUM arguments ** are provided, to the specific file and range of lines. This ** command is similar to "fossil remote hyperlink" except that instead ** of printing the URL, it passes the URL off to the web browser. -** ** > fossil remote REF -** ** Make REF the new default URL, replacing the prior default. ** REF may be a URL or a NAME from a prior "add". */ void remote_url_cmd(void){ char *zUrl, *zArg; @@ -820,11 +797,10 @@ ** Only the main repository database is backed up by this command. The ** open checkout file (if any) is not saved. Nor is the global configuration ** database. ** ** Options: -** ** --overwrite OK to overwrite an existing file ** -R NAME Filename of the repository to backup */ void backup_cmd(void){ char *zDest; Index: src/tag.c ================================================================== --- src/tag.c +++ src/tag.c @@ -391,13 +391,11 @@ ** COMMAND: tag ** ** Usage: %fossil tag SUBCOMMAND ... ** ** Run various subcommands to control tags and properties. -** ** > fossil tag add ?OPTIONS? TAGNAME ARTIFACT-ID ?VALUE? -** ** Add a new tag or property to an artifact referenced by ** ARTIFACT-ID. For checkins, the tag will be usable instead ** of a CHECK-IN in commands such as update and merge. If the ** --propagate flag is present and ARTIFACT-ID refers to a ** wiki page, forum post, technote, or check-in, the tag @@ -417,13 +415,11 @@ ** the form 'YYYY-MMM-DD HH:MM:SS'. ** ** Note that fossil uses some tag prefixes internally and this ** command will reject tags with these prefixes to avoid ** causing problems or confusion: "wiki-", "tkt-", "event-". -** ** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID -** ** Remove the tag TAGNAME from the artifact referenced by ** ARTIFACT-ID, and also remove the propagation of the tag to ** any descendants. Use the the -n|--dry-run option to see ** what would have happened. Certain tag name prefixes are ** forbidden, as documented for the 'add' subcommand. @@ -433,13 +429,11 @@ ** non-CHECK-IN artifacts. ** --date-override DATETIME Set date and time deleted. ** --user-override USER Name USER when deleting the tag. ** -n|--dry-run Display the control artifact, but do ** not insert it into the database. -** ** > fossil tag find ?OPTIONS? TAGNAME -** ** List all objects that use TAGNAME. ** ** Options: ** --raw Interprets tag as a raw name instead of a ** branch name and matches any type of artifact. @@ -448,13 +442,11 @@ ** -t|--type TYPE One of: ci (check-in), w (wiki), ** e (event/technote), f (forum post), ** t (ticket). Default is all types. Ignored ** if --raw is used. ** -n|--limit N Limit to N results. -** ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID? -** ** List all tags or, if ARTIFACT-ID is supplied, all tags and ** their values for that artifact. The tagtype option accepts ** one of: propagated, singleton, cancel. For historical ** scripting compatibility, the internal tag types "wiki-", ** "tkt-", and "event-" (technote) are elided by default @@ -747,11 +739,10 @@ ** two or more separate repositories. You should never need to reparent ** during normal operations. ** ** Reparenting is accomplished by adding a parent tag. So to undo the ** reparenting operation, simply delete the tag. -** ** --test Make database entries but do not add the tag artifact. ** So the reparent operation will be undone by the next ** "fossil rebuild" command. ** -n|--dry-run Print the tag that would have been created but do not ** actually change the database in any way. @@ -841,11 +832,10 @@ ** ** Render a timeline with all check-ins that contain non-propagating ** symbolic tags. ** ** Query parameters: -** ** ng No graph ** nohidden Hide check-ins with "hidden" tag ** onlyhidden Show only check-ins with "hidden" tag ** brbg Background color by branch name ** ubg Background color by user name Index: src/tar.c ================================================================== --- src/tar.c +++ src/tar.c @@ -719,28 +719,24 @@ ** /tarball?r=release&name=xyz.tar.gz ** /tarball/xyz.tar.gz?r=release ** /tarball?name=release/xyz.tar.gz ** ** Query parameters: -** ** name=NAME[.tar.gz] The base name of the output file. The default ** value is a configuration parameter in the project ** settings. A prefix of the name, omitting the ** extension, is used as the top-most directory name. -** ** r=TAG The check-in that is turned into a compressed tarball. ** Defaults to "trunk". This query parameter used to ** be called "uuid" and "uuid" is still accepted for ** backwards compatibility. If the name= query parameter ** contains one "/" character then the part before the / ** is the TAG and the part after the / is the true name. ** If no TAG is specified by any of the above means, then ** "trunk" is used as the default. -** ** in=PATTERN Only include files that match the comma-separate ** list of GLOB patterns in PATTERN, as with ex= -** ** ex=PATTERN Omit any file that match PATTERN. PATTERN is a ** comma-separated list of GLOB patterns, where each ** pattern can optionally be quoted using ".." or '..'. ** Any file matching both ex= and in= is excluded. */ Index: src/th_main.c ================================================================== --- src/th_main.c +++ src/th_main.c @@ -2906,11 +2906,10 @@ ** Read the content of the file named "FILE" as if it were a header or ** footer or ticket rendering script, evaluate it, and show the results ** on standard output. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --open-config Open the configuration database ** --set-anon-caps Set anonymous login capabilities ** --set-user-caps Set user login capabilities @@ -2956,11 +2955,10 @@ ** Evaluate SCRIPT as if it were a header or footer or ticket rendering ** script and show the results on standard output. SCRIPT may be either ** a filename or a string of th1 script code. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --open-config Open the configuration database ** --set-anon-caps Set anonymous login capabilities ** --set-user-caps Set user login capabilities @@ -3017,11 +3015,10 @@ ** Evaluate the contents of the file named "FILE" as if it were a header ** or footer or ticket rendering script and show the results on standard ** output. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --open-config Open the configuration database ** --set-anon-caps Set anonymous login capabilities ** --set-user-caps Set user login capabilities @@ -3086,25 +3083,21 @@ ** TYPE argument must be one of the following: ** ** cmdhook Executes the TH1 procedure [command_hook], after ** setting the TH1 variables "cmd_name", "cmd_args", ** and "cmd_flags" to appropriate values. -** ** cmdnotify Executes the TH1 procedure [command_notify], after ** setting the TH1 variables "cmd_name", "cmd_args", ** and "cmd_flags" to appropriate values. -** ** webhook Executes the TH1 procedure [webpage_hook], after ** setting the TH1 variables "web_name", "web_args", ** and "web_flags" to appropriate values. -** ** webnotify Executes the TH1 procedure [webpage_notify], after ** setting the TH1 variables "web_name", "web_args", ** and "web_flags" to appropriate values. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --th-trace Trace TH1 execution (for debugging purposes) */ void test_th_hook(void){ Index: src/timeline.c ================================================================== --- src/timeline.c +++ src/timeline.c @@ -443,11 +443,11 @@ ** background color of the timeline entry */ gidx = graph_add_row(pGraph, rid, -1, 0, 0, zBr, zBgClr, zUuid, 0); @ <div id="m%d(gidx)" class="tl-nodemark"></div> } @</td> - if( !isSelectedOrCurrent ){ + if( !isSelectedOrCurrent && gidx>0 ){ @ <td class="timeline%s(zStyle)Cell%s(zExtraClass)" id='mc%d(gidx)'> }else{ @ <td class="timeline%s(zStyle)Cell%s(zExtraClass)"> } if( pGraph ){ @@ -570,11 +570,11 @@ if( drawDetailEllipsis ){ @ <span class='timelineEllipsis' id='ellipsis-%d(rid)' \ @ data-id='%d(rid)'>...</span> } if( tmFlags & TIMELINE_COLUMNAR ){ - if( !isSelectedOrCurrent ){ + if( !isSelectedOrCurrent && gidx>0 ){ @ <td class="timelineDetailCell%s(zExtraClass)" id='md%d(gidx)'> }else{ @ <td class="timelineDetailCell%s(zExtraClass)"> } } @@ -1156,11 +1156,11 @@ static void timeline_y_submenu(int isDisabled){ static int i = 0; static const char *az[16]; if( i==0 ){ az[0] = "all"; - az[1] = "Any Type"; + az[1] = "Any"; i = 2; if( g.perm.Read ){ az[i++] = "ci"; az[i++] = "Check-ins"; az[i++] = "g"; @@ -1185,11 +1185,11 @@ az[i++] = "Forum"; } assert( i<=count(az) ); } if( i>2 ){ - style_submenu_multichoice("y", i/2, az, isDisabled); + style_submenu_multichoice("y", "Elements", i/2, az, isDisabled); } } /* ** Return the default value for the "ss" cookie or query parameter. @@ -1222,15 +1222,15 @@ /* Available timeline display styles, together with their y= query ** parameter names. */ const char *const timeline_view_styles[] = { - "m", "Modern View", - "j", "Columnar View", - "c", "Compact View", - "v", "Verbose View", - "x", "Classic View", + "m", "Modern", + "j", "Columnar", + "c", "Compact", + "v", "Verbose", + "x", "Classic", }; #if INTERFACE # define N_TIMELINE_VIEW_STYLE 5 #endif @@ -1241,10 +1241,11 @@ ** Return the TIMELINE_* value appropriate for the view-style. */ int timeline_ss_submenu(void){ cookie_link_parameter("ss","ss",timeline_default_ss()); style_submenu_multichoice("ss", + "View", N_TIMELINE_VIEW_STYLE, timeline_view_styles, 0); return timeline_ss_cookie(); } @@ -1541,11 +1542,10 @@ /* ** WEBPAGE: timeline ** ** Query parameters: -** ** a=TIMEORTAG Show events after TIMEORTAG ** b=TIMEORTAG Show events before TIMEORTAG ** c=TIMEORTAG Show events that happen "circa" TIMEORTAG ** cf=FILEHASH Show events around the time of the first use of ** the file with FILEHASH @@ -2139,11 +2139,11 @@ } } if( advancedMenu ){ style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0); } - style_submenu_entry("n","Max:",4,0); + style_submenu_entry("n","Max",4,0); timeline_y_submenu(1); }else if( f_rid && g.perm.Read ){ /* If f= is present, ignore all other parameters other than n= */ char *zUuid; db_multi_exec( @@ -2669,15 +2669,15 @@ if( zType[0]=='a' || zType[0]=='c' ){ style_submenu_checkbox("unhide", "Unhide", 0, 0); } style_submenu_checkbox("v", "Files",(zType[0]!='a' && zType[0]!='c'),0); } - style_submenu_entry("n","Max:",4,0); + style_submenu_entry("n","Max",4,0); timeline_y_submenu(disableY); if( advancedMenu ){ - style_submenu_entry("t", "Tag Filter:", -8, 0); - style_submenu_multichoice("ms", count(azMatchStyles)/2,azMatchStyles,0); + style_submenu_entry("t", "Tag Filter", -8, 0); + style_submenu_multichoice("ms", "Match Style", count(azMatchStyles)/2,azMatchStyles,0); } } blob_zero(&cond); } if( PB("showsql") ){ @@ -3383,11 +3383,10 @@ ** ** Generate a vanity page that shows project activity for the current ** day of the year for various years in the history of the project. ** ** Query parameters: -** ** today=DATE Use DATE as today's date */ void thisdayinhistory_page(void){ static int aYearsAgo[] = { 1, 2, 3, 4, 5, 10, 15, 20, 30, 40, 50, 75, 100 }; const char *zToday; Index: src/tkt.c ================================================================== --- src/tkt.c +++ src/tkt.c @@ -715,12 +715,12 @@ /* ** WEBPAGE: tktview ** URL: tktview?name=HASH ** ** View a ticket identified by the name= query parameter. -** Other query parameters: ** +** Other query parameters: ** tl Show a timeline of the ticket above the status */ void tktview_page(void){ const char *zScript; char *zFullName; @@ -1194,11 +1194,10 @@ ** URL: /tkttimeline/TICKETUUID ** ** Show the change history for a single ticket in timeline format. ** ** Query parameters: -** ** y=ci Show only check-ins associated with the ticket */ void tkttimeline_page(void){ char *zTitle; const char *zUuid; @@ -1475,53 +1474,42 @@ ** COMMAND: ticket* ** ** Usage: %fossil ticket SUBCOMMAND ... ** ** Run various subcommands to control tickets -** ** > fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?OPTIONS? +** Run the ticket report, identified by the report format title +** used in the GUI. The data is written as flat file on stdout, +** using TAB as separator. ** ** Options: -** -l|--limit LIMITCHAR -** -q|--quote +** -l|--limit LIMITCHAR Specify a different separator +** -q|--quote If --quote is used, the tickets are encoded by quoting special +** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r, +** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\). +** Otherwise, the simplified encoding as on the show report raw page +** in the GUI is used. This has no effect in JSON mode. ** -R|--repository REPO ** -** Run the ticket report, identified by the report format title -** used in the GUI. The data is written as flat file on stdout, -** using TAB as separator. The separator can be changed using -** the -l or --limit option. -** ** If TICKETFILTER is given on the commandline, the query is ** limited with a new WHERE-condition. ** example: Report lists a column # with the uuid ** TICKETFILTER may be [#]='uuuuuuuuu' ** example: Report only lists rows with status not open ** TICKETFILTER: status != 'open' ** -** If --quote is used, the tickets are encoded by quoting special -** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r, -** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\). -** Otherwise, the simplified encoding as on the show report raw page -** in the GUI is used. This has no effect in JSON mode. -** ** Instead of the report title it's possible to use the report ** number; the special report number 0 lists all columns defined in ** the ticket table. -** ** > fossil ticket list fields ** > fossil ticket ls fields -** ** List all fields defined for ticket in the fossil repository. -** ** > fossil ticket list reports ** > fossil ticket ls reports -** ** List all ticket reports defined in the fossil repository. -** ** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q|--quote? ** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q|--quote? -** ** Change ticket identified by TICKETUUID to set the values of ** each field FIELD to VALUE. ** ** Field names as defined in the TICKET table. By default, these ** names include: type, status, subsystem, priority, severity, foundin, @@ -1531,17 +1519,13 @@ ** If you use +FIELD, the VALUE is appended to the field FIELD. You ** can use more than one field/value pair on the commandline. Using ** --quote enables the special character decoding as in "ticket ** show", which allows setting multiline text or text with special ** characters. -** ** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q|--quote? -** ** Like set, but create a new ticket with the given values. -** ** > fossil ticket history TICKETUUID -** ** Show the complete change history for the ticket ** ** Note that the values in set|add are not validated against the ** definitions given in "Ticket Common Script". */ Index: src/tktsetup.c ================================================================== --- src/tktsetup.c +++ src/tktsetup.c @@ -153,12 +153,12 @@ cgi_redirect("tktsetup"); } } @ <form action="%R/%s(g.zPath)" method="post"><div> login_insert_csrf_secret(); - @ <p>%s(zDesc)</p> - @ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea> + @ <p><label for="x">%s(zDesc)</label></p> + @ <textarea id="x" name="x" rows="%d(height)" cols="80">%h(z)</textarea> @ <blockquote><p> @ <input type="submit" name="submit" value="Apply Changes" /> @ <input type="submit" name="clear" value="Revert To Default" /> @ <input type="submit" name="setup" value="Cancel" /> @ </p></blockquote> @@ -324,57 +324,57 @@ @ </th1> @ <h1 style="text-align: center;">Enter A New Ticket</h1> @ <table cellpadding="5"> @ <tr> @ <td colspan="3"> -@ Enter a one-line summary of the ticket:<br /> -@ <input type="text" name="title" size="60" value="$<title>" /> +@ <label>Enter a one-line summary of the ticket:<br /> +@ <input type="text" name="title" size="60" value="$<title>" /></label> @ </td> @ </tr> @ @ <tr> -@ <td align="right">Type:</td> +@ <td align="right"><label for="type">Type:</label></td> @ <td align="left"><th1>combobox type $type_choices 1</th1></td> @ <td align="left">What type of ticket is this?</td> @ </tr> @ @ <tr> -@ <td align="right">Version:</td> +@ <td align="right"><label for="foundin">Version:</label></td> @ <td align="left"> -@ <input type="text" name="foundin" size="20" value="$<foundin>" /> +@ <input type="text" id="foundin" name="foundin" size="20" value="$<foundin>" /> @ </td> @ <td align="left">In what version or build number do you observe @ the problem?</td> @ </tr> @ @ <tr> -@ <td align="right">Severity:</td> +@ <td align="right"><label for="severity">Severity:</label></td> @ <td align="left"><th1>combobox severity $severity_choices 1</th1></td> @ <td align="left">How debilitating is the problem? How badly does the problem @ affect the operation of the product?</td> @ </tr> @ @ <tr> -@ <td align="right">EMail:</td> +@ <td align="right"><label for="private_contact">EMail:</label></td> @ <td align="left"> -@ <input type="text" name="private_contact" value="$<private_contact>" +@ <input type="text" id="private_contact" name="private_contact" value="$<private_contact>" @ size="30" /> @ </td> @ <td align="left"><u>Not publicly visible</u> @ Used by developers to contact you with questions.</td> @ </tr> @ @ <tr> @ <td colspan="3"> -@ Enter a detailed description of the problem. +@ <label for="icomment">Enter a detailed description of the problem.</label> @ For code defects, be sure to provide details on exactly how @ the problem can be reproduced. Provide as much detail as -@ possible. Format: +@ possible. <label for="mutype">Format:</label> @ <th1>combobox mutype {HTML {[links only]} Markdown {Plain Text} Wiki} 1</th1> @ <br /> @ <th1>set nline [linecount $comment 50 10]</th1> -@ <textarea name="icomment" cols="80" rows="$nline" +@ <textarea id="icomment" name="icomment" cols="80" rows="$nline" @ wrap="virtual" class="wikiedit">$<icomment></textarea><br /> @ </tr> @ @ <th1>enable_output [info exists preview]</th1> @ <tr><td colspan="3"> @@ -615,55 +615,56 @@ @ submit_ticket @ set preview 1 @ } @ </th1> @ <table cellpadding="5"> -@ <tr><td class="tktDspLabel">Title:</td><td> -@ <input type="text" name="title" value="$<title>" size="60" /> +@ <tr><td class="tktDspLabel"><label for="title">Title:</label></td><td> +@ <input type="text" id="title" name="title" value="$<title>" size="60" /> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Status:</td><td> +@ <tr><td class="tktDspLabel"><label for="status">Status:</label></td><td> @ <th1>combobox status $status_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Type:</td><td> +@ <tr><td class="tktDspLabel"><label for="type">Type:</label></td><td> @ <th1>combobox type $type_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Severity:</td><td> +@ <tr><td class="tktDspLabel"><label for="severity">Severity:</label></td><td> @ <th1>combobox severity $severity_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Priority:</td><td> +@ <tr><td class="tktDspLabel"><label for="priority">Priority:</label></td><td> @ <th1>combobox priority $priority_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Resolution:</td><td> +@ <tr><td class="tktDspLabel"><label for="resolution">Resolution:</label></td><td> @ <th1>combobox resolution $resolution_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Subsystem:</td><td> +@ <tr><td class="tktDspLabel"><label for="subsystem">Subsystem:</label></td><td> @ <th1>combobox subsystem $subsystem_choices 1</th1> @ </td></tr> @ @ <th1>enable_output [hascap e]</th1> -@ <tr><td class="tktDspLabel">Contact:</td><td> -@ <input type="text" name="private_contact" size="40" +@ <tr><td class="tktDspLabel"><label for="private_contact">Contact:</label></td><td> +@ <input type="text" id="private_contact" name="private_contact" size="40" @ value="$<private_contact>" /> @ </td></tr> @ <th1>enable_output 1</th1> @ -@ <tr><td class="tktDspLabel">Version Found In:</td><td> -@ <input type="text" name="foundin" size="50" value="$<foundin>" /> +@ <tr><td class="tktDspLabel"><label for="foundin"> +@ Version Found In:</label></td><td> +@ <input type="text" id="foundin" name="foundin" size="50" value="$<foundin>" /> @ </td></tr> @ @ <tr><td colspan="2"> -@ Append Remark with format +@ <label for="icomment">Append Remark</label> with <label for="mutype">format</label> @ <th1>combobox mutype {HTML {[links only]} Markdown {Plain Text} Wiki} 1</th1> -@ from -@ <input type="text" name="username" value="$<username>" size="30" />:<br /> -@ <textarea name="icomment" cols="80" rows="15" +@ <label for="username">from</label> +@ <input type="text" id="username" name="username" value="$<username>" size="30" />:<br /> +@ <textarea id="icomment" name="icomment" cols="80" rows="15" @ wrap="virtual" class="wikiedit">$<icomment></textarea> @ </td></tr> @ @ <th1>enable_output [info exists preview]</th1> @ <tr><td colspan="2"> Index: src/unversioned.c ================================================================== --- src/unversioned.c +++ src/unversioned.c @@ -230,67 +230,58 @@ ** for download but which do not preserve history. Only the most recent version ** of each UV-file is retained. Changes to an UV-file are permanent and cannot ** be undone, so use appropriate caution with this command. ** ** Subcommands: -** ** add FILE ... Add or update one or more unversioned files in ** the local repository so that they match FILEs ** on disk. Changes are not pushed to other ** repositories until the next sync. -** ** add FILE --as UVFILE Add or update a single file named FILE on disk ** and UVFILE in the repository unversioned file ** namespace. This variant of the 'add' command allows ** the name to be different in the repository versus ** what appears on disk, but it only allows adding ** a single file at a time. -** ** cat FILE ... Concatenate the content of FILEs to stdout. -** ** edit FILE Bring up FILE in a text editor for modification. -** ** export FILE OUTPUT Write the content of FILE into OUTPUT on disk -** ** list | ls Show all unversioned files held in the local -** repository. Options: +** repository. ** +** Options: ** --glob PATTERN Show only files that match ** --like PATTERN Show only files that match ** -l Show additional details for ** files that match. Implied ** when 'list' is used. -** ** revert ?URL? Restore the state of all unversioned files in the ** local repository to match the remote repository ** URL. ** ** Options: ** -v|--verbose Extra diagnostic output ** -n|--dry-run Show what would have happened -** ** remove|rm|delete FILE ... ** Remove unversioned files from the local repository. ** Changes are not pushed to other repositories until -** the next sync. Options: +** the next sync. ** +** Options: ** --glob PATTERN Remove files that match ** --like PATTERN Remove files that match -** ** sync ?URL? Synchronize the state of all unversioned files with ** the remote repository URL. The most recent version ** of each file is propagated to all repositories and ** all prior versions are permanently forgotten. ** ** Options: ** -v|--verbose Extra diagnostic output ** -n|--dry-run Show what would have happened -** ** touch FILE ... Update the TIMESTAMP on all of the listed files ** ** Options: -** ** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add", ** "edit", "remove", and "touch" subcommands. ** -R|--repository REPO Use FILE as the repository */ void unversioned_cmd(void){ @@ -523,12 +514,12 @@ /* ** WEBPAGE: uvlist ** ** Display a list of all unversioned files in the repository. -** Query parameters: ** +** Query parameters: ** byage=1 Order the initial display be decreasing age ** showdel=0 Show deleted files */ void uvlist_page(void){ Stmt q; Index: src/user.c ================================================================== --- src/user.c +++ src/user.c @@ -317,37 +317,25 @@ ** ** Usage: %fossil user SUBCOMMAND ... ?-R|--repository REPO? ** ** Run various subcommands on users of the open repository or of ** the repository identified by the -R or --repository option. -** ** > fossil user capabilities USERNAME ?STRING? -** ** Query or set the capabilities for user USERNAME -** ** > fossil user contact USERNAME ?CONTACT-INFO? -** ** Query or set contact information for user USERNAME -** ** > fossil user default ?USERNAME? -** ** Query or set the default user. The default user is the ** user for command-line interaction. -** ** > fossil user list ** > fossil user ls -** ** List all users known to the repository -** ** > fossil user new ?USERNAME? ?CONTACT-INFO? ?PASSWORD? -** ** Create a new user in the repository. Users can never be ** deleted. They can be denied all access but they must continue ** to exist in the database. -** ** > fossil user password USERNAME ?PASSWORD? -** ** Change the web access password for a user. */ void user_cmd(void){ int n; db_find_and_open_repository(0, 0); @@ -618,18 +606,14 @@ ** Usage: %fossil test-prompt-password PROMPT VERIFY ** ** Prompts the user for a password and then prints it verbatim. ** ** Behavior is controlled by the VERIFY parameter: -** ** 0 Just ask once. -** ** 1 If the first answer is a non-empty string, ask for ** verification. Repeat if the two strings do not match. -** ** 2 Ask twice, repeat if the strings do not match. - */ void test_prompt_password_cmd(void){ Blob answer; int iVerify = 0; if( g.argc!=4 ) usage("PROMPT VERIFY"); @@ -643,11 +627,10 @@ ** ** Show login attempts, including timestamp and IP address. ** Requires Admin privileges. ** ** Query parameters: -** ** y=N 1: success only. 2: failure only. 3: both (default: 3) ** n=N Number of entries to show (default: 200) ** o=N Skip this many entries (default: 0) */ void access_log_page(void){ Index: src/wiki.c ================================================================== --- src/wiki.c +++ src/wiki.c @@ -523,11 +523,10 @@ ** WEBPAGE: wiki ** ** Display a wiki page. Example: /wiki?name=PAGENAME ** ** Query parameters: -** ** name=NAME Name of the wiki page to display. Required. ** nsm Omit the submenu if present. (Mnemonic: No SubMenu) ** p Always show just the wiki page. For special ** pages for check-ins, branches, or tags, there will ** be a redirect to the associated /info page unless @@ -650,11 +649,11 @@ ** Output a selection box from which the user can select the ** wiki mimetype. */ void mimetype_option_menu(const char *zMimetype){ unsigned i; - @ <select name="mimetype" size="1"> + @ <select id="mimetype" name="mimetype" size="1"> for(i=0; i<count(azStyles); i+=3){ if( fossil_strcmp(zMimetype,azStyles[i])==0 ){ @ <option value="%s(azStyles[i])" selected>%s(azStyles[i+1])</option> }else{ @ <option value="%s(azStyles[i])">%s(azStyles[i+1])</option> @@ -1333,13 +1332,13 @@ "class='hidden'" ">"); CX("<div class='" "wikiedit-options flex-container flex-row child-gap-small'>"); CX("<div class='input-with-label'>" - "<label>Mime type</label>"); + "<label>Mime type "); mimetype_option_menu("text/x-markdown"); - CX("</div>"); + CX("</label></div>"); style_select_list_int("select-font-size", "editor_font_size", "Editor font size", NULL/*tooltip*/, 100, "100%", 100, "125%", 125, @@ -1370,11 +1369,11 @@ "</div>"); CX("</div>"); CX("<div class='flex-container flex-column stretch'>"); CX("<textarea name='content' id='wikiedit-content-editor' " - "class='wikiedit' rows='25'>"); + "class='wikiedit' rows='25' aria-label='Content' title='Content'>"); CX("</textarea>"); CX("</div>"/*textarea wrapper*/); CX("</div>"/*#tab-file-content*/); } /****** Preview tab ******/ @@ -1532,15 +1531,17 @@ style_header("Create A New Wiki Page"); wiki_standard_submenu(W_ALL_BUT(W_NEW)); @ <p>Rules for wiki page names:</p> well_formed_wiki_name_rules(); form_begin(0, "%R/wikinew"); - @ <p>Name of new wiki page: - @ <input style="width: 35;" type="text" name="name" value="%h(zName)" /><br /> - @ %z(href("%R/markup_help"))Markup style</a>: + @ <p><label>Name of new wiki page: + @ <input style="width: 35;" type="text" name="name" value="%h(zName)" /></label><br /> + @ <label>Markup style + @ %z(href("%R/markup_help")) + @ <span class="help-buttonlet processed" title="Help"></span></a>: mimetype_option_menu("text/x-markdown"); - @ <br /><input type="submit" value="Create" /> + @ </label><br /><input type="submit" value="Create" /> @ </p></form> if( zName[0] ){ @ <p><span class="wikiError"> @ "%h(zName)" is not a valid wiki page name!</span></p> } @@ -1693,16 +1694,16 @@ zUser = PD("u", g.zLogin); form_begin(0, "%R/wikiappend"); login_insert_csrf_secret(); @ <input type="hidden" name="name" value="%h(zPageName)" /> @ <input type="hidden" name="mimetype" value="%h(zMimetype)" /> - @ Your Name: - @ <input type="text" name="u" size="20" value="%h(zUser)" /><br /> + @ <label>Your Name: + @ <input type="text" name="u" size="20" value="%h(zUser)" /></label><br /> zFormat = mimetype_common_name(zMimetype); - @ Comment to append (formatted as %s(zFormat)):<br /> + @ <label>Comment to append (formatted as %s(zFormat)):<br /> @ <textarea name="r" class="wikiedit" cols="80" - @ rows="10" wrap="virtual">%h(PD("r",""))</textarea> + @ rows="10" wrap="virtual">%h(PD("r",""))</textarea></label> @ <br /> @ <input type="submit" name="preview" value="Preview Your Comment" /> @ <input type="submit" name="submit" value="Append Your Changes" /> @ <input type="submit" name="cancel" value="Cancel" /> captcha_generate(0); @@ -1714,11 +1715,10 @@ /* ** WEBPAGE: whistory ** URL: /whistory?name=PAGENAME ** ** Additional parameters: -** ** showid Show RID values ** ** Show the complete change history for a single wiki page. */ void whistory_page(void){ @@ -1807,11 +1807,10 @@ ** WEBPAGE: wdiff ** ** Show the changes to a wiki page. ** ** Query parameters: -** ** id=HASH Hash prefix for the child version to be diffed. ** rid=INTEGER RecordID for the child version ** pid=HASH Hash prefix for the parent. ** ** The "id" query parameter is required. "pid" is optional. If "pid" @@ -2126,14 +2125,12 @@ ** COMMAND: wiki* ** ** Usage: %fossil wiki (export|create|commit|list) WikiName ** ** Run various subcommands to work with wiki entries or tech notes. -** ** > fossil wiki export ?OPTIONS? PAGENAME ?FILE? ** > fossil wiki export ?OPTIONS? -t|--technote DATETIME|TECHNOTE-ID|TAG ?FILE? -** ** Sends the latest version of either a wiki page or of a tech ** note to the given file or standard output. A filename of "-" ** writes the output to standard output. The directory parts of ** the output filename are created if needed. ** If PAGENAME is provided, the named wiki page will be output. @@ -2150,13 +2147,11 @@ ** -H|--HTML Works like -h|-html but wraps the output in ** <html><body>...</body></html>. ** -p|--pre If -h|-H is used and the page or technote has ** the text/plain mimetype, its HTML-escaped output ** will be wrapped in <pre>...</pre>. -** ** > fossil wiki (create|commit) (PAGENAME | TECHNOTE-COMMENT) ?FILE? ?OPTIONS? -** ** Create a new or commit changes to an existing wiki page or ** technote from FILE or from standard input. PAGENAME is the ** name of the wiki entry. TECHNOTE-COMMENT is the timeline comment of ** the technote. ** @@ -2182,14 +2177,12 @@ ** updated by its technote id, which is ** its UUID. ** --technote-tags TAGS The set of tags for a technote. ** --technote-bgcolor COLOR The color used for the technote ** on the timeline. -** ** > fossil wiki list ?OPTIONS? ** > fossil wiki ls ?OPTIONS? -** ** Lists all wiki entries, one per line, ordered ** case-insensitively by name. Wiki pages associated with ** check-ins and branches are NOT shown, unless -a is given. ** ** Options: @@ -2204,11 +2197,10 @@ ** -s|--show-technote-ids The id of the tech note will be listed ** along side the timestamp. The tech note ** id will be the first word on each line. ** This option only applies if the ** --technote option is also specified. -** ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in ** year-month-day form, it may be truncated, the "T" may be replaced by ** a space, and it may also name a timezone offset from UTC as "-HH:MM" ** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z" ** means UTC. Index: src/wikiformat.c ================================================================== --- src/wikiformat.c +++ src/wikiformat.c @@ -1896,12 +1896,12 @@ ** COMMAND: test-markdown-render ** ** Usage: %fossil test-markdown-render FILE ... ** ** Render markdown in FILE as HTML on stdout. -** Options: ** +** Options: ** --safe Restrict the output to use only "safe" HTML ** --lint-footnotes Print stats for footnotes-related issues */ void test_markdown_render(void){ Blob in, out; @@ -2769,11 +2769,10 @@ ** This setting controls whether or not unsafe HTML elements ** (such as SCRIPT or STYLE tags) are allowed in Markdown-formatted ** documents. Unsafe HTML is disabled by default. If this setting ** exists and is a string, then letters in that string can enable ** unsafe HTML in various contexts: -** ** - b Unsafe HTML allowed in embedded documentation ** - f Unsafe HTML allowed in forum posts ** - t Unsafe HTML allowed in tickets ** - w Unsafe HTML allowed on wiki pages */ Index: src/xfer.c ================================================================== --- src/xfer.c +++ src/xfer.c @@ -1872,11 +1872,10 @@ ** as necessary to generate an appropriate XFERFILE test case. Then run: ** ** fossil test-xfer xferfile.txt ** ** Options: -** ** --host HOSTNAME Supply a server hostname used to populate ** g.zBaseURL and similar. */ void cmd_test_xfer(void){ const char *zHost; Index: src/xfersetup.c ================================================================== --- src/xfersetup.c +++ src/xfersetup.c @@ -136,12 +136,12 @@ cgi_redirect("xfersetup"); } } @ <form action="%R/%s(g.zPath)" method="post"><div> login_insert_csrf_secret(); - @ <p>%s(zDesc)</p> - @ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea> + @ <p><label for="x">%s(zDesc)</label></p> + @ <textarea id="x" name="x" rows="%d(height)" cols="80">%h(z)</textarea> @ <p> @ <input type="submit" name="submit" value="Apply Changes" /> @ <input type="submit" name="clear" value="Revert To Default" /> @ <input type="submit" name="setup" value="Cancel" /> @ </p> Index: src/zip.c ================================================================== --- src/zip.c +++ src/zip.c @@ -870,33 +870,28 @@ ** query parameter. Return the archive as the HTTP reply content. ** ** If the NAME contains one "/" then the part before the "/" is taken ** as the TAG and the part after the "/" becomes the true name. Hence, ** the following URLs are all equivalent: -** ** /sqlar/508c42a6398f8/download.sqlar ** /sqlar?r=508c42a6398f8&name=download.sqlar ** /sqlar/download.sqlar?r=508c42a6398f8 ** /sqlar?name=508c42a6398f8/download.sqlar ** ** Query parameters: -** ** name=NAME The base name of the output file. The default ** value is a configuration parameter in the project ** settings. A prefix of the name, omitting the ** extension, is used as the top-most directory name. -** ** r=TAG The check-in that is turned into a ZIP archive. ** Defaults to "trunk". This query parameter used to ** be called "uuid" and the older "uuid" name is still ** accepted for backwards compatibility. If this ** query parameter is omitted, the latest "trunk" ** check-in is used. -** ** in=PATTERN Only include files that match the comma-separate ** list of GLOB patterns in PATTERN, as with ex= -** ** ex=PATTERN Omit any file that match PATTERN. PATTERN is a ** comma-separated list of GLOB patterns, where each ** pattern can optionally be quoted using ".." or '..'. ** Any file matching both ex= and in= is excluded. */ Index: www/customskin.md ================================================================== --- www/customskin.md +++ www/customskin.md @@ -103,15 +103,15 @@ In most cases, it is best to leave the Fossil-generated HTML Header alone. (One exception is when the administrator needs to include links to additional CSS files.) The configurable part of the skin begins with the Content Header section which should follow this template: - <div class="header"> + <header class="header"> ... top banner and menu bar ... </div> -Note that `<div class="header">` and `</div>` tags must be included in +Note that `<header class="header">` and `</div>` tags must be included in the Content Header text of the skin. In other words, you, the administrator, need to supply that text as part of your skin customization. The Fossil-generated Content section immediately follows the Content Header. @@ -122,11 +122,11 @@ </div> After the Content is the custom Content Footer section which should follow this template: - <div class="footer"> + <footer class="footer"> ... skin-specific stuff here ... </div> As with the Content Header, the template elements of the Content Footer should appear exactly as they are shown. @@ -140,11 +140,11 @@ ## <a id="mainmenu"></a>Changing the Main Menu Contents As of Fossil 2.15, the actual text content of the skin’s main menu is no longer part of the skin proper if you’re using one of the stock skins. If you look at the Header section of the skin, you’ll find a -`<div class="mainmenu">` element whose contents are set by a short +`<nav class="mainmenu">` element whose contents are set by a short [TH1](./th1.md) script from the contents of the **Main Menu** section of the Setup → Configuration screen. This feature allows the main menu contents to stay the same across different skins, so you no longer have to reapply menu customizations @@ -334,16 +334,16 @@ the value of the TH1 variable NAME. For example, first few lines of a typical Content Header will look like this: - <div class="header"> + <header class="header"> <div class="title"><h1>$<project_name></h1>$<title>/div> After variables are substituted by TH1, that will look more like this: - <div class="header"> + <header class="header"> <div class="title"><h1>Project Name</h1>Page Title</div> As you can see, two TH1 variable substitutions were done. The same TH1 interpreter is used for both the header and the footer @@ -375,20 +375,20 @@ The hbmenu.js script requires the following `<div>` element somewhere in your header, in which to build the hamburger menu. - <div id='hbdrop'></div> + <nav id='hbdrop'></nav> Out of the box, the contents of the panel is populated with the [Site Map](/sitemap), but only if the panel does not already contain any HTML elements (that is, not just comments, plain text or non-presentational white -space). So the hamburger menu can be customized by replacing the empty `<div -id='hbdrop'></div>` element with a menu structure knitted according to the +space). So the hamburger menu can be customized by replacing the empty `<nav +id='hbdrop'></nav>` element with a menu structure knitted according to the following template: - <div id="hbdrop" data-anim-ms="400"> + <nav id="hbdrop" data-anim-ms="400"> <ul class="columns" style="column-width: 20em; column-count: auto">  <li> <a href="$home$index_page">Link: Home</a> <ul> @@ -404,11 +404,11 @@ <li><a href="$home/doc/trunk/www/th1.md">Link: TH1 Scripts</a></li> </ul> </li>  </ul> - </div> + </nav> The custom `data-anim-ms` attribute can be added to the panel element to direct the Javascript logic to override the default menu animation duration of 400 ms. A faster animation duration of 80-200 ms may be preferred for smaller menus. The animation is disabled by setting the attribute to `"0"`.

if {[info exists login]} { html "$login — Logout\n" @@ -18,11 +18,11 @@ $</small></h1> </div>  - <div class="mainmenu"> + <nav class="mainmenu"> <ul> <th1> html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a></li>\n" builtin_request_js hbmenu.js set once 1 @@ -35,16 +35,16 @@ html "<li class='$class'>" if {[string match /* $url]} {set url $home$url} html "<a href='$url'>$name</a></li>\n" } </th1></ul> - </div>  - <div id="hbdrop"></div> + </nav>  + <nav id='hbdrop' title="Sitemap"></nav> </div>  - </div>  + </header>  <div class="middle max-full-width"> <div class="container"> <th1> if {[string first artifact $current_page] == 0 || [string first hexdump $current_page] == 0} { html "<div class=\"artifact_content\">" } </th1> Index: skins/black_and_white/css.txt ================================================================== --- skins/black_and_white/css.txt +++ skins/black_and_white/css.txt @@ -49,11 +49,11 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { margin:10px 0px 10px 0px; padding:1px 0px 0px 20px; border-style:solid; border-color:black; border-width:1px 0px; @@ -60,11 +60,11 @@ background-color:#eee; } /* The main menu bar that appears at the top left of the page beneath ** the header. Width must be co-ordinated with the container below */ -div.mainmenu { +nav.mainmenu { float: left; margin-left: 10px; margin-right: 20px; font-size: 0.9em; font-weight: bold; @@ -73,20 +73,20 @@ border:1px solid #999; width:6em; } /* Main menu is now a list */ -div.mainmenu ul { +nav.mainmenu ul { padding: 0; list-style:none; } -div.mainmenu a, div.mainmenu a:visited{ +nav.mainmenu a, nav.mainmenu a:visited{ padding: 1px 10px 1px 10px; color: #333; text-decoration: none; } -div.mainmenu a:hover { +nav.mainmenu a:hover { color: #eee; background-color: #333; } /* Container for the sub-menu and content so they don't spread @@ -94,33 +94,33 @@ #container { padding-left: 9em; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 10px; font-size: 0.9em; text-align: center; border:1px solid #999; border-width:1px 0px; background-color: #eee; color: #333; } -div.submenu a, div.submenu a:visited, div.sectionmenu>a.button:link, -div.sectionmenu>a.button:visited, div.submenu label { +nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, +div.sectionmenu>a.button:visited, nav.submenu label { padding: 3px 10px 3px 10px; color: #333; text-decoration: none; } -div.submenu a:hover, div.sectionmenu>a.button:hover, div.submenu label:hover { +nav.submenu a:hover, div.sectionmenu>a.button:hover, nav.submenu label:hover { color: #eee; background-color: #333; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 2ex 1ex 0ex 2ex; } /* Some pages have section dividers */ div.section { @@ -149,11 +149,11 @@ color: #333; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; background-color: #eee; Index: skins/black_and_white/footer.txt ================================================================== --- skins/black_and_white/footer.txt +++ skins/black_and_white/footer.txt @@ -1,3 +1,3 @@ -<div class="footer"> +<footer class="footer"> Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/black_and_white/header.txt ================================================================== --- skins/black_and_white/header.txt +++ skins/black_and_white/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <img src="$logo_image_url" alt="logo"> <br />$<project_name> </div> <div class="title">$<title></div> @@ -9,12 +9,12 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu"> <th1> set sitemap 0 foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} @@ -22,6 +22,6 @@ if {[string match /sitemap $url]} {set sitemap 1} } if {!$sitemap} { html "<a href='$home/sitemap'>Sitemap</a>\n" } -</th1></div> +</th1></nav> Index: skins/blitz/css.txt ================================================================== --- skins/blitz/css.txt +++ skins/blitz/css.txt @@ -866,25 +866,25 @@ background-repeat: no-repeat; background-position: center bottom; } .mainmenu li a, -div#hbdrop a { +nav#hbdrop a { color: #3b5c6b; padding: 10px 15px; } .mainmenu li.active a { font-weight: bold; } .mainmenu li:hover -div#hbdrop a:hover { +nav#hbdrop a:hover { background-color: #eee; } -div#hbdrop { +nav#hbdrop { background-color: white; border: 2px solid #ccc; display: none; width: 100%; position: absolute; Index: skins/blitz/footer.txt ================================================================== --- skins/blitz/footer.txt +++ skins/blitz/footer.txt @@ -1,10 +1,10 @@ </div>  </div>  -<div class="footer"> +<footer class="footer"> <div class="container"> <div class="pull-right"> <a href="https://www.fossil-scm.org/">Fossil $release_version $manifest_version $manifest_date</a> </div> This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s </div> -</div> +</footer> Index: skins/blitz/header.txt ================================================================== --- skins/blitz/header.txt +++ skins/blitz/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="container">  <div class="login pull-right"> <th1> @@ -20,11 +20,11 @@ </th1> <small> $<title></small></h1> </div>  - <div class="mainmenu"> + <nav class="mainmenu"> <ul><th1> html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a></li>\n" builtin_request_js hbmenu.js set once 1 foreach {name url expr class} $mainmenu { @@ -36,11 +36,11 @@ html "<li class='$class'>" if {[string match /* $url]} {set url $home$url} html "<a href='$url'>$name</a></li>\n" } </th1></ul> - </div>  - <div id="hbdrop"></div> + </nav>  + <nav id='hbdrop' title="Sitemap"></nav> </div>  - </div>  + </header>  <div class="middle max-full-width"> <div class="container"> Index: skins/darkmode/css.txt ================================================================== --- skins/darkmode/css.txt +++ skins/darkmode/css.txt @@ -34,28 +34,28 @@ div.leftoftitle { visibility: hidden; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 0.25em 0.5em; font-size: 0.9em; font-weight: bold; text-align: center; border-top-left-radius: 0.5em; border-top-right-radius: 0.5em; border-bottom: 1px dotted rgba(200,200,200,0.3); z-index: 21; /* just above hbdrop */ } -div#hbdrop { +nav#hbdrop { background-color: #1f1f1f; border: 2px solid #303536; border-radius: 0 0 0.5em 0.5em; display: none; left: 2em; @@ -62,16 +62,16 @@ width: calc(100% - 4em); position: absolute; z-index: 20; /* just below mainmenu, but above timeline bubbles */ } -div.mainmenu, div.submenu, div.sectionmenu { +nav.mainmenu, nav.submenu, div.sectionmenu { color: #ffffffcc; background-color: #303536/*#0000ff60*/; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 0.15em 0.5em 0.15em 0; font-size: 0.9em; text-align: center; border-bottom-left-radius: 0.5em; border-bottom-right-radius: 0.5em; @@ -80,16 +80,16 @@ color: rgba(127, 201, 255, 0.9); display: inline; text-decoration: none; } a:visited {opacity: 0.8} -div.mainmenu a, div.submenu a, -div.sectionmenu>a.button, div.submenu label, -div.footer a { +nav.mainmenu a, nav.submenu a, +div.sectionmenu>a.button, nav.submenu label, +footer.footer a { padding: 0.15em 0.5em; } -div.mainmenu a.active { +nav.mainmenu a.active { border-bottom: 1px solid #FF4500f0; } a:hover, a:visited:hover { background-color: #FF4500f0; @@ -137,11 +137,11 @@ border-color: #888; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 1ex 1ex 1ex; } /* Some pages have section dividers */ div.section { @@ -168,11 +168,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { clear: both; font-size: 0.8em; padding: 0.15em 0.5em; text-align: right; background-color: #303536/*#0000ff60*/; Index: skins/darkmode/footer.txt ================================================================== --- skins/darkmode/footer.txt +++ skins/darkmode/footer.txt @@ -1,8 +1,8 @@ -<div class="footer"> +<footer class="footer"> <div class="container"> <div class="pull-right"> <a href="https://www.fossil-scm.org/">Fossil $release_version $manifest_version $manifest_date</a> </div> This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s </div> -</div> +</footer> Index: skins/darkmode/header.txt ================================================================== --- skins/darkmode/header.txt +++ skins/darkmode/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="status leftoftitle"><th1> if {[info exists login]} { set logintext "<a href='$home/login'>$login</a>\n" } else { set logintext "<a href='$home/login'>Login</a>\n" @@ -9,12 +9,12 @@ </th1></div> <div class="title">$<title></div> <div class="status"><nobr><th1> html $logintext </th1></nobr></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu"> <th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue @@ -24,7 +24,7 @@ } set url $home$url } html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/default/css.txt ================================================================== --- skins/default/css.txt +++ skins/default/css.txt @@ -9,31 +9,31 @@ -mx-text-size-adjust: none; -webkit-text-size-adjust: none; } a { - color: #4183C4; + color: #2D5486; text-decoration: none; } a:hover { - color: #4183C4; + color: #2D5486; text-decoration: underline; } /* Page title, above menu bars */ .title { - color: #4183C4; + color: #3A76BB; float: left; } .title h1 { display: inline; } .title h1:after { content: " / "; - color: #777; + color: #6B6B6B; font-weight: normal; } .status { float: right; font-size: 0.7em; @@ -53,19 +53,19 @@ white-space: nowrap; z-index: 21; /* just above hbdrop */ } .mainmenu a { text-decoration: none; - color: #777; + color: #6B6B6B; border-right: 1px solid #eaeaea; } .mainmenu a.active, .mainmenu a:hover { color: #000; border-bottom: 2px solid #D26911; } -div#hbdrop { +nav#hbdrop { background-color: white; border: 1px solid black; border-top: white; border-radius: 0 0 0.5em 0.5em; display: none; @@ -83,11 +83,11 @@ border-bottom: 1px solid #ccc; } .submenu a, .submenu label { padding: 10px 11px; text-decoration: none; - color: #777; + color: #6B6B6B; } .submenu label { white-space: nowrap; } .submenu a:hover, .submenu label:hover { @@ -95,16 +95,35 @@ border: 1px solid #ccc; border-radius: 5px; color: #000; } span.submenuctrl, span.submenuctrl input, select.submenuctrl { - color: #777; + color: #6B6B6B; } span.submenuctrl { white-space: nowrap; } +div.searchForm { + text-align: left; +} +.searchForm { + padding: 10px; + border-bottom: 1px solid #ccc; +} +.searchForm label { + padding: 10px 11px; + text-decoration: none; + color: #6B6B6B; + white-space: nowrap; +} +.searchForm label:hover { + padding: 6px 10px; + border: 1px solid #ccc; + border-radius: 5px; + color: #000; +} /* Main document area; elements common to most pages. */ .content { padding-top: 10px; @@ -156,11 +175,11 @@ .footer { border-top: 1px solid #ccc; padding: 10px; font-size: 0.7em; margin-top: 10px; - color: #ccc; + color: #757575; } /* Forum */ .forum a:visited { Index: skins/default/footer.txt ================================================================== --- skins/default/footer.txt +++ skins/default/footer.txt @@ -1,5 +1,5 @@ -<div class="footer"> +<footer class="footer"> This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/default/header.txt ================================================================== --- skins/default/header.txt +++ skins/default/header.txt @@ -1,18 +1,18 @@ -<div class="header"> +<header class="header"> <div class="title"><h1>$<project_name></h1>$<title></div> <div class="status"><th1> if {[info exists login]} { - html "<a href='$home/login'>$login</a>\n" + html "<a href='$home/login' title='Logout'>$login</a>\n" } else { html "<a href='$home/login'>Login</a>\n" } </th1></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu" title="Main Menu"> <th1> -html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" +html "<a id='hbbtn' href='$home/sitemap' title='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} { if {[string match $url\[/?#\]* /$current_page/]} { @@ -20,7 +20,7 @@ } set url $home$url } html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/eagle/css.txt ================================================================== --- skins/eagle/css.txt +++ skins/eagle/css.txt @@ -47,18 +47,18 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px 10px 5px 10px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; @@ -66,11 +66,11 @@ border-top-left-radius: 8px; border-top-right-radius: 8px; color: white; } -div#hbdrop { +nav#hbdrop { background-color: #485D7B; border-radius: 0 0 15px 15px; border-left: 0.5em solid #76869d; border-bottom: 1.2em solid #76869d; display: none; @@ -79,33 +79,33 @@ z-index: 20; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; font-weight: bold; text-align: center; background-color: #485D7B; color: white; } -div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited, +nav.mainmenu a, nav.mainmenu a:visited, nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover { +nav.mainmenu a:hover, nav.submenu a:hover, div.sectionmenu>a.button:hover, +nav.submenu label:hover { text-decoration: underline; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 1ex 0ex 2ex; } /* Some pages have section dividers */ div.section { @@ -131,11 +131,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { clear: both; font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; Index: skins/eagle/footer.txt ================================================================== --- skins/eagle/footer.txt +++ skins/eagle/footer.txt @@ -1,6 +1,6 @@ -<div class="footer"> +<footer class="footer"> <th1> proc getTclVersion {} { if {[catch {tclEval info patchlevel} tclVersion] == 0} { return "<a href=\"https://www.tcl.tk/\">Tcl</a> version $tclVersion" } @@ -19,6 +19,6 @@ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by <a href="$fossilUrl/">Fossil</a> version $release_version $tclVersion <a href="$fossilUrl/index.html/info/$version">$manifest_version</a> <a href="$fossilUrl/index.html/timeline?c=$fossilDate&y=ci">$manifest_date</a> -</div> +</footer> Index: skins/eagle/header.txt ================================================================== --- skins/eagle/header.txt +++ skins/eagle/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <th1> ## ## NOTE: The purpose of this procedure is to take the base URL of the ## Fossil project and return the root of the entire web site using @@ -76,11 +76,11 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></nobr><small><div id="clock"></div></small></div> -</div> +</header> <th1>html "<script nonce='$nonce'>"</th1> (function updateClock(){ var e = document.getElementById("clock"); if(!e) return; if(!updateClock.fmt){ @@ -95,15 +95,15 @@ updateClock.fmt(d.getUTCHours()) + ':' + updateClock.fmt(d.getUTCMinutes()); setTimeout(updateClock,(60-d.getUTCSeconds())*1000); })(); </script> -<div class="mainmenu"><th1> +<nav class="mainmenu"><th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>\n" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id="hbdrop"></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/khaki/css.txt ================================================================== --- skins/khaki/css.txt +++ skins/khaki/css.txt @@ -41,28 +41,28 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px 10px 5px 10px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; background-color: #a09048; color: black; z-index: 21; /* just above hbdrop */ } -div#hbdrop { +nav#hbdrop { background-color: #fef3bc; border: 2px solid #a09048; border-radius: 0 0 0.5em 0.5em; display: none; left: 2em; @@ -72,39 +72,39 @@ z-index: 20; /* just below mainmenu, but above timeline bubbles */ } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; text-align: center; background-color: #c0af58; color: white; } -div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited, +nav.mainmenu a, nav.mainmenu a:visited, nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover, div#hbdrop a:hover { +nav.mainmenu a:hover, nav.submenu a:hover, div.sectionmenu>a.button:hover, +nav.submenu label:hover, nav#hbdrop a:hover { color: #a09048; background-color: white; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 1ex 5px; } -div.content a, div#hbdrop a { color: #706532; } -div.content a:link, div#hbdrop a:link { color: #706532; } -div.content a:visited, div#hbdrop a:visited { color: #704032; } -div.content a:hover, div#hbdrop a:hover { +main.content a, nav#hbdrop a { color: #706532; } +main.content a:link, nav#hbdrop a:link { color: #706532; } +main.content a:visited, nav#hbdrop a:visited { color: #704032; } +main.content a:hover, nav#hbdrop a:hover { background-color: white; color: #706532; } a, a:visited { text-decoration: none; } @@ -133,24 +133,24 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; background-color: #a09048; color: white; } /* Hyperlink colors */ -div.footer a { color: white; } -div.footer a:link { color: white; } -div.footer a:visited { color: white; } -div.footer a:hover { background-color: white; color: #558195; } +footer.footer a { color: white; } +footer.footer a:link { color: white; } +footer.footer a:visited { color: white; } +footer.footer a:hover { background-color: white; color: #558195; } /* <verbatim> blocks */ pre.verbatim { background-color: #f5f5f5; padding: 0.5em; Index: skins/khaki/footer.txt ================================================================== --- skins/khaki/footer.txt +++ skins/khaki/footer.txt @@ -1,3 +1,3 @@ -<div class="footer"> +<footer class="footer"> Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/khaki/header.txt ================================================================== --- skins/khaki/header.txt +++ skins/khaki/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="title">$<title></div> <div class="status"> <div class="logo">$<project_name></div><br/> <th1> if {[info exists login]} { @@ -7,16 +7,16 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></div> -</div> -<div class="mainmenu"><th1> +</header> +<nav class="mainmenu"><th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' title="Sitemap"></nav> Index: skins/original/css.txt ================================================================== --- skins/original/css.txt +++ skins/original/css.txt @@ -42,18 +42,18 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; @@ -62,33 +62,33 @@ border-top-right-radius: 8px; color: white; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; text-align: center; background-color: #456878; color: white; } -div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited, +nav.mainmenu a, nav.mainmenu a:visited, nav.submenu a, nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover { +nav.mainmenu a:hover, nav.submenu a:hover, div.sectionmenu>a.button:hover, +nav.submenu label:hover { color: #558195; background-color: white; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 1ex 1ex 1ex; border: solid #aaa; border-width: 1px; } @@ -115,11 +115,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { clear: both; font-size: 0.8em; padding: 5px 10px 5px 10px; text-align: right; background-color: #558195; @@ -127,14 +127,14 @@ border-bottom-right-radius: 8px; color: white; } /* Hyperlink colors in the footer */ -div.footer a { color: white; } -div.footer a:link { color: white; } -div.footer a:visited { color: white; } -div.footer a:hover { background-color: white; color: #558195; } +footer.footer a { color: white; } +footer.footer a:link { color: white; } +footer.footer a:visited { color: white; } +footer.footer a:hover { background-color: white; color: #558195; } /* verbatim blocks */ pre.verbatim { background-color: #f5f5f5; padding: 0.5em; Index: skins/original/footer.txt ================================================================== --- skins/original/footer.txt +++ skins/original/footer.txt @@ -1,6 +1,6 @@ -<div class="footer"> +<footer class="footer"> <th1> proc getTclVersion {} { if {[catch {tclEval info patchlevel} tclVersion] == 0} { return "<a href=\"https://www.tcl.tk/\">Tcl</a> version $tclVersion" } @@ -19,6 +19,6 @@ <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by <a href="$fossilUrl/">Fossil</a> version $release_version $tclVersion <a href="$fossilUrl/index.html/info/$version">$manifest_version</a> <a href="$fossilUrl/index.html/timeline?c=$fossilDate&y=ci">$manifest_date</a> -</div> +</footer> Index: skins/original/header.txt ================================================================== --- skins/original/header.txt +++ skins/original/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <th1> ## ## NOTE: The purpose of this procedure is to take the base URL of the ## Fossil project and return the root of the entire web site using @@ -70,11 +70,11 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></nobr><small><div id="clock"></div></small></div> -</div> +</header> <th1>html "<script nonce='$nonce'>"</th1> function updateClock(){ var e = document.getElementById("clock"); if(e){ var d = new Date(); @@ -89,11 +89,11 @@ setTimeout(updateClock,(60-d.getUTCSeconds())*1000); } } updateClock(); </script> -<div class="mainmenu"><th1> +<nav class="mainmenu"><th1> set sitemap 0 foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" @@ -100,6 +100,6 @@ if {[string match */sitemap $url]} {set sitemap 1} } if {!$sitemap} { html "<a href='$home/sitemap'>...</a>" } -</th1></div> +</th1></nav> Index: skins/plain_gray/css.txt ================================================================== --- skins/plain_gray/css.txt +++ skins/plain_gray/css.txt @@ -28,18 +28,18 @@ font-weight: bold; white-space: nowrap; } /* The header across the top of the page */ -div.header { +header.header { display: table; width: 100%; } /* The main menu bar that appears at the top of the page beneath ** the header */ -div.mainmenu { +nav.mainmenu { padding: 5px 10px 5px 10px; font-size: 0.9em; font-weight: bold; text-align: center; letter-spacing: 1px; @@ -54,54 +54,54 @@ display: none; width: 95%; position: absolute; z-index: 20; /* just below mainmenu, but above timeline bubbles */ } -div.hbdrop a { color: #604000; } -div.hbdrop a:link { color: #604000;} -div.hbdrop a:visited { color: #600000; } +nav.hbdrop a { color: #604000; } +nav.hbdrop a:link { color: #604000;} +nav.hbdrop a:visited { color: #600000; } /* The submenu bar that *sometimes* appears below the main menu */ -div.submenu, div.sectionmenu { +nav.submenu, div.sectionmenu { padding: 3px 10px 3px 0px; font-size: 0.9em; text-align: center; background-color: #606060; color: white; } -div.mainmenu a, -div.mainmenu a:visited, -div.submenu a, -div.submenu a:visited, +nav.mainmenu a, +nav.mainmenu a:visited, +nav.submenu a, +nav.submenu a:visited, div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited, -div.submenu label { +nav.submenu label { padding: 3px 10px 3px 10px; color: white; text-decoration: none; } -div.mainmenu a:hover, -div.submenu a:hover, +nav.mainmenu a:hover, +nav.submenu a:hover, div.sectionmenu>a.button:hover, -div.submenu label:hover { +nav.submenu label:hover { color: #404040; background-color: white; } a, a:visited { text-decoration: none; } /* All page content from the bottom of the menu or submenu down to ** the footer */ -div.content { +main.content { padding: 0ex 0ex 0ex 0ex; } /* Hyperlink colors */ -div.content a { color: #604000; } -div.content a:link { color: #604000;} -div.content a:visited { color: #600000; } +main.content a { color: #604000; } +main.content a:link { color: #604000;} +main.content a:visited { color: #600000; } /* <verbatim> blocks */ pre.verbatim { background-color: #ffffff; padding: 0.5em; @@ -131,11 +131,11 @@ clear: left; white-space: nowrap; } /* The footer at the very bottom of the page */ -div.footer { +footer.footer { font-size: 0.8em; margin-top: 12px; padding: 5px 10px 5px 10px; text-align: right; background-color: #404040; Index: skins/plain_gray/footer.txt ================================================================== --- skins/plain_gray/footer.txt +++ skins/plain_gray/footer.txt @@ -1,3 +1,3 @@ -<div class="footer"> +<footer class="footer"> Fossil $release_version $manifest_version $manifest_date -</div> +</footer> Index: skins/plain_gray/header.txt ================================================================== --- skins/plain_gray/header.txt +++ skins/plain_gray/header.txt @@ -1,14 +1,14 @@ -<div class="header"> +<header class="header"> <div class="title">$<project_name>: $<title></div> -</div> -<div class="mainmenu"> +</header> +<nav class="mainmenu"> <th1> html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a>" builtin_request_js hbmenu.js foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} {set url $home$url} html "<a href='$url' class='$class'>$name</a>\n" } -</th1></div> -<div id='hbdrop' class='hbdrop'></div> +</th1></nav> +<nav id='hbdrop' class='hbdrop' title="Sitemap"></nav> Index: skins/xekri/css.txt ================================================================== --- skins/xekri/css.txt +++ skins/xekri/css.txt @@ -75,11 +75,11 @@ /************************************** * Main Area */ -div.header, div.mainmenu, div.submenu, div.content, div.footer { +header.header, nav.mainmenu, nav.submenu, main.content, footer.footer { clear: both; margin: 0 auto; max-width: 90%; padding: 0.25rem 1rem; } @@ -87,11 +87,11 @@ /************************************** * Main Area: Header */ -div.header { +header.header { margin: 0.5rem auto 0 auto; display: flex; flex-direction: row; align-items: center; flex-wrap: wrap; @@ -146,73 +146,73 @@ /************************************** * Main Area: Global Menu */ -div.mainmenu, div.submenu { +nav.mainmenu, nav.submenu { background-color: #080; border-radius: 1rem 1rem 0 0; box-shadow: 3px 4px 1px #000; color: #000; font-weight: bold; font-size: 1.1rem; text-align: center; } -div.mainmenu { +nav.mainmenu { padding-top: 0.33rem; padding-bottom: 0.25rem; } -div.submenu { +nav.submenu { border-top: 1px solid #0a0; border-radius: 0; display: block; } -div.mainmenu a, div.submenu a, div.submenu label { +nav.mainmenu a, nav.submenu a, nav.submenu label { color: #000; padding: 0 0.75rem; text-decoration: none; } -div.mainmenu a:hover, div.submenu a:hover, div.submenu label:hover { +nav.mainmenu a:hover, nav.submenu a:hover, nav.submenu label:hover { color: #fff; text-shadow: 0px 0px 6px #0f0; } -div.submenu * { +nav.submenu * { margin: 0 0.5rem; vertical-align: middle; } -div.submenu select, div.submenu input { +nav.submenu select, nav.submenu input { background-color: #222; border: 1px inset #080; color: #eee; cursor: pointer; font-size: 0.9rem; } -div.submenu select { +nav.submenu select { height: 1.75rem; } /************************************** * Main Area: Content */ -div.content { +main.content { background-color: #222; border-radius: 0 0 1rem 1rem; box-shadow: 3px 3px 1px #000; min-height:40%; padding-bottom: 1rem; padding-top: 0.5rem; } -div.content table[bgcolor="white"] { +main.content table[bgcolor="white"] { color: #000; } .piechartLabel { fill: white; @@ -223,40 +223,40 @@ /************************************** * Main Area: Footer */ -div.footer { +footer.footer { color: #ee0; font-size: 0.75rem; padding: 0; text-align: right; width: 75%; } -div.footer div { +footer.footer div { background-color: #222; box-shadow: 3px 3px 1px #000; border-radius: 0 0 1rem 1rem; margin: 0 0 10px 0; padding: 0.25rem 0.75rem; } -div.footer div.page-time { +footer.footer div.page-time { float: left; } -div.footer div.fossil-info { +footer.footer div.fossil-info { float: right; } -div.footer a, div.footer a:link, div.footer a:visited { +footer.footer a, footer.footer a:link, footer.footer a:visited { color: #ee0; } -div.footer a:hover { +footer.footer a:hover { color: #fff; text-shadow: 0px 0px 6px #ee0; } @@ -1152,18 +1152,18 @@ body.branch .brlist > table > tbody > tr:hover:not(.selected), body.branch .brlist > table > tbody > tr.selected { background-color: #444; } -body.chat div.header, body.chat div.footer, -body.chat div.mainmenu, body.chat div.submenu, -body.chat div.content { +body.chat header.header, body.chat footer.footer, +body.chat nav.mainmenu, body.chat nav.submenu, +body.chat main.content { margin-left: 0.5em; margin-right: 0.5em; margin-top: auto/*eliminates unnecessary scrollbars*/; } -body.chat.chat-only-mode div.content { +body.chat.chat-only-mode main.content { max-width: revert; } body.chat #chat-user-list .chat-user{ color: white; } Index: skins/xekri/footer.txt ================================================================== --- skins/xekri/footer.txt +++ skins/xekri/footer.txt @@ -1,9 +1,9 @@ </div> -<div class="footer"> +<footer class="footer"> <div class="page-time"> Generated in <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s </div> <div class="fossil-info"> Fossil v$release_version $manifest_version </div> -</div> +</footer> Index: skins/xekri/header.txt ================================================================== --- skins/xekri/header.txt +++ skins/xekri/header.txt @@ -1,6 +1,6 @@ -<div class="header"> +<header class="header"> <div class="logo"> <th1> ## ## NOTE: The purpose of this procedure is to take the base URL of the ## Fossil project and return the root of the entire web site using @@ -76,11 +76,11 @@ puts "Logged in as $login" } else { puts "Not logged in" } </th1></nobr><small><div id="clock"></div></small></div> -</div> +</header> <th1>html "<script nonce='$nonce'>"</th1> function updateClock(){ var e = document.getElementById("clock"); if(e){ var d = new Date(); @@ -95,11 +95,11 @@ setTimeout(updateClock,(60-d.getUTCSeconds())*1000); } } updateClock(); </script> -<div class="mainmenu"><th1> +<nav class="mainmenu"><th1> set sitemap 0 foreach {name url expr class} $mainmenu { if {![capexpr $expr]} continue if {[string match /* $url]} { if {[string match $url\[/?#\]* /$current_page/]} { @@ -111,6 +111,6 @@ if {[string match */sitemap $url]} {set sitemap 1} } if {!$sitemap} { html "<a href='$home/sitemap'>...</a>\n" } -</th1></div> +</th1></nav> Index: src/accordion.js ================================================================== --- src/accordion.js +++ src/accordion.js @@ -40,10 +40,11 @@ img.className = "accordion_btn accordion_btn_plus"; a[i].insertBefore(img,a[i].firstChild); img = document.createElement("img"); img.src = acc_svgdata[0]+acc_svgdata[3]+acc_svgdata[1]; img.className = "accordion_btn accordion_btn_minus"; + img.alt = "Open/Close Section"; a[i].insertBefore(img,a[i].firstChild); a[i].addEventListener("click",function(){ var x = this.nextElementSibling; if( this.classList.contains("accordion_closed") ){ x.style.maxHeight = x.scrollHeight + "px"; Index: src/add.c ================================================================== --- src/add.c +++ src/add.c @@ -362,11 +362,10 @@ ** The --case-sensitive option determines whether or not filenames should ** be treated case sensitive or not. If the option is not given, the default ** depends on the global setting, or the operating system default, if not set. ** ** Options: -** ** --case-sensitive BOOL Override the case-sensitive setting ** --dotfiles Include files beginning with a dot (".") ** -f|--force Add files without prompting ** --ignore CSG Ignore unmanaged files matching patterns from ** the Comma Separated Glob (CSG) pattern list Index: src/alerts.c ================================================================== --- src/alerts.c +++ src/alerts.c @@ -291,11 +291,11 @@ @ <h1>Status</h1> @ <table class="label-value"> if( alert_enabled() ){ stats_for_email(); }else{ - @ <th>Disabled</th> + @ <td>Disabled</td> } @ </table> @ <hr> @ <h1> Configuration </h1> @ <form action="%R/setup_notification" method="post"><div> @@ -1112,47 +1112,40 @@ ** COMMAND: alerts* ** ** Usage: %fossil alerts SUBCOMMAND ARGS... ** ** Subcommands: -** ** pending Show all pending alerts. Useful for debugging. -** ** reset Hard reset of all email notification tables ** in the repository. This erases all subscription ** information. ** Use with extreme care ** -** ** send Compose and send pending email alerts. ** Some installations may want to do this via ** a cron-job to make sure alerts are sent ** in a timely manner. -** Options: ** +** Options: ** --digest Send digests ** --renewal Send subscription renewal ** notices ** --test Write to standard output -** ** settings [NAME VALUE] With no arguments, list all email settings. ** Or change the value of a single email setting. -** ** status Report on the status of the email alert ** subsystem -** ** subscribers [PATTERN] List all subscribers matching PATTERN. Either ** LIKE or GLOB wildcards can be used in PATTERN. -** ** test-message TO [OPTS] Send a single email message using whatever ** email sending mechanism is currently configured. ** Use this for testing the email notification -** configuration. Options: +** configuration. ** +** Options: ** --body FILENAME Content from FILENAME ** --smtp-trace Trace SMTP processing ** --stdout Send msg to stdout ** -S|--subject SUBJECT Message "subject:" -** ** unsubscribe EMAIL Remove a single subscriber with the given EMAIL. */ void alert_cmd(void){ const char *zCmd; int nCmd; @@ -1603,12 +1596,12 @@ @ <p>To receive email notifications for changes to this @ repository, fill out the form below and press the "Submit" button.</p> form_begin(0, "%R/subscribe"); @ <table class="subscribe"> @ <tr> - @ <td class="form_label">Email Address:</td> - @ <td><input type="text" name="e" value="%h(PD("e",""))" size="30"></td> + @ <td class="form_label"><label for="e">Email Address:</label></td> + @ <td><input type="text" id="e" name="e" value="%h(PD("e",""))" size="30"></td> @ <tr> if( eErr==1 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ </tr> @@ -1621,12 +1614,12 @@ uSeed = captcha_seed(); } zDecoded = captcha_decode(uSeed); zCaptcha = captcha_render(zDecoded); @ <tr> - @ <td class="form_label">Security Code:</td> - @ <td><input type="text" name="captcha" value="%h(zInit)" size="30"> + @ <td class="form_label"><label for="captcha">Security Code:</label></td> + @ <td><input type="text" id="captcha" name="captcha" value="%h(zInit)" size="30"> captcha_speakit_button(uSeed, "Speak the code"); @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td> @ </tr> if( eErr==2 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> @@ -1633,13 +1626,13 @@ } @ </tr> } if( g.perm.Admin ){ @ <tr> - @ <td class="form_label">User:</td> - @ <td><input type="text" name="suname" value="%h(PD("suname",g.zLogin))" \ - @ size="30"></td> + @ <td class="form_label"><label for="suname">User:</label></td> + @ <td><input type="text" id="suname" name="suname" \ + @ value="%h(PD("suname",g.zLogin))" size="30"></td> @ </tr> if( eErr==3 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ </tr> @@ -1667,12 +1660,12 @@ @ Wiki</label><br> } di = PB("di"); @ </td></tr> @ <tr> - @ <td class="form_label">Delivery:</td> - @ <td><select size="1" name="di"> + @ <td class="form_label"><label for="di">Delivery:</label></td> + @ <td><select size="1" id="di" name="di"> @ <option value="0" %s(di?"":"selected")>Individual Emails</option> @ <option value="1" %s(di?"selected":"")>Daily Digest</option> @ </select></td> @ </tr> if( g.perm.Admin ){ @@ -1972,13 +1965,13 @@ zHalfCode = db_text("x","SELECT hex(substr(subscriberCode,1,16))" " FROM subscriber WHERE subscriberId=%d", sid); @ <input type="hidden" name="name" value="%h(zHalfCode)"> @ <table class="subscribe"> @ <tr> - @ <td class="form_label">Email Address:</td> + @ <td class="form_label"><label for="semail">Email Address:</label></td> if( isLogin ){ - @ <td><input type="text" name="semail" value="%h(semail)" size="30">\ + @ <td><input type="text" id="semail" name="semail" value="%h(semail)" size="30">\ if( eErr==8 ){ @ <span class='loginError'>← not a valid email address!</span> }else if( g.perm.Admin ){ @ <a href="%R/announce?to=%t(semail)">\ @ (Send a message to %h(semail))</a>\ @@ -2009,13 +2002,13 @@ @ <tr> @ <td class='form_label'>Last Contact:</td> @ <td>%h(db_column_text(&q,10)) ← \ @ %,d(db_column_int(&q,11)) days ago</td> @ </tr> - @ <td class="form_label">User:</td> - @ <td><input type="text" name="suname" value="%h(suname?suname:"")" \ - @ size="30">\ + @ <td class="form_label"><label for="suname">User:</label></td> + @ <td><input type="text" id="suname" name="suname" \ + @ value="%h(suname?suname:"")" size="30">\ uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", suname); if( uid ){ @ <a href='%R/setup_uedit?id=%d(uid)'>\ @ (login info for %h(suname))</a>\ } @@ -2043,12 +2036,12 @@ @ <label><input type="checkbox" name="sw" %s(sw?"checked":"")>\ @ Wiki</label> } @ </td></tr> @ <tr> - @ <td class="form_label">Delivery:</td> - @ <td><select size="1" name="sdigest"> + @ <td class="form_label"><label for="sdigest">Delivery:</label></td> + @ <td><select size="1" id="sdigest" name="sdigest"> @ <option value="0" %s(sdigest?"":"selected")>Individual Emails</option> @ <option value="1" %s(sdigest?"selected":"")>Daily Digest</option> @ </select></td> @ </tr> if( g.perm.Admin ){ @@ -2276,22 +2269,22 @@ @ explain how to unsubscribe and/or change your subscription settings.</p> @ form_begin(0, "%R/unsubscribe"); @ <table class="subscribe"> @ <tr> - @ <td class="form_label">Email Address:</td> - @ <td><input type="text" name="e" value="%h(zEAddr)" size="30"></td> + @ <td class="form_label"><label for="e">Email Address:</label></td> + @ <td><input type="text" id="e" name="e" value="%h(zEAddr)" size="30"></td> if( eErr==1 ){ @ <td><span class="loginError">← %h(zErr)</span></td> } @ </tr> uSeed = captcha_seed(); zDecoded = captcha_decode(uSeed); zCaptcha = captcha_render(zDecoded); @ <tr> - @ <td class="form_label">Security Code:</td> - @ <td><input type="text" name="captcha" value="" size="30"> + @ <td class="form_label"><label for="captcha">Security Code:</label></td> + @ <td><input type="text" id="captcha" name="captcha" value="" size="30"> captcha_speakit_button(uSeed, "Speak the code"); @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td> if( eErr==2 ){ @ <td><span class="loginError">← %h(zErr)</span></td> } @@ -2698,11 +2691,10 @@ ** for check-in, forum, ticket, or wiki. The remaining text is a ** integer that references the EVENT.OBJID value for the event. ** Run /timeline?showid to see these OBJID values. ** ** Options: -** ** --digest Generate digest alert text ** --needmod Assume all events are pending moderator approval */ void test_alert_cmd(void){ Blob out; @@ -2759,19 +2751,16 @@ ** for check-in, forum, ticket, or wiki. The remaining text is a ** integer that references the EVENT.OBJID value for the event. ** Run /timeline?showid to see these OBJID values. ** ** Options: -** ** --backoffice Run alert_backoffice() after all alerts have ** been added. This will cause the alerts to be ** sent out with the SENDALERT_TRACE option. -** ** --debug Like --backoffice, but add the SENDALERT_STDOUT ** so that emails are printed to standard output ** rather than being sent. -** ** --digest Process emails using SENDALERT_DIGEST */ void test_add_alert_cmd(void){ int i; int doAuto = find_option("backoffice",0,0)!=0; @@ -3231,28 +3220,28 @@ form_begin(0, "%R/contact_admin"); @ <p>Enter a message to the repository administrator below:</p> @ <table class="subscribe"> if( zCaptcha ){ @ <tr> - @ <td class="form_label">Security Code:</td> - @ <td><input type="text" name="captcha" value="" size="10"> + @ <td class="form_label"><label for="captcha">Security Code:</label></td> + @ <td><input type="text" id="captcha" name="captcha" value="" size="10"> captcha_speakit_button(uSeed, "Speak the code"); @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td> @ </tr> } @ <tr> - @ <td class="form_label">Your Email Address:</td> - @ <td><input type="text" name="from" value="%h(PT("from"))" size="30"></td> + @ <td class="form_label"><label for="from">Your Email Address:</label></td> + @ <td><input type="text" id="from" name="from" value="%h(PT("from"))" size="30"></td> @ </tr> @ <tr> - @ <td class="form_label">Subject:</td> - @ <td><input type="text" name="subject" value="%h(PT("subject"))"\ + @ <td class="form_label"><label for="subject">Subject:</label></td> + @ <td><input type="text" id="subject" name="subject" value="%h(PT("subject"))"\ @ size="80"></td> @ </tr> @ <tr> - @ <td class="form_label">Message:</td> - @ <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\ + @ <td class="form_label"><label for="msg">Message:</label></td> + @ <td><textarea id="msg" name="msg" cols="80" rows="10" wrap="virtual">\ @ %h(PT("msg"))</textarea> @ </tr> @ <tr> @ <td></td> @ <td><input type="submit" name="submit" value="Send Message"> @@ -3402,12 +3391,12 @@ int aMod = PB("mods"); const char *aack = aa ? "checked" : ""; const char *allck = all ? "checked" : ""; const char *modck = aMod ? "checked" : ""; @ <tr> - @ <td class="form_label">To:</td> - @ <td><input type="text" name="to" value="%h(PT("to"))" size="30"><br> + @ <td class="form_label"><label for="to">To:</label></td> + @ <td><input type="text" id="to" name="to" value="%h(PT("to"))" size="30"><br> @ <label><input type="checkbox" name="aa" %s(aack)> \ @ All "announcement" subscribers</label> \ @ <a href="%R/subscribers?only=a" target="_blank">(list)</a><br> @ <label><input type="checkbox" name="all" %s(allck)> \ @ All subscribers</label> \ @@ -3416,17 +3405,17 @@ @ All moderators</label> \ @ <a href="%R/setup_ulist?with=5" target="_blank">(list)</a><br></td> @ </tr> } @ <tr> - @ <td class="form_label">Subject:</td> - @ <td><input type="text" name="subject" value="%h(PT("subject"))"\ + @ <td class="form_label"><label for="subject">Subject:</label></td> + @ <td><input type="text" id="subject" name="subject" value="%h(PT("subject"))"\ @ size="80"></td> @ </tr> @ <tr> - @ <td class="form_label">Message:</td> - @ <td><textarea name="msg" cols="80" rows="10" wrap="virtual">\ + @ <td class="form_label"><label for="msg">Message:</label></td> + @ <td><textarea id="msg" name="msg" cols="80" rows="10" wrap="virtual">\ @ %h(PT("msg"))</textarea> @ </tr> @ <tr> @ <td></td> if( fossil_strcmp(P("name"),"test2")==0 ){ Index: src/allrepo.c ================================================================== --- src/allrepo.c +++ src/allrepo.c @@ -61,88 +61,66 @@ ** ** On Win32 systems, the file is named "_fossil" and is located in ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%. ** ** Available operations are: -** ** backup Backup all repositories. The argument must be the name of ** a directory into which all backup repositories are written. -** ** cache Manages the cache used for potentially expensive web ** pages. Any additional arguments are passed on verbatim ** to the cache command. -** ** changes Shows all local checkouts that have uncommitted changes. ** This operation has no additional options. -** ** clean Delete all "extra" files in all local checkouts. Extreme ** caution should be exercised with this command because its ** effects cannot be undone. Use of the --dry-run option to ** carefully review the local checkouts to be operated upon ** and the --whatif option to carefully review the files to ** be deleted beforehand is highly recommended. The command ** line options supported by the clean command itself, if any ** are present, are passed along verbatim. -** ** config Only the "config pull AREA" command works. -** ** dbstat Run the "dbstat" command on all repositories. -** ** extras Shows "extra" files from all local checkouts. The command ** line options supported by the extra command itself, if any ** are present, are passed along verbatim. -** ** fts-config Run the "fts-config" command on all repositories. -** ** git CMD Do the "git export" or "git status" command (whichever ** is specified by CMD) on all repositories for which ** a Git mirror has been previously established. -** ** info Run the "info" command on all repositories. -** ** pull Run a "pull" operation on all repositories. Only the ** --verbose and --share-links options are supported. -** ** push Run a "push" on all repositories. Only the --verbose ** option is supported. -** ** rebuild Rebuild on all repositories. The command line options ** supported by the rebuild command itself, if any are ** present, are passed along verbatim. The --force and ** --randomize options are not supported. -** ** sync Run a "sync" on all repositories. Only the --verbose ** and --unversioned and --share-links options are supported. -** ** set Run the "setting" or "set" commands on all ** repositories. These command are particularly useful in ** conjunction with the "max-loadavg" setting which cannot ** otherwise be set globally. -** ** unset Run the "unset" command on all repositories -** ** server Run the "server" commands on all repositories. ** The root URI gives a listing of all repos. -** ** ui Run the "ui" command on all repositories. Like "server" ** but bind to the loopback TCP address only, enable ** the --localauth option and automatically launch a ** web-browser ** -** ** In addition, the following maintenance operations are supported: -** ** add Add all the repositories named to the set of repositories ** tracked by Fossil. Normally Fossil is able to keep up with ** this list by itself, but sometimes it can benefit from this ** hint if you rename repositories. -** ** ignore Arguments are repositories that should be ignored by ** subsequent clean, extras, list, pull, push, rebuild, and ** sync operations. The -c|--ckout option causes the listed ** local checkouts to be ignored instead. -** ** list | ls Display the location of all repositories. The -c|--ckout ** option causes all local checkouts to be listed instead. ** ** Repositories are automatically added to the set of known repositories ** when one of the following commands are run against the repository: Index: src/attach.c ================================================================== --- src/attach.c +++ src/attach.c @@ -398,12 +398,12 @@ @ <h2>Add Attachment To %s(zTargetType)</h2> form_begin("enctype='multipart/form-data'", "%R/attachadd"); @ <div> @ File to Attach: @ <input type="file" name="f" size="60" /><br /> - @ Description:<br /> - @ <textarea name="comment" cols="80" rows="5" wrap="virtual"></textarea><br /> + @ <label>Description:<br /> + @ <textarea name="comment" cols="80" rows="5" wrap="virtual"></textarea></label><br /> if( zTkt ){ @ <input type="hidden" name="tkt" value="%h(zTkt)" /> }else if( zTechNote ){ @ <input type="hidden" name="technote" value="%h(zTechNote)" /> }else{ @@ -678,18 +678,17 @@ ** COMMAND: attachment* ** ** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS? ** ** Add an attachment to an existing wiki page or tech note. -** Options: ** +** Options: ** -t|--technote DATETIME Specifies the timestamp of ** the technote to which the attachment ** is to be made. The attachment will be ** to the most recently modified tech note ** with the specified timestamp. -** ** -t|--technote TECHNOTE-ID Specifies the technote to be ** updated by its technote id. ** ** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified. ** @@ -792,11 +791,10 @@ ** name arguments are glob prefixes for the attachment.target ** field. If no names are provided then a prefix of [a-zA-Z] is used, ** which will match most wiki page names and some ticket hashes. ** ** Options: -** ** -latest List only the latest version of a given attachment. ** */ void test_list_attachments(void){ Stmt q; Index: src/backoffice.c ================================================================== --- src/backoffice.c +++ src/backoffice.c @@ -679,34 +679,27 @@ ** backoffice work is done in-process. But if there are multiple repositories ** or if --poll is used, a separate sub-process is started for each poll of ** each repository. ** ** Standard options: -** ** --debug Show what this command is doing. -** ** --logfile FILE Append a log of backoffice actions onto FILE. -** ** --min N When polling, invoke backoffice at least ** once every N seconds even if the repository ** never changes. 0 or negative means disable ** this feature. Default: 3600 (once per hour). -** ** --poll N Repeat backoffice calls for repositories that ** change in appoximately N-second intervals. ** N less than 1 turns polling off (the default). ** Recommended polling interval: 60 seconds. -** ** --trace Enable debugging output on stderr ** ** Options intended for internal use only which may change or be ** discontinued in future releases: -** ** --nodelay Do not queue up or wait for a backoffice job ** to complete. If no work is available or if ** backoffice has run recently, return immediately. -** ** --nolease Always run backoffice, even if there is a lease ** conflict. This option implies --nodelay. This ** option is added to secondary backoffice commands ** that are invoked by the --poll option. */ Index: src/bisect.c ================================================================== --- src/bisect.c +++ src/bisect.c @@ -470,71 +470,50 @@ ** ** Usage: %fossil bisect SUBCOMMAND ... ** ** Run various subcommands useful for searching back through the change ** history for a particular checkin that causes or fixes a problem. -** ** > fossil bisect bad ?VERSION? -** ** Identify version VERSION as non-working. If VERSION is omitted, ** the current checkout is marked as non-working. -** ** > fossil bisect good ?VERSION? -** ** Identify version VERSION as working. If VERSION is omitted, ** the current checkout is marked as working. -** ** > fossil bisect log ** > fossil bisect chart -** ** Show a log of "good", "bad", and "skip" versions. "bisect log" ** shows the events in the order that they were tested. ** "bisect chart" shows them in order of check-in. -** ** > fossil bisect next -** ** Update to the next version that is halfway between the working and ** non-working versions. -** ** > fossil bisect options ?NAME? ?VALUE? -** ** List all bisect options, or the value of a single option, or set the ** value of a bisect option. -** ** > fossil bisect reset -** ** Reinitialize a bisect session. This cancels prior bisect history ** and allows a bisect session to start over from the beginning. -** ** > fossil bisect run [OPTIONS] COMMAND -** ** Invoke COMMAND repeatedly to run the bisect. The exit code for ** COMMAND should be 0 for "good", 125 for "skip", and any other value -** for "bad". Options: +** for "bad". ** +** Options: ** -i|--interactive Prompt the user for the good/bad/skip decision ** after each step, rather than using the exit ** code from COMMAND -** ** > fossil bisect skip ?VERSION? -** ** Cause VERSION (or the current checkout if VERSION is omitted) to ** be ignored for the purpose of the current bisect. This might ** be done, for example, because VERSION does not compile correctly ** or is otherwise unsuitable to participate in this bisect. -** ** > fossil bisect vlist|ls|status ?-a|--all? -** ** List the versions in between the inner-most "bad" and "good". -** ** > fossil bisect ui -** ** Like "fossil ui" except start on a timeline that shows only the ** check-ins that are part of the current bisect. -** ** > fossil bisect undo -** ** Undo the most recent "good", "bad", or "skip" command. */ void bisect_cmd(void){ int n; const char *zCmd; Index: src/blob.c ================================================================== --- src/blob.c +++ src/blob.c @@ -1635,22 +1635,18 @@ ** result. Append each argument to "fossil test-echo" and run that ** using fossil_system() to verify that it really does get escaped ** correctly. ** ** Other options: -** ** --filename-args BOOL Subsequent arguments are assumed to be ** filenames if BOOL is true, or not if BOOL ** is false. Defaults on. -** ** --hex HEX Skip the --hex flag and instead decode HEX ** into ascii. This provides a way to insert ** unusual characters as an argument for testing. -** ** --compare HEX ASCII Verify that argument ASCII is identical to ** to decoded HEX. -** ** --fuzz N Run N fuzz cases. Each cases is a call ** to "fossil test-escaped-arg --compare HEX ARG" ** where HEX and ARG are the same argument. ** The argument is chosen at random. */ Index: src/branch.c ================================================================== --- src/branch.c +++ src/branch.c @@ -584,41 +584,35 @@ ** ** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS? ** ** Run various subcommands to manage branches of the open repository or ** of the repository identified by the -R or --repository option. -** ** > fossil branch close|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES? -** ** Adds or cancels the "closed" tag to one or more branches. ** It accepts arbitrary unambiguous symbolic names but ** will only resolve checkin names and skips any which resolve -** to non-leaf checkins. Options: +** to non-leaf checkins. +** +** Options: ** -n|--dry-run do not commit changes and dump artifact ** to stdout ** -v|--verbose output more information ** --date-override DATE DATE to use instead of 'now' ** --user-override USER USER to use instead of the current default -** ** > fossil branch current -** ** Print the name of the branch for the current check-out -** ** > fossil branch hide|unhide ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES? -** ** Adds or cancels the "hidden" tag for the specified branches or ** or checkin IDs. Accepts the same options as the close ** subcommand. -** ** > fossil branch info BRANCH-NAME -** ** Print information about a branch -** ** > fossil branch list|ls ?OPTIONS? ?GLOB? ** > fossil branch lsh ?OPTIONS? ?LIMIT? +** List all branches. ** -** List all branches. Options: +** Options: ** -a|--all List all branches. Default show only open branches ** -c|--closed List closed branches. ** -p List only private branches. ** -r Reverse the sort order ** -t Show recently changed branches first @@ -630,13 +624,11 @@ ** ** The "lsh" variant of this subcommand shows recently changed branches, ** and accepts an optional LIMIT argument (defaults to 5) to cap output, ** but no GLOB argument. All other options are supported, with -t being ** an implied no-op. -** ** > fossil branch new BRANCH-NAME BASIS ?OPTIONS? -** ** Create a new branch BRANCH-NAME off of check-in BASIS. ** Supported options for this subcommand include: ** --private branch is private (i.e., remains local) ** --bgcolor COLOR use COLOR instead of automatic background ** ("auto" lets Fossil choose it automatically, @@ -650,11 +642,10 @@ ** replaced by a space, and it may also name a timezone offset ** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward). ** Either no timezone suffix or "Z" means UTC. ** ** Options valid for all subcommands: -** ** -R|--repository REPO Run commands on repository REPO */ void branch_cmd(void){ int n; const char *zCmd = "list"; @@ -809,12 +800,12 @@ if( zBgClr && zBgClr[0] && show_colors ){ @ <tr style="background-color:%s(zBgClr)"> }else{ @ <tr> } - @ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input - @ type="checkbox" disabled="disabled"/></td> + @ <td>%z(href("%R/timeline?r=%T",zBranch))%h(zBranch)</a><input type="checkbox" + @ title="%h(zBranch)" aria-label="%h(zBranch)" disabled="disabled"/></td> @ <td data-sortkey="%016llx(iMtime)">%s(zAge)</td> @ <td>%d(nCkin)</td> fossil_free(zAge); @ <td>%s(isClosed?"closed":"")</td> if( zMergeTo ){ @@ -837,11 +828,10 @@ ** Show a list of branches. With no query parameters, a sortable table ** is used to show all branches. If query parameters are present a ** fixed bullet list is shown. ** ** Query parameters: -** ** all Show all branches ** closed Show only closed branches ** open Show only open branches ** colortest Show all branches with automatic color ** @@ -968,11 +958,10 @@ ** WEBPAGE: brtimeline ** ** Show a timeline of all branches ** ** Query parameters: -** ** ng No graph ** nohidden Hide check-ins with "hidden" tag ** onlyhidden Show only check-ins with "hidden" tag ** brbg Background color by branch name ** ubg Background color by user name Index: src/browse.c ================================================================== --- src/browse.c +++ src/browse.c @@ -126,11 +126,10 @@ ** source tree. Only files for a single check-in are shown if the ci= ** query parameter is present. If ci= is missing, the union of files ** across all check-ins is shown. ** ** Query parameters: -** ** ci=LABEL Show only files in this check-in. Optional. ** name=PATH Directory to display. Optional. Top-level if missing ** re=REGEXP Show only files matching REGEXP ** type=TYPE TYPE=flat: use this display ** TYPE=tree: use the /tree display instead @@ -640,11 +639,10 @@ ** ** The type=tree query parameter is required or else the /dir format is ** used. ** ** Query parameters: -** ** type=tree Required to prevent use of /dir format ** name=PATH Directory to display. Optional ** ci=LABEL Show only files in this check-in. Optional. ** re=REGEXP Show only files matching REGEXP. Optional. ** expand Begin with the tree fully expanded. @@ -764,11 +762,11 @@ style_submenu_element("Top-Level", "%s", url_render(&sURI, "name", 0, 0, 0)); }else if( zRE ){ blob_appendf(&dirname, "matching \"%s\"", zRE); } - style_submenu_binary("mtime","Sort By Time","Sort By Filename", 0); + style_submenu_binary("mtime","Sort By","Time","Filename", 0); if( zCI ){ style_submenu_element("All", "%s", url_render(&sURI, "ci", 0, 0, 0)); if( nD==0 && !showDirOnly ){ style_submenu_element("File Ages", "%R/fileage?name=%T", zCI); } Index: src/builtin.c ================================================================== --- src/builtin.c +++ src/builtin.c @@ -157,12 +157,13 @@ } /* ** WEBPAGE: builtin loadavg-exempt ** -** Return one of many built-in content files. Query parameters: +** Return one of many built-in content files. ** +** Query parameters: ** name=FILENAME Return the single file whose name is FILENAME. ** mimetype=TYPE Override the mimetype in the returned file to ** be TYPE. If this query parameter is omitted ** (the usual case) then the mimetype is inferred ** from the suffix on FILENAME Index: src/bundle.c ================================================================== --- src/bundle.c +++ src/bundle.c @@ -719,55 +719,40 @@ /* ** COMMAND: bundle* ** ** Usage: %fossil bundle SUBCOMMAND ARGS... -** ** > fossil bundle append BUNDLE FILE... -** ** Add files named on the command line to BUNDLE. This subcommand has ** little practical use and is mostly intended for testing. -** ** > fossil bundle cat BUNDLE HASH... -** ** Extract one or more artifacts from the bundle and write them ** consecutively on standard output. This subcommand was designed ** for testing and introspection of bundles and is not something ** commonly used. -** ** > fossil bundle export BUNDLE ?OPTIONS? -** ** Generate a new bundle, in the file named BUNDLE, that contains a ** subset of the check-ins in the repository (usually a single branch) ** described by the --branch, --from, --to, and/or --checkin options, ** at least one of which is required. If BUNDLE already exists, the ** specified content is added to the bundle. -** ** --branch BRANCH Package all check-ins on BRANCH ** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2 ** --checkin TAG Package the single check-in TAG ** --standalone Do no use delta-encoding against ** artifacts not in the bundle -** ** > fossil bundle extend BUNDLE -** ** The BUNDLE must already exist. This subcommand adds to the bundle ** any check-ins that are descendants of check-ins already in the bundle, ** and any tags that apply to artifacts in the bundle. -** ** > fossil bundle import BUNDLE ?--publish? -** ** Import all content from BUNDLE into the repository. By default, the ** imported files are private and will not sync. Use the --publish ** option to make the import public. -** ** > fossil bundle ls BUNDLE -** ** List the contents of BUNDLE on standard output -** ** > fossil bundle purge BUNDLE -** ** Remove from the repository all files that are used exclusively ** by check-ins in BUNDLE. This has the effect of undoing a ** "fossil bundle import". ** ** See also: [[publish]] Index: src/cache.c ================================================================== --- src/cache.c +++ src/cache.c @@ -260,21 +260,18 @@ ** COMMAND: cache* ** ** Usage: %fossil cache SUBCOMMAND ** ** Manage the cache used for potentially expensive web pages such as -** /zip and /tarball. SUBCOMMAND can be: +** /zip and /tarball. ** +** SUBCOMMAND can be: ** clear Remove all entries from the cache. -** ** init Create the cache file if it does not already exist. -** ** list|ls List the keys and content sizes and other stats for ** all entries currently in the cache. -** ** size ?N? Query or set the maximum number of entries in the cache. -** ** status Show a summary of the cache status. ** ** The cache is stored in a file that is distinct from the repository ** but that is held in the same directory as the repository. The cache ** file can be deleted in order to completely disable the cache. Index: src/capabilities.c ================================================================== --- src/capabilities.c +++ src/capabilities.c @@ -393,11 +393,11 @@ " WHERE cap GLOB '*[as]*'" " ORDER BY 3 ASC", zSelfCap, hasPubPages, zSelfCap ); @ <table id='capabilitySummary' cellpadding="0" cellspacing="0" border="1"> - @ <tr><th> <th>Code<th>Forum<th>Tickets<th>Wiki<th>Chat\ + @ <tr><th>Role<th>Code<th>Forum<th>Tickets<th>Wiki<th>Chat\ @ <th>Unversioned Content</th></tr> while( db_step(&q)==SQLITE_ROW ){ const char *zId = db_column_text(&q, 0); const char *zCap = db_column_text(&q, 1); int n = db_column_int(&q, 3); Index: src/captcha.c ================================================================== --- src/captcha.c +++ src/captcha.c @@ -543,13 +543,13 @@ zDecoded = captcha_decode(uSeed); zCaptcha = captcha_render(zDecoded); @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha"> @ %h(zCaptcha) @ </pre> - @ Enter security code shown above: + @ <label for="captcha">Enter security code shown above:</label> @ <input type="hidden" name="captchaseed" value="%u(uSeed)" /> - @ <input type="text" name="captcha" size=8 /> + @ <input type="text" id="captcha" name="captcha" size=8 /> if( showButton ){ @ <input type="submit" value="Submit"> } @ <br/>\ captcha_speakit_button(uSeed, 0); @@ -559,11 +559,11 @@ /* ** Add a "Speak the captcha" button. */ void captcha_speakit_button(unsigned int uSeed, const char *zMsg){ if( zMsg==0 ) zMsg = "Speak the text"; - @ <input aria-label="%h(zMsg)" type="button" value="%h(zMsg)" \ + @ <input aria-label="%h(zMsg)" title="%h(zMsg)" type="button" value="%h(zMsg)" \ @ id="speakthetext"> @ <script nonce="%h(style_nonce())">/* captcha_speakit_button() */ @ document.getElementById("speakthetext").onclick = function(){ @ var audio = window.fossilAudioCaptcha \ @ || new Audio("%R/captcha-audio/%u(uSeed)"); @@ -574,10 +574,11 @@ @ </script> } /* ** WEBPAGE: test-captcha +** ** Test the captcha-generator by rendering the value of the name= query ** parameter using ascii-art. If name= is omitted, show a random 16-digit ** hexadecimal number. */ void captcha_test(void){ Index: src/chat.c ================================================================== --- src/chat.c +++ src/chat.c @@ -701,11 +701,10 @@ ** /chat-fetch-one/N ** ** Fetches a single message with the given ID, if available. ** ** Options: -** ** raw = the xmsg field will be returned unparsed. ** ** Response is either a single object in the format returned by ** /chat-poll (without the wrapper array) or a JSON-format error ** response, as documented for ajax_route_error(). @@ -971,45 +970,35 @@ ** specified by the --remote option. If there is no default remote ** Fossil repository and the --remote option is omitted, then this ** command fails with an error. ** ** Subcommands: -** ** > fossil chat -** ** When there is no SUBCOMMAND (when this command is simply "fossil chat") ** the response is to bring up a web-browser window to the chatroom ** on the default system web-browser. You can accomplish the same by ** typing the appropriate URL into the web-browser yourself. This ** command is merely a convenience for command-line oriented people. -** ** > fossil chat pull -** ** Copy chat content from the server down into the local clone, ** as a backup or archive. Setup privilege is required on the server. -** ** --all Download all chat content. Normally only ** previously undownloaded content is retrieved. ** --debug Additional debugging output. ** --out DATABASE Store CHAT table in separate database file ** DATABASE rather that adding to local clone ** --unsafe Allow the use of unencrypted http:// -** ** > fossil chat send [ARGUMENTS] -** ** This command sends a new message to the chatroom. The message ** to be sent is determined by arguments as follows: -** ** -f|--file FILENAME File to attach to the message ** --as FILENAME2 Causes --file FILENAME to be sent with ** the attachment name FILENAME2 ** -m|--message TEXT Text of the chat message ** --remote URL Send to this remote URL ** --unsafe Allow the use of unencrypted http:// -** ** > fossil chat url -** ** Show the default URL used to access the chat server. ** ** Additional subcommands may be added in the future. */ void chat_command(void){ Index: src/color.c ================================================================== --- src/color.c +++ src/color.c @@ -169,11 +169,13 @@ @ <p>Enter candidate branch names below and see them displayed in their @ default background colors above.</p> for(i=0; i<10; i++){ sqlite3_snprintf(sizeof(zNm),zNm,"b%d",i); zBr = P(zNm); - @ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br /> + @ <label>Branch %s(zNm): + @ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'> + @ </label><br /> } @ <input type="submit" value="Submit"> @ <input type="submit" name="rand" value="Random"> @ </form> style_finish_page(); Index: src/configure.c ================================================================== --- src/configure.c +++ src/configure.c @@ -724,50 +724,36 @@ ** COMMAND: configuration* ** ** Usage: %fossil configuration METHOD ... ?OPTIONS? ** ** Where METHOD is one of: export import merge pull push reset. -** ** > fossil configuration export AREA FILENAME -** ** Write to FILENAME exported configuration information for AREA. -** AREA can be one of: ** +** AREA can be one of: ** all email interwiki project shun skin ** ticket user alias subscriber -** ** > fossil configuration import FILENAME -** ** Read a configuration from FILENAME, overwriting the current ** configuration. -** ** > fossil configuration merge FILENAME -** ** Read a configuration from FILENAME and merge its values into ** the current configuration. Existing values take priority over ** values read from FILENAME. -** ** > fossil configuration pull AREA ?URL? -** ** Pull and install the configuration from a different server ** identified by URL. If no URL is specified, then the default ** server is used. Use the --overwrite flag to completely ** replace local settings with content received from URL. -** ** > fossil configuration push AREA ?URL? -** ** Push the local configuration into the remote server identified ** by URL. Admin privilege is required on the remote server for ** this to work. When the same record exists both locally and on ** the remote end, the one that was most recently changed wins. -** ** > fossil configuration reset AREA -** ** Restore the configuration to the default. AREA as above. -** ** > fossil configuration sync AREA ?URL? -** ** Synchronize configuration changes in the local repository with ** the remote repository at URL. ** ** Options: ** -R|--repository REPO Affect repository REPO with changes Index: src/content.c ================================================================== --- src/content.c +++ src/content.c @@ -957,17 +957,14 @@ ** Verify that all content can be extracted from the BLOB table correctly. ** If the BLOB table is correct, then the repository can always be ** successfully reconstructed using "fossil rebuild". ** ** Options: -** ** -d|--db-only Run "PRAGMA integrity_check" on the database only. ** No other validation is performed. -** ** --parse Parse all manifests, wikis, tickets, events, and ** so forth, reporting any errors found. -** ** -q|--quick Run "PRAGMA quick_check" on the database only. ** No other validation is performed. */ void test_integrity(void){ Stmt q; @@ -1197,11 +1194,10 @@ ** Look at every artifact in the repository and verify that ** all references are satisfied. Report any referenced artifacts ** that are missing or shunned. ** ** Options: -** ** --notshunned Do not report shunned artifacts ** --quiet Only show output if there are errors */ void test_missing(void){ Stmt q; Index: src/db.c ================================================================== --- src/db.c +++ src/db.c @@ -867,11 +867,10 @@ /* ** COMMAND: test-db-prepare ** Usage: %fossil test-db-prepare ?OPTIONS? SQL-STATEMENT ** ** Options: -** ** --auth-report Enable the ticket report query authorizer. ** --auth-ticket Enable the ticket schema query authorizer. ** ** Invoke db_prepare() on the SQL input. Report any errors encountered. ** This command is used to verify error detection logic in the db_prepare() @@ -4623,11 +4622,10 @@ ** on the local settings. Use the --global option to change global settings. ** ** Options: ** --global set or unset the given property globally instead of ** setting or unsetting it for the open repository only. -** ** --exact only consider exact name matches. ** ** See also: [[configuration]] */ void setting_cmd(void){ Index: src/default.css ================================================================== --- src/default.css +++ src/default.css @@ -86,11 +86,10 @@ } .timelineModernDetail { font-size: 80%; text-align: right; float: right; - opacity: 0.75; margin-top: 0.5em; margin-left: 1em; } .tl-canvas { margin: 0 6px 0 10px; @@ -461,11 +460,11 @@ } td.tktTlOpen { color: #800; } td.tktTlClosed { - color: #888; + color: #757575; } span.tktError { color: red; font-weight: bold; } @@ -563,11 +562,11 @@ /* ^^^ attempt to keep mobile from inflating some text */; } table.diff pre > ins, table.diff pre > del { /* Fill platform-dependent color gaps caused by - inflated line-height */; + inflated line-height */ padding: 0.062em 0 0.062em 0; } table.diff pre > ins > *, table.diff pre > del > *{ /* Avoid odd-looking color swatches in conjunction with @@ -707,18 +706,18 @@ td.difftxt ins > ins.edit { background-color: #c0c0ff; text-decoration: none; font-weight: bold; } -body.tkt div.content li > table.udiff { +body.tkt main.content li > table.udiff { margin-left: 1.5em; margin-top: 0.5em; } -body.tkt div.content ol.tkt-changes > li:target > p > span { +body.tkt main.content ol.tkt-changes > li:target > p > span { border-bottom: 3px solid gold; } -body.tkt div.content ol.tkt-changes > li:target > ol { +body.tkt main.content ol.tkt-changes > li:target > ol { border-left: 1px solid gold; } span.modpending { color: #b03800; Index: src/descendants.c ================================================================== --- src/descendants.c +++ src/descendants.c @@ -536,11 +536,10 @@ ** A "leaf" is a check-in with no children in the same branch. A ** "closed leaf" is a leaf that has a "closed" tag. An "open leaf" ** is a leaf without a "closed" tag. ** ** Query parameters: -** ** all Show all leaves ** closed Show only closed leaves ** ng No graph ** nohidden Hide check-ins with "hidden" tag ** onlyhidden Show only check-ins with "hidden" tag Index: src/diff.c ================================================================== --- src/diff.c +++ src/diff.c @@ -3539,11 +3539,10 @@ ** that alternative origin. Thus using "origin=trunk" on an historical ** version of the file shows the first time each line in the file was changed ** or removed by any subsequent check-in. ** ** Query parameters: -** ** checkin=ID The check-in at which to start the annotation ** filename=FILENAME The filename. ** filevers=BOOLEAN Show file versions rather than check-in versions ** limit=LIMIT Limit the amount of analysis. LIMIT can be one of: ** none No limit Index: src/dispatch.c ================================================================== --- src/dispatch.c +++ src/dispatch.c @@ -798,18 +798,16 @@ ** WEBPAGE: help ** URL: /help?name=CMD ** ** Show the built-in help text for CMD. CMD can be a command-line interface ** command or a page name from the web interface or a setting. -** Query parameters: ** +** Query parameters: ** name=CMD Show help for CMD where CMD is a command name or ** webpage name or setting name. -** ** plaintext Show the help within <pre>...</pre>, as if it were ** displayed using the "fossil help" command. -** ** raw Show the raw help text without any formatting. ** (Used for debugging.) */ void help_page(void){ const char *zCmd = P("cmd"); @@ -1141,11 +1139,10 @@ ** Display information on how to use TOPIC, which may be a command, webpage, or ** setting. Webpage names begin with "/". If TOPIC is omitted, a list of ** topics is returned. ** ** The following options can be used when TOPIC is omitted: -** ** -a|--all List both common and auxiliary commands ** -o|--options List command-line options common to all commands ** -s|--setting List setting names ** -t|--test List unsupported "test" commands ** -v|--verbose List both names and help text @@ -1155,11 +1152,10 @@ ** and unsupported "test" commands), options, ** settings, and web pages ** -e|--everything List all help on all topics ** ** These options can be used when TOPIC is present: -** ** -h|--html Format output as HTML rather than plain text ** -c|--commands Restrict TOPIC search to commands */ void help_cmd(void){ int rc; Index: src/doc.c ================================================================== --- src/doc.c +++ src/doc.c @@ -866,16 +866,13 @@ ** URL: /doc/CHECKIN/FILE ** ** CHECKIN can be either tag or hash prefix or timestamp identifying a ** particular check-in, or the name of a branch (meaning the most recent ** check-in on that branch) or one of various magic words: -** ** "tip" means the most recent check-in -** ** "ckout" means the current check-out, if the server is run from ** within a check-out, otherwise it is the same as "tip" -** ** "latest" means use the most recent check-in for the document ** regardless of what branch it occurs on. ** ** FILE is the name of a file to delivered up as a webpage. FILE is relative ** to the root of the source tree of the repository. The FILE must @@ -1228,15 +1225,14 @@ ** Search for documents that match a user-supplied full-text search pattern. ** If no pattern is specified (by the s= query parameter) then the user ** is prompted to enter a search string. ** ** Query parameters: -** ** s=PATTERN Search for PATTERN */ void doc_search_page(void){ const int isSearch = P("s")!=0; login_check_credentials(); style_header("Document Search%s", isSearch ? " Results" : ""); search_screen(SRCH_DOC, 0); style_finish_page(); } Index: src/etag.c ================================================================== --- src/etag.c +++ src/etag.c @@ -252,11 +252,10 @@ ** Usage: fossil test-etag -key KEY-NUMBER -hash HASH ** ** Generate an etag given a KEY-NUMBER and/or a HASH. ** ** KEY-NUMBER is some combination of: -** ** 1 ETAG_CONFIG The config table version number ** 2 ETAG_DATA The event table version number ** 4 ETAG_COOKIE The display cookie */ void test_etag_cmd(void){ Index: src/event.c ================================================================== --- src/event.c +++ src/event.c @@ -52,11 +52,10 @@ ** WEBPAGE: event ** ** Display a technical note (formerly called an "event"). ** ** PARAMETERS: -** ** name=ID Identify the technical note to display. ID must be ** complete. ** aid=ARTIFACTID Which specific version of the tech-note. Optional. ** v=BOOLEAN Show details if TRUE. Default is FALSE. Optional. ** @@ -346,16 +345,14 @@ ** WEBPAGE: eventedit ** ** Revise or create a technical note (formerly called an "event"). ** ** Required query parameter: -** ** name=ID Hex hash ID of the technote. If omitted, a new ** tech-note is created. ** ** POST parameters from the "Cancel", "Preview", or "Submit" buttons: -** ** w=TEXT Complete text of the technote. ** t=TEXT Time of the technote on the timeline (ISO 8601) ** c=TEXT Timeline comment ** g=TEXT Tags associated with this technote ** mimetype=TEXT Mimetype for w= text @@ -526,42 +523,45 @@ @ <form method="post" action="%R/technoteedit"><div> login_insert_csrf_secret(); @ <input type="hidden" name="name" value="%h(zId)" /> @ <table border="0" cellspacing="10"> - @ <tr><th align="right" valign="top">Timestamp (UTC):</th> + @ <tr><th align="right" valign="top"><label for="t">Timestamp (UTC):</label></th> @ <td valign="top"> - @ <input type="text" name="t" size="25" value="%h(zETime)" /> + @ <input type="text" id="t" name="t" size="25" value="%h(zETime)" /> @ </td></tr> - @ <tr><th align="right" valign="top">Timeline Comment:</th> + @ <tr><th align="right" valign="top"><label for="c">Timeline Comment:</label></th> @ <td valign="top"> - @ <textarea name="c" class="technoteedit" cols="80" + @ <textarea id="c" name="c" class="technoteedit" cols="80" @ rows="3" wrap="virtual">%h(zComment)</textarea> @ </td></tr> - @ <tr><th align="right" valign="top">Timeline Background Color:</th> + @ <tr><th align="right" valign="top"> + @ <label for='newclr'%s(zClrFlag)>Timeline Background Color:</label></th> @ <td valign="top"> - @ <input type='checkbox' name='newclr'%s(zClrFlag) /> - @ Use custom color: \ - @ <input type='color' name='clr' value='%s(zClr[0]?zClr:"#c0f0ff")'> + @ <input type='checkbox' id='newclr'%s(zClrFlag) name='newclr'%s(zClrFlag) /> + @ <label>Use custom color: \ + @ <input type='color' name='clr' value='%s(zClr[0]?zClr:"#c0f0ff")'></label> @ </td></tr> - @ <tr><th align="right" valign="top">Tags:</th> + @ <tr><th align="right" valign="top"><label for="g">Tags:</label></th> @ <td valign="top"> - @ <input type="text" name="g" size="40" value="%h(zTags)" /> + @ <input type="text" id="g" name="g" size="40" value="%h(zTags)" /> @ </td></tr> @ <tr><th align="right" valign="top">\ - @ %z(href("%R/markup_help"))Markup Style</a>:</th> + @ <label for="mimetype">Markup style</label> + @ %z(href("%R/markup_help")) + @ <span class="help-buttonlet processed" title="Help"></span></a>: @ <td valign="top"> mimetype_option_menu(zMimetype); @ </td></tr> - @ <tr><th align="right" valign="top">Page Content:</th> + @ <tr><th align="right" valign="top"><label for="w">Page Content:</label></th> @ <td valign="top"> - @ <textarea name="w" class="technoteedit" cols="80" + @ <textarea id="w" name="w" class="technoteedit" cols="80" @ rows="%d(n)" wrap="virtual">%h(zBody)</textarea> @ </td></tr> @ <tr><td colspan="2"> @ <input type="submit" name="cancel" value="Cancel" /> Index: src/export.c ================================================================== --- src/export.c +++ src/export.c @@ -1816,13 +1816,11 @@ ** ** Usage: %fossil git SUBCOMMAND ** ** Do incremental import or export operations between Fossil and Git. ** Subcommands: -** ** > fossil git export [MIRROR] [OPTIONS] -** ** Write content from the Fossil repository into the Git repository ** in directory MIRROR. The Git repository is created if it does not ** already exist. If the Git repository does already exist, then ** new content added to fossil since the previous export is appended. ** @@ -1852,19 +1850,14 @@ ** The "trunk" branch of the Fossil repository is ** mapped into this name. "master" is used if ** this option is omitted. ** -q|--quiet Reduce output. Repeat for even less output. ** -v|--verbose More output. -** ** > fossil git import MIRROR -** ** TBD... -** ** > fossil git status -** ** Show the status of the current Git mirror, if there is one. -** ** -q|--quiet No output if there is nothing to report */ void gitmirror_command(void){ char *zCmd; int nCmd; Index: src/file.c ================================================================== --- src/file.c +++ src/file.c @@ -1475,11 +1475,10 @@ ** ** Display the effective file handling subsystem "settings" and then ** display file system information about the files specified, if any. ** ** Options: -** ** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off ** --open-config Open the configuration database first. ** --reset Reset cached stat() info for each file. ** --root ROOT Use ROOT as the root of the checkout ** --slash Trailing slashes, if any, are retained. Index: src/fileedit.c ================================================================== --- src/fileedit.c +++ src/fileedit.c @@ -698,11 +698,10 @@ ** ** where FILENAME is a repo-relative name as it would appear in the ** vfile table. ** ** Options: -** ** -R|--repository REPO The repository file to commit to. ** --as FILENAME The repository-side name of the input ** file, relative to the top of the ** repository. Default is the same as the ** input file name. @@ -1538,11 +1537,10 @@ ** Note that fileedit-glob, by design, is a local-only setting. ** It does not sync across repository clones, and must be explicitly ** set on any repositories where this page should be activated. ** ** Optional query parameters: -** ** filename=FILENAME Repo-relative path to the file. ** checkin=VERSION Checkin version, using any unambiguous ** symbolic version name. ** ** If passed a filename but no checkin then it will attempt to @@ -1728,11 +1726,11 @@ "150%", 150, "175%", 175, "200%", 200, NULL); CX("</div>"); CX("<div class='flex-container flex-column stretch'>"); CX("<textarea name='content' id='fileedit-content-editor' " - "class='fileedit' rows='25'>"); + "class='fileedit' rows='25' aria-label='Content' title='Content'>"); CX("</textarea>"); CX("</div>"/*textarea wrapper*/); CX("</div>"/*#tab-file-content*/); } @@ -1906,11 +1904,11 @@ CX("</div>"/*checkboxes*/); } { /******* Commit comment, button, and result manifest *******/ CX("<fieldset class='fileedit-options commit-message'>" - "<legend>Message (required)</legend><div>\n"); + "<legend><label for='fileedit-comment'>Message (required)</label></legend><div>\n"); /* We have two comment input fields, defaulting to single-line ** mode. JS code sets up the ability to toggle between single- ** and multi-line modes. */ CX("<input type='text' name='comment' " "id='fileedit-comment'></input>"); Index: src/finfo.c ================================================================== --- src/finfo.c +++ src/finfo.c @@ -302,10 +302,11 @@ /* Values for the debug= query parameter to finfo */ #define FINFO_DEBUG_MLINK 0x01 /* ** WEBPAGE: finfo +** ** Usage: ** * /finfo?name=FILENAME ** * /finfo?name=FILENAME&ci=HASH ** ** Show the change history for a single file. The name=FILENAME query @@ -316,11 +317,10 @@ ** If only the name=FILENAME parameter is supplied (if ci=HASH is omitted) ** then the graph shows all changes to any file while it happened ** to be called FILENAME and changes are not tracked across renames. ** ** Additional query parameters: -** ** a=DATETIME Only show changes after DATETIME ** b=DATETIME Only show changes before DATETIME ** ci=HASH identify a particular version of a file and then ** track changes to that file across renames ** m=HASH Mark this particular file version. Index: src/forum.c ================================================================== --- src/forum.c +++ src/forum.c @@ -501,11 +501,11 @@ zDate = db_text(0, "SELECT datetime(%.17g,toLocal())", p->rDate); if( p->pEditPrev ){ zPosterName = forum_post_display_name(p->pEditHead, 0); zEditorName = forum_post_display_name(p, pManifest); zHist = bHist ? "" : zQuery[0]==0 ? "?hist" : "&hist"; - @ <h3 class='forumPostHdr'>(%d(p->sid)\ + @ <h2 class='forumPostHdr'>(%d(p->sid)\ @ .%0*d(fossil_num_digits(p->nEdit))(p->rev)) \ if( fossil_strcmp(zPosterName, zEditorName)==0 ){ @ By %s(zPosterName) on %h(zDate) edited from \ @ %z(href("%R/forumpost/%S?%s%s",p->pEditPrev->zUuid,zQuery,zHist))\ @ %d(p->sid).%0*d(fossil_num_digits(p->nEdit))(p->pEditPrev->rev)</a> @@ -515,11 +515,11 @@ @ %z(href("%R/forumpost/%S%s%s",p->pEditPrev->zUuid,zQuery,zHist))\ @ %d(p->sid).%0*d(fossil_num_digits(p->nEdit))(p->pEditPrev->rev)</a> } }else{ zPosterName = forum_post_display_name(p, pManifest); - @ <h3 class='forumPostHdr'>(%d(p->sid)) \ + @ <h2 class='forumPostHdr'>(%d(p->sid)) \ @ By %s(zPosterName) on %h(zDate) } fossil_free(zDate); @@ -553,11 +553,11 @@ /* Provide a link to the raw source code. */ if( !bUnf ){ @ %z(href("%R/forumpost/%!S?raw",p->zUuid))[source]</a> } - @ </h3> + @ </h2> } /* Check if this post is approved, also if it's by the current user. */ bPrivate = content_is_private(p->fpid); bSameUser = login_is_individual() @@ -793,11 +793,10 @@ ** its entire thread. The selected posting is enclosed within ** <div class='forumSel'>...</div>. Javascript is used to move the ** selected posting into view after the page loads. ** ** Query parameters: -** ** name=X REQUIRED. The hash of the post to display. ** t=a Automatic display mode, i.e. hierarchical for ** desktop and chronological for mobile. This is the ** default if the "t" query parameter is omitted. ** t=c Show posts in the order they were written. @@ -820,11 +819,10 @@ ** Show all forum messages associated with a particular message thread. ** The result is basically the same as /forumpost except that none of ** the postings in the thread are selected. ** ** Query parameters: -** ** name=X REQUIRED. The hash of any post of the thread. ** t=a Automatic display mode, i.e. hierarchical for ** desktop and chronological for mobile. This is the ** default if the "t" query parameter is omitted. ** t=c Show posts in the order they were written. @@ -1055,17 +1053,19 @@ const char *zTitle, const char *zMimetype, const char *zContent ){ if( zTitle ){ - @ Title: <input type="input" name="title" value="%h(zTitle)" size="50" - @ maxlength="125"><br> + @ <label>Title: <input type="input" name="title" value="%h(zTitle)" size="50" + @ maxlength="125"></label><br> } - @ %z(href("%R/markup_help"))Markup style</a>: + @ <label>Markup style + @ %z(href("%R/markup_help")) + @ <span class="help-buttonlet processed" title="Help"></span></a>: mimetype_option_menu(zMimetype); - @ <br><textarea aria-label="Content:" name="content" class="wikiedit" \ - @ cols="80" rows="25" wrap="virtual">%h(zContent)</textarea><br> + @ </label><br><textarea aria-label="Content" title="Content" name="content" \ + @ class="wikiedit" cols="80" rows="25" wrap="virtual">%h(zContent)</textarea><br> } /* ** WEBPAGE: forumnew ** WEBPAGE: forumedit @@ -1189,12 +1189,12 @@ /* ** WEBPAGE: forume2 ** ** Edit an existing forum message. -** Query parameters: ** +** Query parameters: ** fpid=X Hash of the post to be edited. REQUIRED */ void forumedit_page(void){ int fpid; int froot; @@ -1379,11 +1379,10 @@ ** The main page for the forum feature. Show a list of recent forum ** threads. Also show a search box at the top if search is enabled, ** and a button for creating a new thread, if enabled. ** ** Query parameters: -** ** n=N The number of threads to show on each page ** x=X Skip the first X threads ** s=Y Search for term Y. */ void forum_main_page(void){ Index: src/fossil.diff.js ================================================================== --- src/fossil.diff.js +++ src/fossil.diff.js @@ -10,10 +10,12 @@ const D = window.fossil.dom; const addToggle = function(diffElem){ const sib = diffElem.previousElementSibling, btn = sib ? D.addClass(D.checkbox(true), 'diff-toggle') : 0; if(!sib) return; + D.attr(btn,'aria-label','Toggle Diff') + D.attr(btn,'title','Toggle Diff') D.append(sib,btn); btn.addEventListener('click', function(){ diffElem.classList.toggle('hidden'); }, false); }; @@ -638,11 +640,11 @@ const SCROLL_LEN = 25; const F = window.fossil, D = F.dom, Diff = F.diff; var lastWidth; Diff.checkTableWidth = function f(force){ if(undefined === f.contentNode){ - f.contentNode = document.querySelector('div.content'); + f.contentNode = document.querySelector('main.content'); } force = true; const parentCS = window.getComputedStyle(f.contentNode); const parentWidth = ( //document.body.clientWidth; Index: src/fossil.dom.js ================================================================== --- src/fossil.dom.js +++ src/fossil.dom.js @@ -262,30 +262,44 @@ element added to it. If legendText is an HTMLElement then is is assumed to be a LEGEND and is appended as-is, else it is assumed (if truthy) to be a value suitable for passing to dom.append(aLegendElement,...). */ - dom.fieldset = function(legendText){ + dom.fieldset = function(legendText, labelFor){ const fs = this.create('fieldset'); if(legendText){ - this.append( - fs, - (legendText instanceof HTMLElement) - ? legendText - : this.append(this.legend(legendText)) - ); + if(labelFor){ + this.append( + fs, + (legendText instanceof HTMLElement) + ? legendText + : this.append(this.legend(legendText, labelFor)) + ); + } else { + this.append( + fs, + (legendText instanceof HTMLElement) + ? legendText + : this.append(this.legend(legendText)) + ); + } } return fs; }; /** Returns a new LEGEND legend element. The given argument, if not falsy, is append()ed to the element (so it may be a string or DOM element. */ - dom.legend = function(legendText){ + dom.legend = function(legendText, labelFor){ const rc = this.create('legend'); - if(legendText) this.append(rc, legendText); + if(legendText) { + if(labelFor){ + legendText = this.label(labelFor,legendText) + } + this.append(rc, legendText); + } return rc; }; /** Appends each argument after the first to the first argument @@ -318,12 +332,16 @@ parent.appendChild(e); } return parent; }; - dom.input = function(type){ - return this.attr(this.create('input'), 'type', type); + dom.input = function(type, id){ + if(id){ + return this.attr(this.create('input'), 'type', type, 'id', id); + } else { + return this.attr(this.create('input'), 'type', type); + } }; /** Returns a new CHECKBOX input element. Usages: Index: src/fossil.page.brlist.js ================================================================== --- src/fossil.page.brlist.js +++ src/fossil.page.brlist.js @@ -10,11 +10,11 @@ * For the time being, continueing without 'const' and 'indexOf' * (but that may be reconsidered later). */ window.addEventListener( 'load', function() { -var submenu = document.querySelector("div.submenu"); +var submenu = document.querySelector("nav.submenu"); var anchor = document.createElement("A"); var brlistDataObj = document.getElementById("brlist-data"); var brlistDataTxt = brlistDataObj.textContent || brlistDataObj.innerText; var brlistData = JSON.parse(brlistDataTxt); anchor.classList.add("label"); Index: src/fossil.page.chat.js ================================================================== --- src/fossil.page.chat.js +++ src/fossil.page.chat.js @@ -64,10 +64,18 @@ /* This can inadvertently influence our flexbox layouts, so move it out of the way. */ D.append(document.body,dbg); } })(); + + /** + Selectors for elements which are direct children of the BODY + element but not part of the /chat UI. + */ + const selectorsOutsideChat = [ + 'body > *:not(.content)' + ]; const ForceResizeKludge = (function(){ /* Workaround for Safari mayhem regarding use of vh CSS units.... We tried to use vh units to set the content area size for the chat layout, but Safari chokes on that, so we calculate that height here: 85% when in "normal" mode and 95% in chat-only @@ -75,17 +83,14 @@ causing the input area to move off-screen. While we're here, we also use this to cap the max-height of the input field so that pasting huge text does not scroll the upper area of the input widget off-screen. */ - const elemsToCount = [ - document.querySelector('body > div.header'), - document.querySelector('body > div.mainmenu'), - document.querySelector('body > #hbdrop'), - document.querySelector('body > div.footer') - ]; - const contentArea = E1('div.content'); + const elemsToCount = document.querySelectorAll( + selectorsOutsideChat.join(',') + ); + const contentArea = E1('main.content'); const bcl = document.body.classList; const resized = function f(){ if(f.$disabled) return; const wh = window.innerHeight, com = bcl.contains('chat-only-mode'); @@ -137,11 +142,11 @@ btnAttach: E1('#chat-button-attach'), inputX: E1('#chat-input-field-x'), input1: E1('#chat-input-field-single'), inputM: E1('#chat-input-field-multi'), inputFile: E1('#chat-input-file'), - contentDiv: E1('div.content'), + contentDiv: E1('main.content'), viewConfig: E1('#chat-config'), viewPreview: E1('#chat-preview'), previewContent: E1('#chat-preview-content'), btnPreview: E1('#chat-button-preview'), views: document.querySelectorAll('.chat-view'), @@ -322,18 +327,11 @@ footer, leaving only the chat application visible to the user. */ chatOnlyMode: function f(yes){ if(undefined === f.elemsToToggle){ - f.elemsToToggle = []; - document.querySelectorAll( - ["body > div.header", - "body > div.mainmenu", - "body > div.footer", - "#debugMsg" - ].join(',') - ).forEach((e)=>f.elemsToToggle.push(e)); + f.elemsToToggle = document.querySelectorAll(selectorsOutsideChat.join(',')); } if(!arguments.length) yes = true; if(yes === this.isChatOnlyMode()) return this; if(yes){ D.addClass(f.elemsToToggle, 'hidden'); @@ -1724,16 +1722,18 @@ const label = op.label ? D.append(D.label(),op.label) : undefined; const labelWrapper = D.addClass(D.div(), 'label-wrapper'); var hint; if(op.hint){ - hint = D.append(D.addClass(D.label(),'hint'),op.hint); + hint = D.append(D.addClass(D.span(),'hint'),op.hint); } if(op.hasOwnProperty('select')){ const col0 = D.addClass(D.span(/*empty, but for spacing*/), 'toggle-wrapper'); D.append(menuEntry, labelWrapper, col0); + D.attr(op.select,'aria-label',op.hint); + D.attr(op.select,'title',op.hint); D.append(labelWrapper, op.select); if(hint) D.append(labelWrapper, hint); if(label) D.append(label); if(op.callback){ op.select.addEventListener('change', (ev)=>op.callback(ev), false); @@ -1745,12 +1745,11 @@ const key = op.boolValue; op.boolValue = ()=>Chat.settings.getBool(key); op.persistentSetting = key; } const check = op.checkbox - = D.attr(D.checkbox(1, op.boolValue()), - 'aria-label', op.label); + = D.attr(D.checkbox(1, op.boolValue())); const id = 'cfgopt'+f.$id; const col0 = D.addClass(D.span(), 'toggle-wrapper'); check.checked = op.boolValue(); op.checkbox = check; D.attr(check, 'id', id); Index: src/fossil.page.fileedit.js ================================================================== --- src/fossil.page.fileedit.js +++ src/fossil.page.fileedit.js @@ -392,24 +392,26 @@ selFiles = this.e.selectFiles = D.addClass(D.select(), 'file-list'), btnLoad = this.e.btnLoadFile = D.addClass(D.button("Load file"), "flex-shrink"), filesLabel = this.e.fileListLabel = - D.addClass(D.div(),'flex-shrink','file-list-label'), + D.addClass(D.label('editable-file-list'),'flex-shrink','file-list-label'), ciLabelWrapper = D.addClass( D.div(), 'flex-container','flex-row', 'flex-shrink', 'stretch', 'child-gap-small' ), btnReload = D.addClass( D.button('Reload'), 'flex-shrink' ), - ciLabel = this.e.ciListLabel = - D.addClass(D.span(),'flex-shrink','checkin-list-label') + ciLabel = this.e.ciListLabel = + D.addClass(D.label('open-leaf-list'),'flex-shrink','checkin-list-label') ; + D.attr(selCi, 'id',"open-leaf-list"); D.attr(selCi, 'title',"The list of opened leaves."); D.attr(selFiles, 'title', "The list of editable files for the selected checkin."); + D.attr(selFiles, 'id',"editable-file-list"); D.attr(btnLoad, 'title', "Load the selected file into the editor."); D.disable(selCi, selFiles, btnLoad); D.attr(selFiles, 'size', 12); D.append( @@ -472,13 +474,14 @@ 'Locally-edited files. Timestamps are the last local edit time. ', 'Only the ',P.config.defaultMaxStashSize,' most recent files ', 'are retained. Saving or reloading a file removes it from this list. ', D.append(D.code(),F.storage.storageImplName()), ' = ',F.storage.storageHelpDescription() - ); - - D.append(wrapper, "Local edits (", + ), + label = D.label('local-edits', "Local edits"); + D.attr(sel, 'id', 'local-edits'); + D.append(wrapper, label, " (", D.append(D.code(), F.storage.storageImplName()), "):", btnHelp, sel, btnClear); F.helpButtonlets.setup(btnHelp); Index: src/fossil.page.pikchrshow.js ================================================================== --- src/fossil.page.pikchrshow.js +++ src/fossil.page.pikchrshow.js @@ -146,10 +146,12 @@ const selectScript = P.e.selectScript = D.select(), cbAutoPreview = P.e.cbAutoPreview = D.attr(D.checkbox(true),'id', 'cb-auto-preview'), cbWrap = D.addClass(D.div(),'input-with-label') ; + D.attr(selectScript, 'aria-label', 'Example Scripts'); + D.attr(selectScript, 'title', 'Example Scripts'); D.append( cbWrap, selectScript, cbAutoPreview, D.label(cbAutoPreview,"Auto-preview?"), Index: src/fossil.page.pikchrshowasm.js ================================================================== --- src/fossil.page.pikchrshowasm.js +++ src/fossil.page.pikchrshowasm.js @@ -371,10 +371,12 @@ //////////////////////////////////////////////////////////// // Set up selection list of predefined scripts... if(true){ const selectScript = PS.e.selectScript = D.select(); + D.attr(selectScript, 'aria-label', 'Example Scripts'); + D.attr(selectScript, 'title', 'Example Scripts'); D.append(PS.e.zoneInputButtons, selectScript); PS.predefinedPiks.forEach(function(script,ndx){ const opt = D.option(script.code ? script.code.trim() :'', script.name); D.append(selectScript, opt); if(!ndx) selectScript.selectedIndex = 0 /*timing/ordering workaround*/; @@ -479,21 +481,17 @@ off-screen. */ const appViews = EAll('.app-view'); const elemsToCount = [ /* Elements which we need to always count in the visible body size. */ - E('body > div.header'), - E('body > div.mainmenu'), - E('body > div.footer') + ...EAll('body > *:not(.content)') ]; const resized = function f(){ if(f.$disabled) return; const wh = window.innerHeight; - var ht; - var extra = 0; - elemsToCount.forEach((e)=>e ? extra += F.dom.effectiveHeight(e) : false); - ht = wh - extra; + let ht = wh; + elemsToCount.forEach((e)=>ht -= F.dom.effectiveHeight(e)); appViews.forEach(function(e){ e.style.height = e.style.maxHeight = [ "calc(", (ht>=100 ? ht : 100), "px", " - 2em"/*fudge value*/,")" Index: src/fossil.page.wikiedit.js ================================================================== --- src/fossil.page.wikiedit.js +++ src/fossil.page.wikiedit.js @@ -550,14 +550,15 @@ this.e.select = sel; D.addClass(parentElem, 'WikiList'); D.clearElement(parentElem); D.append( parentElem, - D.append(D.fieldset("Select a page to edit"), + D.append(D.fieldset("Select a page to edit", 'select-page'), sel) ); D.attr(sel, 'size', 12); + D.attr(sel, 'id', 'select-page'); D.option(D.disable(D.clearElement(sel)), undefined, "Loading..."); /** Set up filter checkboxes for the various types of wiki pages... */ const fsFilter = D.addClass(D.fieldset("Page types"),"page-types-list"), @@ -627,13 +628,13 @@ D.append(D.span(), getEditMarker(getEditMarker.NEW,false)," = new/unsaved"), D.append(D.span(), getEditMarker(getEditMarker.MODIFIED,false)," = has local edits"), D.append(D.span(), getEditMarker(getEditMarker.DELETED,false)," = is empty (deleted)") ); - const fsNewPage = D.fieldset("Create new page"), + const fsNewPage = D.fieldset("Create new page", 'new-page'), fsNewPageBody = D.div(), - newPageName = D.input('text'), + newPageName = D.input('text', 'new-page'), newPageBtn = D.button("Add page locally") ; D.append(parentElem, fsNewPage); D.append(fsNewPage, fsNewPageBody); D.addClass(fsNewPageBody, 'flex-container', 'flex-column', 'new-page'); @@ -697,12 +698,14 @@ 'Locally-edited wiki pages. Timestamps are the last local edit time. ', 'Only the ',P.config.defaultMaxStashSize,' most recent pages ', 'are retained. Saving or reloading a file removes it from this list. ', D.append(D.code(),F.storage.storageImplName()), ' = ',F.storage.storageHelpDescription() - ); - D.append(wrapper, "Local edits (", + ), + label = D.label('local-edits', "Local edits"); + D.attr(sel, 'id', 'local-edits'); + D.append(wrapper, label, " (", D.append(D.code(), F.storage.storageImplName()), "):", btnHelp, sel, btnClear); F.helpButtonlets.setup(btnHelp); Index: src/hbmenu.js ================================================================== --- src/hbmenu.js +++ src/hbmenu.js @@ -24,11 +24,11 @@ ** Operation: ** ** This script request that the HTML contain two elements: ** ** <a id="hbbtn"> <--- The hamburger menu button -** <div id="hbdrop"> <--- Container for the hamburger menu +** <nav id="hbdrop"> <--- Container for the hamburger menu ** ** Bindings are made on hbbtn so that when it is clicked, the following ** happens: ** ** 1. An XHR is made to /sitemap?popup to fetch the HTML for the Index: src/hname.c ================================================================== --- src/hname.c +++ src/hname.c @@ -234,23 +234,18 @@ ** ** Usage: fossil hash-policy ?NEW-POLICY? ** ** Query or set the hash policy for the current repository. Available hash ** policies are as follows: -** ** sha1 New artifact names are created using SHA1 -** ** auto New artifact names are created using SHA1, but ** automatically change the policy to "sha3" when ** any SHA3 artifact enters the repository. -** ** sha3 New artifact names are created using SHA3, but ** older artifacts with SHA1 names may be reused. -** ** sha3-only Use only SHA3 artifact names. Do not reuse legacy ** SHA1 names. -** ** shun-sha1 Shun any SHA1 artifacts received by sync operations ** other than clones. Older legacy SHA1 artifacts are ** allowed during a clone. ** ** The default hash policy for existing repositories is "auto", which will Index: src/hook.c ================================================================== --- src/hook.c +++ src/hook.c @@ -197,49 +197,36 @@ ** COMMAND: hook* ** ** Usage: %fossil hook COMMAND ... ** ** Commands include: -** ** > fossil hook add --command COMMAND --type TYPE --sequence NUMBER -** ** Create a new hook. The --command and --type arguments are ** required. --sequence is optional. -** ** > fossil hook delete ID ... -** ** Delete one or more hooks by their IDs. ID can be "all" ** to delete all hooks. Caution: There is no "undo" for ** this operation. Deleted hooks are permanently lost. -** ** > fossil hook edit --command COMMAND --type TYPE --sequence NUMBER ID ... -** ** Make changes to one or more existing hooks. The ID argument ** is either a hook-id, or a list of hook-ids, or the keyword ** "all". For example, to disable hook number 2, use: ** ** fossil hook edit --type disabled 2 -** ** > fossil hook list -** ** Show all current hooks -** ** > fossil hook status -** ** Print the values of CONFIG table entries that are relevant to ** hook processing. Used for debugging. -** ** > fossil hook test [OPTIONS] ID +** Run the hook script given by ID for testing purposes. ** -** Run the hook script given by ID for testing purposes. ** Options: -** ** --dry-run Print the script on stdout rather than run it ** --base-rcvid N Pretend that the hook-last-rcvid value is N ** --new-rcvid M Pretend that the last rcvid valud is M ** --aux-file NAME NAME is substituted for %A in the script -** ** The --base-rcvid and --new-rcvid options are silently ignored if ** the hook type is not "after-receive". The default values for ** --base-rcvid and --new-rcvid cause the last receive to be processed. */ void hook_cmd(void){ Index: src/http.c ================================================================== --- src/http.c +++ src/http.c @@ -540,11 +540,10 @@ ** is written into that second file instead of being written on standard ** output. Use the "--out OUTPUT" option to specify an output file for ** a GET request where there is no PAYLOAD. ** ** Options: -** ** --compress Use ZLIB compression on the payload ** --mimetype TYPE Mimetype of the payload ** --out FILE Store the reply in FILE ** -v Verbose output ** --xfer PAYLOAD in a Fossil xfer protocol message Index: src/http_ssl.c ================================================================== --- src/http_ssl.c +++ src/http_ssl.c @@ -905,19 +905,16 @@ ** This command is used to view or modify the TLS (Transport Layer ** Security) configuration for Fossil. TLS (formerly SSL) is the ** encryption technology used for secure HTTPS transport. ** ** Sub-commands: -** ** remove-exception DOMAINS Remove TLS cert exceptions for the domains ** listed. Or remove them all if the --all ** option is specified. -** ** scrub ?--force? Remove all SSL configuration data from the ** repository. Use --force to omit the ** confirmation. -** ** show ?-v? Show the TLS configuration. Add -v to see ** additional explaination */ void test_tlsconfig_info(void){ const char *zCmd; Index: src/import.c ================================================================== --- src/import.c +++ src/import.c @@ -1661,26 +1661,26 @@ ** construct a new Fossil repository named by the NEW-REPOSITORY ** argument. If no input file is supplied the interchange format ** data is read from standard input. ** ** The following formats are currently understood by this command -** ** --git Import from the git-fast-export file format (default) +** ** Options: ** --import-marks FILE Restore marks table from FILE ** --export-marks FILE Save marks table to FILE ** --rename-master NAME Renames the master branch to NAME ** --use-author Uses author as the committer ** --attribute "EMAIL USER" Attribute commits to USER ** instead of Git committer EMAIL address -** ** --svn Import from the svnadmin-dump file format. The default ** behaviour (unless overridden by --flat) is to treat 3 ** folders in the SVN root as special, following the ** common layout of SVN repositories. These are (by ** default) trunk/, branches/ and tags/. The SVN --deltas ** format is supported but not required. +** ** Options: ** --trunk FOLDER Name of trunk folder ** --branches FOLDER Name of branches folder ** --tags FOLDER Name of tags folder ** --base PATH Path to project root in repository @@ -1687,11 +1687,10 @@ ** --flat The whole dump is a single branch ** --rev-tags Tag each revision, implied by -i ** --no-rev-tags Disables tagging effect of -i ** --rename-rev PAT Rev tag names, default "svn-rev-%" ** --ignore-tree DIR Ignores subtree rooted at DIR -** ** Common Options: ** -i|--incremental allow importing into an existing repository ** -f|--force overwrite repository if already exists ** -q|--quiet omit progress output ** --no-rebuild skip the "rebuilding metadata" step Index: src/info.c ================================================================== --- src/info.c +++ src/info.c @@ -187,11 +187,10 @@ ** ** Use the "finfo" command to get information about a specific ** file in a checkout. ** ** Options: -** ** -R|--repository REPO Extract info from repository REPO ** -v|--verbose Show extra information about repositories ** ** See also: [[annotate]], [[artifact]], [[finfo]], [[timeline]] */ @@ -1154,11 +1153,10 @@ ** ** Show the difference between two check-ins identified by the from= and ** to= query parameters. ** ** Query parameters: -** ** from=TAG Left side of the comparison ** to=TAG Right side of the comparison ** branch=TAG Show all changes on a particular branch ** diff=INTEGER 0: none, 1: unified, 2: side-by-side ** glob=STRING only diff files matching this glob @@ -1656,11 +1654,10 @@ ** SETTING: preferred-diff-type width=16 default=0 ** ** The preferred-diff-type setting determines the preferred diff format ** for web pages if the format is not otherwise specified, for example ** by a query parameter or cookie. Allowed values: -** ** 1 Unified diff ** 2 Side-by-side diff ** ** If this setting is omitted or has a value of 0 or less, then it ** is ignored. @@ -1707,11 +1704,10 @@ ** the names of two files within the check-in "ci" that are diffed. If the ** "ci" parameter is omitted, then the most recent check-in ("tip") is ** used. ** ** Additional parameters: -** ** dc=N Show N lines of context around each diff ** patch Use the patch diff format ** regex=REGEX Only show differences that match REGEX ** sbs=BOOLEAN Turn side-by-side diffs on and off (default: on) ** verbose=BOOLEAN Show more detail when describing artifacts @@ -1834,11 +1830,10 @@ ** WEBPAGE: raw ** URL: /raw/ARTIFACTID ** URL: /raw?ci=BRANCH&filename=NAME ** ** Additional query parameters: -** ** m=MIMETYPE The mimetype is MIMETYPE ** at=FILENAME Content-disposition; attachment; filename=FILENAME; ** ** Return the uninterpreted content of an artifact. Used primarily ** to view artifacts that are images. @@ -2093,11 +2088,10 @@ ** ** Show the complete content of a file identified by ARTIFACTID ** as preformatted text. ** ** Other parameters: -** ** verbose Show more detail when describing the object */ void hexdump_page(void){ int rid; Blob content; @@ -2358,23 +2352,22 @@ ** /artifact/HASH ** /whatis/HASH ** /file/NAME ** ** Additional query parameters: -** -** ln - show line numbers -** ln=N - highlight line number N -** ln=M-N - highlight lines M through N inclusive -** ln=M-N+Y-Z - highlight lines M through N and Y through Z (inclusive) -** verbose - show more detail in the description -** download - redirect to the download (artifact page only) -** name=NAME - filename or hash as a query parameter -** filename=NAME - alternative spelling for "name=" -** fn=NAME - alternative spelling for "name=" -** ci=VERSION - The specific check-in to use with "name=" to -** identify the file. -** txt - Force display of unformatted source text +** ln show line numbers +** ln=N highlight line number N +** ln=M-N highlight lines M through N inclusive +** ln=M-N+Y-Z highlight lines M through N and Y through Z (inclusive) +** verbose show more detail in the description +** download redirect to the download (artifact page only) +** name=NAME filename or hash as a query parameter +** filename=NAME alternative spelling for "name=" +** fn=NAME alternative spelling for "name=" +** ci=VERSION The specific check-in to use with "name=" to +** identify the file. +** txt Force display of unformatted source text ** ** The /artifact page show the complete content of a file ** identified by HASH. The /whatis page shows only a description ** of how the artifact is used. The /file page shows the most recent ** version of the file or directory called NAME, or a list of the @@ -3105,15 +3098,13 @@ ** Edit a check-in. (Check-ins are immutable and do not really change. ** This page really creates supplemental tags that affect the display ** of the check-in.) ** ** Query parameters: -** ** rid=INTEGER Record ID of the check-in to edit (REQUIRED) ** ** POST parameters after pressing "Preview", "Cancel", or "Apply": -** ** c=TEXT New check-in comment ** u=TEXT New user name ** newclr Apply a background color ** clr=TEXT New background color (only if newclr) ** pclr Propagate new background color (only if newclr) @@ -3123,11 +3114,10 @@ ** newbr Put the check-in on a new branch ** brname=TEXT Name of the new branch (only if newbr) ** close Close this check-in ** hide Hide this check-in ** cNNN Cancel tag with tagid=NNN -** ** cancel Cancel the edit. Return to the check-in view ** preview Show a preview of the edited check-in comment ** apply Apply changes */ void ci_edit_page(void){ @@ -3280,29 +3270,30 @@ form_begin(0, "%R/ci_edit"); login_insert_csrf_secret(); @ <div><input type="hidden" name="r" value="%s(zUuid)" /> @ <table border="0" cellspacing="10"> - @ <tr><th align="right" valign="top">User:</th> + @ <tr><th align="right" valign="top"><label for="u">User:</label></th> @ <td valign="top"> - @ <input type="text" name="u" size="20" value="%h(zNewUser)" /> + @ <input type="text" id="u" name="u" size="20" value="%h(zNewUser)" /> @ </td></tr> - @ <tr><th align="right" valign="top">Comment:</th> + @ <tr><th align="right" valign="top"><label for="c">Comment:</label></th> @ <td valign="top"> - @ <textarea name="c" rows="10" cols="80">%h(zNewComment)</textarea> + @ <textarea id="c" name="c" rows="10" cols="80">%h(zNewComment)</textarea> @ </td></tr> - @ <tr><th align="right" valign="top">Check-in Time:</th> + @ <tr><th align="right" valign="top"><label for="dt">Check-in Time:</label></th> @ <td valign="top"> - @ <input type="text" name="dt" size="20" value="%h(zNewDate)" /> + @ <input type="text" id="dt" name="dt" size="20" value="%h(zNewDate)" /> @ </td></tr> if( zChngTime ){ - @ <tr><th align="right" valign="top">Timestamp of this change:</th> + @ <tr><th align="right" valign="top"> + @ <label for="chngtime">Timestamp of this change:</label></th> @ <td valign="top"> - @ <input type="text" name="chngtime" size="20" value="%h(zChngTime)" /> + @ <input type="text" id="chngtime" name="chngtime" size="20" value="%h(zChngTime)" /> @ </td></tr> } @ <tr><th align="right" valign="top">Background Color:</th> @ <td valign="top"> @@ -3325,13 +3316,13 @@ @ </td></tr> @ <tr><th align="right" valign="top">Tags:</th> @ <td valign="top"> @ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) /> - @ Add the following new tag name to this check-in:</label> + @ Add the following</label> <label>new tag name to this check-in: @ <input type="text" size='15' name="tagname" value="%h(zNewTag)" \ - @ id='tagname' /> + @ id='tagname' /></label> zBranchName = db_text(0, "SELECT value FROM tagxref, tag" " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" " AND tagxref.tagid=%d", rid, TAG_BRANCH); db_prepare(&q, "SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag" @@ -3380,13 +3371,13 @@ } @ <tr><th align="right" valign="top">Branching:</th> @ <td valign="top"> @ <label><input id="newbr" type="checkbox" name="newbr" \ @ data-branch='%h(zBranchName)'%s(zNewBrFlag) /> - @ Make this check-in the start of a new branch named:</label> + @ Make this check-in the start of a</label> <label>new branch named: @ <input id="brname" type="text" style="width:15;" name="brname" \ - @ value="%h(zNewBranch)" /></td></tr> + @ value="%h(zNewBranch)" /></label></td></tr> if( !fHasHidden ){ @ <tr><th align="right" valign="top">Branch Hiding:</th> @ <td valign="top"> @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag) /> @ Hide branch @@ -3471,11 +3462,10 @@ ** Usage: %fossil amend HASH OPTION ?OPTION ...? ** ** Amend the tags on check-in HASH to change how it displays in the timeline. ** ** Options: -** ** --author USER Make USER the author for check-in ** -m|--comment COMMENT Make COMMENT the check-in comment ** -M|--message-file FILE Read the amended comment from FILE ** -e|--edit-comment Launch editor to revise comment ** --date DATETIME Make DATETIME the check-in time @@ -3813,11 +3803,10 @@ ** If VERSION and the found ancestor refer to the same commit, the last two ** components are omitted, unless --long is provided. When no fitting tagged ** ancestor is found, show only the short hash of VERSION. ** ** Options: -** ** --digits Display so many hex digits of the hash ** (default: the larger of 6 and the 'hash-digit' setting) ** -d|--dirty Show whether there are changes to be committed ** --long Always show all three components ** --match GLOB Consider only non-propagating tags matching GLOB Index: src/interwiki.c ================================================================== --- src/interwiki.c +++ src/interwiki.c @@ -160,25 +160,19 @@ ** ** Usage: %fossil interwiki COMMAND ... ** ** Manage the "intermap" that defines the mapping from interwiki tags ** to complete URLs for interwiki links. -** ** > fossil interwiki delete TAG ... -** ** Delete one or more interwiki maps. -** ** > fossil interwiki edit TAG --base URL --hash PATH --wiki PATH -** ** Create an interwiki referenced call TAG. The base URL is ** the --base option, which is required. The --hash and --wiki ** paths are optional. The TAG must be lower-case alphanumeric ** and must be unique. A new entry is created if it does not ** already exit. -** ** > fossil interwiki list -** ** Show all interwiki mappings. */ void interwiki_cmd(void){ const char *zCmd; int nCmd; @@ -397,26 +391,26 @@ @ <p class="error">%h(zErr)</p> } @ <form method="POST" action="%R/intermap"> login_insert_csrf_secret(); @ <table border="0"> - @ <tr><td class="form_label" id="imtag">Tag:</td> - @ <td><input type="text" id="tag" aria-labeledby="imtag" name="tag" \ + @ <tr><td class="form_label"><label for="tag">Tag:</label></td> + @ <td><input type="text" id="tag" name="tag" \ @ size="15" value="%h(zTag)"></td></tr> - @ <tr><td class="form_label" id="imbase">Base URL:</td> - @ <td><input type="text" id="base" aria-labeledby="imbase" name="base" \ + @ <tr><td class="form_label"><label for="base">Base URL:</label></td> + @ <td><input type="text" id="base" name="base" \ @ size="70" value="%h(zBase)"></td></tr> - @ <tr><td class="form_label" id="imhash">Hash-path:</td> - @ <td><input type="text" id="hash" aria-labeledby="imhash" name="hash" \ + @ <tr><td class="form_label"><label for="hash">Hash-path:</label></td> + @ <td><input type="text" id="hash" name="hash" \ @ size="20" value="%h(zHash)"> @ (use "<tt>/info/</tt>" when the target is Fossil)</td></tr> - @ <tr><td class="form_label" id="imwiki">Wiki-path:</td> - @ <td><input type="text" id="wiki" aria-labeledby="imwiki" name="wiki" \ + @ <tr><td class="form_label"><label for="wiki">Wiki-path:</label></td> + @ <td><input type="text" id="wiki" name="wiki" \ @ size="20" value="%h(zWiki)"> @ (use "<tt>/wiki?name=</tt>" when the target is Fossil)</td></tr> @ <tr><td></td> @ <td><input type="submit" name="submit" value="Apply Changes"></td></tr> @ </table> @ </form> style_finish_page(); } Index: src/login.c ================================================================== --- src/login.c +++ src/login.c @@ -534,11 +534,10 @@ ** WEBPAGE: login ** WEBPAGE: logout ** WEBPAGE: my ** ** The login/logout page. Parameters: -** ** g=URL Jump back to this URL after login completes ** anon The g=URL is not accessible by "nobody" but is ** accessible by "anonymous" */ void login_page(void){ @@ -736,17 +735,17 @@ @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead. } @ </span></td></tr> } @ <tr> - @ <td class="form_label" id="userlabel1">User ID:</td> - @ <td><input type="text" id="u" aria-labelledby="userlabel1" name="u" \ + @ <td class="form_label" id="userlabel1"><label for="u">User ID:</label></td> + @ <td><input type="text" id="u" id="u" name="u" \ @ size="30" value="%s(anonFlag?"anonymous":"")"></td> @ </tr> @ <tr> - @ <td class="form_label" id="pswdlabel">Password:</td> - @ <td><input aria-labelledby="pswdlabel" type="password" id="p" \ + @ <td class="form_label" id="pswdlabel"><label for="p">Password:</label></td> + @ <td><input type="password" id="p" \ @ name="p" value="" size="30" />\ if( zAnonPw && !noAnon ){ captcha_speakit_button(uSeed, "Speak password for \"anonymous\""); } @ </td> @@ -805,18 +804,19 @@ char *zRPW = fossil_random_password(12); @ <hr> @ <p>Change Password for user <b>%h(g.zLogin)</b>:</p> form_begin(0, "%R/login"); @ <table> - @ <tr><td class="form_label" id="oldpw">Old Password:</td> - @ <td><input aria-labelledby="oldpw" type="password" name="p" \ + @ <tr><td class="form_label" id="oldpw"><label for="p">Old Password:</label></td> + @ <td><input type="password" id="p" name="p" \ @ size="30"/></td></tr> - @ <tr><td class="form_label" id="newpw">New Password:</td> - @ <td><input aria-labelledby="newpw" type="password" name="n1" \ + @ <tr><td class="form_label" id="newpw"><label for="n1">New Password:</label></td> + @ <td><input type="password" id="n1" name="n1" \ @ size="30" /> Suggestion: %z(zRPW)</td></tr> - @ <tr><td class="form_label" id="reppw">Repeat New Password:</td> - @ <td><input aria-labledby="reppw" type="password" name="n2" \ + @ <tr><td class="form_label" id="reppw"> + @ <label for="n2">Repeat New Password:</label></td> + @ <td><input type="password" id="n2" name="n2" \ @ size="30" /></td></tr> @ <tr><td></td> @ <td><input type="submit" value="Change Password" /></td></tr> @ </table> @ </form> @@ -1781,46 +1781,49 @@ @ <input type="hidden" name="g" value="%h(P("g"))" /> } @ <p><input type="hidden" name="captchaseed" value="%u(uSeed)" /> @ <table class="login_out"> @ <tr> - @ <td class="form_label" align="right" id="uid">User ID:</td> - @ <td><input aria-labelledby="uid" type="text" name="u" \ + @ <td class="form_label" align="right" id="uid"><label for="u">User ID:</label></td> + @ <td><input type="text" id="u" name="u" \ @ value="%h(zUserID)" size="30"></td> @ if( iErrLine==1 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="dpyname">Display Name:</td> - @ <td><input aria-labelledby="dpyname" type="text" name="dn" \ + @ <td class="form_label" align="right" id="dpyname"> + @ <label for="dn">Display Name:</label></td> + @ <td><input type="text" id="dn" name="dn" \ @ value="%h(zDName)" size="30"></td> @ </tr> if( iErrLine==2 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ </tr> @ <tr> - @ <td class="form_label" align="right" id="emaddr">Email Address:</td> - @ <td><input aria-labelledby="emaddr" type="text" name="ea" \ + @ <td class="form_label" align="right" id="emaddr"> + @ <label for="ea">Email Address:</label></td> + @ <td><input type="text" id="ea" name="ea" \ @ value="%h(zEAddr)" size="30"></td> @ </tr> if( iErrLine==3 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } if( canDoAlerts ){ int a = atoi(PD("alerts","1")); @ <tr> - @ <td class="form_label" align="right" id="emalrt">Email Alerts?</td> - @ <td><select aria-labelledby="emalrt" size='1' name='alerts'> + @ <td class="form_label" align="right" id="emalrt"> + @ <label for="alerts">Email Alerts?</label></td> + @ <td><select size='1' id='alerts' name='alerts'> @ <option value="1" %s(a?"selected":"")>Yes</option> @ <option value="0" %s(!a?"selected":"")>No</option> @ </select></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="pswd">Password:</td> - @ <td><input aria-labelledby="pswd" type="password" name="p" \ + @ <td class="form_label" align="right" id="pswd"><label for="p">Password:</label></td> + @ <td><input type="password" id="p" name="p" \ @ value="%h(zPasswd)" size="30"> \ if( zPasswd[0]==0 ){ char *zRPW = fossil_random_password(12); @ Password suggestion: %z(zRPW)</td> }else{ @@ -1829,20 +1832,20 @@ @ <tr> if( iErrLine==4 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="pwcfrm">Confirm:</td> - @ <td><input aria-labelledby="pwcfrm" type="password" name="cp" \ + @ <td class="form_label" align="right" id="pwcfrm"><label for="cp">Confirm:</label></td> + @ <td><input type="password" id="cp" name="cp" \ @ value="%h(zConfirm)" size="30"></td> @ </tr> if( iErrLine==5 ){ @ <tr><td><td><span class='loginError'>↑ %h(zErr)</span></td></tr> } @ <tr> - @ <td class="form_label" align="right" id="cptcha">Captcha:</td> - @ <td><input type="text" name="captcha" aria-labelledby="cptcha" \ + @ <td class="form_label" align="right" id="cptcha"><label for="captcha">Captcha:</label></td> + @ <td><input type="text" id="captcha" name="captcha" \ @ value="%h(captchaIsCorrect?zDecoded:"")" size="30"> captcha_speakit_button(uSeed, "Speak the captcha text"); @ </td> @ </tr> if( iErrLine==6 ){ @@ -2122,31 +2125,24 @@ ** ** Usage: %fossil login-group ?SUBCOMMAND? ?OPTIONS? ** ** Run various subcommands to manage login-group related settings of the open ** repository or of the repository identified by the -R or --repository option. -** ** > fossil login-group ?-R REPO? -** ** Show the login-group to which REPO, or if invoked from within a checkout ** the repository on which the current checkout is based, belongs. -** ** > fossil login-group join ?-R? REPO ?--name NAME? -** ** This subcommand must be invoked from within a checkout to either: add ** the open repository to the login group that REPO is a member, in which ** case the optional "--name" argument is not required; or create a new ** login group between the open repository and REPO, in which case the new ** group NAME is determined by the mandatory "--name" option. REPO may be ** specified with or without the -R flag. -** ** > fossil login-group leave ?-R REPO? -** ** Take the repository REPO, or if invoked from within a checkout the ** repository on which the current checkout is based, out of whatever ** login group it is a member. -** ** About Login Groups: ** ** A login-group is a set of repositories that share user credentials. ** If a user is logged into one member of the group, then that user can ** access any other group member as long as they have an entry in the USER Index: src/main.c ================================================================== --- src/main.c +++ src/main.c @@ -1324,11 +1324,10 @@ ** WEBPAGE: version ** ** Show the version information for Fossil. ** ** Query parameters: -** ** verbose Show details */ void test_version_page(void){ Blob versionInfo; int verboseFlag; @@ -2224,65 +2223,49 @@ ** environment variable is set to "CGI", which should always be the ** case for CGI scripts run by a webserver. Fossil ignores any lines ** that begin with "#". ** ** The following control lines are recognized: -** ** repository: PATH Name of the Fossil repository -** ** directory: PATH Name of a directory containing many Fossil ** repositories whose names all end with ".fossil". ** There should only be one of "repository:" ** or "directory:" -** ** notfound: URL When in "directory:" mode, redirect to ** URL if no suitable repository is found. -** ** repolist When in "directory:" mode, display a page ** showing a list of available repositories if ** the URL is "/". -** ** localauth Grant administrator privileges to connections ** from 127.0.0.1 or ::1. -** ** skin: LABEL Use the built-in skin called LABEL rather than ** the default. If there are no skins called LABEL ** then this line is a no-op. -** ** files: GLOBLIST GLOBLIST is a comma-separated list of GLOB ** patterns that specify files that can be ** returned verbatim. This feature allows Fossil ** to act as a web server returning static ** content. -** ** setenv: NAME VALUE Set environment variable NAME to VALUE. Or ** if VALUE is omitted, unset NAME. -** ** HOME: PATH Shorthand for "setenv: HOME PATH" -** ** cgi-debug: FILE Causing debugging information to be written ** into FILE. -** ** errorlog: FILE Warnings, errors, and panics written to FILE. -** ** timeout: SECONDS Do not run for longer than SECONDS. The default ** timeout is FOSSIL_DEFAULT_TIMEOUT (600) seconds. -** ** extroot: DIR Directory that is the root of the sub-CGI tree ** on the /ext page. -** ** redirect: REPO URL Extract the "name" query parameter and search ** REPO for a check-in or ticket that matches the ** value of "name", then redirect to URL. There ** can be multiple "redirect:" lines that are ** processed in order. If the REPO is "*", then ** an unconditional redirect to URL is taken. -** ** jsmode: VALUE Specifies the delivery mode for JavaScript ** files. See the help text for the --jsmode ** flag of the http command. -** ** mainmenu: FILE Override the mainmenu config setting with the ** contents of the given file. ** ** Most CGI files contain only a "repository:" line. It is uncommon to ** use any other option. @@ -2609,11 +2592,10 @@ ** WEBPAGE: test-pid ** ** Return the process identifier of the running Fossil server instance. ** ** Query parameters: -** ** usepidkey When present and available, also return the ** address and size, within this server process, ** of the saved database encryption key. This ** is only supported when using SEE on Windows. */ @@ -3424,11 +3406,10 @@ /* ** WEBPAGE: test-warning ** ** Test error and warning log operation. This webpage is accessible to ** the administrator only. -** ** case=1 Issue a fossil_warning() while generating the page. ** case=2 Extra db_begin_transaction() ** case=3 Extra db_end_transaction() ** case=4 Error during SQL processing ** case=5 Call the segfault handler Index: src/manifest.c ================================================================== --- src/manifest.c +++ src/manifest.c @@ -1290,11 +1290,10 @@ ** artifacts and report any errors. Run this test command on historical ** repositories after making any changes to the manifest_parse() ** implementation to confirm that the changes did not break anything. ** ** Options: -** ** --limit N Parse no more than N artifacts before stopping ** --wellformed Use all BLOB table entries as input, not just ** those entries that are believed to be valid ** artifacts, and verify that the result the ** manifest_is_well_formed() agrees with the Index: src/merge.c ================================================================== --- src/merge.c +++ src/merge.c @@ -295,41 +295,31 @@ ** Only file content is merged. The result continues to use the ** file and directory names from the current checkout even if those ** names might have been changed in the branch being merged in. ** ** Options: -** ** --backout Do a reverse cherrypick merge against VERSION. ** In other words, back out the changes that were ** added by VERSION. -** ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead ** of the nearest common ancestor. This allows ** a sequence of changes in a branch to be merged ** without having to merge the entire branch. -** ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary ** and do not try to merge parallel changes. This ** option overrides the "binary-glob" setting. -** ** --cherrypick Do a cherrypick merge VERSION into the current ** checkout. A cherrypick merge pulls in the changes ** of the single check-in VERSION, rather than all ** changes back to the nearest common ancestor. -** ** -f|--force Force the merge even if it would be a no-op. -** ** --force-missing Force the merge even if there is missing content. -** ** --integrate Merged branch will be closed when committing. -** ** -K|--keep-merge-files On merge conflict, retain the temporary files ** used for merging, named *-baseline, *-original, ** and *-merge. -** ** -n|--dry-run If given, display instead of run actions -** ** -v|--verbose Show additional details of the merge */ void merge_cmd(void){ int vid; /* Current version "V" */ int mid; /* Version we are merging from "M" */ Index: src/name.c ================================================================== --- src/name.c +++ src/name.c @@ -1026,11 +1026,10 @@ ** Resolve the symbol NAME into its canonical artifact hash ** artifact name and provide a description of what role that artifact ** plays. ** ** Options: -** ** --type TYPE Only find artifacts of TYPE (one of: 'ci', 't', ** 'w', 'g', or 'e') ** -v|--verbose Provide extra information (such as the RID) */ void whatis_cmd(void){ @@ -1442,12 +1441,13 @@ } /* ** WEBPAGE: bloblist ** -** Return a page showing all artifacts in the repository. Query parameters: +** Return a page showing all artifacts in the repository. ** +** Query parameters: ** n=N Show N artifacts ** s=S Start with artifact number S ** priv Show only unpublished or private artifacts ** phan Show only phantom artifacts ** hclr Color code hash types (SHA1 vs SHA3) @@ -1660,11 +1660,10 @@ /* ** WEBPAGE: bigbloblist ** ** Return a page showing the largest artifacts in the repository in order ** of decreasing size. -** ** n=N Show the top N artifacts */ void bigbloblist_page(void){ Stmt q; int n = atoi(PD("n","250")); Index: src/patch.c ================================================================== --- src/patch.c +++ src/patch.c @@ -837,71 +837,54 @@ ** ** This command is used to create, view, and apply Fossil binary patches. ** A Fossil binary patch is a single (binary) file that captures all of the ** uncommitted changes of a check-out. Use Fossil binary patches to transfer ** proposed or incomplete changes between machines for testing or analysis. -** ** > fossil patch create [DIRECTORY] FILENAME -** ** Create a new binary patch in FILENAME that captures all uncommitted ** changes in the check-out at DIRECTORY, or the current directory if ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch ** is written to standard output. -** -** -f|--force Overwrite an existing patch with the same name. -** -** > fossil patch apply [DIRECTORY] FILENAME -** -** Apply the changes in FILENAME to the check-out at DIRECTORY, or -** in the current directory if DIRECTORY is omitted. Options: -** +** -f|--force Overwrite an existing patch with the same name. +** > fossil patch apply [DIRECTORY] FILENAME +** Apply the changes in FILENAME to the check-out at DIRECTORY, or +** in the current directory if DIRECTORY is omitted. +** +** Options: ** -f|--force Apply the patch even though there are unsaved ** changes in the current check-out. Unsaved changes ** are reverted and permanently lost. ** -n|--dry-run Do nothing, but print what would have happened. ** -v|--verbose Extra output explaining what happens. -** ** > fossil patch diff [DIRECTORY] FILENAME -** ** Show a human-readable diff for the patch. All the usual ** diff flags described at "fossil help diff" apply. In addition: -** ** -f|--force Continue trying to perform the diff even if ** baseline information is missing from the current ** repository -** ** > fossil patch push REMOTE-CHECKOUT -** ** Create a patch for the current check-out, transfer that patch to ** a remote machine (using ssh) and apply the patch there. The ** REMOTE-CHECKOUT is in one of the following formats: -** ** * DIRECTORY ** * HOST:DIRECTORY ** * USER@HOST:DIRECTORY ** ** Command-line options: -** ** -f|--force Apply the patch even though there are unsaved ** changes in the current check-out. Unsaved ** changes will be reverted and then the patch is ** applied. ** --fossilcmd EXE Name of the "fossil" executable on the remote ** -n|--dry-run Do nothing, but print what would have happened. ** -v|--verbose Extra output explaining what happens. -** -** ** > fossil patch pull REMOTE-CHECKOUT -** ** Like "fossil patch push" except that the transfer is from remote ** to local. All the same command-line options apply. -** ** > fossil patch view FILENAME -** ** View a summary of the changes in the binary patch FILENAME. ** Use "fossil patch diff" for detailed patch content. -** ** -v|--verbose Show extra detail about the patch. ** */ void patch_cmd(void){ const char *zCmd; Index: src/piechart.c ================================================================== --- src/piechart.c +++ src/piechart.c @@ -315,14 +315,14 @@ piechart_render(width,height, PIE_OTHER|PIE_PERCENT); @ </svg> @ <hr /> } @ <form method="POST" action='%R/test-piechart'> - @ <p>Comma-separated list of slice widths:<br /> - @ <input type='text' name='data' size='80' value='%h(zData)'/><br /> - @ Width: <input type='text' size='8' name='width' value='%d(width)'/> - @ Height: <input type='text' size='8' name='height' value='%d(height)'/><br /> + @ <p><label>Comma-separated list of slice widths:<br /> + @ <input type='text' name='data' size='80' value='%h(zData)'/></label><br /> + @ <label>Width: <input type='text' size='8' name='width' value='%d(width)'/></label> + @ <label>Height: <input type='text' size='8' name='height' value='%d(height)'/></label><br /> @ <input type='submit' value='Draw The Pie Chart'/> @ </form> @ <p>Interesting test cases: @ <ul> @ <li> <a href='test-piechart?data=44,2,2,2,2,2,3,2,2,2,2,2,44'>Case 1</a> Index: src/pikchrshow.c ================================================================== --- src/pikchrshow.c +++ src/pikchrshow.c @@ -287,11 +287,11 @@ "arrow <-> down from last box.s\n" "box same \"Pikchr\" \"Formatter\" \"(pikchr.c)\" fit\n"; } style_header("PikchrShow Client/Server"); CX("<style>"); { - CX("div.content { padding-top: 0.5em }\n"); + CX("main.content { padding-top: 0.5em }\n"); CX("#sbs-wrapper {" "display: flex; flex-direction: column;" "}\n"); CX("#sbs-wrapper > * {" "margin: 0 0.25em 0.5em 0; flex: 1 10 auto;" @@ -341,12 +341,12 @@ CX("body.pikchrshow .v-align-middle{" "vertical-align: middle" "}\n"); CX(".dragover {border: 3px dotted rgba(0,255,0,0.6)}\n"); } CX("</style>"); - CX("<div>Input pikchr code and tap Preview (or Shift-Enter) to render " - "it. <a href='?wasm'>Switch to WASM mode</a>.</div>"); + CX("<div><label for='content'>Input pikchr code</label> and tap Preview (or " + "Shift-Enter) to render it. <a href='?wasm'>Switch to WASM mode</a>.</div>"); CX("<div id='sbs-wrapper'>"); { CX("<div id='pikchrshow-form'>"); { CX("<textarea id='content' name='content' rows='15'>" "%s</textarea>",zContent/*safe-for-%s*/); CX("<div id='pikchrshow-controls'>"); { @@ -525,46 +525,32 @@ ** an SVG graphic. The INFILE and OUTFILE options default to stdin ** resp. stdout, and the names "-" can be used as aliases for those ** streams. ** ** Options: -** ** -div On success, add a DIV wrapper around the ** resulting SVG output which limits its max-width to ** its computed maximum ideal size. -** ** -div-indent Like -div but indent the div. -** ** -div-center Like -div but center the div. -** ** -div-left Like -div but float the div left. -** ** -div-right Like -div but float the div right. -** ** -div-toggle Set the 'toggle' CSS class on the div (used by the ** JavaScript-side post-processor). -** ** -div-source Set the 'source' CSS class on the div, which tells ** CSS to hide the SVG and reveal the source by default. -** ** -src Store the input pikchr's source code in the output as ** a separate element adjacent to the SVG one. Implied ** by -div-source. -** -** ** -th Process the input using TH1 before passing it to pikchr. -** ** -th-novar Disable $var and $<var> TH1 processing. Use this if the ** pikchr script uses '$' for its own purposes and that ** causes issues. This only affects parsing of '$' outside ** of TH1 script blocks. Code in such blocks is unaffected. -** ** -th-nosvg When using -th, output the post-TH1'd script ** instead of the pikchr-rendered output. -** ** -th-trace Trace TH1 execution (for debugging purposes). -** ** ** The -div-indent/center/left/right flags may not be combined. ** ** TH1-related Notes and Caveats: ** Index: src/purge.c ================================================================== --- src/purge.c +++ src/purge.c @@ -455,60 +455,41 @@ ** leave your repository in a goofy state. Know what you are doing! ** Make a backup of your repository before using this command! ** ** FURTHER WARNING: This command is a work-in-progress and may yet ** contain bugs. -** ** > fossil purge artifacts HASH... ?OPTIONS? -** ** Move arbitrary artifacts identified by the HASH list into the ** graveyard. -** ** > fossil purge cat HASH... -** ** Write the content of one or more artifacts in the graveyard onto ** standard output. -** ** > fossil purge checkins TAGS... ?OPTIONS? -** ** Move the check-ins or branches identified by TAGS and all of ** their descendants out of the repository and into the graveyard. ** If TAGS includes a branch name then it means all the check-ins ** on the most recent occurrence of that branch. -** ** > fossil purge files NAME ... ?OPTIONS? -** ** Move all instances of files called NAME into the graveyard. ** NAME should be the name of the file relative to the root of the ** repository. If NAME is a directory, then all files within that ** directory are moved. -** ** > fossil purge list|ls ?-l? -** ** Show the graveyard of prior purges. The -l option gives more ** detail in the output. -** ** > fossil purge obliterate ID... ?--force? -** ** Remove one or more purge events from the graveyard. Once a purge ** event is obliterated, it can no longer be undone. The --force ** option suppresses the confirmation prompt. -** ** > fossil purge tickets NAME ... ?OPTIONS? -** ** TBD... -** ** > fossil purge undo ID -** ** Restore the content previously removed by purge ID. -** ** > fossil purge wiki NAME ... ?OPTIONS? -** ** TBD... ** ** COMMON OPTIONS: -** ** --explain Make no changes, but show what would happen ** --dry-run An alias for --explain */ void purge_cmd(void){ int purgeFlags = PURGE_MOVETO_GRAVEYARD | PURGE_PRINT_SUMMARY; Index: src/regexp.c ================================================================== --- src/regexp.c +++ src/regexp.c @@ -809,11 +809,10 @@ ** ** Run a regular expression match over the named disk files, or against ** standard input if no disk files are named on the command-line. ** ** Options: -** ** -i|--ignore-case Ignore case */ void re_test_grep(void){ ReCompiled *pRe; const char *zErr; @@ -853,11 +852,10 @@ ** ** For details of the supported regular expression dialect, see ** https://fossil-scm.org/fossil/doc/trunk/www/grep.md ** ** Options: -** ** -c|--count Suppress normal output; instead print a count ** of the number of matching files ** -i|--ignore-case Ignore case ** -l|--files-with-matches List only hash for each match ** --once Stop searching after the first match Index: src/report.c ================================================================== --- src/report.c +++ src/report.c @@ -380,12 +380,12 @@ /* ** WEBPAGE: rptnew ** WEBPAGE: rptedit ** ** Create (/rptnew) or edit (/rptedit) a ticket report format. -** Query parameters: ** +** Query parameters: ** rn=N Ticket report number. (required) ** t=TITLE Title of the report format ** w=USER Owner of the report format ** s=SQL SQL text used to implement the report ** k=KEY Color key @@ -511,28 +511,30 @@ if( zErr ){ @ <blockquote class="reportError">%h(zErr)</blockquote> } @ <form action="rptedit" method="post"><div> @ <input type="hidden" name="rn" value="%d(rn)" /> - @ <p>Report Title:<br /> - @ <input type="text" name="t" value="%h(zTitle)" size="60" /></p> - @ <p>Enter a complete SQL query statement against the "TICKET" table:<br /> - @ <textarea name="s" rows="20" cols="80">%h(zSQL)</textarea> + @ <p><label for="t">Report Title:</label><br /> + @ <input type="text" id="t" name="t" value="%h(zTitle)" size="60" /></p> + @ <p><label for="s"> + @ Enter a complete SQL query statement against the "TICKET" table:</label><br /> + @ <textarea id="s" name="s" rows="20" cols="80">%h(zSQL)</textarea> @ </p> login_insert_csrf_secret(); if( g.perm.Admin ){ - @ <p>Report owner: - @ <input type="text" name="w" size="20" value="%h(zOwner)" /> + @ <p><label for="w">Report owner:</label> + @ <input type="text" id="w" name="w" size="20" value="%h(zOwner)" /> @ </p> } else { @ <input type="hidden" name="w" value="%h(zOwner)" /> } - @ <p>Enter an optional color key in the following box. (If blank, no + @ <p><label for="k"> + @ Enter an optional color key in the following box.</label> (If blank, no @ color key is displayed.) Each line contains the text for a single @ entry in the key. The first token of each line is the background @ color for that line.<br /> - @ <textarea name="k" rows="8" cols="50">%h(zClrKey)</textarea> + @ <textarea id="k" name="k" rows="8" cols="50">%h(zClrKey)</textarea> @ </p> @ <p><label><input type="checkbox" name="dflt" %s(dflt?"checked":"")> \ @ Make this the default report</label></p> if( !g.perm.Admin && fossil_strcmp(zOwner,g.zLogin)!=0 ){ @ <p>This report format is owned by %h(zOwner). You are not allowed @@ -560,11 +562,11 @@ zSchema = db_text(0,"SELECT sql FROM sqlite_schema WHERE name='ticket'"); if( zSchema==0 ){ zSchema = db_text(0,"SELECT sql FROM repository.sqlite_schema" " WHERE name='ticket'"); } - @ <hr /><h3>TICKET Schema</h3> + @ <hr /><h2>TICKET Schema</h2> @ <blockquote><pre> @ <code class="language-sql">%h(zSchema)</code> @ </pre></blockquote> @ <h3>Notes</h3> @ <ul> @@ -773,11 +775,11 @@ for(i=0; i<nArg; i++){ const char *zName = azName[i]; if( i==pState->iBg ) continue; if( pState->iNewRow>=0 && i>=pState->iNewRow ){ if( g.perm.Write && zTid ){ - @ <th> </th> + @ <td> </td> zTid = 0; } if( zName[0]=='_' ) zName++; @ </tr><tr><th colspan=%d(pState->nCol)>%h(zName)</th> }else{ @@ -786,11 +788,11 @@ } @ <th>%h(zName)</th> } } if( g.perm.Write && zTid ){ - @ <th> </th> + @ <td> </td> } @ </tr></thead><tbody> } if( azArg==0 ){ @ <tr><td colspan="%d(pState->nCol)"> Index: src/rss.c ================================================================== --- src/rss.c +++ src/rss.c @@ -230,29 +230,24 @@ ** COMMAND: rss* ** ** Usage: %fossil rss ?OPTIONS? ** ** The CLI variant of the /timeline.rss page, this produces an RSS -** feed of the timeline to stdout. Options: +** feed of the timeline to stdout. ** +** Options: ** -type|y FLAG May be: all (default), ci (show check-ins only), ** t (show tickets only), w (show wiki only). -** ** -limit|n LIMIT The maximum number of items to show. -** ** -tkt HASH Filter for only those events for the specified ticket. -** ** -tag TAG Filter for a tag -** ** -wiki NAME Filter on a specific wiki page. ** ** Only one of -tkt, -tag, or -wiki may be used. -** ** -name FILENAME Filter for a specific file. This may be combined ** with one of the other filters (useful for looking ** at a specific branch). -** ** -url STRING Set the RSS feed's root URL to the given string. ** The default is "URL-PLACEHOLDER" (without quotes). */ void cmd_timeline_rss(void){ Stmt q; Index: src/search.c ================================================================== --- src/search.c +++ src/search.c @@ -334,11 +334,10 @@ ** ** Run the full-scan search algorithm using SEARCHSTRING against ** the text of the files listed. Output matches and snippets. ** ** Options: -** ** --begin TEXT Text to insert before each match ** --end TEXT Text to insert after each match ** --gap TEXT Text to indicate elided content ** --html Input is HTML ** --static Use the static Search object @@ -583,11 +582,10 @@ ** score. The -limit option can be used to limit the number of entries ** returned. The -width option can be used to set the output width used ** when printing matches. ** ** Options: -** ** -a|--all Output all matches, not just best matches. ** -n|--limit N Limit output to N matches. ** -W|--width WIDTH Set display width to WIDTH columns, 0 for ** unlimited. Defaults the terminal's width. */ @@ -1141,11 +1139,12 @@ if( zClass ){ @ <div class='searchForm searchForm%s(zClass)'> }else{ @ <div class='searchForm'> } - @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)> + @ <label>Search for: + @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)></label> if( (mFlags & 0x01)!=0 && (srchFlags & (srchFlags-1))!=0 ){ static const struct { const char *z; const char *zNm; unsigned m; } aY[] = { { "all", "All", SRCH_ALL }, { "c", "Check-ins", SRCH_CKIN }, { "d", "Docs", SRCH_DOC }, @@ -1155,21 +1154,21 @@ { "f", "Forum", SRCH_FORUM }, }; const char *zY = PD("y","all"); unsigned newFlags = srchFlags; int i; - @ <select size='1' name='y'> + @ <label> Elements: <select size='1' name='y'> for(i=0; i<count(aY); i++){ if( (aY[i].m & srchFlags)==0 ) continue; cgi_printf("<option value='%s'", aY[i].z); if( fossil_strcmp(zY,aY[i].z)==0 ){ newFlags &= aY[i].m; cgi_printf(" selected"); } cgi_printf(">%s</option>\n", aY[i].zNm); } - @ </select> + @ </select></label> srchFlags = newFlags; } if( fDebug ){ @ <input type="hidden" name="debug" value="1"> } @@ -1197,11 +1196,10 @@ /* ** WEBPAGE: search ** ** Search for check-in comments, documents, tickets, or wiki that ** match a user-supplied pattern. -** ** s=PATTERN Specify the full-text pattern to search for ** y=TYPE What to search. ** c -> check-ins ** d -> documentation ** t -> tickets @@ -1850,22 +1848,19 @@ ** COMMAND: fts-config* ** ** Usage: fossil fts-config ?SUBCOMMAND? ?ARGUMENT? ** ** The "fossil fts-config" command configures the full-text search capabilities -** of the repository. Subcommands: +** of the repository. ** +** Subcommands: ** reindex Rebuild the search index. This is a no-op if ** index search is disabled -** ** index (on|off) Turn the search index on or off -** ** enable cdtwe Enable various kinds of search. c=Check-ins, ** d=Documents, t=Tickets, w=Wiki, e=Tech Notes. -** ** disable cdtwe Disable various kinds of search -** ** stemmer (on|off) Turn the Porter stemmer on or off for indexed ** search. (Unindexed search is never stemmed.) ** ** The current search settings are displayed after any changes are applied. ** Run this command with no arguments to simply see the settings. Index: src/setup.c ================================================================== --- src/setup.c +++ src/setup.c @@ -209,19 +209,28 @@ admin_log("Set option [%q] to [%q].", zVar, iQ ? "on" : "off"); iVal = iQ; } } - @ <label><input type="checkbox" name="%s(zQParm)" \ - @ aria-label="%h(zLabel[0]?zLabel:zQParm)" \ + if( zLabel[0] ) { + @ <label> + } + @ <input type="checkbox" name="%s(zQParm)" \ + if( !zLabel[0] ) { + @ aria-label="%h(zLabel[0]?zLabel:zQParm)" \ + } + @ title="%h(zLabel[0]?zLabel:zQParm)" \ if( iVal ){ @ checked="checked" \ } if( disabled ){ @ disabled="disabled" \ } - @ /> <b>%s(zLabel)</b></label> + @ /> + if( zLabel[0] ) { + @ <b>%s(zLabel)</b></label> + } } /* ** Generate an entry box for an attribute. */ @@ -244,16 +253,26 @@ db_protect_pop(); admin_log("Set entry_attribute %Q to: %.*s%s", zVar, 20, zQ, (nZQ>20 ? "..." : "")); zVal = zQ; } - @ <input aria-label="%h(zLabel[0]?zLabel:zQParm)" type="text" \ + if( zLabel[0] ) { + @ <label> + } + @ <input + if( !zLabel[0] ) { + @ aria-label="%h(zLabel[0]?zLabel:zQParm)" + } + @ title="%h(zLabel[0]?zLabel:zQParm)" type="text" \ @ id="%s(zQParm)" name="%s(zQParm)" value="%h(zVal)" size="%d(width)" \ if( disabled ){ @ disabled="disabled" \ } - @ /> <b>%s(zLabel)</b> + @ /> + if( zLabel[0] ) { + @ <b>%s(zLabel)</b></label> + } } /* ** Generate a text box for an attribute. */ @@ -278,18 +297,24 @@ admin_log("Set textarea_attribute %Q to: %.*s%s", zVar, 20, zQ, (nZQ>20 ? "..." : "")); z = zQ; } if( rows>0 && cols>0 ){ + if( *zLabel ){ + @ <label> + } @ <textarea id="id%s(zQP)" name="%s(zQP)" rows="%d(rows)" \ - @ aria-label="%h(zLabel[0]?zLabel:zQP)" \ + if( !*zLabel ){ + @ aria-label="%h(zLabel[0]?zLabel:zQP)" \ + } + @ title="%h(zLabel[0]?zLabel:zQP)" \ if( disabled ){ @ disabled="disabled" \ } @ cols="%d(cols)">%h(z)</textarea> if( *zLabel ){ - @ <span class="textareaLabel">%s(zLabel)</span> + @ <span class="textareaLabel">%s(zLabel)</span></label> } } return z; } @@ -316,16 +341,16 @@ db_protect_pop(); admin_log("Set multiple_choice_attribute %Q to: %.*s%s", zVar, 20, zQ, (nZQ>20 ? "..." : "")); z = zQ; } - @ <select aria-label="%h(zLabel)" size="1" name="%s(zQP)" id="id%s(zQP)"> + @ <label><select title="%h(zLabel)" size="1" name="%s(zQP)" id="id%s(zQP)"> for(i=0; i<nChoice*2; i+=2){ const char *zSel = fossil_strcmp(azChoice[i],z)==0 ? " selected" : ""; @ <option value="%h(azChoice[i])"%s(zSel)>%h(azChoice[i+1])</option> } - @ </select> <b>%h(zLabel)</b> + @ </select> <b>%h(zLabel)</b></label> } /* ** Insert code into the current page that allows the user to configure ** auto-hyperlink related robot defense settings. @@ -694,30 +719,30 @@ @ @ <form action="%R/setup_login_group" method="post"><div> login_insert_csrf_secret(); @ <blockquote><table border="0"> @ - @ <tr><th align="right" id="rfigtj">Repository filename \ - @ in group to join:</th> - @ <td width="5"></td><td> - @ <input aria-labelledby="rfigtj" type="text" size="50" \ - @ value="%h(zRepo)" name="repo"></td></tr> - @ - @ <tr><th align="right" id="lotar">Login on the above repo:</th> - @ <td width="5"></td><td> - @ <input aria-labelledby="lotar" type="text" size="20" \ - @ value="%h(zLogin)" name="login"></td></tr> - @ - @ <tr><th align="right" id="lgpw">Password:</th> - @ <td width="5"></td><td> - @ <input aria-labelledby="lgpw" type="password" size="20" name="pw">\ + @ <tr><th align="right" id="rfigtj"><label for="repo">Repository filename \ + @ in group to join:</label></th> + @ <td width="5"></td><td> + @ <input type="text" size="50" \ + @ value="%h(zRepo)" id="repo" name="repo"></td></tr> + @ + @ <tr><th align="right" id="lotar"><label for="login">Login on the above repo:</label></th> + @ <td width="5"></td><td> + @ <input type="text" size="20" \ + @ value="%h(zLogin)" id="login" name="login"></td></tr> + @ + @ <tr><th align="right" id="lgpw"><label for="pw">Password:</label></th> + @ <td width="5"></td><td> + @ <input type="password" size="20" id="pw" name="pw">\ @ </td></tr> @ - @ <tr><th align="right" id="nolg">Name of login-group:</th> + @ <tr><th align="right" id="nolg"><label for="newname">Name of login-group:</label></th> @ <td width="5"></td><td> - @ <input aria-labelledby="nolg" type="text" size="30" \ - @ value="%h(zNewName)" name="newname"> + @ <input type="text" size="30" \ + @ value="%h(zNewName)" id="newname" name="newname"> @ (only used if creating a new login-group).</td></tr> @ @ <tr><td colspan="3" align="center"> @ <input type="submit" value="Join" name="join"></td></tr> @ </table></blockquote></div></form> @@ -1653,12 +1678,12 @@ @ The logo may or may not appear on each @ page depending on the <a href="setup_skinedit?w=0">CSS</a> and @ <a href="setup_skinedit?w=2">header setup</a>. @ To change the logo image, use the following form:</p> login_insert_csrf_secret(); - @ Logo Image file: - @ <input type="file" name="logoim" size="60" accept="image/*" /> + @ <label>Logo Image file: + @ <input type="file" name="logoim" size="60" accept="image/*" /></label> @ <p align="center"> @ <input type="submit" name="setlogo" value="Change Logo" /> @ <input type="submit" name="clrlogo" value="Revert To Default" /></p> @ <p>(Properties: "logo-image" and "logo-mimetype") @ </div></form> @@ -1677,12 +1702,12 @@ @ The background image may or may not appear on each @ page depending on the <a href="setup_skinedit?w=0">CSS</a> and @ <a href="setup_skinedit?w=2">header setup</a>. @ To change the background image, use the following form:</p> login_insert_csrf_secret(); - @ Background image file: - @ <input type="file" name="bgim" size="60" accept="image/*" /> + @ <label>Background image file: + @ <input type="file" name="bgim" size="60" accept="image/*" /></label> @ <p align="center"> @ <input type="submit" name="setbg" value="Change Background" /> @ <input type="submit" name="clrbg" value="Revert To Default" /></p> @ </div></form> @ <p>(Properties: "background-image" and "background-mimetype") @@ -1701,12 +1726,12 @@ @ The icon image may or may not appear on each @ page depending on the web browser in use and the MIME-Types that it @ supports for icon images. @ To change the icon image, use the following form:</p> login_insert_csrf_secret(); - @ Icon image file: - @ <input type="file" name="iconim" size="60" accept="image/*" /> + @ <label>Icon image file: + @ <input type="file" name="iconim" size="60" accept="image/*" /></label> @ <p align="center"> @ <input type="submit" name="seticon" value="Change Icon" /> @ <input type="submit" name="clricon" value="Revert To Default" /></p> @ </div></form> @ <p>(Properties: "icon-image" and "icon-mimetype") @@ -1793,12 +1818,12 @@ go = 1; } @ @ <form method="post" action="%R/admin_sql"> login_insert_csrf_secret(); - @ SQL:<br /> - @ <textarea name="q" rows="8" cols="80">%h(zQ)</textarea><br /> + @ <label>SQL:<br /> + @ <textarea name="q" rows="8" cols="80">%h(zQ)</textarea></label><br /> @ <input type="submit" name="go" value="Run SQL"> @ <input type="submit" name="schema" value="Show Schema"> @ <input type="submit" name="tablelist" value="List Tables"> @ <input type="submit" name="configtab" value="CONFIG Table Query"> @ </form> @@ -1902,12 +1927,12 @@ @ run by this page. If Tcl integration was enabled at compile-time and @ the "tcl" setting is enabled, Tcl commands may be run as well.</p> @ @ <form method="post" action="%R/admin_th1"> login_insert_csrf_secret(); - @ TH1:<br /> - @ <textarea name="q" rows="5" cols="80">%h(zQ)</textarea><br /> + @ <label>TH1:<br /> + @ <textarea name="q" rows="5" cols="80">%h(zQ)</textarea></label><br /> @ <input type="submit" name="go" value="Run TH1"> @ </form> if( go ){ const char *zR; int rc; @@ -2174,13 +2199,13 @@ blob_init(&namelist, 0, 0); while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); const char *zValue = db_column_text(&q, 1); @ <tr><td> - @ <input type='text' size='20' value='%h(zName)' name='n%d(cnt)'> + @ <input type='text' size='20' value='%h(zName)' name='n%d(cnt)' title='Alias %d(cnt)'> @ </td><td> - @ <input type='text' size='80' value='%h(zValue)' name='v%d(cnt)'> + @ <input type='text' size='80' value='%h(zValue)' name='v%d(cnt)' title='URI %d(cnt)'> @ </td></tr> cnt++; if( blob_size(&namelist)>0 ) blob_append(&namelist, " ", 1); blob_append(&namelist, zName, -1); } Index: src/setupuser.c ================================================================== --- src/setupuser.c +++ src/setupuser.c @@ -31,11 +31,10 @@ ** ** Show a list of users. Clicking on any user jumps to the edit ** screen for that user. Requires Admin privileges. ** ** Query parameters: -** ** with=CAP Only show users that have one or more capabilities in CAP. ** ubg Color backgrounds by username hash */ void setup_ulist(void){ Stmt s; @@ -604,26 +603,26 @@ @ <input type="hidden" name="pw" value="*"> } @ <input type="hidden" name="referer" value="%h(cgi_referer("setup_ulist"))"> @ <table width="100%%"> @ <tr> - @ <td class="usetupEditLabel" id="suuid">User ID:</td> + @ <td class="usetupEditLabel" id="suuid"><label for="id">User ID:</label></td> if( uid ){ - @ <td>%d(uid) <input aria-labelledby="suuid" type="hidden" \ + @ <td>%d(uid) <input type="hidden" \ @ name="id" value="%d(uid)"/>\ @ </td> }else{ - @ <td>(new user)<input aria-labelledby="suuid" type="hidden" name="id" \ + @ <td>(new user)<input type="hidden" name="id" \ @ value="0" /></td> } @ </tr> @ <tr> - @ <td class="usetupEditLabel" id="sulgn">Login:</td> + @ <td class="usetupEditLabel" id="sulgn"><label for="login">Login:</label></td> if( login_is_special(zLogin) ){ @ <td><b>%h(zLogin)</b></td> }else{ - @ <td><input aria-labelledby="sulgn" type="text" name="login" \ + @ <td><input type="text" id="login" name="login" \ @ value="%h(zLogin)" /> if( alert_tables_exist() ){ int sid; sid = db_int(0, "SELECT subscriberId FROM subscriber" " WHERE suname=%Q", zLogin); @@ -632,12 +631,13 @@ @ (subscription info for %h(zLogin))</a>\ } } @ </td></tr> @ <tr> - @ <td class="usetupEditLabel" id="sucnfo">Contact Info:</td> - @ <td><textarea aria-labelledby="sucnfo" name="info" cols="40" \ + @ <td class="usetupEditLabel" id="sucnfo"> + @ <label for="info">Contact Info:</label></td> + @ <td><textarea id="info" name="info" cols="40" \ @ rows="2">%h(zInfo)</textarea></td> } @ </tr> @ <tr> @ <td class="usetupEditLabel">Capabilities:</td> @@ -729,19 +729,19 @@ @ <a href="%R/setup_ucap_list">(key)</a> @ </td> @ </tr> if( !login_is_special(zLogin) ){ @ <tr> - @ <td align="right" id="supw">Password:</td> + @ <td align="right" id="supw"><label for="pw">Password:</label></td> if( zPw[0] ){ /* Obscure the password for all users */ - @ <td><input aria-labelledby="supw" type="password" autocomplete="off" \ - @ name="pw" value="**********" /></td> + @ <td><input type="password" autocomplete="off" \ + @ id="pw" name="pw" value="**********" /></td> }else{ /* Show an empty password as an empty input field */ char *zRPW = fossil_random_password(12); - @ <td><input aria-labelledby="supw" type="password" name="pw" \ + @ <td><input type="password" id="pw" name="pw" \ @ autocomplete="off" value="" /> Password suggestion: %z(zRPW)</td> } @ </tr> } zGroup = login_group_name(); Index: src/sha1.c ================================================================== --- src/sha1.c +++ src/sha1.c @@ -501,12 +501,12 @@ ** ** Usage: %fossil sha1sum FILE... ** ** Compute an SHA1 checksum of all files named on the command-line. ** If a file is named "-" then take its content from standard input. -** Options: ** +** Options: ** -h|--dereference If FILE is a symbolic link, compute the hash ** on the object that the link points to. Normally, ** the hash is over the name of the object that ** the link points to. ** Index: src/sha3.c ================================================================== --- src/sha3.c +++ src/sha3.c @@ -628,11 +628,10 @@ ** ** To be clear: The official NIST FIPS-202 implementation of SHA3 ** with the added 01 padding is used, not the original Keccak submission. ** ** Options: -** ** --224 Compute a SHA3-224 hash ** --256 Compute a SHA3-256 hash (the default) ** --384 Compute a SHA3-384 hash ** --512 Compute a SHA3-512 hash ** --size N An N-bit hash. N must be a multiple of 32 between Index: src/shun.c ================================================================== --- src/shun.c +++ src/shun.c @@ -168,13 +168,13 @@ @ artifact content will be purged from the repository the next time the @ repository is rebuilt. A list of shunned artifacts can be seen at the @ bottom of this page.</p> @ @ <a name="addshun"></a> - @ <p>To shun artifacts, enter their artifact hashes (the 40- or + @ <p><label for="shun-uuid">To shun artifacts, enter their artifact hashes (the 40- or @ 64-character lowercase hexadecimal hash of the artifact content) in the - @ following box and press the "Shun" button. This will cause the artifacts + @ following box and press the "Shun" button.</label> This will cause the artifacts @ to be removed from the repository and will prevent the artifacts from being @ readded to the repository by subsequent sync operation.</p> @ @ <p>Note that you must enter full artifact hashes, not abbreviations @ or symbolic tags.</p> @@ -187,11 +187,11 @@ @ sight - set the "hidden" tag on such artifacts instead.</p> @ @ <blockquote> @ <form method="post" action="%R/%s(g.zPath)"><div> login_insert_csrf_secret(); - @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid"> + @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid" id="shun-uuid"> if( zShun ){ if( strlen(zShun) ){ @ %h(zShun) }else if( nRcvid ){ db_prepare(&q, "SELECT uuid FROM blob WHERE rcvid=%d", nRcvid); @@ -205,20 +205,20 @@ @ <input type="submit" name="add" value="Shun" /> @ </div></form> @ </blockquote> @ @ <a name="delshun"></a> - @ <p>Enter the UUIDs of previously shunned artifacts to cause them to be - @ accepted again in the repository. The artifacts content is not + @ <p><label for="accept-uuid">Enter the UUIDs of previously shunned artifacts to cause them to be + @ accepted again in the repository.</label> The artifacts content is not @ restored because the content is unknown. The only change is that @ the formerly shunned artifacts will be accepted on subsequent sync @ operations.</p> @ @ <blockquote> @ <form method="post" action="%R/%s(g.zPath)"><div> login_insert_csrf_secret(); - @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid"> + @ <textarea class="fullsize-text" cols="70" rows="%d(numRows)" name="uuid" id="accept-uuid"> if( zAccept ){ if( strlen(zAccept) ){ @ %h(zAccept) }else if( nRcvid ){ db_prepare(&q, "SELECT uuid FROM blob WHERE rcvid=%d", nRcvid); Index: src/sitemap.c ================================================================== --- src/sitemap.c +++ src/sitemap.c @@ -165,11 +165,11 @@ @ Trunk Check-in</a></li> @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li> @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li> @ <li>%z(href("%R/uvlist"))Unversioned Files</a> if( g.perm.Write && zEditGlob[0]!=0 ){ - @ <li>%z(href("%R/fileedit"))On-line File Editor</li> + @ <li>%z(href("%R/fileedit"))On-line File Editor</a></li> } @ </ul> } if( g.perm.Read ){ @ <li>%z(href("%R/timeline"))Project Timeline</a> Index: src/skins.c ================================================================== --- src/skins.c +++ src/skins.c @@ -441,12 +441,12 @@ @ named "%h(zNewName)". Choose a different name.</span></p> } @ <form action="%R/setup_skin_admin" method="post"><div> @ <table border="0"><tr> @ <tr><td align="right">Current name:<td align="left"><b>%h(zOldName)</b> - @ <tr><td align="right">New name:<td align="left"> - @ <input type="text" size="35" name="newname" value="%h(zNewName)"> + @ <tr><td align="right"><label for="newname">New name:</label><td align="left"> + @ <input type="text" size="35" id="newname" name="newname" value="%h(zNewName)"> @ <tr><td><td> @ <input type="hidden" name="sn" value="%h(zOldName)"> @ <input type="submit" name="rename" value="Rename"> @ <input type="submit" name="canren" value="Cancel"> @ </table> @@ -483,12 +483,12 @@ @ <p><span class="generalError">There is already another skin @ named "%h(zNewName)". Choose a different name.</span></p> } @ <form action="%R/setup_skin_admin" method="post"><div> @ <table border="0"><tr> - @ <tr><td align="right">Name for this skin:<td align="left"> - @ <input type="text" size="35" name="svname" value="%h(zNewName)"> + @ <tr><td align="right"><label for="svname">Name for this skin:</label><td align="left"> + @ <input type="text" size="35" id="svname" name="svname" value="%h(zNewName)"> @ <tr><td><td> @ <input type="submit" name="save" value="Save"> @ <input type="submit" name="cansave" value="Cancel"> @ </table> login_insert_csrf_secret(); @@ -774,11 +774,10 @@ /* ** WEBPAGE: setup_skinedit ** ** Edit aspects of a skin determined by the w= query parameter. ** Requires Admin or Setup privileges. -** ** w=NUM -- 0=CSS, 1=footer, 2=header, 3=details, 4=js ** sk=NUM -- the draft skin number */ void setup_skinedit(void){ static const struct sSkinAddr { @@ -853,26 +852,27 @@ } @ <form action="%R/setup_skinedit" method="post"><div> login_insert_csrf_secret(); @ <input type='hidden' name='w' value='%d(ii)'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ <h2>Edit %s(zTitle):</h2> + @ <h2><label for="%s(zFile)">Edit %s(zTitle):</label></h2> if( P("submit") && cgi_csrf_safe(0) && (zOrig==0 || strcmp(zOrig,zContent)!=0) ){ db_set_mprintf(zContent, 0, "draft%d-%s",iSkin,zFile); } - @ <textarea name="%s(zFile)" rows="10" cols="80">\ + @ <textarea id="%s(zFile)" name="%s(zFile)" rows="10" cols="80">\ @ %h(zContent)</textarea> @ <br /> @ <input type="submit" name="submit" value="Apply Changes" /> if( isRevert ){ @ ← Press to complete reversion to "%s(zBasis)" }else if( fossil_strcmp(zContent,zDflt)!=0 ){ @ <input type="submit" name="revert" value='Revert To "%s(zBasis)"' /> } @ <hr /> - @ Baseline: \ + @ <label>Baseline: \ skin_emit_skin_selector("basis", zBasis, zDraft); + @ </label> @ <input type="submit" name="diff" value="Unified Diff" /> @ <input type="submit" name="sbsdiff" value="Side-by-Side Diff" /> if( P("diff")!=0 || P("sbsdiff")!=0 ){ Blob from, to, out; DiffConfig DCfg; @@ -1032,20 +1032,20 @@ @ edits are made to one of nine draft skins. A draft skin can then @ be published to become the default skin. @ Nine separate drafts are available to facilitate A/B testing.</p> @ @ <form method='POST' action='%R/setup_skin#step2' id='f01'> - @ <p class='skinInput'>Draft skin to edit: + @ <p class='skinInput'><label>Draft skin to edit: @ <select size='1' name='sk' id='skStep1'> for(i=1; i<=9; i++){ if( i==iSkin ){ @ <option value='%d(i)' selected>draft%d(i)</option> }else{ @ <option value='%d(i)'>draft%d(i)</option> } } - @ </select> + @ </select></label> @ </p> @ @ <a name='step2'></a> @ <h1>Step 2: Authenticate</h1> @ @@ -1057,13 +1057,13 @@ @ the draft%d(iSkin) skin: @ @ <form method='POST' action='%R/setup_skin#step2' id='f02'> @ <p class='skinInput'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ Authorized editors for skin draft%d(iSkin): + @ <label>Authorized editors for skin draft%d(iSkin): @ <input type='text' name='editors' value='%h(zAllowedEditors)'\ - @ width='40'> + @ width='40'></label> @ <input type='submit' name='submit2' value='Change'> @ </p> @ </form> }else if( isEditor ){ @ <p>You are authorized to make changes to the draft%d(iSkin) skin. @@ -1085,13 +1085,13 @@ @ or a preexisting skin, to use as a baseline.</p> @ @ <form method='POST' action='%R/setup_skin#step4' id='f03'> @ <p class='skinInput'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ Initialize skin <b>draft%d(iSkin)</b> using + @ <label>Initialize skin <b>draft%d(iSkin)</b> using skin_emit_skin_selector("initskin", "current", 0); - @ <input type='submit' name='init3' value='Go'> + @ </label><input type='submit' name='init3' value='Go'> @ </p> @ </form> } @ @ <a name='step4'></a> @@ -1155,14 +1155,14 @@ @ pressing the button below:</p> @ @ <form method='POST' action='%R/setup_skin#step7'> @ <p class='skinInput'> @ <input type='hidden' name='sk' value='%d(iSkin)'> - @ <input type='checkbox' name='pub7ck1' value='yes'>\ - @ Skin draft%d(iSkin) has been tested and found ready for production.<br> - @ <input type='checkbox' name='pub7ck2' value='yes'>\ - @ The current skin should be overwritten with draft%d(iSkin).<br> + @ <label><input type='checkbox' name='pub7ck1' value='yes'>\ + @ Skin draft%d(iSkin) has been tested and found ready for production.</label><br> + @ <label><input type='checkbox' name='pub7ck2' value='yes'>\ + @ The current skin should be overwritten with draft%d(iSkin).</label><br> @ <input type='submit' name='pub7' value='Publish Draft%d(iSkin)'> @ </p></form> @ @ <p>You will probably need to press Reload on your browser after @ publishing the new skin.</p> Index: src/smtp.c ================================================================== --- src/smtp.c +++ src/smtp.c @@ -423,11 +423,10 @@ ** Interact with the SMTP server for DOMAIN by setting up a connection ** and then immediately shutting it back down. Log all interaction ** on the console. Use ME as the domain name of the sender. ** ** Options: -** ** --direct Use DOMAIN directly without going through MX ** --port N Talk on TCP port N */ void test_smtp_probe(void){ SmtpSession *p; @@ -596,11 +595,10 @@ ** ** Use SMTP to send the email message contained in the file named EMAIL ** to the list of users TO. FROM is the sender of the email. ** ** Options: -** ** --direct Go directly to the TO domain. Bypass MX lookup ** --relayhost R Use R as relay host directly for delivery. ** --port N Use TCP port N instead of 25 ** --trace Show the SMTP conversation on the console */ Index: src/sqlcmd.c ================================================================== --- src/sqlcmd.c +++ src/sqlcmd.c @@ -330,78 +330,58 @@ ** in ways that are unrecoverable. Be sure you know what you are doing before ** running any SQL commands that modify the repository database. Use the ** --readonly option to prevent accidental damage to the repository. ** ** Options: -** ** --no-repository Skip opening the repository database. -** ** --readonly Open the repository read-only. No changes ** are allowed. This is a recommended safety ** precaution to prevent repository damage. -** ** -R REPOSITORY Use REPOSITORY as the repository database -** ** --test Enable some testing and analysis features ** that are normally disabled. ** ** All of the standard sqlite3 command-line shell options should also ** work. ** ** The following SQL extensions are provided with this Fossil-enhanced ** version of the sqlite3 command-line shell: -** ** builtin A virtual table that contains one row for ** each datafile that is built into the Fossil ** binary. -** ** checkin_mtime(X,Y) Return the mtime for the file Y (a BLOB.RID) ** found in check-in X (another BLOB.RID value). -** ** compress(X) Compress text X with the same algorithm used ** to compress artifacts in the BLOB table. -** ** content(X) Return the content of artifact X. X can be an ** artifact hash or hash prefix or a tag. Artifacts ** are stored compressed and deltaed. This function ** does all necessary decompression and undeltaing. -** ** decompress(X) Decompress text X. Undoes the work of ** compress(X). -** ** delta_apply(X,D) Apply delta D to source blob X and return ** the result. -** ** delta_create(X,Y) Create and return a delta that will convert ** X into Y. -** ** delta_output_size(D) Return the number of bytes of output to expect ** when applying delta D -** ** delta_parse(D) A table-valued function that deconstructs ** delta D and returns rows for each element of ** that delta. -** ** files_of_checkin(X) A table-valued function that returns info on ** all files contained in check-in X. Example: -** ** SELECT * FROM files_of_checkin('trunk'); -** ** helptext A virtual table with one row for each command, ** webpage, and setting together with the built-in ** help text. -** ** now() Return the number of seconds since 1970. -** ** obscure(T) Obfuscate the text password T so that its ** original value is not readily visible. Fossil ** uses this same algorithm when storing passwords ** of remote URLs. -** ** regexp The REGEXP operator works, unlike in ** standard SQLite. -** ** symbolic_name_to_rid(X) Return the BLOB.RID corresponding to symbolic ** name X. */ void cmd_sqlite3(void){ int noRepository; Index: src/stash.c ================================================================== --- src/stash.c +++ src/stash.c @@ -503,57 +503,43 @@ /* ** COMMAND: stash ** ** Usage: %fossil stash SUBCOMMAND ARGS... -** ** > fossil stash ** > fossil stash save ?-m|--comment COMMENT? ?FILES...? ** > fossil stash snapshot ?-m|--comment COMMENT? ?FILES...? -** ** Save the current changes in the working tree as a new stash. ** Then revert the changes back to the last check-in. If FILES ** are listed, then only stash and revert the named files. The ** "save" verb can be omitted if and only if there are no other ** arguments. The "snapshot" verb works the same as "save" but ** omits the revert, keeping the checkout unchanged. -** ** > fossil stash list|ls ?-v|--verbose? ?-W|--width NUM? -** ** List all changes sets currently stashed. Show information about ** individual files in each changeset if -v or --verbose is used. -** ** > fossil stash show|cat ?STASHID? ?DIFF-OPTIONS? ** > fossil stash gshow|gcat ?STASHID? ?DIFF-OPTIONS? -** ** Show the contents of a stash as a diff against its baseline. ** With gshow and gcat, gdiff-command is used instead of internal ** diff logic. -** ** > fossil stash pop ** > fossil stash apply ?STASHID? -** ** Apply STASHID or the most recently created stash to the current ** working checkout. The "pop" command deletes that changeset from ** the stash after applying it but the "apply" command retains the ** changeset. -** ** > fossil stash goto ?STASHID? -** ** Update to the baseline checkout for STASHID then apply the ** changes of STASHID. Keep STASHID so that it can be reused ** This command is undoable. -** ** > fossil stash drop|rm ?STASHID? ?-a|--all? -** ** Forget everything about STASHID. Forget the whole stash if the ** -a|--all flag is used. Individual drops are undoable but -a|--all ** is not. -** ** > fossil stash diff ?STASHID? ?DIFF-OPTIONS? ** > fossil stash gdiff ?STASHID? ?DIFF-OPTIONS? -** ** Show diffs of the current working directory and what that ** directory would be if STASHID were applied. With gdiff, ** gdiff-command is used instead of internal diff logic. */ void stash_cmd(void){ Index: src/stat.c ================================================================== --- src/stat.c +++ src/stat.c @@ -333,11 +333,10 @@ ** ** Shows statistics and global information about the repository and/or ** verify the integrity of a repository. ** ** Options: -** ** -b|--brief Only show essential elements. ** --db-check Run "PRAGMA quick_check" on the repository database. ** --db-verify Run a full verification of the repository integrity. ** This involves decoding and reparsing all artifacts ** and can take significant time. Index: src/statrep.c ================================================================== --- src/statrep.c +++ src/statrep.c @@ -223,11 +223,11 @@ @ class='statistics-report-table-events'> } @ <thead> @ <th>%s(zTimeLabel)</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </thead><tbody> /* Run the query twice. The first time we calculate the maximum number of events for a given row. Maybe someone with better SQL Fu can re-implement this with a single query. @@ -362,11 +362,11 @@ @ <table class='statistics-report-table-events sortable' border='0' \ @ cellpadding='2' cellspacing='0' data-column-types='tkx' data-init-sort='2'> @ <thead><tr> @ <th>User</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> db_prepare(&query, "SELECT ifnull(euser,user), " "COUNT(*) AS eventCount " "FROM v_reports " @@ -438,11 +438,11 @@ @ <table class='statistics-report-table-events sortable' border='0' \ @ cellpadding='2' cellspacing='0' data-column-types='tNx' data-init-sort='2'> @ <thead><tr> @ <th>File</th> @ <th>Check-ins</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> while( SQLITE_ROW == db_step(&query) ){ const char *zFile = db_column_text(&query, 0); const int n = db_column_int(&query, 1); int sz; @@ -519,11 +519,11 @@ @ cellpadding='2' cellspacing='0' data-column-types='ntnx' data-init-sort='1'> @ <thead><tr> @ <th>DoW</th> @ <th>Day</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> while( SQLITE_ROW == db_step(&query) ){ const int nCount = db_column_int(&query, 1); if(nCount>nMaxEvents){ nMaxEvents = nCount; @@ -595,11 +595,11 @@ @ <table class='statistics-report-table-events sortable' border='0' \ @ cellpadding='2' cellspacing='0' data-column-types='nnx' data-init-sort='1'> @ <thead><tr> @ <th>Hour</th> @ <th>Events</th> - @ <th width='90%%'></th> + @ <th width='90%%'>Graph</th> @ </tr></thead><tbody> while( SQLITE_ROW == db_step(&query) ){ const int nCount = db_column_int(&query, 1); if(nCount>nMaxEvents){ nMaxEvents = nCount; @@ -643,11 +643,11 @@ int iterations = 0; /* # of active time periods. */ int rowCount = 0; int total = 0; stats_report_init_view(); - style_submenu_sql("y", "Year:", + style_submenu_sql("y", "Year", "WITH RECURSIVE a(b) AS (" " SELECT substr(date('now'),1,4) UNION ALL" " SELECT b-1 FROM a" " WHERE b>0+(SELECT substr(date(min(mtime)),1,4) FROM event)" ") SELECT b, b FROM a ORDER BY b DESC"); @@ -674,11 +674,11 @@ "border='0' cellpadding='2' width='100%%' " "cellspacing='0' data-column-types='tnx' data-init-sort='0'>"); cgi_printf("<thead><tr>" "<th>Week</th>" "<th>Events</th>" - "<th width='90%%'></th>" + "<th width='90%%'>Graph</th>" "</tr></thead>" "<tbody>"); while( SQLITE_ROW == db_step(&q) ){ const int nCount = db_column_int(&q, 1); if(nCount>nMaxEvents){ @@ -784,21 +784,19 @@ ** WEBPAGE: reports ** ** Shows activity reports for the repository. ** ** Query Parameters: -** ** view=REPORT_NAME Valid values: bymonth, byyear, byuser ** user=NAME Restricts statistics to the given user ** type=TYPE Restricts the report to a specific event type: ** ci (check-in), f (forum), w (wiki), t (ticket), g (tag) ** Defaulting to all event types. ** ** The view-specific query parameters include: ** ** view=byweek: -** ** y=YYYY The year to report (default is the server's ** current year). */ void stats_report_page(){ const char *zView = P("view"); /* Which view/report to show. */ @@ -811,16 +809,16 @@ const char *zVal; /* Value of view= query parameter */ int eType; /* Corresponding RPT_* define */ } aViewType[] = { { "File Changes","byfile", RPT_BYFILE }, { "Last Change", "lastchng", RPT_LASTCHNG }, - { "By Month", "bymonth", RPT_BYMONTH }, - { "By User", "byuser", RPT_BYUSER }, - { "By Week", "byweek", RPT_BYWEEK }, - { "By Weekday", "byweekday", RPT_BYWEEKDAY }, - { "By Year", "byyear", RPT_BYYEAR }, - { "By Hour", "byhour", RPT_BYHOUR }, + { "Month", "bymonth", RPT_BYMONTH }, + { "User", "byuser", RPT_BYUSER }, + { "Week", "byweek", RPT_BYWEEK }, + { "Weekday", "byweekday", RPT_BYWEEKDAY }, + { "Year", "byyear", RPT_BYYEAR }, + { "Hour", "byhour", RPT_BYHOUR }, }; static const char *const azType[] = { "a", "All Changes", "ci", "Check-ins", "f", "Forum Posts", @@ -850,15 +848,15 @@ for(i=0; i<count(aViewType); i++){ azView[nView++] = aViewType[i].zVal; azView[nView++] = aViewType[i].zName; } if( eType!=RPT_BYFILE ){ - style_submenu_multichoice("type", count(azType)/2, azType, 0); + style_submenu_multichoice("type", "Type", count(azType)/2, azType, 0); } - style_submenu_multichoice("view", nView/2, azView, 0); + style_submenu_multichoice("view", "Group By", nView/2, azView, 0); if( eType!=RPT_BYUSER && eType!=RPT_LASTCHNG ){ - style_submenu_sql("user","User:", + style_submenu_sql("user","User", "SELECT '', 'All Users' UNION ALL " "SELECT x, x FROM (" " SELECT DISTINCT trim(coalesce(euser,user)) AS x FROM event %s" " ORDER BY 1 COLLATE nocase) WHERE x!=''", eType==RPT_BYFILE ? "WHERE type='ci'" : "" Index: src/style.c ================================================================== --- src/style.c +++ src/style.c @@ -44,15 +44,16 @@ const char *zLink; /* Jump to this link when button is pressed */ } aSubmenu[30]; static int nSubmenu = 0; /* Number of buttons */ static struct SubmenuCtrl { const char *zName; /* Form query parameter */ - const char *zLabel; /* Label. Might be NULL for FF_MULTI */ + const char *zLabel; /* Label */ unsigned char eType; /* FF_ENTRY, FF_MULTI, FF_CHECKBOX */ unsigned char eVisible; /* STYLE_NORMAL or STYLE_DISABLED */ short int iSize; /* Width for FF_ENTRY. Count for FF_MULTI */ const char *const *azChoice; /* value/display pairs for FF_MULTI */ + const char *zTrue; /* FF_BINARY label when true */ const char *zFalse; /* FF_BINARY label when false */ const char *zJS; /* Javascript to run on toggle */ } aSubmenuCtrl[20]; static int nSubmenuCtrl = 0; #define FF_ENTRY 1 /* Text entry box */ @@ -307,30 +308,34 @@ aSubmenuCtrl[nSubmenuCtrl].eType = FF_CHECKBOX; nSubmenuCtrl++; } void style_submenu_binary( const char *zName, /* Query parameter name */ + const char *zLabel, /* Label of parameter */ const char *zTrue, /* Label to show when parameter is true */ const char *zFalse, /* Label to show when the parameter is false */ int eVisible /* Visible or disabled */ ){ assert( nSubmenuCtrl < count(aSubmenuCtrl) ); aSubmenuCtrl[nSubmenuCtrl].zName = zName; - aSubmenuCtrl[nSubmenuCtrl].zLabel = zTrue; + aSubmenuCtrl[nSubmenuCtrl].zLabel = zLabel; + aSubmenuCtrl[nSubmenuCtrl].zTrue = zTrue; aSubmenuCtrl[nSubmenuCtrl].zFalse = zFalse; aSubmenuCtrl[nSubmenuCtrl].eVisible = eVisible; aSubmenuCtrl[nSubmenuCtrl].eType = FF_BINARY; nSubmenuCtrl++; } void style_submenu_multichoice( const char *zName, /* Query parameter name */ + const char *zLabel, /* Label of parameter */ int nChoice, /* Number of options */ const char *const *azChoice, /* value/display pairs. 2*nChoice entries */ int eVisible /* Visible or disabled */ ){ assert( nSubmenuCtrl < count(aSubmenuCtrl) ); aSubmenuCtrl[nSubmenuCtrl].zName = zName; + aSubmenuCtrl[nSubmenuCtrl].zLabel = zLabel; aSubmenuCtrl[nSubmenuCtrl].iSize = nChoice; aSubmenuCtrl[nSubmenuCtrl].azChoice = azChoice; aSubmenuCtrl[nSubmenuCtrl].eVisible = eVisible; aSubmenuCtrl[nSubmenuCtrl].eType = FF_MULTI; nSubmenuCtrl++; @@ -645,11 +650,11 @@ ** Default HTML page header text through <body>. If the repository-specific ** header template lacks a <body> tag, then all of the following is ** prepended. */ static const char zDfltHeader[] = -@ <html> +@ <html lang="en"> @ <head> @ <meta charset="UTF-8"> @ <base href="$baseurl/$current_page" /> @ <meta http-equiv="Content-Security-Policy" content="$default_csp" /> @ <meta name="viewport" content="width=device-width, initial-scale=1.0"> @@ -987,11 +992,11 @@ if( nSubmenuCtrl ){ @ <form id='f01' method='GET' action='%R/%s(g.zPath)'> @ <input type='hidden' name='udc' value='1'> cgi_tag_query_parameter("udc"); } - @ <div class="submenu"> + @ <nav id="submenu" class="submenu"> if( nSubmenu>0 ){ qsort(aSubmenu, nSubmenu, sizeof(aSubmenu[0]), submenuCompare); for(i=0; i<nSubmenu; i++){ struct Submenu *p = &aSubmenu[i]; style_derive_classname(p->zLabel, zClass, sizeof zClass); @@ -1018,29 +1023,27 @@ } style_derive_classname(zQPN, zClass+4, sizeof(zClass)-4); switch( aSubmenuCtrl[i].eType ){ case FF_ENTRY: @ <span class='submenuctrl%s(zXtraClass) %s(zClass)'>\ - @ %h(aSubmenuCtrl[i].zLabel)\ + @ <label>%h(aSubmenuCtrl[i].zLabel): \ @ <input type='text' name='%s(zQPN)' value='%h(PD(zQPN, ""))' \ if( aSubmenuCtrl[i].iSize<0 ){ @ size='%d(-aSubmenuCtrl[i].iSize)' \ }else if( aSubmenuCtrl[i].iSize>0 ){ @ size='%d(aSubmenuCtrl[i].iSize)' \ @ maxlength='%d(aSubmenuCtrl[i].iSize)' \ } - @ id='submenuctrl-%d(i)'%s(zDisabled)></span> + @ id='submenuctrl-%d(i)'%s(zDisabled)></label></span> break; case FF_MULTI: { int j; const char *zVal = P(zQPN); if( zXtraClass[0] ){ @ <span class='%s(zXtraClass+1) %s(zClass)'> } - if( aSubmenuCtrl[i].zLabel ){ - @ %h(aSubmenuCtrl[i].zLabel)\ - } + @ <label>%h(aSubmenuCtrl[i].zLabel): \ @ <select class='submenuctrl %s(zClass)' size='1' name='%s(zQPN)' \ @ id='submenuctrl-%d(i)'%s(zDisabled)> for(j=0; j<aSubmenuCtrl[i].iSize*2; j+=2){ const char *zQPV = aSubmenuCtrl[i].azChoice[j]; @ <option value='%h(zQPV)'\ @@ -1048,30 +1051,33 @@ @ selected\ } @ >%h(aSubmenuCtrl[i].azChoice[j+1])</option> } @ </select> + @ </label> if( zXtraClass[0] ){ @ </span> } break; } case FF_BINARY: { int isTrue = PB(zQPN); + @ <label for='submenuctrl-%d(i)'>%h(aSubmenuCtrl[i].zLabel): @ <select class='submenuctrl%s(zXtraClass)' size='1' \ @ name='%s(zQPN)' id='submenuctrl-%d(i)'%s(zDisabled)> @ <option value='1'\ if( isTrue ){ @ selected\ } - @ >%h(aSubmenuCtrl[i].zLabel)</option> + @ >%h(aSubmenuCtrl[i].zTrue)</option> @ <option value='0'\ if( !isTrue ){ @ selected\ } @ >%h(aSubmenuCtrl[i].zFalse)</option> @ </select> + @ </label> break; } case FF_CHECKBOX: { @ <label class='submenuctrl submenuckbox%s(zXtraClass) %s(zClass)'>\ @ <input type='checkbox' name='%s(zQPN)' id='submenuctrl-%d(i)' \ @@ -1086,11 +1092,11 @@ @ %h(aSubmenuCtrl[i].zLabel)</label> break; } } } - @ </div> + @ </nav> if( nSubmenuCtrl ){ cgi_query_parameters_to_hidden(); cgi_tag_query_parameter(0); @ </form> builtin_request_js("menu.js"); @@ -1107,17 +1113,17 @@ @ <div class="adunit_banner"> cgi_append_content(zAd, -1); @ </div> } - @ <div class="content"><span id="debugMsg"></span> + @ <main class="content"><span id="debugMsg"></span> cgi_destination(CGI_BODY); if( sideboxUsed ){ @ <div class="endContent"></div> } - @ </div> + @ </main> /* Put the footer at the bottom of the page. */ zFooter = skin_get("footer"); if( sqlite3_strlike("%</body>%", zFooter, 0)==0 ){ style_load_all_js_files(); @@ -1265,18 +1271,15 @@ /* ** WEBPAGE: style.css loadavg-exempt ** ** Return the style sheet. The style sheet is assemblied from ** multiple sources, in order: -** ** (1) The built-in "default.css" style sheet containing basic defaults. -** ** (2) The page-specific style sheet taken from the built-in ** called "PAGENAME.css" where PAGENAME is the value of the name= ** or page= query parameters. If neither name= nor page= exist, ** then this section is a no-op. -** ** (3) The skin-specific "css.txt" file, if there one. ** ** All of (1), (2), and (3) above (or as many as exist) are concatenated. ** The result is then run through TH1 with the following variables set: ** Index: src/style.chat.css ================================================================== --- src/style.chat.css +++ src/style.chat.css @@ -199,11 +199,11 @@ } body.chat #chat-messages-wrapper.loading > * { /* An attempt at reducing flicker when loading lots of messages. */ visibility: hidden; } -body.chat div.content { +body.chat main.content { margin: 0; padding: 0; display: flex; flex-direction: column-reverse; /* ^^^^ In order to get good automatic scrolling of new messages on Index: src/sync.c ================================================================== --- src/sync.c +++ src/sync.c @@ -319,11 +319,10 @@ ** If URL is not specified, then the URL from the most recent clone, push, ** pull, remote, or sync command is used. See "fossil help clone" for ** details on the URL formats. ** ** Options: -** ** --all Pull from all remotes, not just the default ** -B|--httpauth USER:PASS Credentials for the simple HTTP auth protocol, ** if required by the remote website ** --from-parent-project Pull content from the parent project ** --ipv4 Use only IPv4, not IPv6 @@ -374,11 +373,10 @@ ** If URL is not specified, then the URL from the most recent clone, push, ** pull, remote, or sync command is used. See "fossil help clone" for ** details on the URL formats. ** ** Options: -** ** --all Push to all remotes, not just the default ** -B|--httpauth USER:PASS Credentials for the simple HTTP auth protocol, ** if required by the remote website ** --ipv4 Use only IPv4, not IPv6 ** --no-http-compression Do not compress HTTP traffic @@ -423,11 +421,10 @@ ** If URL is not specified, then the URL from the most recent clone, push, ** pull, remote, or sync command is used. See "fossil help clone" for ** details on the URL formats. ** ** Options: -** ** --all Sync with all remotes, not just the default ** -B|--httpauth USER:PASS Credentials for the simple HTTP auth protocol, ** if required by the remote website ** --ipv4 Use only IPv4, not IPv6 ** --no-http-compression Do not compress HTTP traffic @@ -485,49 +482,35 @@ ** View or modify the URLs of remote repositories used for syncing. ** The "default" remote is specially named by Fossil and corresponds to ** the URL used in the most recent "sync", "push", "pull", "clone", or ** similar command. As such, the default remote can be updated by ** Fossil with each sync command. Other named remotes are persistent. -** ** > fossil remote -** ** With no arguments, this command shows the current default remote ** URL. If there is no default, it shows "off". -** ** > fossil remote add NAME URL -** ** Add a new named URL. Afterwards, NAME can be used as a short ** symbolic name for URL in contexts where a URL is required. The ** URL argument can be "default" or a prior symbolic name to make ** a copy of an existing URL under the new NAME. The "default" ** remote cannot be defined with this subcommand; instead, ** use 'fossil remote REF' as documented below. -** ** > fossil remote config-data -** ** DEBUG USE ONLY - Show the name and value of every CONFIG table ** entry in the repository that is associated with the remote URL store. ** Passwords are obscured in the output. -** ** > fossil remote delete NAME -** ** Delete a named URL previously created by the "add" subcommand. -** ** > fossil remote hyperlink ?FILENAME? ?LINENUM? ?LINENUM? -** ** Print a URL that will access the current checkout on the remote ** repository. Or if the FILENAME argument is included, print the ** URL to access that particular file within the current checkout. ** If one or two linenumber arguments are provided after the filename, ** then the URL is for the line or range of lines specified. -** ** > fossil remote list|ls -** ** Show all remote repository URLs. -** ** > fossil remote off -** ** Forget the default URL. This disables autosync. ** ** This is a convenient way to enter "airplane mode". To enter ** airplane mode, first save the current default URL, then turn the ** default off. Perhaps like this: @@ -536,28 +519,22 @@ ** fossil remote off ** ** To exit airplane mode and turn autosync back on again: ** ** fossil remote main -** ** > fossil remote scrub -** ** Forget any saved passwords for remote repositories, but continue ** to remember the URLs themselves. You will be prompted for the ** password the next time it is needed. -** ** > fossil remote ui ?FILENAME? ?LINENUM? ?LINENUM? -** ** Bring up a web browser pointing at the remote repository, and ** specifically to the page that describes the current checkout ** on that remote repository. Or if FILENAME and/or LINENUM arguments ** are provided, to the specific file and range of lines. This ** command is similar to "fossil remote hyperlink" except that instead ** of printing the URL, it passes the URL off to the web browser. -** ** > fossil remote REF -** ** Make REF the new default URL, replacing the prior default. ** REF may be a URL or a NAME from a prior "add". */ void remote_url_cmd(void){ char *zUrl, *zArg; @@ -820,11 +797,10 @@ ** Only the main repository database is backed up by this command. The ** open checkout file (if any) is not saved. Nor is the global configuration ** database. ** ** Options: -** ** --overwrite OK to overwrite an existing file ** -R NAME Filename of the repository to backup */ void backup_cmd(void){ char *zDest; Index: src/tag.c ================================================================== --- src/tag.c +++ src/tag.c @@ -391,13 +391,11 @@ ** COMMAND: tag ** ** Usage: %fossil tag SUBCOMMAND ... ** ** Run various subcommands to control tags and properties. -** ** > fossil tag add ?OPTIONS? TAGNAME ARTIFACT-ID ?VALUE? -** ** Add a new tag or property to an artifact referenced by ** ARTIFACT-ID. For checkins, the tag will be usable instead ** of a CHECK-IN in commands such as update and merge. If the ** --propagate flag is present and ARTIFACT-ID refers to a ** wiki page, forum post, technote, or check-in, the tag @@ -417,13 +415,11 @@ ** the form 'YYYY-MMM-DD HH:MM:SS'. ** ** Note that fossil uses some tag prefixes internally and this ** command will reject tags with these prefixes to avoid ** causing problems or confusion: "wiki-", "tkt-", "event-". -** ** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID -** ** Remove the tag TAGNAME from the artifact referenced by ** ARTIFACT-ID, and also remove the propagation of the tag to ** any descendants. Use the the -n|--dry-run option to see ** what would have happened. Certain tag name prefixes are ** forbidden, as documented for the 'add' subcommand. @@ -433,13 +429,11 @@ ** non-CHECK-IN artifacts. ** --date-override DATETIME Set date and time deleted. ** --user-override USER Name USER when deleting the tag. ** -n|--dry-run Display the control artifact, but do ** not insert it into the database. -** ** > fossil tag find ?OPTIONS? TAGNAME -** ** List all objects that use TAGNAME. ** ** Options: ** --raw Interprets tag as a raw name instead of a ** branch name and matches any type of artifact. @@ -448,13 +442,11 @@ ** -t|--type TYPE One of: ci (check-in), w (wiki), ** e (event/technote), f (forum post), ** t (ticket). Default is all types. Ignored ** if --raw is used. ** -n|--limit N Limit to N results. -** ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID? -** ** List all tags or, if ARTIFACT-ID is supplied, all tags and ** their values for that artifact. The tagtype option accepts ** one of: propagated, singleton, cancel. For historical ** scripting compatibility, the internal tag types "wiki-", ** "tkt-", and "event-" (technote) are elided by default @@ -747,11 +739,10 @@ ** two or more separate repositories. You should never need to reparent ** during normal operations. ** ** Reparenting is accomplished by adding a parent tag. So to undo the ** reparenting operation, simply delete the tag. -** ** --test Make database entries but do not add the tag artifact. ** So the reparent operation will be undone by the next ** "fossil rebuild" command. ** -n|--dry-run Print the tag that would have been created but do not ** actually change the database in any way. @@ -841,11 +832,10 @@ ** ** Render a timeline with all check-ins that contain non-propagating ** symbolic tags. ** ** Query parameters: -** ** ng No graph ** nohidden Hide check-ins with "hidden" tag ** onlyhidden Show only check-ins with "hidden" tag ** brbg Background color by branch name ** ubg Background color by user name Index: src/tar.c ================================================================== --- src/tar.c +++ src/tar.c @@ -719,28 +719,24 @@ ** /tarball?r=release&name=xyz.tar.gz ** /tarball/xyz.tar.gz?r=release ** /tarball?name=release/xyz.tar.gz ** ** Query parameters: -** ** name=NAME[.tar.gz] The base name of the output file. The default ** value is a configuration parameter in the project ** settings. A prefix of the name, omitting the ** extension, is used as the top-most directory name. -** ** r=TAG The check-in that is turned into a compressed tarball. ** Defaults to "trunk". This query parameter used to ** be called "uuid" and "uuid" is still accepted for ** backwards compatibility. If the name= query parameter ** contains one "/" character then the part before the / ** is the TAG and the part after the / is the true name. ** If no TAG is specified by any of the above means, then ** "trunk" is used as the default. -** ** in=PATTERN Only include files that match the comma-separate ** list of GLOB patterns in PATTERN, as with ex= -** ** ex=PATTERN Omit any file that match PATTERN. PATTERN is a ** comma-separated list of GLOB patterns, where each ** pattern can optionally be quoted using ".." or '..'. ** Any file matching both ex= and in= is excluded. */ Index: src/th_main.c ================================================================== --- src/th_main.c +++ src/th_main.c @@ -2906,11 +2906,10 @@ ** Read the content of the file named "FILE" as if it were a header or ** footer or ticket rendering script, evaluate it, and show the results ** on standard output. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --open-config Open the configuration database ** --set-anon-caps Set anonymous login capabilities ** --set-user-caps Set user login capabilities @@ -2956,11 +2955,10 @@ ** Evaluate SCRIPT as if it were a header or footer or ticket rendering ** script and show the results on standard output. SCRIPT may be either ** a filename or a string of th1 script code. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --open-config Open the configuration database ** --set-anon-caps Set anonymous login capabilities ** --set-user-caps Set user login capabilities @@ -3017,11 +3015,10 @@ ** Evaluate the contents of the file named "FILE" as if it were a header ** or footer or ticket rendering script and show the results on standard ** output. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --open-config Open the configuration database ** --set-anon-caps Set anonymous login capabilities ** --set-user-caps Set user login capabilities @@ -3086,25 +3083,21 @@ ** TYPE argument must be one of the following: ** ** cmdhook Executes the TH1 procedure [command_hook], after ** setting the TH1 variables "cmd_name", "cmd_args", ** and "cmd_flags" to appropriate values. -** ** cmdnotify Executes the TH1 procedure [command_notify], after ** setting the TH1 variables "cmd_name", "cmd_args", ** and "cmd_flags" to appropriate values. -** ** webhook Executes the TH1 procedure [webpage_hook], after ** setting the TH1 variables "web_name", "web_args", ** and "web_flags" to appropriate values. -** ** webnotify Executes the TH1 procedure [webpage_notify], after ** setting the TH1 variables "web_name", "web_args", ** and "web_flags" to appropriate values. ** ** Options: -** ** --cgi Include a CGI response header in the output ** --http Include an HTTP response header in the output ** --th-trace Trace TH1 execution (for debugging purposes) */ void test_th_hook(void){ Index: src/timeline.c ================================================================== --- src/timeline.c +++ src/timeline.c @@ -443,11 +443,11 @@ ** background color of the timeline entry */ gidx = graph_add_row(pGraph, rid, -1, 0, 0, zBr, zBgClr, zUuid, 0); @ <div id="m%d(gidx)" class="tl-nodemark"></div> } @</td> - if( !isSelectedOrCurrent ){ + if( !isSelectedOrCurrent && gidx>0 ){ @ <td class="timeline%s(zStyle)Cell%s(zExtraClass)" id='mc%d(gidx)'> }else{ @ <td class="timeline%s(zStyle)Cell%s(zExtraClass)"> } if( pGraph ){ @@ -570,11 +570,11 @@ if( drawDetailEllipsis ){ @ <span class='timelineEllipsis' id='ellipsis-%d(rid)' \ @ data-id='%d(rid)'>...</span> } if( tmFlags & TIMELINE_COLUMNAR ){ - if( !isSelectedOrCurrent ){ + if( !isSelectedOrCurrent && gidx>0 ){ @ <td class="timelineDetailCell%s(zExtraClass)" id='md%d(gidx)'> }else{ @ <td class="timelineDetailCell%s(zExtraClass)"> } } @@ -1156,11 +1156,11 @@ static void timeline_y_submenu(int isDisabled){ static int i = 0; static const char *az[16]; if( i==0 ){ az[0] = "all"; - az[1] = "Any Type"; + az[1] = "Any"; i = 2; if( g.perm.Read ){ az[i++] = "ci"; az[i++] = "Check-ins"; az[i++] = "g"; @@ -1185,11 +1185,11 @@ az[i++] = "Forum"; } assert( i<=count(az) ); } if( i>2 ){ - style_submenu_multichoice("y", i/2, az, isDisabled); + style_submenu_multichoice("y", "Elements", i/2, az, isDisabled); } } /* ** Return the default value for the "ss" cookie or query parameter. @@ -1222,15 +1222,15 @@ /* Available timeline display styles, together with their y= query ** parameter names. */ const char *const timeline_view_styles[] = { - "m", "Modern View", - "j", "Columnar View", - "c", "Compact View", - "v", "Verbose View", - "x", "Classic View", + "m", "Modern", + "j", "Columnar", + "c", "Compact", + "v", "Verbose", + "x", "Classic", }; #if INTERFACE # define N_TIMELINE_VIEW_STYLE 5 #endif @@ -1241,10 +1241,11 @@ ** Return the TIMELINE_* value appropriate for the view-style. */ int timeline_ss_submenu(void){ cookie_link_parameter("ss","ss",timeline_default_ss()); style_submenu_multichoice("ss", + "View", N_TIMELINE_VIEW_STYLE, timeline_view_styles, 0); return timeline_ss_cookie(); } @@ -1541,11 +1542,10 @@ /* ** WEBPAGE: timeline ** ** Query parameters: -** ** a=TIMEORTAG Show events after TIMEORTAG ** b=TIMEORTAG Show events before TIMEORTAG ** c=TIMEORTAG Show events that happen "circa" TIMEORTAG ** cf=FILEHASH Show events around the time of the first use of ** the file with FILEHASH @@ -2139,11 +2139,11 @@ } } if( advancedMenu ){ style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0); } - style_submenu_entry("n","Max:",4,0); + style_submenu_entry("n","Max",4,0); timeline_y_submenu(1); }else if( f_rid && g.perm.Read ){ /* If f= is present, ignore all other parameters other than n= */ char *zUuid; db_multi_exec( @@ -2669,15 +2669,15 @@ if( zType[0]=='a' || zType[0]=='c' ){ style_submenu_checkbox("unhide", "Unhide", 0, 0); } style_submenu_checkbox("v", "Files",(zType[0]!='a' && zType[0]!='c'),0); } - style_submenu_entry("n","Max:",4,0); + style_submenu_entry("n","Max",4,0); timeline_y_submenu(disableY); if( advancedMenu ){ - style_submenu_entry("t", "Tag Filter:", -8, 0); - style_submenu_multichoice("ms", count(azMatchStyles)/2,azMatchStyles,0); + style_submenu_entry("t", "Tag Filter", -8, 0); + style_submenu_multichoice("ms", "Match Style", count(azMatchStyles)/2,azMatchStyles,0); } } blob_zero(&cond); } if( PB("showsql") ){ @@ -3383,11 +3383,10 @@ ** ** Generate a vanity page that shows project activity for the current ** day of the year for various years in the history of the project. ** ** Query parameters: -** ** today=DATE Use DATE as today's date */ void thisdayinhistory_page(void){ static int aYearsAgo[] = { 1, 2, 3, 4, 5, 10, 15, 20, 30, 40, 50, 75, 100 }; const char *zToday; Index: src/tkt.c ================================================================== --- src/tkt.c +++ src/tkt.c @@ -715,12 +715,12 @@ /* ** WEBPAGE: tktview ** URL: tktview?name=HASH ** ** View a ticket identified by the name= query parameter. -** Other query parameters: ** +** Other query parameters: ** tl Show a timeline of the ticket above the status */ void tktview_page(void){ const char *zScript; char *zFullName; @@ -1194,11 +1194,10 @@ ** URL: /tkttimeline/TICKETUUID ** ** Show the change history for a single ticket in timeline format. ** ** Query parameters: -** ** y=ci Show only check-ins associated with the ticket */ void tkttimeline_page(void){ char *zTitle; const char *zUuid; @@ -1475,53 +1474,42 @@ ** COMMAND: ticket* ** ** Usage: %fossil ticket SUBCOMMAND ... ** ** Run various subcommands to control tickets -** ** > fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?OPTIONS? +** Run the ticket report, identified by the report format title +** used in the GUI. The data is written as flat file on stdout, +** using TAB as separator. ** ** Options: -** -l|--limit LIMITCHAR -** -q|--quote +** -l|--limit LIMITCHAR Specify a different separator +** -q|--quote If --quote is used, the tickets are encoded by quoting special +** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r, +** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\). +** Otherwise, the simplified encoding as on the show report raw page +** in the GUI is used. This has no effect in JSON mode. ** -R|--repository REPO ** -** Run the ticket report, identified by the report format title -** used in the GUI. The data is written as flat file on stdout, -** using TAB as separator. The separator can be changed using -** the -l or --limit option. -** ** If TICKETFILTER is given on the commandline, the query is ** limited with a new WHERE-condition. ** example: Report lists a column # with the uuid ** TICKETFILTER may be [#]='uuuuuuuuu' ** example: Report only lists rows with status not open ** TICKETFILTER: status != 'open' ** -** If --quote is used, the tickets are encoded by quoting special -** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r, -** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\). -** Otherwise, the simplified encoding as on the show report raw page -** in the GUI is used. This has no effect in JSON mode. -** ** Instead of the report title it's possible to use the report ** number; the special report number 0 lists all columns defined in ** the ticket table. -** ** > fossil ticket list fields ** > fossil ticket ls fields -** ** List all fields defined for ticket in the fossil repository. -** ** > fossil ticket list reports ** > fossil ticket ls reports -** ** List all ticket reports defined in the fossil repository. -** ** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q|--quote? ** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q|--quote? -** ** Change ticket identified by TICKETUUID to set the values of ** each field FIELD to VALUE. ** ** Field names as defined in the TICKET table. By default, these ** names include: type, status, subsystem, priority, severity, foundin, @@ -1531,17 +1519,13 @@ ** If you use +FIELD, the VALUE is appended to the field FIELD. You ** can use more than one field/value pair on the commandline. Using ** --quote enables the special character decoding as in "ticket ** show", which allows setting multiline text or text with special ** characters. -** ** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q|--quote? -** ** Like set, but create a new ticket with the given values. -** ** > fossil ticket history TICKETUUID -** ** Show the complete change history for the ticket ** ** Note that the values in set|add are not validated against the ** definitions given in "Ticket Common Script". */ Index: src/tktsetup.c ================================================================== --- src/tktsetup.c +++ src/tktsetup.c @@ -153,12 +153,12 @@ cgi_redirect("tktsetup"); } } @ <form action="%R/%s(g.zPath)" method="post"><div> login_insert_csrf_secret(); - @ <p>%s(zDesc)</p> - @ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea> + @ <p><label for="x">%s(zDesc)</label></p> + @ <textarea id="x" name="x" rows="%d(height)" cols="80">%h(z)</textarea> @ <blockquote><p> @ <input type="submit" name="submit" value="Apply Changes" /> @ <input type="submit" name="clear" value="Revert To Default" /> @ <input type="submit" name="setup" value="Cancel" /> @ </p></blockquote> @@ -324,57 +324,57 @@ @ </th1> @ <h1 style="text-align: center;">Enter A New Ticket</h1> @ <table cellpadding="5"> @ <tr> @ <td colspan="3"> -@ Enter a one-line summary of the ticket:<br /> -@ <input type="text" name="title" size="60" value="$<title>" /> +@ <label>Enter a one-line summary of the ticket:<br /> +@ <input type="text" name="title" size="60" value="$<title>" /></label> @ </td> @ </tr> @ @ <tr> -@ <td align="right">Type:</td> +@ <td align="right"><label for="type">Type:</label></td> @ <td align="left"><th1>combobox type $type_choices 1</th1></td> @ <td align="left">What type of ticket is this?</td> @ </tr> @ @ <tr> -@ <td align="right">Version:</td> +@ <td align="right"><label for="foundin">Version:</label></td> @ <td align="left"> -@ <input type="text" name="foundin" size="20" value="$<foundin>" /> +@ <input type="text" id="foundin" name="foundin" size="20" value="$<foundin>" /> @ </td> @ <td align="left">In what version or build number do you observe @ the problem?</td> @ </tr> @ @ <tr> -@ <td align="right">Severity:</td> +@ <td align="right"><label for="severity">Severity:</label></td> @ <td align="left"><th1>combobox severity $severity_choices 1</th1></td> @ <td align="left">How debilitating is the problem? How badly does the problem @ affect the operation of the product?</td> @ </tr> @ @ <tr> -@ <td align="right">EMail:</td> +@ <td align="right"><label for="private_contact">EMail:</label></td> @ <td align="left"> -@ <input type="text" name="private_contact" value="$<private_contact>" +@ <input type="text" id="private_contact" name="private_contact" value="$<private_contact>" @ size="30" /> @ </td> @ <td align="left"><u>Not publicly visible</u> @ Used by developers to contact you with questions.</td> @ </tr> @ @ <tr> @ <td colspan="3"> -@ Enter a detailed description of the problem. +@ <label for="icomment">Enter a detailed description of the problem.</label> @ For code defects, be sure to provide details on exactly how @ the problem can be reproduced. Provide as much detail as -@ possible. Format: +@ possible. <label for="mutype">Format:</label> @ <th1>combobox mutype {HTML {[links only]} Markdown {Plain Text} Wiki} 1</th1> @ <br /> @ <th1>set nline [linecount $comment 50 10]</th1> -@ <textarea name="icomment" cols="80" rows="$nline" +@ <textarea id="icomment" name="icomment" cols="80" rows="$nline" @ wrap="virtual" class="wikiedit">$<icomment></textarea><br /> @ </tr> @ @ <th1>enable_output [info exists preview]</th1> @ <tr><td colspan="3"> @@ -615,55 +615,56 @@ @ submit_ticket @ set preview 1 @ } @ </th1> @ <table cellpadding="5"> -@ <tr><td class="tktDspLabel">Title:</td><td> -@ <input type="text" name="title" value="$<title>" size="60" /> +@ <tr><td class="tktDspLabel"><label for="title">Title:</label></td><td> +@ <input type="text" id="title" name="title" value="$<title>" size="60" /> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Status:</td><td> +@ <tr><td class="tktDspLabel"><label for="status">Status:</label></td><td> @ <th1>combobox status $status_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Type:</td><td> +@ <tr><td class="tktDspLabel"><label for="type">Type:</label></td><td> @ <th1>combobox type $type_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Severity:</td><td> +@ <tr><td class="tktDspLabel"><label for="severity">Severity:</label></td><td> @ <th1>combobox severity $severity_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Priority:</td><td> +@ <tr><td class="tktDspLabel"><label for="priority">Priority:</label></td><td> @ <th1>combobox priority $priority_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Resolution:</td><td> +@ <tr><td class="tktDspLabel"><label for="resolution">Resolution:</label></td><td> @ <th1>combobox resolution $resolution_choices 1</th1> @ </td></tr> @ -@ <tr><td class="tktDspLabel">Subsystem:</td><td> +@ <tr><td class="tktDspLabel"><label for="subsystem">Subsystem:</label></td><td> @ <th1>combobox subsystem $subsystem_choices 1</th1> @ </td></tr> @ @ <th1>enable_output [hascap e]</th1> -@ <tr><td class="tktDspLabel">Contact:</td><td> -@ <input type="text" name="private_contact" size="40" +@ <tr><td class="tktDspLabel"><label for="private_contact">Contact:</label></td><td> +@ <input type="text" id="private_contact" name="private_contact" size="40" @ value="$<private_contact>" /> @ </td></tr> @ <th1>enable_output 1</th1> @ -@ <tr><td class="tktDspLabel">Version Found In:</td><td> -@ <input type="text" name="foundin" size="50" value="$<foundin>" /> +@ <tr><td class="tktDspLabel"><label for="foundin"> +@ Version Found In:</label></td><td> +@ <input type="text" id="foundin" name="foundin" size="50" value="$<foundin>" /> @ </td></tr> @ @ <tr><td colspan="2"> -@ Append Remark with format +@ <label for="icomment">Append Remark</label> with <label for="mutype">format</label> @ <th1>combobox mutype {HTML {[links only]} Markdown {Plain Text} Wiki} 1</th1> -@ from -@ <input type="text" name="username" value="$<username>" size="30" />:<br /> -@ <textarea name="icomment" cols="80" rows="15" +@ <label for="username">from</label> +@ <input type="text" id="username" name="username" value="$<username>" size="30" />:<br /> +@ <textarea id="icomment" name="icomment" cols="80" rows="15" @ wrap="virtual" class="wikiedit">$<icomment></textarea> @ </td></tr> @ @ <th1>enable_output [info exists preview]</th1> @ <tr><td colspan="2"> Index: src/unversioned.c ================================================================== --- src/unversioned.c +++ src/unversioned.c @@ -230,67 +230,58 @@ ** for download but which do not preserve history. Only the most recent version ** of each UV-file is retained. Changes to an UV-file are permanent and cannot ** be undone, so use appropriate caution with this command. ** ** Subcommands: -** ** add FILE ... Add or update one or more unversioned files in ** the local repository so that they match FILEs ** on disk. Changes are not pushed to other ** repositories until the next sync. -** ** add FILE --as UVFILE Add or update a single file named FILE on disk ** and UVFILE in the repository unversioned file ** namespace. This variant of the 'add' command allows ** the name to be different in the repository versus ** what appears on disk, but it only allows adding ** a single file at a time. -** ** cat FILE ... Concatenate the content of FILEs to stdout. -** ** edit FILE Bring up FILE in a text editor for modification. -** ** export FILE OUTPUT Write the content of FILE into OUTPUT on disk -** ** list | ls Show all unversioned files held in the local -** repository. Options: +** repository. ** +** Options: ** --glob PATTERN Show only files that match ** --like PATTERN Show only files that match ** -l Show additional details for ** files that match. Implied ** when 'list' is used. -** ** revert ?URL? Restore the state of all unversioned files in the ** local repository to match the remote repository ** URL. ** ** Options: ** -v|--verbose Extra diagnostic output ** -n|--dry-run Show what would have happened -** ** remove|rm|delete FILE ... ** Remove unversioned files from the local repository. ** Changes are not pushed to other repositories until -** the next sync. Options: +** the next sync. ** +** Options: ** --glob PATTERN Remove files that match ** --like PATTERN Remove files that match -** ** sync ?URL? Synchronize the state of all unversioned files with ** the remote repository URL. The most recent version ** of each file is propagated to all repositories and ** all prior versions are permanently forgotten. ** ** Options: ** -v|--verbose Extra diagnostic output ** -n|--dry-run Show what would have happened -** ** touch FILE ... Update the TIMESTAMP on all of the listed files ** ** Options: -** ** --mtime TIMESTAMP Use TIMESTAMP instead of "now" for the "add", ** "edit", "remove", and "touch" subcommands. ** -R|--repository REPO Use FILE as the repository */ void unversioned_cmd(void){ @@ -523,12 +514,12 @@ /* ** WEBPAGE: uvlist ** ** Display a list of all unversioned files in the repository. -** Query parameters: ** +** Query parameters: ** byage=1 Order the initial display be decreasing age ** showdel=0 Show deleted files */ void uvlist_page(void){ Stmt q; Index: src/user.c ================================================================== --- src/user.c +++ src/user.c @@ -317,37 +317,25 @@ ** ** Usage: %fossil user SUBCOMMAND ... ?-R|--repository REPO? ** ** Run various subcommands on users of the open repository or of ** the repository identified by the -R or --repository option. -** ** > fossil user capabilities USERNAME ?STRING? -** ** Query or set the capabilities for user USERNAME -** ** > fossil user contact USERNAME ?CONTACT-INFO? -** ** Query or set contact information for user USERNAME -** ** > fossil user default ?USERNAME? -** ** Query or set the default user. The default user is the ** user for command-line interaction. -** ** > fossil user list ** > fossil user ls -** ** List all users known to the repository -** ** > fossil user new ?USERNAME? ?CONTACT-INFO? ?PASSWORD? -** ** Create a new user in the repository. Users can never be ** deleted. They can be denied all access but they must continue ** to exist in the database. -** ** > fossil user password USERNAME ?PASSWORD? -** ** Change the web access password for a user. */ void user_cmd(void){ int n; db_find_and_open_repository(0, 0); @@ -618,18 +606,14 @@ ** Usage: %fossil test-prompt-password PROMPT VERIFY ** ** Prompts the user for a password and then prints it verbatim. ** ** Behavior is controlled by the VERIFY parameter: -** ** 0 Just ask once. -** ** 1 If the first answer is a non-empty string, ask for ** verification. Repeat if the two strings do not match. -** ** 2 Ask twice, repeat if the strings do not match. - */ void test_prompt_password_cmd(void){ Blob answer; int iVerify = 0; if( g.argc!=4 ) usage("PROMPT VERIFY"); @@ -643,11 +627,10 @@ ** ** Show login attempts, including timestamp and IP address. ** Requires Admin privileges. ** ** Query parameters: -** ** y=N 1: success only. 2: failure only. 3: both (default: 3) ** n=N Number of entries to show (default: 200) ** o=N Skip this many entries (default: 0) */ void access_log_page(void){ Index: src/wiki.c ================================================================== --- src/wiki.c +++ src/wiki.c @@ -523,11 +523,10 @@ ** WEBPAGE: wiki ** ** Display a wiki page. Example: /wiki?name=PAGENAME ** ** Query parameters: -** ** name=NAME Name of the wiki page to display. Required. ** nsm Omit the submenu if present. (Mnemonic: No SubMenu) ** p Always show just the wiki page. For special ** pages for check-ins, branches, or tags, there will ** be a redirect to the associated /info page unless @@ -650,11 +649,11 @@ ** Output a selection box from which the user can select the ** wiki mimetype. */ void mimetype_option_menu(const char *zMimetype){ unsigned i; - @ <select name="mimetype" size="1"> + @ <select id="mimetype" name="mimetype" size="1"> for(i=0; i<count(azStyles); i+=3){ if( fossil_strcmp(zMimetype,azStyles[i])==0 ){ @ <option value="%s(azStyles[i])" selected>%s(azStyles[i+1])</option> }else{ @ <option value="%s(azStyles[i])">%s(azStyles[i+1])</option> @@ -1333,13 +1332,13 @@ "class='hidden'" ">"); CX("<div class='" "wikiedit-options flex-container flex-row child-gap-small'>"); CX("<div class='input-with-label'>" - "<label>Mime type</label>"); + "<label>Mime type "); mimetype_option_menu("text/x-markdown"); - CX("</div>"); + CX("</label></div>"); style_select_list_int("select-font-size", "editor_font_size", "Editor font size", NULL/*tooltip*/, 100, "100%", 100, "125%", 125, @@ -1370,11 +1369,11 @@ "</div>"); CX("</div>"); CX("<div class='flex-container flex-column stretch'>"); CX("<textarea name='content' id='wikiedit-content-editor' " - "class='wikiedit' rows='25'>"); + "class='wikiedit' rows='25' aria-label='Content' title='Content'>"); CX("</textarea>"); CX("</div>"/*textarea wrapper*/); CX("</div>"/*#tab-file-content*/); } /****** Preview tab ******/ @@ -1532,15 +1531,17 @@ style_header("Create A New Wiki Page"); wiki_standard_submenu(W_ALL_BUT(W_NEW)); @ <p>Rules for wiki page names:</p> well_formed_wiki_name_rules(); form_begin(0, "%R/wikinew"); - @ <p>Name of new wiki page: - @ <input style="width: 35;" type="text" name="name" value="%h(zName)" /><br /> - @ %z(href("%R/markup_help"))Markup style</a>: + @ <p><label>Name of new wiki page: + @ <input style="width: 35;" type="text" name="name" value="%h(zName)" /></label><br /> + @ <label>Markup style + @ %z(href("%R/markup_help")) + @ <span class="help-buttonlet processed" title="Help"></span></a>: mimetype_option_menu("text/x-markdown"); - @ <br /><input type="submit" value="Create" /> + @ </label><br /><input type="submit" value="Create" /> @ </p></form> if( zName[0] ){ @ <p><span class="wikiError"> @ "%h(zName)" is not a valid wiki page name!</span></p> } @@ -1693,16 +1694,16 @@ zUser = PD("u", g.zLogin); form_begin(0, "%R/wikiappend"); login_insert_csrf_secret(); @ <input type="hidden" name="name" value="%h(zPageName)" /> @ <input type="hidden" name="mimetype" value="%h(zMimetype)" /> - @ Your Name: - @ <input type="text" name="u" size="20" value="%h(zUser)" /><br /> + @ <label>Your Name: + @ <input type="text" name="u" size="20" value="%h(zUser)" /></label><br /> zFormat = mimetype_common_name(zMimetype); - @ Comment to append (formatted as %s(zFormat)):<br /> + @ <label>Comment to append (formatted as %s(zFormat)):<br /> @ <textarea name="r" class="wikiedit" cols="80" - @ rows="10" wrap="virtual">%h(PD("r",""))</textarea> + @ rows="10" wrap="virtual">%h(PD("r",""))</textarea></label> @ <br /> @ <input type="submit" name="preview" value="Preview Your Comment" /> @ <input type="submit" name="submit" value="Append Your Changes" /> @ <input type="submit" name="cancel" value="Cancel" /> captcha_generate(0); @@ -1714,11 +1715,10 @@ /* ** WEBPAGE: whistory ** URL: /whistory?name=PAGENAME ** ** Additional parameters: -** ** showid Show RID values ** ** Show the complete change history for a single wiki page. */ void whistory_page(void){ @@ -1807,11 +1807,10 @@ ** WEBPAGE: wdiff ** ** Show the changes to a wiki page. ** ** Query parameters: -** ** id=HASH Hash prefix for the child version to be diffed. ** rid=INTEGER RecordID for the child version ** pid=HASH Hash prefix for the parent. ** ** The "id" query parameter is required. "pid" is optional. If "pid" @@ -2126,14 +2125,12 @@ ** COMMAND: wiki* ** ** Usage: %fossil wiki (export|create|commit|list) WikiName ** ** Run various subcommands to work with wiki entries or tech notes. -** ** > fossil wiki export ?OPTIONS? PAGENAME ?FILE? ** > fossil wiki export ?OPTIONS? -t|--technote DATETIME|TECHNOTE-ID|TAG ?FILE? -** ** Sends the latest version of either a wiki page or of a tech ** note to the given file or standard output. A filename of "-" ** writes the output to standard output. The directory parts of ** the output filename are created if needed. ** If PAGENAME is provided, the named wiki page will be output. @@ -2150,13 +2147,11 @@ ** -H|--HTML Works like -h|-html but wraps the output in ** <html><body>...</body></html>. ** -p|--pre If -h|-H is used and the page or technote has ** the text/plain mimetype, its HTML-escaped output ** will be wrapped in <pre>...</pre>. -** ** > fossil wiki (create|commit) (PAGENAME | TECHNOTE-COMMENT) ?FILE? ?OPTIONS? -** ** Create a new or commit changes to an existing wiki page or ** technote from FILE or from standard input. PAGENAME is the ** name of the wiki entry. TECHNOTE-COMMENT is the timeline comment of ** the technote. ** @@ -2182,14 +2177,12 @@ ** updated by its technote id, which is ** its UUID. ** --technote-tags TAGS The set of tags for a technote. ** --technote-bgcolor COLOR The color used for the technote ** on the timeline. -** ** > fossil wiki list ?OPTIONS? ** > fossil wiki ls ?OPTIONS? -** ** Lists all wiki entries, one per line, ordered ** case-insensitively by name. Wiki pages associated with ** check-ins and branches are NOT shown, unless -a is given. ** ** Options: @@ -2204,11 +2197,10 @@ ** -s|--show-technote-ids The id of the tech note will be listed ** along side the timestamp. The tech note ** id will be the first word on each line. ** This option only applies if the ** --technote option is also specified. -** ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in ** year-month-day form, it may be truncated, the "T" may be replaced by ** a space, and it may also name a timezone offset from UTC as "-HH:MM" ** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z" ** means UTC. Index: src/wikiformat.c ================================================================== --- src/wikiformat.c +++ src/wikiformat.c @@ -1896,12 +1896,12 @@ ** COMMAND: test-markdown-render ** ** Usage: %fossil test-markdown-render FILE ... ** ** Render markdown in FILE as HTML on stdout. -** Options: ** +** Options: ** --safe Restrict the output to use only "safe" HTML ** --lint-footnotes Print stats for footnotes-related issues */ void test_markdown_render(void){ Blob in, out; @@ -2769,11 +2769,10 @@ ** This setting controls whether or not unsafe HTML elements ** (such as SCRIPT or STYLE tags) are allowed in Markdown-formatted ** documents. Unsafe HTML is disabled by default. If this setting ** exists and is a string, then letters in that string can enable ** unsafe HTML in various contexts: -** ** - b Unsafe HTML allowed in embedded documentation ** - f Unsafe HTML allowed in forum posts ** - t Unsafe HTML allowed in tickets ** - w Unsafe HTML allowed on wiki pages */ Index: src/xfer.c ================================================================== --- src/xfer.c +++ src/xfer.c @@ -1872,11 +1872,10 @@ ** as necessary to generate an appropriate XFERFILE test case. Then run: ** ** fossil test-xfer xferfile.txt ** ** Options: -** ** --host HOSTNAME Supply a server hostname used to populate ** g.zBaseURL and similar. */ void cmd_test_xfer(void){ const char *zHost; Index: src/xfersetup.c ================================================================== --- src/xfersetup.c +++ src/xfersetup.c @@ -136,12 +136,12 @@ cgi_redirect("xfersetup"); } } @ <form action="%R/%s(g.zPath)" method="post"><div> login_insert_csrf_secret(); - @ <p>%s(zDesc)</p> - @ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea> + @ <p><label for="x">%s(zDesc)</label></p> + @ <textarea id="x" name="x" rows="%d(height)" cols="80">%h(z)</textarea> @ <p> @ <input type="submit" name="submit" value="Apply Changes" /> @ <input type="submit" name="clear" value="Revert To Default" /> @ <input type="submit" name="setup" value="Cancel" /> @ </p> Index: src/zip.c ================================================================== --- src/zip.c +++ src/zip.c @@ -870,33 +870,28 @@ ** query parameter. Return the archive as the HTTP reply content. ** ** If the NAME contains one "/" then the part before the "/" is taken ** as the TAG and the part after the "/" becomes the true name. Hence, ** the following URLs are all equivalent: -** ** /sqlar/508c42a6398f8/download.sqlar ** /sqlar?r=508c42a6398f8&name=download.sqlar ** /sqlar/download.sqlar?r=508c42a6398f8 ** /sqlar?name=508c42a6398f8/download.sqlar ** ** Query parameters: -** ** name=NAME The base name of the output file. The default ** value is a configuration parameter in the project ** settings. A prefix of the name, omitting the ** extension, is used as the top-most directory name. -** ** r=TAG The check-in that is turned into a ZIP archive. ** Defaults to "trunk". This query parameter used to ** be called "uuid" and the older "uuid" name is still ** accepted for backwards compatibility. If this ** query parameter is omitted, the latest "trunk" ** check-in is used. -** ** in=PATTERN Only include files that match the comma-separate ** list of GLOB patterns in PATTERN, as with ex= -** ** ex=PATTERN Omit any file that match PATTERN. PATTERN is a ** comma-separated list of GLOB patterns, where each ** pattern can optionally be quoted using ".." or '..'. ** Any file matching both ex= and in= is excluded. */ Index: www/customskin.md ================================================================== --- www/customskin.md +++ www/customskin.md @@ -103,15 +103,15 @@ In most cases, it is best to leave the Fossil-generated HTML Header alone. (One exception is when the administrator needs to include links to additional CSS files.) The configurable part of the skin begins with the Content Header section which should follow this template: - <div class="header"> + <header class="header"> ... top banner and menu bar ... </div> -Note that `<div class="header">` and `</div>` tags must be included in +Note that `<header class="header">` and `</div>` tags must be included in the Content Header text of the skin. In other words, you, the administrator, need to supply that text as part of your skin customization. The Fossil-generated Content section immediately follows the Content Header. @@ -122,11 +122,11 @@ </div> After the Content is the custom Content Footer section which should follow this template: - <div class="footer"> + <footer class="footer"> ... skin-specific stuff here ... </div> As with the Content Header, the template elements of the Content Footer should appear exactly as they are shown. @@ -140,11 +140,11 @@ ## <a id="mainmenu"></a>Changing the Main Menu Contents As of Fossil 2.15, the actual text content of the skin’s main menu is no longer part of the skin proper if you’re using one of the stock skins. If you look at the Header section of the skin, you’ll find a -`<div class="mainmenu">` element whose contents are set by a short +`<nav class="mainmenu">` element whose contents are set by a short [TH1](./th1.md) script from the contents of the **Main Menu** section of the Setup → Configuration screen. This feature allows the main menu contents to stay the same across different skins, so you no longer have to reapply menu customizations @@ -334,16 +334,16 @@ the value of the TH1 variable NAME. For example, first few lines of a typical Content Header will look like this: - <div class="header"> + <header class="header"> <div class="title"><h1>$<project_name></h1>$<title>/div> After variables are substituted by TH1, that will look more like this: - <div class="header"> + <header class="header"> <div class="title"><h1>Project Name</h1>Page Title</div> As you can see, two TH1 variable substitutions were done. The same TH1 interpreter is used for both the header and the footer @@ -375,20 +375,20 @@ The hbmenu.js script requires the following `<div>` element somewhere in your header, in which to build the hamburger menu. - <div id='hbdrop'></div> + <nav id='hbdrop'></nav> Out of the box, the contents of the panel is populated with the [Site Map](/sitemap), but only if the panel does not already contain any HTML elements (that is, not just comments, plain text or non-presentational white -space). So the hamburger menu can be customized by replacing the empty `<div -id='hbdrop'></div>` element with a menu structure knitted according to the +space). So the hamburger menu can be customized by replacing the empty `<nav +id='hbdrop'></nav>` element with a menu structure knitted according to the following template: - <div id="hbdrop" data-anim-ms="400"> + <nav id="hbdrop" data-anim-ms="400"> <ul class="columns" style="column-width: 20em; column-count: auto">  <li> <a href="$home$index_page">Link: Home</a> <ul> @@ -404,11 +404,11 @@ <li><a href="$home/doc/trunk/www/th1.md">Link: TH1 Scripts</a></li> </ul> </li>  </ul> - </div> + </nav> The custom `data-anim-ms` attribute can be added to the panel element to direct the Javascript logic to override the default menu animation duration of 400 ms. A faster animation duration of 80-200 ms may be preferred for smaller menus. The animation is disabled by setting the attribute to `"0"`.