Skip to content

Make team name a public setting #346

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.

Sign up for GitHub

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

Open
Torgen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make team name a public setting #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blackboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</div>
<h1 align="center" class="bb-blackboard-h1">
<span class="bb-no-wrap">
<span class="bb-hide-when-narrower">Codex</span></span> <span class="bb-hide-when-narrow">Puzzle </span><span class="bb-no-wrap">Blackboard
<span class="bb-hide-when-narrower">{{teamName}}</span></span> <span class="bb-hide-when-narrow">Puzzle </span><span class="bb-no-wrap">Blackboard
</span>
</h1>
<table class="table table-bordered table-condensed bb-puzzle">
Expand Down
2 changes: 2 additions & 0 deletions client/000startup/settings.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ settings.WIKI_HOST = server.wikiHost ? 'https://wiki.codexian.us'
# hunt year, used to make wiki links
settings.HUNT_YEAR = server.huntYear ? 2014

settings.TEAM_NAME = server.teamName ? 'Codex'

# -- Performance settings --

# make fewer people subscribe to ringhunters chat.
Expand Down
2 changes: 1 addition & 1 deletion client/blackboard.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Template.blackboard.onRendered ->
ss.activate(ss.targets[0]) if ss.targets.length
ss.process()
# page title
$("title").text("Codex Puzzle Blackboard")
$("title").text("#{settings.TEAM_NAME} Puzzle Blackboard")
# affix side menu
# XXX disabled because it doesn't play nice with narrow screens
#$("#bb-sidebar > .bb-sidenav").affix()
Expand Down
2 changes: 2 additions & 0 deletions client/main.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ Template.registerHelper 'linkify', (contents) ->
Template.registerHelper 'compactHeader', () ->
(Session.equals 'currentPage', 'chat')

Template.registerHelper 'teamName', -> settings.TEAM_NAME

# subscribe to the all-names feed all the time
Meteor.subscribe 'all-names'
# subscribe to all nicks all the time
Expand Down
4 changes: 2 additions & 2 deletions quip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ <h2>Add new quip</h2>
<form class="bb-add-new-quip">
<fieldset>
<span class="help-block">
Give us a fun way for our duty officer to answer the Codex phone when HQ calls.
Give us a fun way for our duty officer to answer the {{teamName}} phone when HQ calls.
</span>
<textarea placeholder="Hello, this is Codex…" rows="3"></textarea><br/>
<textarea placeholder="Hello, this is {{teamName}}…" rows="3"></textarea><br/>
<button type="submit" class="btn">Submit</button>
</fieldset>
</form>
Expand Down