From 0792495a750d65e2fe73a7b39f54955ec48b4b08 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Wed, 24 Aug 2016 15:15:09 -0400 Subject: modified userprofile --- assets/css/style.css | 26 ---- assets/images/side-bar.png | Bin 0 -> 2810 bytes views/layouts/layout.hbs | 6 + views/user_profile_alt.hbs | 309 ++++++++++++++------------------------------- 4 files changed, 99 insertions(+), 242 deletions(-) create mode 100644 assets/images/side-bar.png diff --git a/assets/css/style.css b/assets/css/style.css index 32c9fa9..fbc38fd 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -377,32 +377,6 @@ section.exam-info em { } /*** EXAM QUESTIONS PAGE END ***/ -/*** USER PROFILE PAGE ***/ -.user-info-content{ - padding-top: 100px; -} - -.user-info-content img{ - max-width: 100px; -} - -.user-info-content p{ - color: gray; -} - -.prf-sign-off{ - margin: 15px; -} - -.prf-tables{ - text-align: left; -} - -.prf-details{ - text-align: center; -} -/*** USER PROFILE PAGE END ***/ - /*** ABOUT PAGE ***/ .about-p{ padding: 30px 30px 0 30px; diff --git a/assets/images/side-bar.png b/assets/images/side-bar.png new file mode 100644 index 0000000..1eaee9e Binary files /dev/null and b/assets/images/side-bar.png differ diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs index 42bd09b..8b0d7b3 100644 --- a/views/layouts/layout.hbs +++ b/views/layouts/layout.hbs @@ -14,6 +14,11 @@ + + {{# if userProfile}} + + {{/if}} + @@ -37,6 +42,7 @@ {{/if}} + {{# if noHeader}} diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs index edd5b60..8353be9 100644 --- a/views/user_profile_alt.hbs +++ b/views/user_profile_alt.hbs @@ -3,233 +3,110 @@
-
- - - +
+ + +
+

Account

+
-
-
-
-

{{ user.f_name }} {{ user.l_name }}

+ + {{# if messages.success }} +
+ +

{{ messages.success }}

+
+ {{ else }} + {{# if messages.error }} +
+

{{ messages.error }}

+
+ {{/if}} + {{/if}} + +
+ + +
+

ChrisHopper89

-
- -
- - {{# if messages.success }} -
- -

{{ messages.success }}

-
- {{ else }} - {{# if messages.error }} -
-

{{ messages.error }}

-
- {{/if}} - {{/if}} -
- - - - - - - {{# if user.university }} - - - - - {{/if}} - {{# if user.department }} - - - - - {{/if}} - - - - - - - - - - - - - - - {{# if user.phone_num}} - - - - - {{/if}} - -
Email:{{ user.email }}
University:{{ user.university }}
Department:{{ user.department }}
Answered:{{ user.answered }}
Inbox:{{ user.messages }}
Comments:{{ user.comments }}
Phone Number:{{ user.phone_num }}
-
-
-
- {{# if user.examfollows }} -

Here are the exams you are following:

-
- - - {{# each user.examfollows}} - - - - - - {{/each}} - -
- Course Code: {{this.course_code}} - -

Term: {{this.term}}

-

Year: {{this.year}}

-

Type: {{this.type}}

-
-
- {{ else }} -

You are not following any exams.

- {{/if}} -
- -
-

Send Message

- -
-
-
- - -
-
- - -
-
- - -
- - -
-
-
-
- {{# if inbox }} -

Inbox

-
-
-
-
Date
-
Subject
-
Sender
-
- {{# each inbox }} - -
{{ this.date }}
-
{{ this.subject }}
-
{{ this.sender }}
- - {{/each}} + + + +
+ + User Pic +

Jim Hopper

+

jhop@gmail.com

+ + +
- {{ else }} -

No Messages.

- {{/if}} -
-
- - {{# if user.comment_list.length }} -

Comment History

-
- - - - - - - - - - {{# each user.comment_list }} - - - - - - {{/each}} - -
DateCommentExam
{{ this.date }}{{ this.comment }}{{ this.course_code }} > {{ this.term }} - {{ this.year }}
+ + + -
+ - -
- Logout -
+ -
-
+ + +
+
+

Profile

+ +
+ +
Personal Info
+

Username: ChiefHopper86

+

Name: Jim Hopper

+

University: University of Toronto

+ +
+
User Stats
+

Answered: 20

+

Comments: 25

+

Score: 205

+ + + +
+ +
+ + + + + + + +
-- cgit v1.2.3