{body}Project: {jinja_escape(project)}
" - f"{blob_html}{POSTAMBLE}" + heading=f"Blob {oid_short}", + project=project, + code=sanitize(text) or "", + line_nums="\n".join(str(i) for i in range(1, num_lines + 1)), + lang="", + blame=False, ) raise HTTPException(status_code=404, detail="Unknown object type") @@ -563,41 +549,35 @@ def git_search( def git_search_page(project: str) -> HTMLResponse: """Per-project search UI page. Calls /project/{project}?a=search via fetch.""" project_enc = quote(project, safe="/") - pre = PREAMBLE.render( + return render_page( + "search.html", title=f"Search - {project}", - site_name=settings.SITE_NAME, - ) - body = env.get_template("search.html").render( project=project, project_enc=project_enc, project_url=f"/project/{project_enc}", search_api_url=f"/project/{project_enc}", ) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") -def _hooks_summary_cell(project: str, project_enc: str) -> Cell: - """Render the Hooks row: installed samples with versions and an install dropdown.""" - tpl = env.get_template("hooks_summary_cell.html") +def _hooks_context(project: str, project_enc: str) -> dict[str, Any]: + """Data for hooks_summary_cell.html.""" try: installed = list_installed_hooks(project) available = list_installable_hooks(project) except (KeyError, OSError): - return trusted_html(tpl.render(mode="unavailable")) - return trusted_html( - tpl.render( - mode="manage", - project_enc=project_enc, - installed=installed, - available=available, - ) - ) + return {"mode": "unavailable", "project_enc": project_enc, "installed": [], "available": []} + return { + "mode": "manage", + "project_enc": project_enc, + "installed": installed, + "available": available, + } -def _merge_request_summary_cell(project: str) -> Cell: +def _merge_request_context(project: str) -> dict[str, Any] | None: heads = git_get_heads_list(project) if not heads: - return html_format('{}', "No branches.") + return None refs = [h[1] for h in heads] branches = [{"short": h[0], "ref": h[1]} for h in heads] if "refs/heads/main" in refs: @@ -607,14 +587,12 @@ def _merge_request_summary_cell(project: str) -> Cell: else: ours_default_ref = refs[0] theirs_default_ref = next((r for r in refs if r != ours_default_ref), refs[0]) - return trusted_html( - env.get_template("merge_request_summary_cell.html").render( - project=project, - branches=branches, - theirs_default_ref=theirs_default_ref, - ours_default_ref=ours_default_ref, - ) - ) + return { + "project": project, + "branches": branches, + "theirs_default_ref": theirs_default_ref, + "ours_default_ref": ours_default_ref, + } def _project_has_boards(project: str) -> bool: @@ -624,6 +602,27 @@ def _project_has_boards(project: str) -> bool: return False +class BoardLink(TypedDict): + href: str + text: str + style: str | None + + +def board_link_spec(project: str) -> BoardLink: + if _project_has_boards(project): + return { + "href": f"/project/{quote(project, safe='/')}/board/", + "text": "project board", + "style": None, + } + style = "color: #999; cursor: not-allowed;" if settings.AUTH else None + return { + "href": "/board/create?project=" + quote(project, safe=""), + "text": "create board", + "style": style, + } + + def create_board_link(project: str) -> Cell: href = "/board/create?project=" + quote(project, safe="") if settings.AUTH: @@ -632,9 +631,10 @@ def create_board_link(project: str) -> Cell: def project_board_link(project: str) -> Cell: - if _project_has_boards(project): - return html_link(f"/project/{quote(project, safe='/')}/board/", "project board") - return create_board_link(project) + spec = board_link_spec(project) + if spec["style"]: + return html_link(spec["href"], spec["text"], style=spec["style"]) + return html_link(spec["href"], spec["text"]) def git_summary(project: str, extra_rows: list[list[Cell]] | None = None) -> HTMLResponse: @@ -643,79 +643,33 @@ def git_summary(project: str, extra_rows: list[list[Cell]] | None = None) -> HTM owner = git_get_project_owner(project) or "" initial_ref_state = summary_ref_state(project, "HEAD") project_enc = quote(project, safe="/") - - rows: list[list[Cell]] = [ - ["Owner", owner], - [ - trusted_html( - ' ' - '" - ), - html_join([ - html_link( - initial_ref_state["commit_href"], - initial_ref_state["display"], - id="summary-ref-commit-link", - ), - ": ", - html_link(initial_ref_state["browse_href"], "browse", id="summary-ref-browse-link"), - " - ", - html_link(initial_ref_state["log_href"], "log", id="summary-ref-log-link"), - " - ", - html_link(initial_ref_state["shortlog_href"], "shortlog", id="summary-ref-shortlog-link"), - ]), - ], - ["Branches", html_link(f"/project/{project}?a=heads", "view branches")], - ["Merge request", _merge_request_summary_cell(project)], - ["Tags", html_link(f"/project/{project}?a=tags", "view tags")], - ["Remotes", html_link(f"/project/{project}?a=remotes", "view remotes")], - ["Board", project_board_link(project)], - ["Search", html_link(f"/project/{project_enc}/search", "search files")], - ["Hooks", _hooks_summary_cell(project, project_enc)], - ] - if extra_rows: - rows.extend(extra_rows) - table = env.get_template("table.html").render( - cols=["Field", "Value"], - rows=rows, - ) - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - {project}", site_name=settings.SITE_NAME) - body_parts = [f"{pre}{jinja_escape(descr)}
") - body_parts.append(_render_collapsible_section("Project", table, flush_table=True)) - files_body = ( - f'No remotes configured.
{POSTAMBLE}") + return _table_page(title=title, heading="Remotes", empty_message="No remotes configured.") rows = [[r["name"], r["url"] or "—", r["push_url"] or "—"] for r in remotes] - table = env.get_template("table.html").render( - cols=["Name", "URL", "Push URL"], - rows=rows, - ) - pre = PREAMBLE.render(title=f"Remotes - {project}", site_name=settings.SITE_NAME) - return HTMLResponse(f"{pre}{body}{body}Project: {jinja_escape(project)}
" - f"{table}{pagination_html}{POSTAMBLE}" + title = f"History - {f} - {project} @ {ref_display}" + return _table_page( + title=title, + project=project, + cols=["Commit", "Subject", "Author", "Date", "Age", "Patch"], + rows=rows, + pagination=_pagination_context(request, page, pagecount, page > 1, has_next), ) @@ -1018,17 +963,13 @@ def git_heads(project: str, token: str | None) -> HTMLResponse: html_link(commit_href, oid_short), html_link(tree_href, "tree"), ]) - title = f"Heads - {jinja_escape(project)}" - pre = PREAMBLE.render(title=title, site_name=settings.SITE_NAME) - table = env.get_template("table.html").render( + title = f"Heads - {project}" + return _table_page( + title=title, + project=project, cols=["Head", "Commit", ""], rows=rows, ) - return HTMLResponse( - f"{pre}Project: {jinja_escape(project)}
{table}" - + POSTAMBLE - ) def git_tags(project: str, request: Request, page: int, pagecount: int) -> HTMLResponse: @@ -1070,19 +1011,13 @@ def git_tags(project: str, request: Request, page: int, pagecount: int) -> HTMLR html_link(tag_link, name), obj_cell, ]) - title = f"Tags - {jinja_escape(project)}" - pre = PREAMBLE.render(title=title, site_name=settings.SITE_NAME) - table = env.get_template("table.html").render( + title = f"Tags - {project}" + return _table_page( + title=title, + project=project, cols=["Tag", "Object"], rows=rows, - ) - pagination_html = _render_pagination( - request, page, pagecount, page > 1, page < total_pages, total_pages=total_pages - ) - return HTMLResponse( - f"{pre}Project: {jinja_escape(project)}
" - f"{table}{pagination_html}{POSTAMBLE}" + pagination=_pagination_context(request, page, pagecount, page > 1, page < total_pages, total_pages=total_pages), ) @@ -1153,13 +1088,12 @@ def git_tag(project: str, h: str | None, notice: str | None = None) -> HTMLRespo ] if message: table_rows.append(["Message", html_format("", message)]) - table = env.get_template("table.html").render(cols=["Field", "Value"], rows=table_rows) - title = f"Tag {jinja_escape(tag_name)} - {jinja_escape(project)}" - pre = PREAMBLE.render(title=title, site_name=settings.SITE_NAME) - return HTMLResponse( - f"{pre}Project: {jinja_escape(project)}
" - f"{table}{POSTAMBLE}" + return _table_page( + title=f"Tag {tag_name} - {project}", + heading=f"Tag {tag_name}", + project=project, + cols=["Field", "Value"], + rows=table_rows, ) @@ -1204,13 +1138,12 @@ def git_commit(project: str, h: str | None) -> HTMLResponse: if message: table_rows.append(["", html_format("", message)]) table_rows.append(["", html_join([html_link(diff_link, "diff"), " · ", html_link(patch_link, "patch")])]) - table = env.get_template("table.html").render(cols=["Field", "Value"], rows=table_rows) - title = f"Commit {jinja_escape(oid_short)} - {jinja_escape(project)}" - pre = PREAMBLE.render(title=title, site_name=settings.SITE_NAME) - return HTMLResponse( - f"{pre}Project: {jinja_escape(project)}
" - f"{table}{POSTAMBLE}" + return _table_page( + title=f"Commit {oid_short} - {project}", + heading=f"Commit {oid_short}", + project=project, + cols=["Field", "Value"], + rows=table_rows, ) @@ -1218,15 +1151,14 @@ def git_commitdiff(project: str, h: str | None) -> HTMLResponse: """Commit diff page: unified diff rendered with diff2html.""" diff_text, oid_short = _commit_unified_diff_or_raise(project, h or "") diff_b64 = base64.b64encode(diff_text.encode("utf-8")).decode("ascii") - title = f"Commit diff {oid_short} - {project}" - pre = PREAMBLE.render(title=title, site_name=settings.SITE_NAME) - body = env.get_template("commitdiff.html").render( + return render_page( + "commitdiff.html", + title=f"Commit diff {oid_short} - {project}", project=project, oid_short=oid_short, diff_b64=diff_b64, commit_link=f"/project/{project}?a=commit&h={quote(h or '', safe='')}", ) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") def git_patch(project: str, h: str | None) -> PlainTextResponse: @@ -1292,18 +1224,14 @@ def git_blobdiff( if diff_text is None: raise HTTPException(status_code=404, detail="Blob not found") diff_b64 = base64.b64encode(diff_text.encode("utf-8")).decode("ascii") - blob_link = f"/project/{project}?a=blob&h={quote(h or '', safe='')}&f={quote(path_new, safe='/')}" - pre = PREAMBLE.render( - title=f"Blob diff - {jinja_escape(path_new)} - {jinja_escape(project)}", - site_name=settings.SITE_NAME, - ) - body = env.get_template("blobdiff.html").render( + return render_page( + "blobdiff.html", + title=f"Blob diff - {path_new} - {project}", project=project, path_new=path_new, diff_b64=diff_b64, - blob_link=blob_link, + blob_link=f"/project/{project}?a=blob&h={quote(h or '', safe='')}&f={quote(path_new, safe='/')}", ) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") def git_blobpatch( diff --git a/pygitweb/auth.py b/pygitweb/auth.py index a52747d..1ad01ce 100644 --- a/pygitweb/auth.py +++ b/pygitweb/auth.py @@ -35,7 +35,7 @@ from pygitweb.password_hash import verify_password from pygitweb.permissions import Permission, PermissionPrincipal, has_branch_read_permission from pygitweb.projects import git_get_project_owner from pygitweb.sessions import create_session, get_session, revoke_session -from pygitweb.templates_env import POSTAMBLE, PREAMBLE, env +from pygitweb.templates_env import render_page ACCESS_TOKEN_COOKIE_NAME = "pygitweb_access_token" LOGIN_COOKIE_MAX_AGE = 60 * 60 * 24 * 7 @@ -319,16 +319,15 @@ async def login_page( if not settings.AUTH: raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Authentication is disabled") next_safe = safe_next_url(next) - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - Sign in", site_name=settings.SITE_NAME) - body = env.get_template("login.html").render( - site_name=settings.SITE_NAME, + return render_page( + "login.html", + title=f"{settings.SITE_NAME} - Sign in", next=next_safe, error=None, local_available=is_local_auth_available(auth_config), oauth_available=is_oauth_auth_available(auth_config), oauth_provider=str(auth_config.oauth_provider).strip() or "OAuth", ) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") @auth_router.post( @@ -351,16 +350,15 @@ async def login_form_submit( next_safe = safe_next_url(next) user = authenticate_local_user(username.strip(), password) if user is None: - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - Sign in", site_name=settings.SITE_NAME) - body = env.get_template("login.html").render( - site_name=settings.SITE_NAME, + return render_page( + "login.html", + title=f"{settings.SITE_NAME} - Sign in", next=next_safe, error="Incorrect username or password.", local_available=True, oauth_available=is_oauth_auth_available(auth_config), oauth_provider=str(auth_config.oauth_provider).strip() or "OAuth", ) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") sid = create_session(user.username, email=user.email, auth_method="local") resp = RedirectResponse(url=next_safe, status_code=303) resp.set_cookie( @@ -445,9 +443,12 @@ async def user_account_page( token: Annotated[str | None, Depends(access_token_from_request)], ) -> HTMLResponse | RedirectResponse: if not settings.AUTH: - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - Account", site_name=settings.SITE_NAME) - body = 'Authentication is not enabled on this server.
' - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") + return render_page( + "message.html", + title=f"{settings.SITE_NAME} - Account", + paragraphs=["Authentication is not enabled on this server."], + muted=True, + ) if not is_auth_configured(auth_config): raise HTTPException( status_code=status.HTTP_503_SERVICE_UNAVAILABLE, @@ -456,9 +457,11 @@ async def user_account_page( u = decode_access_token(token or "") if token else None if u is None: return RedirectResponse(url="/login?next=/user", status_code=303) - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - Account", site_name=settings.SITE_NAME) - body = env.get_template("user_profile.html").render(username=u.username, site_name=settings.SITE_NAME) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") + return render_page( + "user_profile.html", + title=f"{settings.SITE_NAME} - Account", + username=u.username, + ) @auth_router.get( diff --git a/pygitweb/main.py b/pygitweb/main.py index 6a75c33..eb356ea 100644 --- a/pygitweb/main.py +++ b/pygitweb/main.py @@ -26,6 +26,7 @@ from pygitweb.actions import ( SearchSortQuery, SummaryRefsPayload, SummaryRefState, + board_link_spec, create_board_link, git_blame, git_blame_raw, @@ -49,7 +50,6 @@ from pygitweb.actions import ( git_tags, git_tree, parse_pagination, - project_board_link, summary_ref_options, summary_ref_state, ) @@ -122,7 +122,7 @@ from pygitweb.tasks import ( task_router, ) from pygitweb.team import team_router -from pygitweb.templates_env import POSTAMBLE, PREAMBLE, Cell, env, html_join, html_link, jinja_escape, trusted_html +from pygitweb.templates_env import Cell, html_join, html_link, jinja_escape, render_page, trusted_html from pygitweb.timeline_cache import clear_timeline_cache_async, get_all_timeline_events, warm_timeline_cache_async from pygitweb.validation import is_valid_pathname @@ -266,32 +266,30 @@ def git_project_list( export_ok=settings.EXPORT_OK, ) list_ = filter_projects_by_read_access(all_projects, token) - visibility_notice = "" + notice = "" if not list_: if all_projects and settings.AUTH: - visibility_notice = ( - 'No projects are visible with your current authentication ' - "and permissions. Sign in or ask an administrator for repository access.
" - ) + notice = "hidden" elif not all_projects: - visibility_notice = "No projects found.
" - - table = env.get_template("table.html").render( - cols=["Project", "Description", "Board"], - rows=[ - [ - html_link( - f"/project/{quote(pr.get('path', ''), safe='/')}", - pr.get("path", "") or "", - ), - pr.get("descr") or pr.get("path", "") or "", - project_board_link(pr.get("path", "") or ""), - ] - for pr in list_[:50] - ], + notice = "empty" + projects = [] + for pr in list_[:50]: + path = pr.get("path", "") or "" + board = board_link_spec(path) + projects.append({ + "href": f"/project/{quote(path, safe='/')}", + "path": path, + "descr": pr.get("descr") or path, + "board_href": board["href"], + "board_text": board["text"], + "board_style": board["style"], + }) + return render_page( + "project_list.html", + title=f"{settings.SITE_NAME} - Projects", + notice=notice, + projects=projects, ) - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - Projects", site_name=settings.SITE_NAME) - return HTMLResponse(f"{pre}No projects found.
' - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - Boards", site_name=settings.SITE_NAME) - return HTMLResponse(f"{pre}Action completed.
{POSTAMBLE}") + return render_page( + "message.html", + title=f"{plugin.action_name()} - {project}", + paragraphs=["Action completed."], + ) if action == "summary": return git_summary(project, extra_rows=_project_subpage_rows(project)) if action == "tree": @@ -908,8 +911,11 @@ async def dispatch( search_max_count, ) # Stub others with minimal response - pre = PREAMBLE.render(title=f"{action} - {project}", site_name=settings.SITE_NAME) - return HTMLResponse(f"{pre}Action: {jinja_escape(action)}
Project: {jinja_escape(project)}
{POSTAMBLE}") + return render_page( + "message.html", + title=f"{action} - {project}", + paragraphs=[f"Action: {action}", f"Project: {project}"], + ) if __name__ == "__main__": diff --git a/pygitweb/merge_requests.py b/pygitweb/merge_requests.py index b8861f3..aff5397 100644 --- a/pygitweb/merge_requests.py +++ b/pygitweb/merge_requests.py @@ -12,11 +12,10 @@ from fastapi.responses import HTMLResponse, RedirectResponse from pygittools.merge import MergeRequest, MergeRequestStatus, get_merge_request_by_oid from pygitweb.auth import access_token_from_request, principal_from_session, require_permission -from pygitweb.config import settings from pygitweb.dependencies import ValidatedReadableFormProject, ValidatedReadableQueryProject from pygitweb.git_helpers import open_repo, resolve_mr_opener from pygitweb.permissions import Permission -from pygitweb.templates_env import POSTAMBLE, PREAMBLE, env, jinja_escape +from pygitweb.templates_env import render_page from pygitweb.validation import is_valid_ref_format @@ -153,10 +152,8 @@ def merge_request_tag_response( "notice": notice or "", **status_fields, } - title = f"Merge request: {jinja_escape(mr.title) or ''} — {jinja_escape(project) or ''}" - pre = PREAMBLE.render(title=title, site_name=settings.SITE_NAME) - body = env.get_template("merge_request_tag.html").render(**ctx) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") + title = f"Merge request: {mr.title or ''} — {project or ''}" + return render_page("merge_request_tag.html", title=title, **ctx) @merge_router.post( diff --git a/pygitweb/settings.py b/pygitweb/settings.py index 77072ff..84046f6 100644 --- a/pygitweb/settings.py +++ b/pygitweb/settings.py @@ -22,7 +22,7 @@ from pygitweb.permissions import Permission from pygitweb.plugin_loader import apply_plugin_reload, list_available_plugins from pygitweb.settings_config import settings_batch_update from pygitweb.shutdown import request_graceful_shutdown -from pygitweb.templates_env import POSTAMBLE, PREAMBLE, Cell, env, html_format +from pygitweb.templates_env import Cell, env, html_format, render_page def _quote_path(path: str) -> str: @@ -302,12 +302,12 @@ def settings_pygitweb_page(request: Request): form_body = "\n".join(fields_html) enabled = set(settings.ENABLED_PLUGINS) plugin_rows = [{"name": name, "checked": name in enabled} for name in list_available_plugins()] - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - PyGitWeb settings", site_name=settings.SITE_NAME) - body = env.get_template("pygitweb_settings.html").render( + return render_page( + "pygitweb_settings.html", + title=f"{settings.SITE_NAME} - PyGitWeb settings", form_body=form_body, plugin_rows=plugin_rows, ) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") @router.post("/pygitweb/submit", response_class=HTMLResponse) @@ -349,12 +349,10 @@ async def settings_pygitweb_plugins(request: Request): async def settings_pygitweb_shutdown(request: Request, background_tasks: BackgroundTasks) -> HTMLResponse: """Gracefully stop the PyGitWeb server process.""" background_tasks.add_task(request_graceful_shutdown, request.app) - pre = PREAMBLE.render( + return render_page( + "shutdown_ack.html", title=f"{settings.SITE_NAME} - Shutting down", - site_name=settings.SITE_NAME, ) - body = env.get_template("shutdown_ack.html").render() - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") # ---------- Routes: PyGit2 ---------- @@ -365,9 +363,11 @@ def settings_pygit2_page(request: Request): for name, val, kind, doc in _get_pygit2_values(): fields_html.append(_render_pygit2_field(name, val, kind, doc)) form_body = "\n".join(fields_html) - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - PyGit2 settings", site_name=settings.SITE_NAME) - body = env.get_template("pygit2_settings.html").render(form_body=form_body) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") + return render_page( + "pygit2_settings.html", + title=f"{settings.SITE_NAME} - PyGit2 settings", + form_body=form_body, + ) @router.post("/pygit2/submit", response_class=HTMLResponse) @@ -407,20 +407,17 @@ def settings_project_page(request: Request, name: ValidatedReadableSettingsProje rows = [_project_config_table_row(k, v, i) for i, (k, v) in enumerate(entries)] # One empty row for adding new rows.append(_project_config_table_row("", "", len(entries))) - table_html = env.get_template("table.html").render(cols=["Key", "Value"], rows=rows) - pre = PREAMBLE.render( - title=f"{settings.SITE_NAME} - Project settings: {name}", - site_name=settings.SITE_NAME, - ) submit_url = f"/settings/project/{_quote_path(name)}/submit" cancel_url = f"/project/{_quote_path(name)}" - body = env.get_template("project_settings.html").render( + return render_page( + "project_settings.html", + title=f"{settings.SITE_NAME} - Project settings: {name}", project_title=name, submit_url=submit_url, cancel_url=cancel_url, - table_html=table_html, + cols=["Key", "Value"], + rows=rows, ) - return HTMLResponse(f"{pre}{body}{POSTAMBLE}") @router.post("/project/{name:path}/submit", response_class=HTMLResponse) diff --git a/pygitweb/tasks.py b/pygitweb/tasks.py index 0654710..a016c15 100644 --- a/pygitweb/tasks.py +++ b/pygitweb/tasks.py @@ -41,7 +41,7 @@ from pygitweb.dependencies import ValidatedReadableQueryProject, filter_projects from pygitweb.gravatar import gravatar_url from pygitweb.permissions import Permission, PermissionPrincipal from pygitweb.projects import git_get_projects_list -from pygitweb.templates_env import POSTAMBLE, PREAMBLE, Cell, env, html_link +from pygitweb.templates_env import Cell, html_link, render_page # Well-known empty tree OID for boards/tasks when repo has no HEAD EMPTY_TREE_OID = pygit2.Oid(hex="4b825dc642cb6eb9a060e54bf8d69288fbee4904") @@ -355,25 +355,18 @@ def all_tasks_page( t.get("assignee") or "Unassigned", str(t.get("points") if t.get("points") is not None else ""), ]) - table = env.get_template("table.html").render( + statuses = [ + {"value": status, "label": status.replace("_", " ").title(), "selected": status_filter == status} + for status in BOARD_STATUS_ORDER + ] + return render_page( + "tasks.html", + title=f"{settings.SITE_NAME} - Tasks", + status_filter=status_filter or "", + statuses=statuses, cols=["Task", "Project", "Board", "Status", "Priority", "Assignee", "Points"], rows=rows, ) - status_options = "".join( - f'' - for s in BOARD_STATUS_ORDER - ) - filter_form = ( - '" - ) - body = table if rows else 'No tasks found.
' - pre = PREAMBLE.render(title=f"{settings.SITE_NAME} - Tasks", site_name=settings.SITE_NAME) - return HTMLResponse(f"{pre}Project: {{ link("/project/" ~ project, project) }}
+{% endif %} +{{ code }}Project: {{ project }} · blob
Project: {{ project }} · commit
No projects are visible with your current authentication and permissions. Sign in or ask an administrator for repository access.
+{% elif notice == "empty" %} +No projects found.
+{% endif %} +| Project | +Description | +Board | +
|---|---|---|
| {{ link(project.href, project.path) }} | +{{ project.descr }} | +{{ link(project.board_href, project.board_text, style=project.board_style) }} | +
Repository config (local and worktree only).
{{ plain }}PyGitWeb is shutting down gracefully. You can close this tab.
{{ descr }}
+{% endif %} +{% call section("Project", flush=true) %} +| Field | Value |
|---|---|
| Owner | +{{ owner }} | +
| + + + | ++{{ link(ref.commit_href, ref.display, id="summary-ref-commit-link") }}: +{{ link(ref.browse_href, "browse", id="summary-ref-browse-link") }} - +{{ link(ref.log_href, "log", id="summary-ref-log-link") }} - +{{ link(ref.shortlog_href, "shortlog", id="summary-ref-shortlog-link") }} + | +
| Branches | +{{ link(project_url ~ "?a=heads", "view branches") }} | +
| Merge request | ++{% if merge_request %} +{% with project=merge_request.project, branches=merge_request.branches, theirs_default_ref=merge_request.theirs_default_ref, ours_default_ref=merge_request.ours_default_ref %} +{% include "merge_request_summary_cell.html" %} +{% endwith %} +{% else %} +No branches. +{% endif %} + | +
| Tags | +{{ link(project_url ~ "?a=tags", "view tags") }} | +
| Remotes | +{{ link(project_url ~ "?a=remotes", "view remotes") }} | +
| Board | +{{ link(board.href, board.text, style=board.style) }} | +
| Search | +{{ link(project_url_enc ~ "/search", "search files") }} | +
| Hooks | ++{% with mode=hooks.mode, project_enc=hooks.project_enc, installed=hooks.installed, available=hooks.available %} +{% include "hooks_summary_cell.html" %} +{% endwith %} + | +
| {{ cell }} | {% endfor %}
{{ link(ref.browse_href, "Browse full tree", id="summary-tree-browse-link") }}
+{% endcall %} +Project: {{ link("/project/" ~ project, project) }}
+{% endif %} +{% if rows %} +{% include "table.html" %} +{% elif empty_message %} +No tasks found.
+{% endif %} +{% endblock %} diff --git a/pygitweb/templates/team.html b/pygitweb/templates/team.html index a49c806..82090a0 100644 --- a/pygitweb/templates/team.html +++ b/pygitweb/templates/team.html @@ -1,4 +1,6 @@ -{# Team overview: open tasks across projects, grouped by assignee. Expects: iso_week, groups [ { assignee, points_total, capacity, over_capacity, can_edit, capacity_url, table_html } ] #} +{% extends "base.html" %} +{% block content %} +{# Team overview: open tasks across projects, grouped by assignee. Expects: iso_week, groups [ { assignee, points_total, capacity, over_capacity, can_edit, capacity_url, rows } ] #}What everyone is currently working on, across every project you can read.
@@ -29,7 +31,10 @@{}", "<hi>" +def test_render_page_uses_base_template_and_escapes_text() -> None: + resp = render_page("message.html", title="Hello