diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-08-28 05:59:57 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-08-28 05:59:57 +0000 |
| commit | 61b0f64f2e6c5e79ebf6c3df85cddc96c1ac2836 (patch) | |
| tree | ab60be4d34187d594725dbc23c0c5f77fa2b9145 /views | |
| parent | 5d0305e8f284fe9ce0ec47325a6fd56508ce65f4 (diff) | |
| parent | 86ca8165abd5a305b27a95525182e25911b6626f (diff) | |
Merged conflict
Diffstat (limited to 'views')
| -rw-r--r-- | views/user_profile_alt.hbs | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs index 8cc45b8..f04d094 100644 --- a/views/user_profile_alt.hbs +++ b/views/user_profile_alt.hbs @@ -125,10 +125,10 @@ <!-- Inbox page --> <section class="u-profile" id="profile-inbox"> <h4>Inbox </h4> - <hr> + <h5 id="u-inbox-count"></h5> {{# if inbox }} - <div class="col-sm-12"> + <div class="col-sm-12" id="u-inbox-container"> <table class="table table-striped u-table"> <thead> <tr> @@ -137,47 +137,15 @@ <th>Sender</th> </tr> </thead> - <tbody> - {{# each inbox }} - <tr class="u-table-row" data-toggle="modal" data-target=".{{ this.class }}"> - <td>{{ this.date }}</td> - <td>{{ this.subject }}</td> - <td>{{ this.sender }}</td> - </tr> - {{/each}} + <tbody id="u-inbox-body"> </tbody> </table> - - - - {{# each inbox}} - <article class="modal fade {{this.class}}"> - <div class="modal-dialog"> - <div class="modal-content"> - - <section class="modal-header"> - <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"> - {{ this.message }} - </section> - - <div class="modal-footer"> - - </div> - - </div> - </div> - </article> - {{/each}} </div> {{ else }} <h3>No Messages.</h3> {{/if}} + <div id="u-pageNumber"></div> + <div id="u-pager"></div> </section> |