From e22634658a23da5c9e327fd78db0a173f76a965d Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 2 May 2013 15:01:11 +0100
Subject: [PATCH] add in daniel / tavern tab content

---
 public/img/npcs/daniel.png | Bin 0 -> 1635 bytes
 src/app/browser.coffee     |   3 ++-
 src/app/profile.coffee     |   5 ++---
 styles/app/game-pane.styl  |   6 +++++-
 views/app/avatar.html      |  10 ----------
 views/app/game-pane.html   |  26 ++++++++++++++++++++++++++
 views/app/settings.html    |   2 --
 7 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 public/img/npcs/daniel.png

diff --git a/public/img/npcs/daniel.png b/public/img/npcs/daniel.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aed8f315638890fb7facff1d4055088f3d9a4a0
GIT binary patch
literal 1635
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

literal 0
HcmV?d00001

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 94bb3ffdc3..9256a4021f 100644
--- a/src/app/browser.coffee
+++ b/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?"
diff --git a/src/app/profile.coffee b/src/app/profile.coffee
index 882b22fb60..753e48dbbf 100644
--- a/src/app/profile.coffee
+++ b/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()
 
diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl
index 7992970350..35e26ee45a 100644
--- a/styles/app/game-pane.styl
+++ b/styles/app/game-pane.styl
@@ -9,4 +9,8 @@
 
 .tab-notification
     color: #fff;
-    background-color: #51a351
\ No newline at end of file
+    background-color: #51a351
+
+.tavern-pane
+    position:relative
+    height:500px
\ No newline at end of file
diff --git a/views/app/avatar.html b/views/app/avatar.html
index 2d993fdf3c..4f658de3e0 100644
--- a/views/app/avatar.html
+++ b/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) -->
diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index d5d9eba7a5..b4309c5137 100644
--- a/views/app/game-pane.html
+++ b/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>
\ No newline at end of file
diff --git a/views/app/settings.html b/views/app/settings.html
index d77864b0db..6a6c94b1ce 100644
--- a/views/app/settings.html
+++ b/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/>