diff options
Diffstat (limited to 'forged')
| -rw-r--r-- | forged/static/style.css | 17 | ||||
| -rw-r--r-- | forged/templates/400.tmpl | 10 | ||||
| -rw-r--r-- | forged/templates/400_colon.tmpl | 12 | ||||
| -rw-r--r-- | forged/templates/403.tmpl | 10 | ||||
| -rw-r--r-- | forged/templates/404.tmpl | 8 | ||||
| -rw-r--r-- | forged/templates/451.tmpl | 10 | ||||
| -rw-r--r-- | forged/templates/500.tmpl | 10 | ||||
| -rw-r--r-- | forged/templates/501.tmpl | 8 | ||||
| -rw-r--r-- | forged/templates/group.tmpl | 118 | ||||
| -rw-r--r-- | forged/templates/index.tmpl | 86 | ||||
| -rw-r--r-- | forged/templates/login.tmpl | 82 | ||||
| -rw-r--r-- | forged/templates/repo_branches.tmpl | 111 | ||||
| -rw-r--r-- | forged/templates/repo_commit.tmpl | 186 | ||||
| -rw-r--r-- | forged/templates/repo_contrib_index.tmpl | 120 | ||||
| -rw-r--r-- | forged/templates/repo_contrib_one.tmpl | 200 | ||||
| -rw-r--r-- | forged/templates/repo_index.tmpl | 144 | ||||
| -rw-r--r-- | forged/templates/repo_log.tmpl | 136 | ||||
| -rw-r--r-- | forged/templates/repo_raw_dir.tmpl | 130 | ||||
| -rw-r--r-- | forged/templates/repo_tree_dir.tmpl | 142 | ||||
| -rw-r--r-- | forged/templates/repo_tree_file.tmpl | 88 |
20 files changed, 841 insertions, 787 deletions
diff --git a/forged/static/style.css b/forged/static/style.css index 51846a2..13a2c8e 100644 --- a/forged/static/style.css +++ b/forged/static/style.css @@ -86,10 +86,8 @@ html, code, pre { /* Footer styles */ footer { - margin-top: 1rem; margin-left: auto; margin-right: auto; - margin-bottom: 1rem; display: block; padding: 0 5px; width: fit-content; @@ -104,6 +102,21 @@ footer a:link, footer a:visited { padding: 0 1rem; } +/* Sticky footer */ +body { + position: relative; + min-height: 100vh; +} +main { + padding-bottom: 2.5rem; +} +footer { + position: absolute; + bottom: 0; + width: 100%; + height: 2rem; +} + /* Link styles */ a:link, a:visited { text-decoration-color: var(--text-decoration-color); diff --git a/forged/templates/400.tmpl b/forged/templates/400.tmpl index 9c96ca5..5bb2185 100644 --- a/forged/templates/400.tmpl +++ b/forged/templates/400.tmpl @@ -11,10 +11,12 @@ </head> <body class="400"> {{- template "header" . -}} - <div class="padding-wrapper complete-error-page"> - <h1>400 Bad Request</h1> - <p>{{- .complete_error_msg -}}</p> - </div> + <main> + <div class="padding-wrapper complete-error-page"> + <h1>400 Bad Request</h1> + <p>{{- .complete_error_msg -}}</p> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/400_colon.tmpl b/forged/templates/400_colon.tmpl index c5f72a3..6509c0f 100644 --- a/forged/templates/400_colon.tmpl +++ b/forged/templates/400_colon.tmpl @@ -11,11 +11,13 @@ </head> <body class="400-colon"> {{- template "header" . -}} - <div class="padding-wrapper complete-error-page"> - <h1>400 Bad Request</h1> - <p>We recently switched URL schemes. Previously “<code>:</code>” was used as our URL group separator, but because OpenSMTPD does not implement local-part address quoting properly, we’re unable to include “<code>:</code>” in URLs properly, hence we use “<code>-</code>” now.</p> - <p>As a precaution in case visitors get confused, this page was set up. <strong>You should probably replace the “<code>:</code>”s with “<code>-</code>”s in the URL bar.</strong> If there are colons in the URL that <em>is not</em> the group separator—that’s an edge case that we’ll fix later.</p> - </div> + <main> + <div class="padding-wrapper complete-error-page"> + <h1>400 Bad Request</h1> + <p>We recently switched URL schemes. Previously “<code>:</code>” was used as our URL group separator, but because OpenSMTPD does not implement local-part address quoting properly, we’re unable to include “<code>:</code>” in URLs properly, hence we use “<code>-</code>” now.</p> + <p>As a precaution in case visitors get confused, this page was set up. <strong>You should probably replace the “<code>:</code>”s with “<code>-</code>”s in the URL bar.</strong> If there are colons in the URL that <em>is not</em> the group separator—that’s an edge case that we’ll fix later.</p> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/403.tmpl b/forged/templates/403.tmpl index 4908c38..5090c60 100644 --- a/forged/templates/403.tmpl +++ b/forged/templates/403.tmpl @@ -11,10 +11,12 @@ </head> <body class="403"> {{- template "header" . -}} - <div class="padding-wrapper complete-error-page"> - <h1>403 Forbidden</h1> - <p>{{- .complete_error_msg -}}</p> - </div> + <main> + <div class="padding-wrapper complete-error-page"> + <h1>403 Forbidden</h1> + <p>{{- .complete_error_msg -}}</p> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/404.tmpl b/forged/templates/404.tmpl index d9485ef..10ee1b3 100644 --- a/forged/templates/404.tmpl +++ b/forged/templates/404.tmpl @@ -11,9 +11,11 @@ </head> <body class="404"> {{- template "header" . -}} - <div class="padding-wrapper complete-error-page"> - <h1>404 Not Found</h1> - </div> + <main> + <div class="padding-wrapper complete-error-page"> + <h1>404 Not Found</h1> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/451.tmpl b/forged/templates/451.tmpl index 510f96c..962fd90 100644 --- a/forged/templates/451.tmpl +++ b/forged/templates/451.tmpl @@ -11,10 +11,12 @@ </head> <body class="451"> {{- template "header" . -}} - <div class="padding-wrapper complete-error-page"> - <h1>451 Unavailable For Legal Reasons</h1> - <p>{{- .complete_error_msg -}}</p> - </div> + <main> + <div class="padding-wrapper complete-error-page"> + <h1>451 Unavailable For Legal Reasons</h1> + <p>{{- .complete_error_msg -}}</p> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/500.tmpl b/forged/templates/500.tmpl index b1dc15d..38603d5 100644 --- a/forged/templates/500.tmpl +++ b/forged/templates/500.tmpl @@ -11,10 +11,12 @@ </head> <body class="500"> {{- template "header" . -}} - <div class="padding-wrapper complete-error-page"> - <h1>500 Internal Server Error</h1> - <p>{{- .complete_error_msg -}}</p> - </div> + <main> + <div class="padding-wrapper complete-error-page"> + <h1>500 Internal Server Error</h1> + <p>{{- .complete_error_msg -}}</p> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/501.tmpl b/forged/templates/501.tmpl index d982bfc..f17b62e 100644 --- a/forged/templates/501.tmpl +++ b/forged/templates/501.tmpl @@ -11,9 +11,11 @@ </head> <body class="501"> {{- template "header" . -}} - <div class="padding-wrapper complete-error-page"> - <h1>501 Not Implemented</h1> - </div> + <main> + <div class="padding-wrapper complete-error-page"> + <h1>501 Not Implemented</h1> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/group.tmpl b/forged/templates/group.tmpl index b15c316..3338f9b 100644 --- a/forged/templates/group.tmpl +++ b/forged/templates/group.tmpl @@ -12,66 +12,68 @@ </head> <body class="group"> {{- template "header" . -}} - <div class="padding-wrapper"> - {{- if .description -}} - <p>{{- .description -}}</p> - {{- end -}} - {{- template "group_view" . -}} - </div> - {{- if .direct_access -}} + <main> <div class="padding-wrapper"> - <form method="POST" enctype="application/x-www-form-urlencoded"> - <table> - <thead> - <tr> - <th class="title-row" colspan="2"> - Create repo - </th> - </tr> - </thead> - <tbody> - <tr> - <th scope="row">Name</th> - <td class="tdinput"> - <input id="repo-name-input" name="repo_name" type="text" /> - </td> - </tr> - <tr> - <th scope="row">Description</th> - <td class="tdinput"> - <input id="repo-desc-input" name="repo_desc" type="text" /> - </td> - </tr> - <tr> - <th scope="row">Contrib</th> - <td class="tdinput"> - <select id="repo-contrib-input" name="repo_contrib"> - <option value="public">Public</option> - <option value="ssh_pubkey">SSH public key</option> - <option value="federated">Federated service</option> - <option value="registered_user">Registered user</option> - <option value="closed">Closed</option> - </select> - </td> - </tr> - </tbody> - <tfoot> - <tr> - <td class="th-like" colspan="2"> - <div class="flex-justify"> - <div class="left"> - </div> - <div class="right"> - <input class="btn-primary" type="submit" value="Create" /> - </div> - </div> - </td> - </tr> - </tfoot> - </table> - </form> + {{- if .description -}} + <p>{{- .description -}}</p> + {{- end -}} + {{- template "group_view" . -}} </div> - {{- end -}} + {{- if .direct_access -}} + <div class="padding-wrapper"> + <form method="POST" enctype="application/x-www-form-urlencoded"> + <table> + <thead> + <tr> + <th class="title-row" colspan="2"> + Create repo + </th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">Name</th> + <td class="tdinput"> + <input id="repo-name-input" name="repo_name" type="text" /> + </td> + </tr> + <tr> + <th scope="row">Description</th> + <td class="tdinput"> + <input id="repo-desc-input" name="repo_desc" type="text" /> + </td> + </tr> + <tr> + <th scope="row">Contrib</th> + <td class="tdinput"> + <select id="repo-contrib-input" name="repo_contrib"> + <option value="public">Public</option> + <option value="ssh_pubkey">SSH public key</option> + <option value="federated">Federated service</option> + <option value="registered_user">Registered user</option> + <option value="closed">Closed</option> + </select> + </td> + </tr> + </tbody> + <tfoot> + <tr> + <td class="th-like" colspan="2"> + <div class="flex-justify"> + <div class="left"> + </div> + <div class="right"> + <input class="btn-primary" type="submit" value="Create" /> + </div> + </div> + </td> + </tr> + </tfoot> + </table> + </form> + </div> + {{- end -}} + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/index.tmpl b/forged/templates/index.tmpl index bd81f04..66bd177 100644 --- a/forged/templates/index.tmpl +++ b/forged/templates/index.tmpl @@ -11,50 +11,52 @@ </head> <body class="index"> {{- template "header" . -}} - <div class="padding-wrapper"> - <table class="wide"> - <thead> - <tr> - <th colspan="2" class="title-row">Groups</th> - </tr> - <tr> - <th scope="col">Name</th> - <th scope="col">Description</th> - </tr> - </thead> - <tbody> - {{- range .groups -}} + <main> + <div class="padding-wrapper"> + <table class="wide"> + <thead> <tr> - <td> - <a href="{{- .Name | path_escape -}}/">{{- .Name -}}</a> - </td> - <td> - {{- .Description -}} - </td> + <th colspan="2" class="title-row">Groups</th> </tr> - {{- end -}} - </tbody> - </table> - <table class="wide"> - <thead> - <tr> - <th colspan="2" class="title-row"> - Info - </th> - </tr> - </thead> - <tbody> - <tr> - <th scope="row">SSH public key</th> - <td><code class="breakable">{{- .global.server_public_key_string -}}</code></td> - </tr> - <tr> - <th scope="row">SSH fingerprint</th> - <td><code class="breakable">{{- .global.server_public_key_fingerprint -}}</code></td> - </tr> - </tbody> - </table> - </div> + <tr> + <th scope="col">Name</th> + <th scope="col">Description</th> + </tr> + </thead> + <tbody> + {{- range .groups -}} + <tr> + <td> + <a href="{{- .Name | path_escape -}}/">{{- .Name -}}</a> + </td> + <td> + {{- .Description -}} + </td> + </tr> + {{- end -}} + </tbody> + </table> + <table class="wide"> + <thead> + <tr> + <th colspan="2" class="title-row"> + Info + </th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">SSH public key</th> + <td><code class="breakable">{{- .global.server_public_key_string -}}</code></td> + </tr> + <tr> + <th scope="row">SSH fingerprint</th> + <td><code class="breakable">{{- .global.server_public_key_fingerprint -}}</code></td> + </tr> + </tbody> + </table> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/login.tmpl b/forged/templates/login.tmpl index 1e26c82..980b863 100644 --- a/forged/templates/login.tmpl +++ b/forged/templates/login.tmpl @@ -10,47 +10,49 @@ <title>Login – {{ .global.forge_title -}}</title> </head> <body class="index"> - {{- .login_error -}} - <div class="padding-wrapper"> - <form method="POST" enctype="application/x-www-form-urlencoded"> - <table> - <thead> - <tr> - <th class="title-row" colspan="2"> - Password authentication - </th> - </tr> - </thead> - <tbody> - <tr> - <th scope="row">Username</th> - <td class="tdinput"> - <input id="usernameinput" name="username" type="text" /> - </td> - </tr> - <tr> - <th scope="row">Password</th> - <td class="tdinput"> - <input id="passwordinput" name="password" type="password" /> - </td> - </tr> - </tbody> - <tfoot> - <tr> - <td class="th-like" colspan="2"> - <div class="flex-justify"> - <div class="left"> + <main> + {{- .login_error -}} + <div class="padding-wrapper"> + <form method="POST" enctype="application/x-www-form-urlencoded"> + <table> + <thead> + <tr> + <th class="title-row" colspan="2"> + Password authentication + </th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">Username</th> + <td class="tdinput"> + <input id="usernameinput" name="username" type="text" /> + </td> + </tr> + <tr> + <th scope="row">Password</th> + <td class="tdinput"> + <input id="passwordinput" name="password" type="password" /> + </td> + </tr> + </tbody> + <tfoot> + <tr> + <td class="th-like" colspan="2"> + <div class="flex-justify"> + <div class="left"> + </div> + <div class="right"> + <input class="btn-primary" type="submit" value="Submit" /> + </div> </div> - <div class="right"> - <input class="btn-primary" type="submit" value="Submit" /> - </div> - </div> - </td> - </tr> - </tfoot> - </table> - </form> - </div> + </td> + </tr> + </tfoot> + </table> + </form> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_branches.tmpl b/forged/templates/repo_branches.tmpl index 55ea0a6..c32519d 100644 --- a/forged/templates/repo_branches.tmpl +++ b/forged/templates/repo_branches.tmpl @@ -12,60 +12,65 @@ </head> <body class="repo-branches"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link active" href="../branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link active" href="../branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="padding-wrapper"> - <p> - <strong> - Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. - </strong> - </p> - <table id="branches"> - <thead> - <tr class="title-row"> - <th colspan="1">Branches</th> - </tr> - </thead> - <tbody> - {{- range .branches -}} - <tr> - <td> - <a href="../?branch={{ . }}">{{ . }}</a> - </td> - </tr> - {{- end -}} - </tbody> - </table> - </div> + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> + </div> + <div class="padding-wrapper"> + <p> + <strong> + Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. + </strong> + </p> + <table id="branches"> + <thead> + <tr class="title-row"> + <th colspan="1">Branches</th> + </tr> + </thead> + <tbody> + {{- range .branches -}} + <tr> + <td> + <a href="../?branch={{ . }}">{{ . }}</a> + </td> + </tr> + {{- end -}} + </tbody> + </table> + </div> + </main> + <footer> + {{- template "footer" . -}} + </footer> </body> </html> {{- end -}} diff --git a/forged/templates/repo_commit.tmpl b/forged/templates/repo_commit.tmpl index 470bba9..42f2bcd 100644 --- a/forged/templates/repo_commit.tmpl +++ b/forged/templates/repo_commit.tmpl @@ -12,103 +12,105 @@ </head> <body class="repo-commit"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="padding-wrapper scroll"> - <div class="key-val-grid-wrapper"> - <section id="commit-info" class="key-val-grid"> - <div class="title-row">Commit info</div> - <div class="row-label">ID</div> - <div class="row-value">{{- .commit_id -}}</div> - <div class="row-label">Author</div> - <div class="row-value"> - <span>{{- .commit_object.Author.Name -}}</span> <span><<a href="mailto:{{- .commit_object.Author.Email -}}">{{- .commit_object.Author.Email -}}</a>></span> - </div> - <div class="row-label">Author date</div> - <div class="row-value">{{- .commit_object.Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}}</div> - <div class="row-label">Committer</div> - <div class="row-value"> - <span>{{- .commit_object.Committer.Name -}}</span> <span><<a href="mailto:{{- .commit_object.Committer.Email -}}">{{- .commit_object.Committer.Email -}}</a>></span> - </div> - <div class="row-label">Committer date</div> - <div class="row-value">{{- .commit_object.Committer.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}}</div> - <div class="row-label">Actions</div> - <div class="row-value"> - <a href="{{- .commit_object.Hash -}}.patch">Get patch</a> - </div> - </section> + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> </div> - </div> - - <div class="padding-wrapper scroll" id="this-commit-message"> - <pre>{{- .commit_object.Message -}}</pre> - </div> - <div class="padding-wrapper"> - {{- $parent_commit_hash := .parent_commit_hash -}} - {{- $commit_object := .commit_object -}} - {{- range .file_patches -}} - <div class="file-patch toggle-on-wrapper"> - <input type="checkbox" id="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-toggle toggle-on-toggle"> - <label for="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-header toggle-on-header"> - <div> - {{- if eq .From.Path "" -}} - --- /dev/null - {{- else -}} - --- a/<a href="../tree/{{- .From.Path -}}?commit={{- $parent_commit_hash -}}">{{- .From.Path -}}</a> {{ .From.Mode -}} - {{- end -}} - <br /> - {{- if eq .To.Path "" -}} - +++ /dev/null - {{- else -}} - +++ b/<a href="../tree/{{- .To.Path -}}?commit={{- $commit_object.Hash -}}">{{- .To.Path -}}</a> {{ .To.Mode -}} - {{- end -}} + <div class="padding-wrapper scroll"> + <div class="key-val-grid-wrapper"> + <section id="commit-info" class="key-val-grid"> + <div class="title-row">Commit info</div> + <div class="row-label">ID</div> + <div class="row-value">{{- .commit_id -}}</div> + <div class="row-label">Author</div> + <div class="row-value"> + <span>{{- .commit_object.Author.Name -}}</span> <span><<a href="mailto:{{- .commit_object.Author.Email -}}">{{- .commit_object.Author.Email -}}</a>></span> + </div> + <div class="row-label">Author date</div> + <div class="row-value">{{- .commit_object.Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}}</div> + <div class="row-label">Committer</div> + <div class="row-value"> + <span>{{- .commit_object.Committer.Name -}}</span> <span><<a href="mailto:{{- .commit_object.Committer.Email -}}">{{- .commit_object.Committer.Email -}}</a>></span> </div> - </label> - <div class="file-content toggle-on-content scroll"> - {{- range .Chunks -}} - {{- if eq .Operation 0 -}} - <pre class="chunk chunk-unchanged">{{ .Content }}</pre> - {{- else if eq .Operation 1 -}} - <pre class="chunk chunk-addition">{{ .Content }}</pre> - {{- else if eq .Operation 2 -}} - <pre class="chunk chunk-deletion">{{ .Content }}</pre> - {{- else -}} - <pre class="chunk chunk-unknown">{{ .Content }}</pre> + <div class="row-label">Committer date</div> + <div class="row-value">{{- .commit_object.Committer.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}}</div> + <div class="row-label">Actions</div> + <div class="row-value"> + <a href="{{- .commit_object.Hash -}}.patch">Get patch</a> + </div> + </section> + </div> + </div> + + <div class="padding-wrapper scroll" id="this-commit-message"> + <pre>{{- .commit_object.Message -}}</pre> + </div> + <div class="padding-wrapper"> + {{- $parent_commit_hash := .parent_commit_hash -}} + {{- $commit_object := .commit_object -}} + {{- range .file_patches -}} + <div class="file-patch toggle-on-wrapper"> + <input type="checkbox" id="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-toggle toggle-on-toggle"> + <label for="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-header toggle-on-header"> + <div> + {{- if eq .From.Path "" -}} + --- /dev/null + {{- else -}} + --- a/<a href="../tree/{{- .From.Path -}}?commit={{- $parent_commit_hash -}}">{{- .From.Path -}}</a> {{ .From.Mode -}} + {{- end -}} + <br /> + {{- if eq .To.Path "" -}} + +++ /dev/null + {{- else -}} + +++ b/<a href="../tree/{{- .To.Path -}}?commit={{- $commit_object.Hash -}}">{{- .To.Path -}}</a> {{ .To.Mode -}} + {{- end -}} + </div> + </label> + <div class="file-content toggle-on-content scroll"> + {{- range .Chunks -}} + {{- if eq .Operation 0 -}} + <pre class="chunk chunk-unchanged">{{ .Content }}</pre> + {{- else if eq .Operation 1 -}} + <pre class="chunk chunk-addition">{{ .Content }}</pre> + {{- else if eq .Operation 2 -}} + <pre class="chunk chunk-deletion">{{ .Content }}</pre> + {{- else -}} + <pre class="chunk chunk-unknown">{{ .Content }}</pre> + {{- end -}} {{- end -}} - {{- end -}} + </div> </div> - </div> - {{- end -}} - </div> + {{- end -}} + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_contrib_index.tmpl b/forged/templates/repo_contrib_index.tmpl index 172a079..7d2d474 100644 --- a/forged/templates/repo_contrib_index.tmpl +++ b/forged/templates/repo_contrib_index.tmpl @@ -12,68 +12,70 @@ </head> <body class="repo-contrib-index"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link active" href="../contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link active" href="../contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="padding-wrapper"> - <h2>How to submit a merge request</h2> - <pre>git clone {{ .ssh_clone_url }} -cd {{ .repo_name }} -git checkout -b contrib/name_of_your_contribution -# edit and commit stuff -git push -u origin HEAD</pre> - <p>Pushes that update branches in other namespaces, or pushes to existing contribution branches belonging to other SSH keys, will be automatically -rejected, unless you are an authenticated maintainer. Otherwise, a merge request is automatically opened, and the maintainers are notified via IRC.</p> - <p>Alternatively, you may <a href="https://git-send-email.io">email patches</a> to <a href="mailto:{{ .repo_patch_mailing_list }}">{{ .repo_patch_mailing_list }}</a>.</p> - </div> - <div class="padding-wrapper"> - <table id="recent-merge_requests" class="wide"> - <thead> - <tr> - <th scope="col">ID</th> - <th scope="col">Title</th> - <th scope="col">Status</th> - </tr> - </thead> - <tbody> - {{- range .merge_requests -}} + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> + </div> + <div class="padding-wrapper"> + <h2>How to submit a merge request</h2> + <pre>git clone {{ .ssh_clone_url }} + cd {{ .repo_name }} + git checkout -b contrib/name_of_your_contribution + # edit and commit stuff + git push -u origin HEAD</pre> + <p>Pushes that update branches in other namespaces, or pushes to existing contribution branches belonging to other SSH keys, will be automatically + rejected, unless you are an authenticated maintainer. Otherwise, a merge request is automatically opened, and the maintainers are notified via IRC.</p> + <p>Alternatively, you may <a href="https://git-send-email.io">email patches</a> to <a href="mailto:{{ .repo_patch_mailing_list }}">{{ .repo_patch_mailing_list }}</a>.</p> + </div> + <div class="padding-wrapper"> + <table id="recent-merge_requests" class="wide"> + <thead> <tr> - <td class="merge_request-id">{{- .ID -}}</td> - <td class="merge_request-title"><a href="{{- .ID -}}/">{{- .Title -}}</a></td> - <td class="merge_request-status">{{- .Status -}}</td> + <th scope="col">ID</th> + <th scope="col">Title</th> + <th scope="col">Status</th> </tr> - {{- end -}} - </tbody> - </table> - </div> + </thead> + <tbody> + {{- range .merge_requests -}} + <tr> + <td class="merge_request-id">{{- .ID -}}</td> + <td class="merge_request-title"><a href="{{- .ID -}}/">{{- .Title -}}</a></td> + <td class="merge_request-status">{{- .Status -}}</td> + </tr> + {{- end -}} + </tbody> + </table> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_contrib_one.tmpl b/forged/templates/repo_contrib_one.tmpl index a5f35d3..6556ea9 100644 --- a/forged/templates/repo_contrib_one.tmpl +++ b/forged/templates/repo_contrib_one.tmpl @@ -12,109 +12,111 @@ </head> <body class="repo-contrib-one"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link active" href="../contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link active" href="../contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="padding-wrapper"> - <table id="mr-info-table"> - <thead> - <tr class="title-row"> - <th colspan="2">Merge request info</th> - </tr> - </thead> - <tbody> - <tr> - <th scope="row">ID</th> - <td>{{- .mr_id -}}</td> - </tr> - <tr> - <th scope="row">Status</th> - <td>{{- .mr_status -}}</td> - </tr> - <tr> - <th scope="row">Title</th> - <td>{{- .mr_title -}}</td> - </tr> - <tr> - <th scope="row">Source ref</th> - <td>{{- .mr_source_ref -}}</td> - </tr> - <tr> - <th scope="row">Destination branch</th> - <td>{{- .mr_destination_branch -}}</td> - </tr> - <tr> - <th scope="row">Merge base</th> - <td>{{- .merge_base.Hash.String -}}</td> - </tr> - </tbody> - </table> - </div> - <div class="padding-wrapper"> - {{- $merge_base := .merge_base -}} - {{- $source_commit := .source_commit -}} - {{- range .file_patches -}} - <div class="file-patch toggle-on-wrapper"> - <input type="checkbox" id="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-toggle toggle-on-toggle"> - <label for="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-header toggle-on-header"> - <div> - {{- if eq .From.Path "" -}} - --- /dev/null - {{- else -}} - --- a/<a href="../../tree/{{- .From.Path -}}?commit={{- $merge_base.Hash -}}">{{- .From.Path -}}</a> {{ .From.Mode -}} - {{- end -}} - <br /> - {{- if eq .To.Path "" -}} - +++ /dev/null - {{- else -}} - +++ b/<a href="../../tree/{{- .To.Path -}}?commit={{- $source_commit.Hash -}}">{{- .To.Path -}}</a> {{ .To.Mode -}} + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> + </div> + <div class="padding-wrapper"> + <table id="mr-info-table"> + <thead> + <tr class="title-row"> + <th colspan="2">Merge request info</th> + </tr> + </thead> + <tbody> + <tr> + <th scope="row">ID</th> + <td>{{- .mr_id -}}</td> + </tr> + <tr> + <th scope="row">Status</th> + <td>{{- .mr_status -}}</td> + </tr> + <tr> + <th scope="row">Title</th> + <td>{{- .mr_title -}}</td> + </tr> + <tr> + <th scope="row">Source ref</th> + <td>{{- .mr_source_ref -}}</td> + </tr> + <tr> + <th scope="row">Destination branch</th> + <td>{{- .mr_destination_branch -}}</td> + </tr> + <tr> + <th scope="row">Merge base</th> + <td>{{- .merge_base.Hash.String -}}</td> + </tr> + </tbody> + </table> + </div> + <div class="padding-wrapper"> + {{- $merge_base := .merge_base -}} + {{- $source_commit := .source_commit -}} + {{- range .file_patches -}} + <div class="file-patch toggle-on-wrapper"> + <input type="checkbox" id="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-toggle toggle-on-toggle"> + <label for="toggle-{{- .From.Hash -}}{{- .To.Hash -}}" class="file-header toggle-on-header"> + <div> + {{- if eq .From.Path "" -}} + --- /dev/null + {{- else -}} + --- a/<a href="../../tree/{{- .From.Path -}}?commit={{- $merge_base.Hash -}}">{{- .From.Path -}}</a> {{ .From.Mode -}} + {{- end -}} + <br /> + {{- if eq .To.Path "" -}} + +++ /dev/null + {{- else -}} + +++ b/<a href="../../tree/{{- .To.Path -}}?commit={{- $source_commit.Hash -}}">{{- .To.Path -}}</a> {{ .To.Mode -}} + {{- end -}} + </div> + </label> + <div class="file-content toggle-on-content scroll"> + {{- range .Chunks -}} + {{- if eq .Operation 0 -}} + <pre class="chunk chunk-unchanged">{{ .Content }}</pre> + {{- else if eq .Operation 1 -}} + <pre class="chunk chunk-addition">{{ .Content }}</pre> + {{- else if eq .Operation 2 -}} + <pre class="chunk chunk-deletion">{{ .Content }}</pre> + {{- else -}} + <pre class="chunk chunk-unknown">{{ .Content }}</pre> + {{- end -}} {{- end -}} </div> - </label> - <div class="file-content toggle-on-content scroll"> - {{- range .Chunks -}} - {{- if eq .Operation 0 -}} - <pre class="chunk chunk-unchanged">{{ .Content }}</pre> - {{- else if eq .Operation 1 -}} - <pre class="chunk chunk-addition">{{ .Content }}</pre> - {{- else if eq .Operation 2 -}} - <pre class="chunk chunk-deletion">{{ .Content }}</pre> - {{- else -}} - <pre class="chunk chunk-unknown">{{ .Content }}</pre> - {{- end -}} - {{- end -}} </div> - </div> - {{- end -}} - </div> + {{- end -}} + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_index.tmpl b/forged/templates/repo_index.tmpl index d040f3a..a0d2b7b 100644 --- a/forged/templates/repo_index.tmpl +++ b/forged/templates/repo_index.tmpl @@ -12,80 +12,82 @@ </head> <body class="repo-index"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link active" href="./{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link active" href="./{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="settings/">Settings</a> + </li> + </ul> </div> - </div> - {{- if .notes -}} - <div id="notes">Notes</div> - <ul> - {{- range .notes -}}<li>{{- . -}}</li>{{- end -}} - </ul> - </div> - {{- end -}} - <p class="readingwidth"><code>{{- .ssh_clone_url -}}</code></p> - {{- if .ref_name -}} - <p class="readingwidth"> - <strong> - Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. - </strong> - </p> - {{- end -}} - {{- if .commits -}} - <div class="commit-list-small"> - {{- range .commits -}} - <div class="event"> - <div> - <a href="commit/{{- .Hash -}}" title="{{- .Hash -}}" rel="nofollow"> - {{- .Hash | printf "%.8s" -}} - </a> - — <a href="mailto:{{- .Email -}}">{{- .Author -}}</a> - <small class="pull-right"> - <span title="{{- .Date -}}">{{- .Date -}}</span> - </small> - </div> - <pre class="commit">{{- .Message | first_line -}}</pre> - </div> - {{- end -}} - {{- if dereference_error .commits_err -}} - <div class="commit-error"> - Error while obtaining commit log: {{ .commits_err }} - </div> - {{- end -}} + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> </div> - {{- end -}} - {{- if .readme -}} - <div class="padding-wrapper" id="readme"> - {{- .readme -}} + {{- if .notes -}} + <div id="notes">Notes</div> + <ul> + {{- range .notes -}}<li>{{- . -}}</li>{{- end -}} + </ul> </div> - {{- end -}} + {{- end -}} + <p class="readingwidth"><code>{{- .ssh_clone_url -}}</code></p> + {{- if .ref_name -}} + <p class="readingwidth"> + <strong> + Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. + </strong> + </p> + {{- end -}} + {{- if .commits -}} + <div class="commit-list-small"> + {{- range .commits -}} + <div class="event"> + <div> + <a href="commit/{{- .Hash -}}" title="{{- .Hash -}}" rel="nofollow"> + {{- .Hash | printf "%.8s" -}} + </a> + — <a href="mailto:{{- .Email -}}">{{- .Author -}}</a> + <small class="pull-right"> + <span title="{{- .Date -}}">{{- .Date -}}</span> + </small> + </div> + <pre class="commit">{{- .Message | first_line -}}</pre> + </div> + {{- end -}} + {{- if dereference_error .commits_err -}} + <div class="commit-error"> + Error while obtaining commit log: {{ .commits_err }} + </div> + {{- end -}} + </div> + {{- end -}} + {{- if .readme -}} + <div class="padding-wrapper" id="readme"> + {{- .readme -}} + </div> + {{- end -}} + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_log.tmpl b/forged/templates/repo_log.tmpl index 2262902..28aeed0 100644 --- a/forged/templates/repo_log.tmpl +++ b/forged/templates/repo_log.tmpl @@ -12,76 +12,78 @@ </head> <body class="repo-log"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link active" href="../log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="../settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="../{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link active" href="../log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="../settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="scroll"> - {{- if .ref_name -}} - <p> - <strong> - Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. - </strong> - </p> - {{- end -}} - <table id="commits" class="wide"> - <thead> - <tr class="title-row"> - <th colspan="4">Commits {{ if .ref_name }} on {{ .ref_name }}{{ end -}}</th> - </tr> - <tr> - <th scope="col">ID</th> - <th scope="col">Title</th> - <th scope="col">Author</th> - <th scope="col">Author date</th> - </tr> - </thead> - <tbody> - {{- range .commits -}} + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> + </div> + <div class="scroll"> + {{- if .ref_name -}} + <p> + <strong> + Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. + </strong> + </p> + {{- end -}} + <table id="commits" class="wide"> + <thead> + <tr class="title-row"> + <th colspan="4">Commits {{ if .ref_name }} on {{ .ref_name }}{{ end -}}</th> + </tr> <tr> - <td class="commit-id"><a href="../commit/{{- .Hash -}}">{{- .Hash -}}</a></td> - <td class="commit-title">{{- .Message | first_line -}}</td> - <td class="commit-author"> - <a class="email-name" href="mailto:{{- .Author.Email -}}">{{- .Author.Name -}}</a> - </td> - <td class="commit-time"> - {{- .Author.When.Format "2006-01-02 15:04:05 -0700" -}} - </td> + <th scope="col">ID</th> + <th scope="col">Title</th> + <th scope="col">Author</th> + <th scope="col">Author date</th> </tr> - {{- end -}} - {{- if dereference_error .commits_err -}} - Error while obtaining commit log: {{ .commits_err }} - {{- end -}} - </tbody> - </table> - </div> + </thead> + <tbody> + {{- range .commits -}} + <tr> + <td class="commit-id"><a href="../commit/{{- .Hash -}}">{{- .Hash -}}</a></td> + <td class="commit-title">{{- .Message | first_line -}}</td> + <td class="commit-author"> + <a class="email-name" href="mailto:{{- .Author.Email -}}">{{- .Author.Name -}}</a> + </td> + <td class="commit-time"> + {{- .Author.When.Format "2006-01-02 15:04:05 -0700" -}} + </td> + </tr> + {{- end -}} + {{- if dereference_error .commits_err -}} + Error while obtaining commit log: {{ .commits_err }} + {{- end -}} + </tbody> + </table> + </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_raw_dir.tmpl b/forged/templates/repo_raw_dir.tmpl index a33da4a..d72a41f 100644 --- a/forged/templates/repo_raw_dir.tmpl +++ b/forged/templates/repo_raw_dir.tmpl @@ -12,74 +12,76 @@ </head> <body class="repo-raw-dir"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link active" href="{{- .repo_url_root -}}tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link active" href="{{- .repo_url_root -}}tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="padding-wrapper scroll"> - {{- if .ref_name -}} - <p> - <strong> - Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. - </strong> - </p> - {{- end -}} - <table id="file-tree" class="wide"> - <thead> - <tr class="title-row"> - <th colspan="3"> - (Raw) /{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }}{{ if .ref_name }} on {{ .ref_name }}{{ end -}} - </th> - </tr> - <tr> - <th scope="col">Mode</th> - <th scope="col">Filename</th> - <th scope="col">Size</th> - </tr> - </thead> - <tbody> - {{- $path_spec := .path_spec -}} - {{- range .files -}} + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> + </div> + <div class="padding-wrapper scroll"> + {{- if .ref_name -}} + <p> + <strong> + Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. + </strong> + </p> + {{- end -}} + <table id="file-tree" class="wide"> + <thead> + <tr class="title-row"> + <th colspan="3"> + (Raw) /{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }}{{ if .ref_name }} on {{ .ref_name }}{{ end -}} + </th> + </tr> <tr> - <td class="file-mode">{{- .Mode -}}</td> - <td class="file-name"><a href="{{- .Name -}}{{- if not .IsFile -}}/{{- end -}}{{- template "ref_query" $root -}}">{{- .Name -}}</a>{{- if not .IsFile -}}/{{- end -}}</td> - <td class="file-size">{{- .Size -}}</td> + <th scope="col">Mode</th> + <th scope="col">Filename</th> + <th scope="col">Size</th> </tr> - {{- end -}} - </tbody> - </table> - </div> - <div class="padding-wrapper"> - <div id="refs"> + </thead> + <tbody> + {{- $path_spec := .path_spec -}} + {{- range .files -}} + <tr> + <td class="file-mode">{{- .Mode -}}</td> + <td class="file-name"><a href="{{- .Name -}}{{- if not .IsFile -}}/{{- end -}}{{- template "ref_query" $root -}}">{{- .Name -}}</a>{{- if not .IsFile -}}/{{- end -}}</td> + <td class="file-size">{{- .Size -}}</td> + </tr> + {{- end -}} + </tbody> + </table> + </div> + <div class="padding-wrapper"> + <div id="refs"> + </div> </div> - </div> + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_tree_dir.tmpl b/forged/templates/repo_tree_dir.tmpl index fc06646..3d8425c 100644 --- a/forged/templates/repo_tree_dir.tmpl +++ b/forged/templates/repo_tree_dir.tmpl @@ -12,79 +12,81 @@ </head> <body class="repo-tree-dir"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link active" href="{{- .repo_url_root -}}tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link active" href="{{- .repo_url_root -}}tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="padding-wrapper scroll"> - {{- if .ref_name -}} - <p> - <strong> - Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. - </strong> - </p> - {{- end -}} - <table id="file-tree" class="wide"> - <thead> - <tr class="title-row"> - <th colspan="3"> - /{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }}{{ if .ref_name }} on {{ .ref_name }}{{ end -}} - </th> - <tr> - <th scope="col">Mode</th> - <th scope="col">Filename</th> - <th scope="col">Size</th> - </tr> - </tr> - </thead> - <tbody> - {{- $path_spec := .path_spec -}} - {{- range .files -}} - <tr> - <td class="file-mode">{{- .Mode -}}</td> - <td class="file-name"><a href="{{- .Name -}}{{- if not .IsFile -}}/{{- end -}}{{- template "ref_query" $root -}}">{{- .Name -}}</a>{{- if not .IsFile -}}/{{- end -}}</td> - <td class="file-size">{{- .Size -}}</td> + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> + </div> + <div class="padding-wrapper scroll"> + {{- if .ref_name -}} + <p> + <strong> + Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. + </strong> + </p> + {{- end -}} + <table id="file-tree" class="wide"> + <thead> + <tr class="title-row"> + <th colspan="3"> + /{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }}{{ if .ref_name }} on {{ .ref_name }}{{ end -}} + </th> + <tr> + <th scope="col">Mode</th> + <th scope="col">Filename</th> + <th scope="col">Size</th> + </tr> </tr> - {{- end -}} - </tbody> - </table> - </div> - <div class="padding-wrapper"> - <div id="refs"> + </thead> + <tbody> + {{- $path_spec := .path_spec -}} + {{- range .files -}} + <tr> + <td class="file-mode">{{- .Mode -}}</td> + <td class="file-name"><a href="{{- .Name -}}{{- if not .IsFile -}}/{{- end -}}{{- template "ref_query" $root -}}">{{- .Name -}}</a>{{- if not .IsFile -}}/{{- end -}}</td> + <td class="file-size">{{- .Size -}}</td> + </tr> + {{- end -}} + </tbody> + </table> </div> - </div> - {{- if .readme -}} - <div class="padding-wrapper" id="readme"> - {{- .readme -}} - </div> - {{- end -}} + <div class="padding-wrapper"> + <div id="refs"> + </div> + </div> + {{- if .readme -}} + <div class="padding-wrapper" id="readme"> + {{- .readme -}} + </div> + {{- end -}} + </main> <footer> {{- template "footer" . -}} </footer> diff --git a/forged/templates/repo_tree_file.tmpl b/forged/templates/repo_tree_file.tmpl index 76404a9..a462b04 100644 --- a/forged/templates/repo_tree_file.tmpl +++ b/forged/templates/repo_tree_file.tmpl @@ -13,50 +13,52 @@ </head> <body class="repo-tree-file"> {{- template "header" . -}} - <div class="repo-header"> - <h2>{{- .repo_name -}}</h2> - <ul class="nav-tabs-standalone"> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}{{- template "ref_query" $root -}}">Summary</a> - </li> - <li class="nav-item"> - <a class="nav-link active" href="{{- .repo_url_root -}}tree/{{- template "ref_query" $root -}}">Tree</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}log/{{- template "ref_query" $root -}}">Log</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}branches/">Branches</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}tags/">Tags</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}contrib/">Merge requests</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{- .repo_url_root -}}settings/">Settings</a> - </li> - </ul> - </div> - <div class="repo-header-extension"> - <div class="repo-header-extension-content"> - {{- .repo_description -}} + <main> + <div class="repo-header"> + <h2>{{- .repo_name -}}</h2> + <ul class="nav-tabs-standalone"> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}{{- template "ref_query" $root -}}">Summary</a> + </li> + <li class="nav-item"> + <a class="nav-link active" href="{{- .repo_url_root -}}tree/{{- template "ref_query" $root -}}">Tree</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}log/{{- template "ref_query" $root -}}">Log</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}branches/">Branches</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}tags/">Tags</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}contrib/">Merge requests</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{- .repo_url_root -}}settings/">Settings</a> + </li> + </ul> </div> - </div> - <div class="padding"> - {{- if .ref_name -}} - <p> - <strong> - Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. - </strong> - </p> - {{- end -}} - <p> - /{{ .path_spec }} (<a href="/{{ template "group_path_plain" .group_path }}/-/repos/{{ .repo_name }}/raw/{{ .path_spec }}{{- template "ref_query" $root -}}">raw</a>) - </p> - {{- .file_contents -}} - </div> + <div class="repo-header-extension"> + <div class="repo-header-extension-content"> + {{- .repo_description -}} + </div> + </div> + <div class="padding"> + {{- if .ref_name -}} + <p> + <strong> + Warning: Due to various recent migrations, viewing non-HEAD refs may be broken. + </strong> + </p> + {{- end -}} + <p> + /{{ .path_spec }} (<a href="/{{ template "group_path_plain" .group_path }}/-/repos/{{ .repo_name }}/raw/{{ .path_spec }}{{- template "ref_query" $root -}}">raw</a>) + </p> + {{- .file_contents -}} + </div> + </main> <footer> {{- template "footer" . -}} </footer> |