github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 14:03:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make Persona configurable

Browse Source
This commit is contained in:
Dan Callahan 2013-03-01 13:51:00 -06:00
parent 23d812a4ab
commit 7c87359e02
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/modal/login.js.handlebars
View File

@ -16,8 +16,10 @@
{{#if Discourse.SiteSettings.enable_github_logins}} {{#if Discourse.SiteSettings.enable_github_logins}}
<button class="btn btn-social github" title="{{i18n login.github.title}}" {{action "githubLogin" target="view"}}>{{i18n login.github.title}}</button> <button class="btn btn-social github" title="{{i18n login.github.title}}" {{action "githubLogin" target="view"}}>{{i18n login.github.title}}</button>
{{/if}} {{/if}}
{{#if Discourse.SiteSettings.enable_persona_logins}}
<br> <br>
<button class="btn btn-social persona" title="{{i18n login.persona.title}}" {{action "personaLogin" target="view"}}>{{i18n login.persona.title}}</button> <button class="btn btn-social persona" title="{{i18n login.persona.title}}" {{action "personaLogin" target="view"}}>{{i18n login.persona.title}}</button>
{{/if}}
</div> </div>
<h3 style="text-align:center; margin-bottom:10px;"> <h3 style="text-align:center; margin-bottom:10px;">
{{i18n login.or}} {{i18n login.or}}

2
app/models/site_setting.rb
View File

@ -124,6 +124,8 @@ class SiteSetting < ActiveRecord::Base
setting(:github_client_id, '') setting(:github_client_id, '')
setting(:github_client_secret, '') setting(:github_client_secret, '')
client_setting(:enable_persona_logins, true)
setting(:enforce_global_nicknames, true) setting(:enforce_global_nicknames, true)
setting(:discourse_org_access_key, '') setting(:discourse_org_access_key, '')
setting(:enable_s3_uploads, false) setting(:enable_s3_uploads, false)

2
app/views/layouts/application.html.erb
View File

@ -58,7 +58,7 @@
<footer id='bottom'></footer> <footer id='bottom'></footer>
<%= render :partial => "common/discourse_javascript" %> <%= render :partial => "common/discourse_javascript" %>
<%= render :partial => "common/persona_javascript" %> <%= render :partial => "common/persona_javascript" if SiteSetting.enable_persona_logins %>
<%= render_google_analytics_code %> <%= render_google_analytics_code %>
<!-- Discourse Version: <%= Discourse::VERSION::STRING %> --> <!-- Discourse Version: <%= Discourse::VERSION::STRING %> -->

2
config/locales/server.en.yml
View File

@ -339,6 +339,8 @@ en:
github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications" github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications"
github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications"
enable_persona_logins: "Enable email-based authentication with Mozilla Persona"
allow_import: "Allow import, which can replace ALL site data; leave false unless you plan to do data imports" allow_import: "Allow import, which can replace ALL site data; leave false unless you plan to do data imports"
active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds" active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"