Did a bunch related to achievements and user profile page

This commit is contained in:
Ruben Vereecken 2014-07-28 20:04:44 +02:00
parent 194463c113
commit 7987e1d05b
9 changed files with 25 additions and 14 deletions

View file

@ -25,4 +25,4 @@ module.exports = class Achievement extends CocoModel
getNotifyStyle: -> Achievement.styleMapping[@get 'difficulty']
getImageURL: ->
if @get 'icon' then '/file/' + @get('icon') else '/images/achievements/stars.png'
if @get 'icon' then '/file/' + @get('icon') else '/images/achievements/default.png'

View file

@ -120,13 +120,12 @@
position: absolute
bottom: 48px
.achievement-level
.user-level
font-size: 20px
z-index: 1000
position: absolute
left: -15px
margin-top: -3px
box-shadow: 0 0 0 2px black, 0 0 0 3px lightgrey, 0 0 0 5px black
box-shadow: 0 0 0 2px black, 0 0 0 4px lightgrey, 0 0 0 6px black
> .progress-bar-wrapper
position: absolute
@ -181,3 +180,8 @@
.exp-bar-left
background-color: #fffbfd
.user-level
z-index: 1000
box-shadow: 0 0 0 1px black, 0 0 0 3px lightgrey, 0 0 0 4px black
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif

View file

@ -73,14 +73,15 @@ a.disabled
border-radius: 0px
font-family: Bangers
.user-dropdown-header
> .user-dropdown-header
position: relative
background: #E4CF8C
height: 160px
padding: 10px
text-align: center
color: black
border-bottom: #32281e 1px solid
a:hover
> a:hover
background-color: transparent
img
border: #e3be7a 8px solid
@ -91,6 +92,16 @@ a.disabled
margin-top: 10px
text-shadow: 2px 2px 3px white
color: #31281E
.user-level
position: absolute
top: 85px
right: 100px
font-size: 20px
border-radius: 50%
background-color: #FFE4BC
box-shadow: 0 0 0 1px black // disable for double border
color: gold
text-shadow: 1px 1px black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black
.user-dropdown-body
color: black

View file

@ -18,7 +18,7 @@
> .picture
width: 100%
background-color: #dadada
background-color: #ffe4bc
border: 4px solid white
> .name

View file

@ -10,9 +10,6 @@ div
if popup
.progress-wrapper
//.earned-exp(data-notify-html="earnedExp")
span.achievement-level.badge(data-notify-html="level")
span.user-level.badge(data-notify-html="level")
.progress-bar-wrapper(data-notify-html="progressBar")
.progress-bar-border
//(data-notify-html="barBorder")
//img(src='/images/achievements/bar_border.png' width='100%')

View file

@ -43,6 +43,7 @@ body
span.caret
ul.dropdown-menu(role="menu")
li.user-dropdown-header
span.user-level.badge= me.level()
a(href="/user/#{me.get('slug') || me.get('_id')}")
img.img-circle(src="#{me.getPhotoURL()}" alt="")
h3=me.get('name') || 'Anoner'

View file

@ -12,7 +12,7 @@ block append content
a.btn.btn-default(href="/user/#{user.get('slug') || user.get('_id')}/profile")
i.glyphicon.glyphicon-briefcase
span Job Profile
a.btn.btn-default(href="profile")
a.btn.btn-default.disabled(href="#")
i.glyphicon.glyphicon-pencil
span Code
- var emails = user.get('emails')

View file

@ -53,7 +53,6 @@ module.exports = class RootView extends CocoView
newlyAchievedBar = $("<div data-toggle='tooltip' class='progress-bar exp-bar-new' style='width:#{newlyAchievedPercentage}%'></div>")
emptyBar = $("<div data-toggle='tooltip' class='progress-bar exp-bar-left' style='width:#{100 - newlyAchievedPercentage - alreadyAchievedPercentage}%'></div>")
progressBar = $('<div class="progress" data-toggle="tooltip"></div>').append(alreadyAchievedBar).append(newlyAchievedBar).append(emptyBar)
#message = if (currentLevel isnt 1) and leveledUp then "Reached level #{currentLevel}!" else null
alreadyAchievedBar.tooltip(title: "#{currentExp} XP in total")
newlyAchievedBar.tooltip(title: "#{achievedExp} XP earned")
@ -87,7 +86,6 @@ module.exports = class RootView extends CocoView
description: achievement.get('description')
progressBar: progressBar
earnedExp: "+ #{achievedExp} XP"
#message: message
level: currentLevel
barBorder: barBorder

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB