Skip to content

Commit

Permalink
profile & alias pages are displaying data correctly & formatted
Browse files Browse the repository at this point in the history
  • Loading branch information
Melanie Fryman committed Sep 8, 2014
1 parent d8c3dcb commit 23ba1a1
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 18 deletions.
2 changes: 1 addition & 1 deletion app/static/css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion app/static/css/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,6 @@ a.photo.thumbnail {
width: 75px;
margin: auto;
}

#clientButtons {
text-align:left;
}
122 changes: 106 additions & 16 deletions app/views/users/alias.jade
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ block content
.row
.col-xs-1
.col-xs-6
h2=client.alias
h2 #{client.alias}
.row
.col-xs-1
.col-xs-6
Expand All @@ -26,22 +26,56 @@ block content
.col-xs-4
a.thumbnail#alias(href='#')
img(src='#{client.profilePhoto}')
.col-xs-2.col-xs-offset-1
span.fa.fa-heart
.col-xs-4
button.btn.btn-default.btn-(data-toggle='modal', data-target='#newMessage'): i.fa.fa-envelope   Message
include newMessage
a.btn.btn-default.btn(href='/gifts'): i.fa.fa-gift   Send a Gift
form.form(role='form', method='post', action='/message/#{client._id}')
input(type='hidden', name='senderId', value=user._id)
input(type='hidden', name='receiverId', value=client._id)
button.btn.btn-default.btn-(type='submit'): i.fa.fa-eye   Wink
a.btn.btn-default(href='/proposals/#{client._id}/new'): i.fa.fa-calendar   Request a Date


.col-xs-4#clientButtons
.row
.col-xs-4
a.btn.btn-default(href='/proposals/#{client._id}/new'): i.fa.fa-calendar   Request a Date
.row
.col-xs-4
a.btn.btn-default.btn(href='/gifts'): i.fa.fa-gift   Send a Gift
.row
.col-xs-4
button.btn.btn-default.btn-(data-toggle='modal', data-target='#newMessage'): i.fa.fa-envelope   Message
include newMessage
.row
.col-xs-4
a.btn.btn-default(href='#'): i.fa.fa-heart   Favorite
.row
.col-xs-4
form.form(role='form', method='post', action='/message/#{client._id}')
input(type='hidden', name='senderId', value=user._id)
input(type='hidden', name='receiverId', value=client._id)
button.btn.btn-default.btn-(type='submit'): i.fa.fa-eye   Wink
.row
.col-xs-6
.row
.col-xs-2
.col-xs-8
.col-xs-12
.panel.panel-info
.panel-heading
h3#about.panel-title About me
.panel-body
dl
dt My self summary
br
dd #{client.about.aboutMe}
br
dt What I'm doing with my life...
dd #{client.about.life}
br
dt I'm really good at...
dd #{client.about.brag}
br
dt My interestes (favorite books, music, food, etc.)...
dd #{client.about.interests}
br
dt My favorite roll was...
dd #{client.about.roll}
br
dt On a typical Wednesday night I am...
dd #{client.about.nightLife}
br
.row
.col-xs-12
.c-wrapper
#carousel-example-generic.carousel.slide(data-ride='carousel')
ol.carousel-indicators
Expand All @@ -58,4 +92,60 @@ block content
a.right.carousel-control(href='#carousel-example-generic', role='button', data-slide='prev')
span.glyphicon.glyphicon-chevron-right
.col-xs-2
.col-xs-6
.row
.col-xs-12
.panel.panel-info
.panel-heading
h3#details.panel-title Details
.panel-body
dl.dl-horizontal
dt Orientation: 
dd #{client.orientation}
br
dt Height: 
dd #{client.details.feet} feet,  #{client.details.inches} inches
br
dt Body Type: 
dd #{client.details.bodyType}
br
dt Diet: 
dd #{client.details.diet}
br
dt Smokes: 
dd #{client.details.smoking}
br
dt Drinks: 
dd #{client.details.drinking}
br
dt Drug of Choice: 
dd #{client.details.drug}
br
dt Religion: 
dd #{client.details.religion},  #{client.details.religionSerious}
br
dt Sign: 
dd #{client.details.sign}  #{client.details.signSerious}
br
dt Education: 
dd #{client.details.educationStatus}  #{client.details.educationLevel}
br
dt Ulmer Status: 
dd #{client.details.ulmer}
br
dt Income: 
dd #{client.details.income}
br
dt Relationship Status: 
dd #{client.details.relationshipStatus}
br
dt Relationship Type: 
dd #{client.details.monogamyFlex}   #{client.details.monogamous}
br
dt Offspring: 
dd #{client.details.childrenQ1},   #{client.details.childrenQ2}
br
dt Pets: 
dd #{client.details.dogs},  #{client.details.cats}
br
block scripts

0 comments on commit 23ba1a1

Please sign in to comment.