diff --git a/src/app/content.coffee b/src/app/content.coffee index e267b02be4..eb3429c1bb 100644 --- a/src/app/content.coffee +++ b/src/app/content.coffee @@ -115,6 +115,9 @@ module.exports = { ] items: { + unlockedMessage: + title: "Item Store Unlocked" + content: "Congradulations, you have unlocked the Item Store! You can now buy weapons, armor, potions, etc. Read each item's comment for more information." weapon: [ {text: "Sword 1", icon: "item-sword1", notes:'', value:0} {text: "Sword 2", icon:'item-sword2', notes:'', value:100} diff --git a/src/app/index.coffee b/src/app/index.coffee index c3d7f1f26a..81da5d9eef 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -104,13 +104,13 @@ ready (model) -> if !user.get('items.itemsEnabled') and stats.exp >=50 user.set 'items.itemsEnabled', true $('ul.items').popover - title: "Item Store Unlocked" + title: content.items.unlockedMessage.title placement: 'left' html: true content: "
\ \ - Congradulations, you have unlocked the Item Store! You can now buy weapons, armor, potions, etc. Read each item's comment for more information. \ - [Close]
" + #{content.items.unlockedMessage.content} [Close]\ + " $('ul.items').popover 'show' user.set 'stats.exp', stats.exp @@ -288,6 +288,9 @@ ready (model) -> chart = new google.visualization.LineChart(document.getElementById( chartSelector )) chart.draw(data, options) + exports.buyItem = (e, el) -> + + exports.vote = (e, el, next) -> direction = $(el).attr('data-direction') direction = 'up' if direction == 'true/' diff --git a/styles/app/index.styl b/styles/app/index.styl index 1355373e9b..1f51db295f 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -75,7 +75,7 @@ li:hover .task-meta-controls .hover-show .vote-up, .vote-down text-decoration:none; - .buy-link, .static-buy-link + .buy-link, .item-buy-link background-color: #ccffcc padding: 2px margin-right: 10px @@ -83,10 +83,10 @@ li:hover .task-meta-controls .hover-show img height:20px + + .item-buy-link + background-color: #DEE5F2 - .static-buy-link - background-color: #DEE5F2 - #character img width: 60px @@ -118,6 +118,8 @@ footer.footer .item-store-popover img float:left padding-right:7px; + + .item .task-text img max-height: 16px diff --git a/views/app/index.html b/views/app/index.html index 48a85f3aa4..9ab98f3a83 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -217,7 +217,7 @@
- {:item.value} + {:item.value}
{:item.text}