-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use Font Awesome to provide a cute icon #129
Open
embray
wants to merge
1
commit into
trac-hacks:master
Choose a base branch
from
embray:github-login-icon
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,7 @@ | |
from trac.versioncontrol.web_ui.changeset import ChangesetModule | ||
from trac.web.api import IRequestHandler, RequestDone | ||
from trac.web.auth import LoginModule | ||
from trac.web.chrome import add_warning | ||
from trac.web.chrome import add_warning, add_script | ||
|
||
def _config_secret(value): | ||
if re.match(r'[A-Z_]+', value): | ||
|
@@ -68,6 +68,13 @@ class GitHubLoginModule(LoginModule): | |
'github', 'preferred_email_domain', '', | ||
doc="Prefer email address under this domain over the primary address.") | ||
|
||
fontawesome_url = Option( | ||
'github', 'fontawesome_url', | ||
'https://use.fontawesome.com/releases/v5.0.7/js/all.js', | ||
doc='This plugin uses Font Awesome to provide the GitHub icon. ' | ||
'Set the URL to the FA JavaScript to use here, or set to empty ' | ||
'to disable the icon altogether.') | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would change comment to: Add a GitHub icon to the login/logout button. The icon is enabled by specifying the path to the Font Awesome script. Set the value to empty to remove the icon. |
||
# INavigationContributor methods | ||
|
||
def get_active_navigation_item(self, req): | ||
|
@@ -90,9 +97,14 @@ def get_navigation_items(self, req): | |
action=logout_href, method='post', id='logout', | ||
class_='trac-logout')) | ||
else: | ||
text = _('GitHub Login') | ||
if self.fontawesome_url: | ||
add_script(req, self.fontawesome_url) | ||
text = tag(tag.i(class_='fab fa-github-alt'), ' ', text) | ||
|
||
yield ('metanav', 'github_login', | ||
tag.a(_('GitHub Login'), | ||
href=req.href('%s/login' % self.auth_path_prefix))) | ||
tag.a(text, href=req.href('%s/login' % | ||
self.auth_path_prefix))) | ||
|
||
# IRequestHandler methods | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Order of these should be switched per PEP8. No need to recreate pull request, I'll make the change before merging.