From 07f9cacf57c291b546661acb03ab9275c5eca37e Mon Sep 17 00:00:00 2001
From: Dan Rosart <torgen@gmail.com>
Date: Sun, 4 Feb 2018 01:21:15 +0000
Subject: [PATCH 1/5] Put nav within blackboard in slide-in drawer.

---
 blackboard.html          | 19 ++++++++++++++++++
 blackboard.less          | 43 +++++++++++++++++++++++++++++++++++++++-
 client/blackboard.coffee | 15 +++++++++++++-
 page.html                |  3 +++
 4 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/blackboard.html b/blackboard.html
index f905f2575..2fdc2c988 100644
--- a/blackboard.html
+++ b/blackboard.html
@@ -1,3 +1,22 @@
+<template name="blackboard_menu_drawer">
+<div class="bb-menu-button">
+<button class="btn btn-inverse btn-small">
+<i class="icon-white icon-list"></i>
+</button>
+</div>
+<div class="bb-menu-drawer fade">
+  <ul class="nav nav-list bb-sidenav">
+    {{#each roundgroups}}
+    <li class="nav-header">{{name}}</li>
+    {{#each rounds}}
+    <li><a title="r{{round_num}}" href="#r{{round._id}}"><i class="icon-chevron-right"></i>
+    {{round.name}}</a></li>
+    {{/each}}
+    {{/each}}
+  </ul>
+</div>
+</template>
+
 <template name="blackboard">
 
 <!-- puzzles w/ index -->
diff --git a/blackboard.less b/blackboard.less
index 4bbee488c..edd7db8f5 100644
--- a/blackboard.less
+++ b/blackboard.less
@@ -56,6 +56,48 @@ body.has-emojis {
       font-family: "Noto Sans", sans-serif;
   }
 }
+.bb-menu-button {
+  position: fixed;
+  bottom: 0px;
+  left:0px;
+  z-index: 1030;
+}
+.bb-menu-drawer {
+  &.fade {
+    opacity: 1;
+  }
+  position: fixed;
+  top: 0px;
+  bottom: 0px;
+  overflow-y: auto;
+  background-color: white;
+  width: 256px;
+  left: -256px;
+  z-index: 1050;
+  transition: left 0.25s ease-in-out;
+  border-right: 1px solid black;
+  &.in {
+    left: 0px;
+  }
+  ul {
+    margin-left: 5px;
+    li {
+      display: block;
+      a {
+        display: block;
+        &.bb-wiki { text-align: center; }
+      }
+      /* Chevrons */
+      .icon-chevron-right {
+        float: right;
+        margin-top: 2px;
+        margin-right: -6px;
+        opacity: .25;
+      }
+    }
+  }
+}
+
 .bb-puzzleround, .bb-chat-messages {
   padding-top: 40px; /* allow space for breadcrumbs in navbar */
 }
@@ -653,7 +695,6 @@ html.fullHeight {
   body {
     padding-top: 0;
   }
-
   #roomName { width:85px; } /* narrow room name input */
   .bb-omit-when-narrow, .puzzle-working, .puzzle-update { display: none; }
   .bb-buttonbar .bb-login { float: right }
diff --git a/client/blackboard.coffee b/client/blackboard.coffee
index a1516dd6b..4bfeb52f8 100644
--- a/client/blackboard.coffee
+++ b/client/blackboard.coffee
@@ -139,7 +139,7 @@ Template.blackboard.helpers
     return r
   stuck: share.model.isStuck
 
-Template.blackboard_status_grid.helpers
+common_helpers =
   roundgroups: ->
     dir = if Session.get 'sortReverse' then 'desc' else 'asc'
     model.RoundGroups.find {}, sort: [["created", dir]]
@@ -164,6 +164,19 @@ Template.blackboard_status_grid.helpers
     return p
   stuck: share.model.isStuck
 
+Template.blackboard_status_grid.helpers common_helpers
+Template.blackboard_menu_drawer.helpers common_helpers
+
+Template.blackboard_menu_drawer.events
+  "click .bb-menu-button .btn": (event, template) ->
+    template.$('.bb-menu-drawer').modal 'show'
+  "click a[href^=#]": (event, template) ->
+    event.preventDefault()
+    template.$('.bb-menu-drawer').modal 'hide'
+    $.scrollTo (event.target.getAttribute 'href'),
+      duration: 400
+      offset: { top: -110 }
+
 Template.nick_presence.helpers
   email: ->
     cn = share.model.canonical(this.nick)
diff --git a/page.html b/page.html
index a044cd7a1..4cb0c150a 100644
--- a/page.html
+++ b/page.html
@@ -19,6 +19,9 @@
 </head>
 
 <body>
+  {{#if currentPageEquals "blackboard"}}
+    {{> blackboard_menu_drawer}}
+  {{/if}}
   <div id="bb-body">
       {{> page }}
   </div>

From c54cde7326fb9b28032d040935b25ece9983af66 Mon Sep 17 00:00:00 2001
From: Dan Rosart <Torgen@users.noreply.github.com>
Date: Sat, 3 Feb 2018 17:27:52 -0800
Subject: [PATCH 2/5] Remove sidebar stuff obviated by slide-in drawer

---
 blackboard.html          | 17 +++--------------
 blackboard.less          | 26 --------------------------
 client/blackboard.coffee | 10 ----------
 3 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/blackboard.html b/blackboard.html
index 2fdc2c988..889520d1d 100644
--- a/blackboard.html
+++ b/blackboard.html
@@ -6,6 +6,9 @@
 </div>
 <div class="bb-menu-drawer fade">
   <ul class="nav nav-list bb-sidenav">
+    <li><a class="bb-wiki" href="{{wiki title=""}}"
+           target="_blank">Codex Wiki</a></li>
+    <li class="divider"></li>
     {{#each roundgroups}}
     <li class="nav-header">{{name}}</li>
     {{#each rounds}}
@@ -21,20 +24,6 @@
 
 <!-- puzzles w/ index -->
 <div class="row-fluid">
-  <div id="bb-sidebar" class="span2">
-    <ul class="nav nav-list bb-sidenav span2">
-      <li><a class="bb-wiki" href="{{wiki title=""}}"
-             target="_blank">Codex Wiki</a></li>
-      <li class="divider"></li>
-      {{#each roundgroups}}
-      <li class="nav-header">{{name}}</li>
-      {{#each rounds}}
-      <li><a title="r{{round_num}}" href="#r{{round._id}}{{updateScrollSpy}}"><i class="icon-chevron-right"></i>
-      {{round.name}}</a></li>
-      {{/each}}
-      {{/each}}
-    </ul>
-  </div>
   <div id="bb-tables" class="{{#if hideStatus}}span10{{else}}span8{{/if}} {{#if canEdit}}bb-canEdit{{/if}}">
     <!-- content div -->
 <div class="btn-toolbar pull-right text-right bb-top-buttons">
diff --git a/blackboard.less b/blackboard.less
index edd7db8f5..9ea23d341 100644
--- a/blackboard.less
+++ b/blackboard.less
@@ -206,32 +206,6 @@ body.has-emojis {
     text-transform: uppercase;
   }
 }
-#bb-sidebar {
-  .bb-sidenav {
-    margin-top: 10px;
-    background-color: #fff;
-    -webkit-border-radius: 6px;
-       -moz-border-radius: 6px;
-            border-radius: 6px;
-    -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065);
-       -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065);
-            box-shadow: 0 1px 4px rgba(0,0,0,.065);
-    border: 1px solid #e5e5e5;
-
-    position: fixed; /* for wide screens */
-
-    & > li:first-child { text-align: center; /* wiki link */ }
-    li.nav-header, li > a { .ellipsis; }
-
-    /* Chevrons */
-    .icon-chevron-right {
-      float: right;
-      margin-top: 2px;
-      margin-right: -6px;
-      opacity: .25;
-    }
-  }
-}
 
 #bb-right-sidebar {
   position: fixed;
diff --git a/client/blackboard.coffee b/client/blackboard.coffee
index 4bfeb52f8..2c4b2af71 100644
--- a/client/blackboard.coffee
+++ b/client/blackboard.coffee
@@ -188,19 +188,9 @@ share.find_bbedit = (event) ->
   return edit.split('/')
 
 Template.blackboard.onRendered ->
-  $("#bb-sidebar").localScroll({ duration: 400, lazy: true })
-  $("body").scrollspy(target: "#bb-sidebar", offset: (NAVBAR_HEIGHT + 10))
-  ss = $("body").data("scrollspy")
-  # hack to ensure first element is selected on first reload
-  ss.activate(ss.targets[0]) if ss.targets.length
-  ss.process()
   #  page title
   $("title").text("Codex Puzzle Blackboard")
-  # affix side menu
-  # XXX disabled because it doesn't play nice with narrow screens
-  #$("#bb-sidebar > .bb-sidenav").affix()
   # tooltips
-  $('#bb-sidebar .nav > li > a').tooltip placement: 'right'
   $('#bb-tables .bb-puzzle .puzzle-name > a').tooltip placement: 'left'
   # see the global 'updateScrollSpy' helper for details on how
   # we update scrollspy when the rounds list changes

From b432bc2c06d8706fb82a85d49a52ac8c46695edb Mon Sep 17 00:00:00 2001
From: Dan Rosart <Torgen@users.noreply.github.com>
Date: Tue, 5 Dec 2017 19:47:35 -0800
Subject: [PATCH 3/5] Remove nav panel

* Remove left sidebar.

* Make the status grid a table.
---
 blackboard.html | 31 +++++++++++++++----------------
 blackboard.less | 14 +++++++++-----
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/blackboard.html b/blackboard.html
index 889520d1d..ba63322c5 100644
--- a/blackboard.html
+++ b/blackboard.html
@@ -24,7 +24,7 @@
 
 <!-- puzzles w/ index -->
 <div class="row-fluid">
-  <div id="bb-tables" class="{{#if hideStatus}}span10{{else}}span8{{/if}} {{#if canEdit}}bb-canEdit{{/if}}">
+  <div id="bb-tables" class="{{#if hideStatus}}span12{{else}}span9{{/if}} {{#if canEdit}}bb-canEdit{{/if}}">
     <!-- content div -->
 <div class="btn-toolbar pull-right text-right bb-top-buttons">
     {{#if canEdit}}
@@ -155,7 +155,7 @@ <h2 class="bb-editable" data-bbedit="roundgroups/{{_id}}/title">
   {{#if hideStatus}}
   <div class="bb-hide-status"><i class='icon-chevron-left'></i></div>
   {{else}}
-  <div id="bb-right-sidebar" class="span2"><div>
+  <div id="bb-right-sidebar" class="span3"><div>
     <div class="bb-hide-status"><i class='icon-chevron-right'></i></div>
     {{> blackboard_status_grid}}
   </div></div><!-- bb-right-sidebar -->
@@ -165,26 +165,25 @@ <h2 class="bb-editable" data-bbedit="roundgroups/{{_id}}/title">
 
 <template name="blackboard_status_grid">
   <div class="bb-status-grid">
+  <table>
+  <tbody>
     {{#each roundgroups}}
-    <div class="bb-status-grid-row {{#if solved}}bb-status-solved{{else}}{{#if stuck this}}bb-status-stuck{{else}}bb-status-unsolved{{/if}}{{/if}}">{{link id=_id}}</div>
+    <tr><th colspan=2 class="bb-status-grid-roundgroup bb-status-{{#unless solved}}un{{/unless}}solved">{{link id=_id}}</th></tr>
     {{#each rounds}}
-    <div class="bb-status-grid-row">
-      <div class="bb-status-grid-cell">
-        <div class="{{#if round.solved}}bb-status-solved{{else}}{{#if stuck round}}bb-status-stuck{{else}}bb-status-unsolved{{/if}}{{/if}}">
-          {{link id=round._id title=round.name text=rX}}:
-        </div>
-      </div><!--
-      -->{{#each puzzles}}<!--
-      --><div class="bb-status-grid-cell">
-        <div class="{{#if puzzle.solved}}bb-status-solved{{else}}{{#if stuck puzzle}}bb-status-stuck{{else}}bb-status-unsolved{{/if}}{{/if}}">
+    <tr>
+      <td class="bb-status-grid-round bb-status-{{#unless round.solved}}un{{/unless}}solved">
+          {{link id=round._id title="meta" text=round.name}}
+      </td><td class="bb-status-grid-puzzles">
+      {{#each puzzles}}<!--
+      --><div class="bb-status-grid-cell bb-status-{{#unless puzzle.solved}}un{{/unless}}solved">
           {{link id=puzzle._id title=puzzle.name text=puzzle_num}}
-        </div>
       </div><!--
-      -->{{/each}}
-    </div>
+      -->{{/each}}</td>
+    </tr>
     {{/each}}
     {{/each}}
-  </div><!-- bb-status-grid -->
+  </tbody>
+  </table></div><!-- bb-status-grid -->
 </template>
 
 <template name="blackboard_round">
diff --git a/blackboard.less b/blackboard.less
index 9ea23d341..c9bd96a84 100644
--- a/blackboard.less
+++ b/blackboard.less
@@ -206,7 +206,6 @@ body.has-emojis {
     text-transform: uppercase;
   }
 }
-
 #bb-right-sidebar {
   position: fixed;
   right: 14px;
@@ -242,10 +241,15 @@ body.has-emojis {
     padding: 5px;
     font-size: 80%;
 
-    .bb-status-grid-row {
-      padding-left: 1.5em;
-      text-indent: -1.5em;
-      & > * { text-indent: 0; }
+    .bb-status-grid-roundgroup {
+      font-weight: bold;
+      text-transform: uppercase;
+    }
+    td {
+      padding: 0px;
+    }
+    .bb-status-grid-round {
+      padding-right:2px;
     }
     .bb-status-grid-cell {
       display: inline-block;

From f9047c5a4aa53d860d9749f39c2149bf7d0257ad Mon Sep 17 00:00:00 2001
From: Dan Rosart <torgen@gmail.com>
Date: Sun, 4 Feb 2018 01:45:08 +0000
Subject: [PATCH 4/5] Put blackboard drawer inside blackboard template. I
 worried the modal wouldn't work, but it does.

---
 blackboard.html          | 6 +-----
 client/blackboard.coffee | 7 ++-----
 page.html                | 3 ---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/blackboard.html b/blackboard.html
index ba63322c5..feadf332e 100644
--- a/blackboard.html
+++ b/blackboard.html
@@ -1,4 +1,4 @@
-<template name="blackboard_menu_drawer">
+<template name="blackboard">
 <div class="bb-menu-button">
 <button class="btn btn-inverse btn-small">
 <i class="icon-white icon-list"></i>
@@ -18,10 +18,6 @@
     {{/each}}
   </ul>
 </div>
-</template>
-
-<template name="blackboard">
-
 <!-- puzzles w/ index -->
 <div class="row-fluid">
   <div id="bb-tables" class="{{#if hideStatus}}span12{{else}}span9{{/if}} {{#if canEdit}}bb-canEdit{{/if}}">
diff --git a/client/blackboard.coffee b/client/blackboard.coffee
index 2c4b2af71..d45c8fcaa 100644
--- a/client/blackboard.coffee
+++ b/client/blackboard.coffee
@@ -139,7 +139,7 @@ Template.blackboard.helpers
     return r
   stuck: share.model.isStuck
 
-common_helpers =
+Template.blackboard_status_grid.helpers
   roundgroups: ->
     dir = if Session.get 'sortReverse' then 'desc' else 'asc'
     model.RoundGroups.find {}, sort: [["created", dir]]
@@ -164,10 +164,7 @@ common_helpers =
     return p
   stuck: share.model.isStuck
 
-Template.blackboard_status_grid.helpers common_helpers
-Template.blackboard_menu_drawer.helpers common_helpers
-
-Template.blackboard_menu_drawer.events
+Template.blackboard.events
   "click .bb-menu-button .btn": (event, template) ->
     template.$('.bb-menu-drawer').modal 'show'
   "click a[href^=#]": (event, template) ->
diff --git a/page.html b/page.html
index 4cb0c150a..a044cd7a1 100644
--- a/page.html
+++ b/page.html
@@ -19,9 +19,6 @@
 </head>
 
 <body>
-  {{#if currentPageEquals "blackboard"}}
-    {{> blackboard_menu_drawer}}
-  {{/if}}
   <div id="bb-body">
       {{> page }}
   </div>

From 2509592facde7068b9a16bd5f1d96e39b4b24a6a Mon Sep 17 00:00:00 2001
From: Dan Rosart <Torgen@users.noreply.github.com>
Date: Tue, 17 Jul 2018 01:07:16 -0700
Subject: [PATCH 5/5] Quote hash in matcher for fragment links`

It seems like some versions of jQuery require it.
---
 client/blackboard.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/blackboard.coffee b/client/blackboard.coffee
index d45c8fcaa..87cb87191 100644
--- a/client/blackboard.coffee
+++ b/client/blackboard.coffee
@@ -167,7 +167,7 @@ Template.blackboard_status_grid.helpers
 Template.blackboard.events
   "click .bb-menu-button .btn": (event, template) ->
     template.$('.bb-menu-drawer').modal 'show'
-  "click a[href^=#]": (event, template) ->
+  "click a[href^='#']": (event, template) ->
     event.preventDefault()
     template.$('.bb-menu-drawer').modal 'hide'
     $.scrollTo (event.target.getAttribute 'href'),
