mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-23 23:58:02 -05:00
Merge branch 'master' of https://github.com/Marvellanius/codecombat into dutch-localization-update
This commit is contained in:
Scott Erickson
commit
fffe5f995d
6 changed files with 125 additions and 8 deletions
Binary file not shown.
|
After Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 253 KiB |
|
|
@ -78,7 +78,8 @@
|
|||
width: 80%
|
||||
left: 10%
|
||||
bottom: -30px
|
||||
|
||||
|
||||
|
||||
//- Errors
|
||||
.alert
|
||||
position: absolute
|
||||
|
|
|
|||
96
app/styles/play/modal/lang-nl/buy-gems-modal-nl.sass
Normal file
96
app/styles/play/modal/lang-nl/buy-gems-modal-nl.sass
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
@import "app/styles/mixins"
|
||||
|
||||
#buy-gems-modal-nl
|
||||
|
||||
//- Header
|
||||
|
||||
h1
|
||||
position: absolute
|
||||
left: 325px
|
||||
top: -70px
|
||||
margin: 0
|
||||
width: 612px
|
||||
text-align: center
|
||||
color: rgb(254,188,68)
|
||||
font-size: 38px
|
||||
text-shadow: black 4px 4px 0, black -4px -4px 0, black 4px -4px 0, black -4px 4px 0, black 4px 0px 0, black 0px -4px 0, black -4px 0px 0, black 0px 4px 0
|
||||
|
||||
//- Clear modal defaults
|
||||
.modal-dialog
|
||||
margin: 150px auto 0 auto
|
||||
padding: 0
|
||||
width: 1300px
|
||||
height: 460px
|
||||
background: none
|
||||
|
||||
//- Background
|
||||
#buy-gems-background
|
||||
position: absolute
|
||||
top: -157px
|
||||
left: -2px
|
||||
|
||||
//- Close modal button
|
||||
|
||||
#close-modal
|
||||
position: absolute
|
||||
left: 1005px
|
||||
top: -80px
|
||||
width: 60px
|
||||
height: 60px
|
||||
color: white
|
||||
text-align: center
|
||||
font-size: 30px
|
||||
padding-top: 15px
|
||||
cursor: pointer
|
||||
@include rotate(-3deg)
|
||||
|
||||
&:hover
|
||||
color: yellow
|
||||
|
||||
//- Products
|
||||
|
||||
#products
|
||||
position: absolute
|
||||
left: 55px
|
||||
top: 242px
|
||||
width: 1300px
|
||||
height: 140px
|
||||
|
||||
.product
|
||||
width: 228px
|
||||
height: 136px
|
||||
float: left
|
||||
text-align: center
|
||||
margin-right: 12px
|
||||
position: relative
|
||||
|
||||
h4
|
||||
font-size: 20px
|
||||
color: rgb(22,16,5)
|
||||
|
||||
h3
|
||||
margin-top: 10px
|
||||
text-transform: uppercase
|
||||
color: rgb(22,16,5)
|
||||
|
||||
button
|
||||
position: absolute
|
||||
width: 80%
|
||||
left: 10%
|
||||
bottom: -30px
|
||||
|
||||
.btn-ideal
|
||||
border-image: url(/images/common/lang-nl/button-background-ideal-active-border.png) 14 20 20 fill round
|
||||
color: #f2f2f2
|
||||
|
||||
a
|
||||
color: #f2f2f2
|
||||
text-decoration: none
|
||||
|
||||
//- Errors
|
||||
.alert
|
||||
position: absolute
|
||||
left: 10%
|
||||
width: 80%
|
||||
top: 20px
|
||||
border: 5px solid gray
|
||||
|
|
@ -1,16 +1,19 @@
|
|||
.modal-dialog
|
||||
.modal-content
|
||||
|
||||
.modal-content
|
||||
|
||||
if view.state === 'purchasing'
|
||||
.alert.alert-info(data-i18n="buy_gems.purchasing")
|
||||
|
||||
|
||||
else if view.state === 'retrying'
|
||||
#retrying-alert.alert.alert-danger(data-i18n="buy_gems.retrying")
|
||||
|
||||
else
|
||||
img(src="/images/pages/play/modal/buy-gems-background.png")#buy-gems-background
|
||||
h1(data-i18n="play.buy_gems")
|
||||
|
||||
if (me.get('preferredLanguage',true) || 'en-US').split('-')[0] == 'nl'
|
||||
img(src="/images/pages/play/modal/lang-nl/buy-gems-background-NL.png")#buy-gems-background)
|
||||
else
|
||||
img(src="/images/pages/play/modal/buy-gems-background.png")#buy-gems-background
|
||||
h1(data-i18n="play.buy_gems")
|
||||
|
||||
#products
|
||||
for product in view.products.models
|
||||
.product
|
||||
|
|
@ -19,6 +22,16 @@
|
|||
button.btn.btn-illustrated.btn-lg(value=product.get('name'))
|
||||
span= product.get('priceString')
|
||||
|
||||
if (me.get('preferredLanguage',true) || 'en-US').split('-')[0] == 'nl'
|
||||
.product
|
||||
h4.subscription-gem-amount x{{gems}} / mo
|
||||
h3
|
||||
| 1, 3, 6 OF 12
|
||||
br
|
||||
| MAANDEN
|
||||
a(href="http://www.codecombat.nl/kopen", target="_blank")
|
||||
button.btn.btn-ideal.btn-illustrated.btn-lg.btn-succes PREPAID CODES
|
||||
|
||||
.product
|
||||
h4.subscription-gem-amount x{{gems}} / mo
|
||||
h3(data-i18n="account.subscription")
|
||||
|
|
|
|||
|
|
@ -6,7 +6,11 @@ SubscribeModal = require 'views/core/SubscribeModal'
|
|||
Products = require 'collections/Products'
|
||||
|
||||
module.exports = class BuyGemsModal extends ModalView
|
||||
id: 'buy-gems-modal'
|
||||
id:
|
||||
if (me.get('preferredLanguage',true) || 'en-US').split('-')[0] == 'nl'
|
||||
'buy-gems-modal-nl'
|
||||
else
|
||||
'buy-gems-modal'
|
||||
template: template
|
||||
plain: true
|
||||
|
||||
|
|
@ -68,6 +72,9 @@ module.exports = class BuyGemsModal extends ModalView
|
|||
onClickProductButton: (e) ->
|
||||
@playSound 'menu-button-click'
|
||||
productID = $(e.target).closest('button').val()
|
||||
# Don't throw error when product is not found
|
||||
if productID.length == 0
|
||||
return
|
||||
product = @products.findWhere { name: productID }
|
||||
|
||||
if application.isIPadApp
|
||||
|
|
|
|||
Loading…
Reference in a new issue