From 91638c435076736ea1d6ac7f532a35523bd79f89 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Mon, 25 Jul 2016 04:55:59 -0400
Subject: Added popup window to view messages in profile page

---
 views/user_profile_alt.hbs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'views')

diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index 2270d76..30153d1 100644
--- a/views/user_profile_alt.hbs
+++ b/views/user_profile_alt.hbs
@@ -199,19 +199,20 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
                             </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>
 
                         {{# each inbox}}
-                        <article class="modal fade {{this.date}}{{this.sender}}">
+                        <article class="modal fade {{this.class}}">
                             <div class="modal-dialog">
                                 <div class="modal-content">
 
@@ -287,4 +288,4 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
 
 </div>
 </div>
-</main>
\ No newline at end of file
+</main>
-- 
cgit v1.2.3


From bca90452150c6a128f88765d04481a0235059af3 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Mon, 25 Jul 2016 07:02:14 -0400
Subject: need pull"

---
 views/user_profile_alt.hbs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'views')

diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index 30153d1..c97c77c 100644
--- a/views/user_profile_alt.hbs
+++ b/views/user_profile_alt.hbs
@@ -153,7 +153,6 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
                 </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 -->
@@ -166,6 +165,8 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
                             </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">
@@ -189,7 +190,22 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
                     {{# 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>
@@ -198,6 +214,7 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
                             </tr>
                             </thead>
                             <tbody>
+
                             {{# each inbox }}
                                 <tr>
                                     <td><a href="#" data-toggle="modal" data-target=".{{ this.class }}">
@@ -209,7 +226,7 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
                                 </tr>
                             {{/each}}
                             </tbody>
-                        </table>
+                        </table> -->
 
                         {{# each inbox}}
                         <article class="modal fade {{this.class}}">
@@ -220,6 +237,7 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
                                         <button type="button" class="close" data-dismiss="modal">&times;</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">
-- 
cgit v1.2.3


From 203071f005057ebb186ddd3e0ada8629420ed409 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Mon, 25 Jul 2016 21:49:05 -0400
Subject: Added add_user: extra check if username is taken by an admin (and
 nice versa). Fixed Answered, Inbox and comments fields in user_profile

---
 views/user_profile_alt.hbs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index 7297b63..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>
-- 
cgit v1.2.3


From 91a62e2808bdb17f787a5b234599c838d4fd5220 Mon Sep 17 00:00:00 2001
From: Waref Haque <warefhaque@Warefs-MacBook-Pro.local>
Date: Tue, 26 Jul 2016 00:13:04 -0400
Subject: search bar validation

---
 views/index.hbs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'views')

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"
-- 
cgit v1.2.3