diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-26 07:43:08 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-26 07:43:08 +0000 |
| commit | 3983edb2518acd91f991ad5fc6308bcaf46700f5 (patch) | |
| tree | a81da7c47c8f9d0b853d478c619baadcf35d8237 /views | |
| parent | f016bdbc35b7efa44bd63413bde09433ea916c59 (diff) | |
| parent | a345cf13d3b952ef0d427b61475f5cf722b3cbb0 (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'views')
| -rw-r--r-- | views/index.hbs | 28 | ||||
| -rw-r--r-- | views/user_profile_alt.hbs | 42 |
2 files changed, 58 insertions, 12 deletions
diff --git a/views/index.hbs b/views/index.hbs index c3cbeab..6dffef9 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -1,4 +1,6 @@ <header> + + <div class="header-content"> <form action="/search/courses" method="get" id="search-field"> @@ -7,7 +9,31 @@ <hr> <!-- Divider --> <div class="search col-md-8 col-lg-8 col-md-offset-2"> <!-- Search-bar, Drop-down and Prompt --> - <div class="input-group"> + + {{# if success }} + <section class="alert alert-success"> + <!-- Change those to banners later --> + <h2>Signup Successful!</h2> + </section> + {{ else }} + {{# if errors }} + <section class="alert alert-danger"> + <ul> + {{# each errors }} + <li>{{ this.msg }}</li> + {{/each}} + </ul> + </section> + {{/if}} + {{/if}} + {{#if flashMsg}} + <section class="alert alert-danger"> + {{flashMsg}} + </section> + {{/if}} + + + <div class="input-group"> <!-- Search Category Drop-Down --> <div class="input-group-btn"> <button type="button" diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs index 64f0286..4d8fd8b 100644 --- a/views/user_profile_alt.hbs +++ b/views/user_profile_alt.hbs @@ -68,8 +68,9 @@ </tr> <tr> <tr> - <td>Messages:</td> + <td>Inbox:</td> <td>{{ user.messages }}</td> + </tr> <tr> <td>Comments:</td> @@ -152,7 +153,6 @@ </div> <div class="row" id="profile-send-message"> - <h3>Send Message</h3> {{# if messages.success }} <section class="alert alert-success"> <!-- Change those to banners later --> @@ -165,6 +165,8 @@ </section> {{/if}} {{/if}} + <h3>Send Message</h3> + <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6"> <form action="/user/user_profile/send_message" method="post"> <div class="form-group"> @@ -188,7 +190,22 @@ {{# if inbox }} <h3>Inbox</h3> <div class="col-sm-10 col-sm-offset-1 prf-tables"> - <table class="table"> + <div class="table"> + <div class="table-row"> + <div class="table-cell" class="head"><h5>Date</h5></div> + <div class="table-cell" class="head"><h5>Subject</h5></div> + <div class="table-cell" class="head"><h5>Sender</h5></div> + </div> + {{# each inbox }} + <a href="#" class="table-row" data-toggle="modal" data-target=".{{ this.class }}"> + <div class="table-cell">{{ this.date }}</div> + <div class="table-cell">{{ this.subject }}</div> + <div class="table-cell">{{ this.sender }}</div> + </a> + {{/each}} + </div> + + <!--<table class="table"> <thead> <tr> <th>Date</th> @@ -197,20 +214,22 @@ </tr> </thead> <tbody> + {{# each inbox }} - <a href="#" data-toggle="modal" data-target=".{{this.date}}{{this.sender}}"> <tr> - <td>{{ this.date }}</td> - <td>{{ this.subject }}</td> - <td>{{ this.sender }}</td> + <td><a href="#" data-toggle="modal" data-target=".{{ this.class }}"> + {{ this.date }}</a></td> + <td><a href="#" data-toggle="modal" data-target=".{{ this.class }}"> + {{ this.subject }}</a></td> + <td><a href="#" data-toggle="modal" data-target=".{{ this.class }}"> + {{ this.sender }}</a></td> </tr> - </a> {{/each}} </tbody> - </table> + </table> --> {{# each inbox}} - <article class="modal fade {{this.date}}{{this.sender}}"> + <article class="modal fade {{this.class}}"> <div class="modal-dialog"> <div class="modal-content"> @@ -218,6 +237,7 @@ <button type="button" class="close" data-dismiss="modal">×</button> <h4 class="modal-title"><em>Subject: </em>{{ this.subject }}</h4> <h5><em>From: </em>{{ this.sender }}</h5> + <em>Date: </em> {{this.date}} </section> <section class="modal-body"> @@ -286,4 +306,4 @@ </div> </div> -</main>
\ No newline at end of file +</main> |