add in daniel / tavern tab content

src/app/browser.coffee

@@ -53,9 +53,10 @@ setupSortable = (model) ->
           # or the item's id property
           model.at("_#{type}List").pass(ignore: domId).move {id}, to
 
-setupTooltips = module.exports.setupTooltips = (model) ->
+setupTooltips = module.exports.setupTooltips = ->
   $('[rel=tooltip]').tooltip()
   $('[rel=popover]').popover()
+  $('.popover-auto-show').popover('show')
 
   $('.priority-multiplier-help').popover
     title: "How difficult is this task?"

src/app/profile.coffee

@@ -25,7 +25,6 @@ module.exports.app = (appExports, model) ->
     browser.setupTooltips(model)
 
   appExports.toggleGamePane = ->
-    model.set '_gamePane', !model.get('_gamePane')
-    $('[rel=tooltip]').tooltip()
-    $('[rel=popover]').popover()
+    model.set '_gamePane', !model.get('_gamePane'), ->
+      browser.setupTooltips()
 

styles/app/game-pane.styl

@@ -9,4 +9,8 @@
 
 .tab-notification
     color: #fff;
-    background-color: #51a351
+    background-color: #51a351
+
+.tavern-pane
+    position:relative
+    height:500px

views/app/avatar.html

@@ -168,16 +168,6 @@
         </div>
     </div>
 
-<rest:>
-    <form>
-        <fieldset>
-            <label class="checkbox">
-                <input type="checkbox" name="rest" checked={_user.flags.rest} >Temporarily freeze account
-            </label>
-            <small>Useful if you're going on vacation for or get sick.</small>
-        </fieldset>
-    </form>
-
 <achievements:>
     <!--TODO replce this in the future with HTML from BrowserQuest's index.html, which properly handles the achievements
         sprite-sheets (see BQ's achievements.css, main.css) -->

views/app/game-pane.html

@@ -55,6 +55,10 @@
                 <app:pets:stable />
             </div>
 
+            <div class="tab-pane" id="profileTavern">
+                <app:game-pane:tavern />
+            </div>
+
             <div class="tab-pane" id="profileSettings">
                 {{#if _loggedIn}}
                     <app:settings:settings-pane />
@@ -62,4 +66,26 @@
             </div>
         </div>
 
+    </div>
+
+<tavern:>
+    <div class='row-fluid tavern-pane'>
+        <div class='span6'>
+            <img src='/img/npcs/daniel.png' />
+            <div class="popover fade right in" style="top: 0px; left: 135px; display: block;">
+                <div class="arrow"></div>
+                <h3 class="popover-title">Daniel Johansson</h3>
+                <div class="popover-content">Welcome to the Tavern! I'm the bar keep, <a target="_blank" href="http://www.kickstarter.com/profile/2014640723">Daniel</a>. If you would like to rest a while (going on vacation?), I can set you up at the inn for 10gp. While you're resting, your dailies won't hurt you. The minimum stay is 24h, but you can check out whenever you want. In the future, you may find other adventurers here, looking meet and mingle (LFG anyone?)</div>
+            </div>
+        </div>
+        <div class='span6'>
+            <form>
+                <fieldset>
+                    <label class="checkbox">
+                        <input type="checkbox" name="rest" checked={_user.flags.rest} >Rest in the inn
+                    </label>
+                </fieldset>
+            </form>
+
+        </div>
     </div>

views/app/settings.html

@@ -18,8 +18,6 @@
             <hr/>
             <h4>Misc</h4>
             <button x-bind="click:toggleHeader" class="btn">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
-            <br/><br/>
-            <app:avatar:rest />
 
             {{#if _user.auth.local}}
             <hr/>