merged

3 files changed, 109 insertions, 86 deletions

diff --git a/views/admin.hbs b/views/admin.hbs
index b821dc3..12c2ba9 100644
--- a/views/admin.hbs
+++ b/views/admin.hbs
@@ -3,6 +3,18 @@
 <div class="row">
 <!-- Admin control Panel --->
 <div class="col-xs-12 col-sm-12 col-md-8 col-md-offset-2 col-xs-offset-0 col-sm-offset-0  toppad cpnl-details">
+    {{# if messages.success }}
+        <section class="alert alert-success custom-Alert">
+            <!-- Change those to banners later -->
+            <h4>{{ messages.success }}</h4>
+        </section>
+    {{ else }}
+        {{# if messages.error }}
+            <section class="alert alert-danger custom-Alert">
+                <h4>{{ messages.error }}</h4>
+            </section>
+        {{/if}}
+    {{/if}}
 
     <!-- Admin Control Panel Menu -->
     <nav class="navbar navbar-custom">
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs
index c97c77c..7297b63 100644
--- a/views/user_profile_alt.hbs
+++ b/views/user_profile_alt.hbs
@@ -3,8 +3,7 @@
 <div class="row">
 
 <!-- User Profile details -->
-<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xs-offset-0
-col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details">
+<div class="col-xs-12 col-sm-12 col-md-8 col-md-offset-2 col-xs-offset-0 col-sm-offset-0  toppad prf-details">
 
     <!-- User Profile Menu -->
     <nav class="navbar navbar-custom">
diff --git a/views/user_solutions.hbs b/views/user_solutions.hbs
index b00b098..fac0301 100644
--- a/views/user_solutions.hbs
+++ b/views/user_solutions.hbs
@@ -1,103 +1,115 @@
 <main id="solutions-main">
 <div class='search solutions-container container'>
 <div>
+    {{# if messages.success }}
+        <section class="alert alert-success custom-Alert">
+            <!-- Change those to banners later -->
+            <h4>{{ messages.success }}</h4>
+        </section>
+    {{ else }}
+        {{# if messages.error }}
+            <section class="alert alert-danger custom-Alert">
+                <h4>{{ messages.error }}</h4>
+            </section>
+        {{/if}}
+    {{/if}}
 
-<!-- Add Solution button and path -->
-<div class="row top-sol">
-    <a href="/user/add_solution/{{examID}}/{{qID}}">
-        <button class="col-xs-4 col-sm-2 col-md-2 col-lg-2
-        col-xs-offset-4 col-sm-offset-5 col-md-offset-2
-        col-lg-offset-2 rounded" id="add-solution">
-            <h3>Add a solution</h3>
-        </button>
-    </a>
 
-    <!-- Replace p below with breadcrumbs later -->
-    <p class="col-xs-12 col-sm-12 col-md-6 show-path">
-        CSC148 > Winter 2015 > Question 1
-    </p>
-</div>
+    <!-- Add Solution button and path -->
+    <div class="row top-sol">
+        <a href="/user/add_solution/{{examID}}/{{qID}}">
+            <button class="col-xs-4 col-sm-2 col-md-2 col-lg-2
+            col-xs-offset-4 col-sm-offset-5 col-md-offset-2
+            col-lg-offset-2 rounded" id="add-solution">
+                <h3>Add a solution</h3>
+            </button>
+        </a>
 
-<!-- Solution 1 Example -->
-{{#each query}}
-    <div class="row">
-        <section id="sol-" class="col-md-10 col-md-offset-1 rounded">
-            <div class="post-info">
-                <div class="">
-                    <img class="img-responsive img-circle user-image" src="/assets/images/misc/user1.jpeg">
-                    <p class="username">{{this.author}}</p>
-                </div>
+        <!-- Replace p below with breadcrumbs later -->
+        <p class="col-xs-12 col-sm-12 col-md-6 show-path">
+            CSC148 > Winter 2015 > Question 1
+        </p>
+    </div>
 
-                <div class="pull-right">
-                    <div class="voting">
-                        <form action="/user/solution/vote/{{../examID}}/{{../qID}}/{{this._id}}" method="post">
-                            <input type="hidden" name="vote" value="up"/>
-                            <button class="upvote" type="submit"><img src="/assets/images/up_arrow.png"></button>
-                            <input type="hidden" name="_csrf" value="{{../csrfToken }}">
-                        </form>
-                        <form action="/user/solution/vote/{{../examID}}/{{../qID}}/{{this._id}}" method="post">
-                            <input type="hidden" name="vote" value="down"/>
-                            <button class="downvote"><img src="/assets/images/down_arrow.png"></button>
-                            <input type="hidden" name="_csrf" value="{{../csrfToken }}">
-                        </form>
-                        <p class="num-votes">{{this.votes}}</p>
+    <!-- Solution 1 Example -->
+    {{#each query}}
+        <div class="row">
+            <section id="sol-" class="col-md-10 col-md-offset-1 rounded">
+                <div class="post-info">
+                    <div class="">
+                        <img class="img-responsive img-circle user-image" src="/assets/images/misc/user1.jpeg">
+                        <p class="username">{{this.author}}</p>
                     </div>
-                </div>
-            </div>
 
-            <div class="user-sol">
-                <h3>Solution</h3>
-                <p>{{this.text}}</p>
-            </div>
+                    <div class="pull-right">
+                        <div class="voting">
+                            <form action="/user/solution/vote/{{../examID}}/{{../qID}}/{{this._id}}" method="post">
+                                <input type="hidden" name="vote" value="up"/>
+                                <button class="upvote" type="submit"><img src="/assets/images/up_arrow.png"></button>
+                                <input type="hidden" name="_csrf" value="{{../csrfToken }}">
+                            </form>
+                            <form action="/user/solution/vote/{{../examID}}/{{../qID}}/{{this._id}}" method="post">
+                                <input type="hidden" name="vote" value="down"/>
+                                <button class="downvote"><img src="/assets/images/down_arrow.png"></button>
+                                <input type="hidden" name="_csrf" value="{{../csrfToken }}">
+                            </form>
+                            <p class="num-votes">{{this.votes}}</p>
+                        </div>
+                    </div>
+                </div>
 
-            <div class="comments">
-                <h3>
-                    <a data-toggle="collapse" href="#com{{@index}}">
-                        <span>
-                            {{this.commentCount}}
-                        </span>
-                        comments
-                        <span class="caret"></span>
-                    </a>
-                </h3>
+                <div class="user-sol">
+                    <h3>Solution</h3>
+                    <p>{{this.text}}</p>
+                </div>
 
-                <div id="com{{@index}}" class="panel-collapse collapse">
-                    <ul class="list-group">
-                        {{#each this.comments}}
-                            <li class="list-group-item">
-                                <img src="/assets/images/misc/user3.jpeg"
-                                     class="img-responsive img-circle comment-user-img">
-                                <p class="comment-username">
-                                    <a href="/user_profile">
-                                        {{this.by}}
-                                    </a>
-                                    , {{this.date}}
-                                </p>
-                                <p class="user-comment">{{this.text}}</p>
-                            </li>
-                        {{/each}}
+                <div class="comments">
+                    <h3>
+                        <a data-toggle="collapse" href="#com{{@index}}">
+                            <span>
+                                {{this.commentCount}}
+                            </span>
+                            comments
+                            <span class="caret"></span>
+                        </a>
+                    </h3>
 
-                        <form action="/user/comment/submit/{{../examID}}/{{../qID}}/{{this._id}}" method="post">
-                            <div class="form-group">
-                                <textarea type="text"
-                                          class="form-control"
-                                          placeholder="Enter comment"
-                                          name="comment">
+                    <div id="com{{@index}}" class="panel-collapse collapse">
+                        <ul class="list-group">
+                            {{#each this.comments}}
+                                <li class="list-group-item">
+                                    <img src="/assets/images/misc/user3.jpeg"
+                                         class="img-responsive img-circle comment-user-img">
+                                    <p class="comment-username">
+                                        <a href="/user_profile">
+                                            {{this.by}}
+                                        </a>
+                                        , {{this.date}}
+                                    </p>
+                                    <p class="user-comment">{{this.text}}</p>
+                                </li>
+                            {{/each}}
 
-                                </textarea>
-                            </div>
-                            <input type="hidden" name="_csrf" value="{{../csrfToken }}">
-                            <button type="submit" class="btn btn-primary">Submit</button>
-                        </form>
+                            <form action="/user/comment/submit/{{../examID}}/{{../qID}}/{{this._id}}" method="post">
+                                <div class="form-group">
+                                    <textarea type="text"
+                                              class="form-control"
+                                              placeholder="Enter comment"
+                                              name="comment">
 
-                    </ul>
-                </div>
+                                    </textarea>
+                                </div>
+                                <input type="hidden" name="_csrf" value="{{../csrfToken }}">
+                                <button type="submit" class="btn btn-primary">Submit</button>
+                            </form>
 
-            </div>
-        </section>
-    </div>
-{{/each}}
+                        </ul>
+                    </div>
 
+                </div>
+            </section>
+        </div>
+    {{/each}}
 
 </div>
 </div>