Skip to content

Eliminate abbreviated "who's working" list #339

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

Eliminate abbreviated "who's working" list #339

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
16 changes: 0 additions & 16 deletions blackboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,7 @@ <h3 class="bb-editable" data-bbedit="rounds/{{round._id}}/title">
</td>
{{#unless canEdit}}
<td class="puzzle-working">
<div class="{{#if lotsOfPeople whos_working.count}}bb-lots{{/if}}">
<span class="bb-short">
{{ whos_working.count }} people
({{local_working}}<i class="icon-map-marker"></i>)
</span>
<span class="bb-long">
{{#each whos_working}}{{> nick_presence }} {{/each}}
</span>
</div>
</td>
<td class="puzzle-update">
{{#if round.solved}}solved {{pretty_ts timestamp=round.solved style="brief duration"}}
Expand Down Expand Up @@ -395,15 +387,7 @@ <h3 class="bb-editable" data-bbedit="rounds/{{round._id}}/title">
</td>
{{#unless canEdit}}
<td class="puzzle-working">
<div class="{{#if lotsOfPeople whos_working.count}}bb-lots{{/if}}">
<span class="bb-short">
{{ whos_working.count }} people
({{local_working}}<i class="icon-map-marker"></i>)
</span>
<span class="bb-long">
{{#each whos_working}}{{> nick_presence }} {{/each}}
</span>
</div>
</td>
<td class="puzzle-update">
{{#if puzzle.solved}}solved {{pretty_ts timestamp=puzzle.solved style="brief duration"}}
Expand Down
8 changes: 0 additions & 8 deletions blackboard.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,14 +404,6 @@ body.has-emojis {

.puzzle-working {
.background { color: #ccc; }
.bb-lots {
.bb-short { display: block; }
.bb-long { display: none; }
}
&, &:hover .bb-lots {
.bb-short { display: none; }
.bb-long { display: block; }
}
}
td.puzzle-update {
font-size: 85%;
Expand Down
10 changes: 0 additions & 10 deletions client/blackboard.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,6 @@ Template.blackboard_round.helpers
return model.Presence.find
room_name: ("rounds/"+this.round?._id)
, sort: ["nick"]
local_working: ->
count = 0
model.Presence.find(room_name: ("rounds/"+this.round?._id)).forEach (p) ->
count++ if share.isNickNear(p.nick)
count
compactMode: compactMode
nCols: nCols
stuck: share.model.isStuck
Expand All @@ -367,11 +362,6 @@ Template.blackboard_puzzle.helpers
return model.Presence.find
room_name: ("puzzles/"+this.puzzle?._id)
, sort: ["nick"]
local_working: ->
count = 0
model.Presence.find(room_name: ("puzzles/"+this.puzzle?._id)).forEach (p) ->
count++ if share.isNickNear(p.nick)
count
compactMode: compactMode
nCols: nCols
stuck: share.model.isStuck
Expand Down