diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-23 04:12:31 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-23 04:12:31 +0000 |
| commit | eefeb25d3fabf377c09dd6c7282f0992eb1afea1 (patch) | |
| tree | f20e01c06ac71bf18d0ab446aa30a9d66aef52f5 /views | |
| parent | 0ccf1dc1b80fe2dff8f98538ffac673c6b326a57 (diff) | |
| parent | 218b2c014b1ab68ee8289210820d7b6b742bceef (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'views')
| -rw-r--r-- | views/signin.hbs | 2 | ||||
| -rw-r--r-- | views/signup.hbs | 2 | ||||
| -rw-r--r-- | views/user_profile_alt.hbs | 97 |
3 files changed, 46 insertions, 55 deletions
diff --git a/views/signin.hbs b/views/signin.hbs index 81d0f81..44425f3 100644 --- a/views/signin.hbs +++ b/views/signin.hbs @@ -34,7 +34,7 @@ <input type="password" class="form-control" placeholder="New Password" name="password"> </div> <input type="hidden" name="_csrf" value="{{ csrfToken }}"> - <button type="signin" class="btn btn-primary">Sign In</button> + <button class="btn btn-primary">Sign In</button> </form> </div> diff --git a/views/signup.hbs b/views/signup.hbs index 571363b..e7d9c9a 100644 --- a/views/signup.hbs +++ b/views/signup.hbs @@ -62,7 +62,7 @@ <input type="text" class="form-control" placeholder="Department (optional)" name="dept"> </div> <input type="hidden" name="_csrf" value="{{ csrfToken }}"> - <button type="signup" class="btn btn-primary">Sign Up</button> + <button class="btn btn-primary">Sign Up</button> </form> </div> diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs index 8b102b8..413fd0f 100644 --- a/views/user_profile_alt.hbs +++ b/views/user_profile_alt.hbs @@ -32,7 +32,7 @@ <div class="rounded"> <div class="panel panel-info rounded"> <div class="panel-heading"> - <h3 class="panel-title">Walter White</h3> + <h3 class="panel-title">{{ user.f_name }} {{ user.l_name }}</h3> </div> <div class="panel-body"> <!--- User-Profile Pages --> @@ -47,78 +47,69 @@ <table class="table table-user-information"> <tbody> <tr> - <td>Univeristy:</td> - <td>U of T</td> + <td>Email:</td> + <td><a href="{{ user.email }}">{{ user.email }}</a></td> </tr> + {{# if user.university }} + <tr> + <td>University:</td> + <td>{{ user.university }}</td> + </tr> + {{/if}} + {{# if user.department }} <tr> <td>Department:</td> - <td>CS</td> + <td>{{ user.department }}</td> </tr> + {{/if}} <tr> <td>Answered:</td> - <td>50</td> + <td>{{ user.answered }}</td> </tr> <tr> <tr> <td>Messages:</td> - <td>25</td> + <td>{{ user.messages }}</td> </tr> <tr> <td>Comments:</td> - <td>100</td> - </tr> - <tr> - <td>Email:</td> - <td><a href="mailto:info@support.com">info@support.com</a></td> - </tr> - <tr> - <td>Phone Number:</td> - <td>111-111-1111(Mobile)</td> + <td>{{ user.comments }}</td> </tr> + {{# if user.phone_num}} + <tr> + <td>Phone Number:</td> + <td>{{ user.phone_num }}</td> + </tr> + {{/if}} </tbody> </table> </div> </div> <div class="row" id="profile-follows"> - <h3>You are following:</h3> - <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6"> - <table class="table-condensed"> - <tbody> - <tr> - <th> - <img class="img-circle img-responsive" - src="../assets/images/misc/user1.jpeg" alt="avatar"> - </th> - <th> - <h4>The Dude</h4> - <p>3 comments</p> - </th> + {{# if user.followers }} + <h3>You are being followed by:</h3> + <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6"> + <table class="table-condensed"> + <tbody> + {{# each user.followers}} + <tr> + <th> + <img class="img-circle img-responsive" + src="../assets/images/misc/user1.jpeg" alt="avatar"> + </th> + <th> + <h4>The Dude</h4> + <p>3 comments</p> + </th> - </tr> - <tr> - <th> - <img class="img-circle img-responsive" - src="../assets/images/misc/user2.jpeg" alt="avatar"> - </th> - <th> - <h4>He-Man</h4> - <p>20 comments</p> - </th> - </tr> - <tr> - <th> - <img class="img-circle img-responsive" - src="../assets/images/misc/user3.jpeg" alt="avatar"> - </th> - <th> - <h4>Lady Lips</h4> - <p>56 comments</p> - </th> - </tr> - </tbody> - - </table> - </div> + </tr> + {{/each}} + </tbody> + </table> + </div> + {{ else }} + <h3>You do not have any followers.</h3> + {{/if}} </div> <div class="row" id="profile-friends"> <h3>Friends</h3> |