thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Un-extract templates
Some checks failed
testing / backend-checks (push) Failing after 14m0s
Details
testing / frontend-checks (push) Successful in 2m53s
Details
testing / test-unit (push) Has been skipped
Details
testing / test-mysql (push) Has been skipped
Details
testing / test-pgsql (push) Has been skipped
Details
testing / test-sqlite (push) Has been skipped
Details
Integration tests for the release process / release-simulation (push) Has been cancelled
Details
/ release (push) Has been cancelled
Details

Browse source
This commit is contained in:
thepaperpilot 2024-04-20 22:08:03 -05:00
parent 783e503ae0
commit 890a609c4e
2 changed files with 159 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

319
templates/base/head_navbar.tmpl
View file

@ -3,203 +3,158 @@
{{$notificationUnreadCount = call .NotificationUnreadCount}} {{$notificationUnreadCount = call .NotificationUnreadCount}}
{{end}} {{end}}
<nav id="navbar" aria-label="{{ctx.Locale.Tr "aria.navbar"}}"> <nav id="custom-navbar-container" aria-label="{{ctx.Locale.Tr "aria.navbar"}}">
<div class="navbar-left ui secondary menu"> <div class="custom-navbar">
<!-- the logo --> <menu class="mobile-links">
<a class="item" id="navbar-logo" href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home"}}{{end}}"> <li class="dropdown">
<img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true"> <a aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
<i class="fa-solid fa-bars"></i>
</a>
<ul class="dropdown-menu">
<li>
<a href="https://incremental.social/all">Threads</a>
</li>
<li>
<a href="https://incremental.social/microblog">Microblog</a>
</li>
<li>
<a href="https://incremental.social/people">People</a>
</li>
<li>
<a href="https://chat.incremental.social">Chat</a>
</li>
<li class="active">
<a href="https://code.incremental.social">Code</a>
</li>
</ul>
</li>
</menu>
<a id="custom-navbar-logo" href="https://incremental.social" aria-label="{{ctx.Locale.Tr "home"}}">
<img id="logo" src="https://incremental.social/mbin_logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true">
</a> </a>
<!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column --> <menu class="desktop-links">
<div class="ui secondary menu item navbar-mobile-right only-mobile"> <li>
{{if .IsSigned}} <a href="https://incremental.social/all">Threads</a>
<a id="mobile-notifications-icon" class="item tw-w-auto tw-p-2" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}"> </li>
<div class="tw-relative"> <li>
{{svg "octicon-bell"}} <a href="https://incremental.social/microblog">Microblog</a>
<span class="notification_count{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span> </li>
</div> <li>
<a href="https://incremental.social/people">People</a>
</li>
<li>
<a href="https://chat.incremental.social">Chat</a>
</li>
<li class="active">
<a href="https://code.incremental.social">Code</a>
</li>
</menu>
<div class="flex-spacer"></div>
<menu>
<li class="dropdown">
<a aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
<i class="fa-solid fa-magnifying-glass"></i>
</a> </a>
{{end}} <ul class="dropdown-menu">
<button class="item tw-w-auto ui icon mini button tw-p-2 tw-m-0" id="navbar-expand-toggle" aria-label="{{ctx.Locale.Tr "toggle_menu"}}">{{svg "octicon-three-bars"}}</button> {{if .IsSigned}}
</div> <li>
<a href="{{AppSubUrl}}/issues">{{ctx.Locale.Tr "issues"}}</a>
<!-- navbar links non-mobile --> </li>
{{if and .IsSigned .MustChangePassword}} <li>
{{/* No links */}} <a href="{{AppSubUrl}}/pulls">{{ctx.Locale.Tr "pull_requests"}}</a>
{{else if .IsSigned}} </li>
{{if not .UnitIssuesGlobalDisabled}} <li>
<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{ctx.Locale.Tr "issues"}}</a> <a href="{{AppSubUrl}}/milestones">{{ctx.Locale.Tr "milestones"}}</a>
{{end}} </li>
{{if not .UnitPullsGlobalDisabled}} {{end}}
<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{ctx.Locale.Tr "pull_requests"}}</a> <li>
{{end}} <a href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore.repos"}}</a>
{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}} </li>
{{if .ShowMilestonesDashboardPage}} <li>
<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{ctx.Locale.Tr "milestones"}}</a> <a href="{{AppSubUrl}}/explore/users">{{ctx.Locale.Tr "explore.users"}}</a>
{{end}} </li>
{{end}} <li>
<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore"}}</a> <a href="{{AppSubUrl}}/explore/organizations">{{ctx.Locale.Tr "explore.organizations"}}</a>
{{else if .IsLandingPageOrganizations}} </li>
<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{ctx.Locale.Tr "explore"}}</a> </ul>
{{else}} </li>
<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore"}}</a> {{if .IsSigned}}
{{end}} <li class="dropdown">
<a aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
{{template "custom/extra_links" .}} <i class="fa-solid fa-plus"></i>
{{if not .IsSigned}}
<a class="item" target="_blank" rel="noopener noreferrer" href="https://forgejo.org/docs/latest/">{{ctx.Locale.Tr "help"}}</a>
{{end}}
</div>
<!-- the full dropdown menus -->
<div class="navbar-right ui secondary menu">
{{if and .IsSigned .MustChangePassword}}
<div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
<span class="text tw-flex tw-items-center">
{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
<span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
</span>
<div class="menu user-menu">
<div class="ui header">
{{ctx.Locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
</div>
<div class="divider"></div>
<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout">
{{svg "octicon-sign-out"}}
{{ctx.Locale.Tr "sign_out"}}
</a> </a>
</div><!-- end content avatar menu --> <ul class="dropdown-menu">
</div><!-- end dropdown avatar menu --> <li>
{{else if .IsSigned}} <a href="{{AppSubUrl}}/repo/create">{{ctx.Locale.Tr "new_repo"}}</a>
{{if EnableTimetracking}} </li>
<a class="active-stopwatch-trigger item tw-mx-0{{if not .ActiveStopwatch}} tw-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{ctx.Locale.Tr "active_stopwatch"}}"> <li>
<div class="tw-relative"> <a href="{{AppSubUrl}}/repo/migrate">{{ctx.Locale.Tr "new_migrate"}}</a>
{{svg "octicon-stopwatch"}} </li>
<span class="header-stopwatch-dot"></span> <li>
</div> <a href="{{AppSubUrl}}/org/create">{{ctx.Locale.Tr "new_org"}}</a>
<span class="only-mobile tw-ml-2">{{ctx.Locale.Tr "active_stopwatch"}}</span> </li>
</ul>
</li>
<li>
<a href="{{AppSubUrl}}/notifications" aria-label="{{ctx.Locale.Tr "notifications"}}">
<i class="fa-solid fa-bell"></i>
<span class="notification-badge{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span>
</a> </a>
<div class="active-stopwatch-popup item tippy-target tw-p-2"> </li>
<div class="tw-flex tw-items-center"> <li class="dropdown">
<a class="stopwatch-link tw-flex tw-items-center" href="{{.ActiveStopwatch.IssueLink}}"> <a class="user" aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
{{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{ctx.AvatarUtils.Avatar .SignedUser 50 "tw-mr-1"}}
<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span> <span class="user-name">{{.SignedUser.Name}}</span>
<span class="ui primary label stopwatch-time tw-my-0 tw-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
</span>
</a> </a>
<form class="stopwatch-commit" method="post" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/toggle"> <ul class="dropdown-menu">
{{.CsrfTokenHtml}} <li>
<button <a href="https://incremental.social/u/{{.SignedUser.Name}}">
type="submit"
class="ui button mini compact basic icon"
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.stop_tracking"}}"
>{{svg "octicon-square-fill"}}</button>
</form>
<form class="stopwatch-cancel" method="post" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/cancel">
{{.CsrfTokenHtml}}
<button
type="submit"
class="ui button mini compact basic icon"
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.cancel_tracking"}}"
>{{svg "octicon-trash"}}</button>
</form>
</div>
</div>
{{end}}
<a class="item not-mobile tw-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
<div class="tw-relative">
{{svg "octicon-bell"}}
<span class="notification_count{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span>
</div>
</a>
<div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "create_new"}}">
<span class="text">
{{svg "octicon-plus"}}
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
<span class="only-mobile">{{ctx.Locale.Tr "create_new"}}</span>
</span>
<div class="menu">
<a class="item" href="{{AppSubUrl}}/repo/create">
{{svg "octicon-plus"}} {{ctx.Locale.Tr "new_repo"}}
</a>
{{if not .DisableMigrations}}
<a class="item" href="{{AppSubUrl}}/repo/migrate">
{{svg "octicon-repo-push"}} {{ctx.Locale.Tr "new_migrate"}}
</a>
{{end}}
{{if .SignedUser.CanCreateOrganization}}
<a class="item" href="{{AppSubUrl}}/org/create">
{{svg "octicon-organization"}} {{ctx.Locale.Tr "new_org"}}
</a>
{{end}}
</div><!-- end content create new menu -->
</div><!-- end dropdown menu create new -->
<div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
<span class="text tw-flex tw-items-center">
{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
<span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
<span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
</span>
<div class="menu user-menu">
<div class="ui header">
{{ctx.Locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
</div>
<div class="divider"></div>
<a class="item" href="{{.SignedUser.HomeLink}}">
{{svg "octicon-person"}}
{{ctx.Locale.Tr "your_profile"}} {{ctx.Locale.Tr "your_profile"}}
</a> </a>
{{if not .DisableStars}} </li>
<a class="item" href="{{.SignedUser.HomeLink}}?tab=stars"> <li>
{{svg "octicon-star"}} <a href="{{.SignedUser.HomeLink}}">
Code Profile
</a>
</li>
<li>
<a href="{{.SignedUser.HomeLink}}?tab=stars">
{{ctx.Locale.Tr "your_starred"}} {{ctx.Locale.Tr "your_starred"}}
</a> </a>
{{end}} </li>
<a class="item" href="{{AppSubUrl}}/notifications/subscriptions"> <li>
{{svg "octicon-bell"}} <a href="{{AppSubUrl}}/notifications/subscriptions">
{{ctx.Locale.Tr "notification.subscriptions"}} {{ctx.Locale.Tr "notification.subscriptions"}}
</a> </a>
<a class="{{if .PageIsUserSettings}}active {{end}}item" href="{{AppSubUrl}}/user/settings"> </li>
{{svg "octicon-tools"}} <li>
<a href="{{AppSubUrl}}/user/settings">
{{ctx.Locale.Tr "your_settings"}} {{ctx.Locale.Tr "your_settings"}}
</a> </a>
<a class="item" target="_blank" rel="noopener noreferrer" href="https://forgejo.org/docs/latest/"> </li>
{{svg "octicon-question"}} {{if .IsAdmin}}
{{ctx.Locale.Tr "help"}} <li>
</a> <a href="{{AppSubUrl}}/admin">
{{if .IsAdmin}}
<div class="divider"></div>
<a class="{{if .PageIsAdmin}}active {{end}}item" href="{{AppSubUrl}}/admin">
{{svg "octicon-server"}}
{{ctx.Locale.Tr "admin_panel"}} {{ctx.Locale.Tr "admin_panel"}}
</a> </a>
{{end}} </li>
{{end}}
<div class="divider"></div> <li>
<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout"> <a href="{{AppSubUrl}}/user/logout">{{ctx.Locale.Tr "sign_out"}}</a>
{{svg "octicon-sign-out"}} </li>
{{ctx.Locale.Tr "sign_out"}} </ul>
</li>
{{else}}
<li>
<a rel="nofollow" href="{{AppSubUrl}}/user/oauth2/Incremental%20Social?redirect_to={{.CurrentURL}}">
{{ctx.Locale.Tr "sign_in"}}
</a> </a>
</div><!-- end content avatar menu --> </li>
</div><!-- end dropdown avatar menu --> {{end}}
{{else}} </menu>
{{if .ShowRegistrationButton}} </div>
<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
{{svg "octicon-person"}} {{ctx.Locale.Tr "register"}}
</a>
{{end}}
<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
{{svg "octicon-sign-in"}} {{ctx.Locale.Tr "sign_in"}}
</a>
{{end}}
</div><!-- end full right menu -->
</nav> </nav>

50
templates/user/auth/signin_inner.tmpl
View file

@ -1,5 +1,5 @@
{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}} {{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}}
{{template "base/alert" .}} {{template "base/alert" .}}
{{end}} {{end}}
<h4 class="ui top attached header center"> <h4 class="ui top attached header center">
{{if .LinkAccountMode}} {{if .LinkAccountMode}}
@ -9,53 +9,13 @@
{{end}} {{end}}
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
<form class="ui form tw-max-w-2xl tw-m-auto" action="{{.SignInLink}}" method="post"> <form class="ui form" action="{{.SignInLink}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
</div>
{{if or (not .DisablePassword) .LinkAccountMode}}
<div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
<label for="password">{{ctx.Locale.Tr "password"}}</label>
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
</div>
{{end}}
{{if not .LinkAccountMode}}
<div class="inline field">
<div class="ui checkbox">
<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
<input name="remember" type="checkbox">
</div>
</div>
{{end}}
{{template "user/auth/captcha" .}} {{if .OAuth2Providers}}
<div class="field">
<button class="ui primary button">
{{if .LinkAccountMode}}
{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
{{else}}
{{ctx.Locale.Tr "sign_in"}}
{{end}}
</button>
<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
</div>
{{if .ShowRegistrationButton}}
<div class="field">
<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now"}}</a>
</div>
{{end}}
{{if .OAuth2Providers}}
<div class="divider divider-text">
{{ctx.Locale.Tr "sign_in_or"}}
</div>
<div id="oauth2-login-navigator" class="tw-py-1"> <div id="oauth2-login-navigator" class="tw-py-1">
<div class="tw-flex tw-flex-col tw-justify-center"> <div class="tw-flex tw-flex-col tw-justify-center">
<div id="oauth2-login-navigator-inner" class="tw-flex tw-flex-col tw-flex-wrap tw-items-center tw-gap-2"> <div id="oauth2-login-navigator-inner" class="tw-flex fw-flex-col tw-flex-wrap tw-items-center tw-gap-2">
{{range $provider := .OAuth2Providers}} {{range $provider := .OAuth2Providers}}
<a class="{{$provider.Name}} ui button tw-flex tw-items-center tw-justify-center tw-py-2 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}"> <a class="{{$provider.Name}} ui button tw-flex tw-items-center tw-justify-center tw-py-2 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
{{$provider.IconHTML 28}} {{$provider.IconHTML 28}}
@ -65,6 +25,6 @@
</div> </div>
</div> </div>
</div> </div>
{{end}} {{end}}
</form> </form>
</div> </div>