Proper formatting for comment list items, added author and db relatio…

…nship in comment model. Moved status messages to include
adamcrampton · Mar 4, 2015 · 4eca6e3 · 4eca6e3
1 parent 476310a
commit 4eca6e3
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 19 deletions.
diff --git a/app/controllers/AjaxController.php b/app/controllers/AjaxController.php
@@ -22,8 +22,8 @@ public function ajax_add_comment()
 
 			// Add author and timestamp of new comment to comment text
 			$comment_stamp = $insert_comment->updated_at;
-
-			$comment_text = $comment_stamp . ' ' . $comment;
+			$comment_author = User::whereUsers_id($insert_comment->comments_users_fk)->first()->users_username;
+			$comment_text = 'By <strong>' . $comment_author . '</strong> at ' . $comment_stamp . '<br />' . $comment;
 
 			return json_encode(['comment_status' => 'success', 'comment_text' => $comment_text]);
 		}

diff --git a/app/models/Comment.php b/app/models/Comment.php
@@ -5,9 +5,15 @@
 	protected $table = 'comments';
 	protected $primaryKey = 'comments_id';
 
+	// DB Relationships
 	public function master()
 	{
 		return $this->belongsTo('Master', 'comments_master_fk', 'master_id');
 	}
 
+	public function users()
+	{
+		return $this->belongsTo('User', 'comments_users_fk', 'users_id');
+	}
+
 }
diff --git a/app/views/includes/status_show.blade.php b/app/views/includes/status_show.blade.php
@@ -0,0 +1,9 @@
+<div id="comment_add_success" class="alert alert-success alert-dismissible hide" role="alert">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <strong>Success!</strong> Comment added.
+</div>
+
+<div id="comment_add_failed" class="alert alert-danger alert-dismissible hide" role="alert">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <strong>Sorry, there was a problem adding your comment.</strong> Please contact support.
+</div>
diff --git a/app/views/layouts/default.blade.php b/app/views/layouts/default.blade.php
@@ -51,15 +51,7 @@
 
     <div class="container page">
 
-    <div id="comment_add_success" class="alert alert-success alert-dismissible hide" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <strong>Success!</strong> Comment added.
-    </div>
-
-    <div id="comment_add_failed" class="alert alert-danger alert-dismissible hide" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <strong>Sorry, there was a problem adding your comment.</strong> Please contact support.
-    </div>
+    @include('includes.status_show')
 
         @yield('content')
     </div><!-- /.container -->

diff --git a/app/views/modals/comment.blade.php b/app/views/modals/comment.blade.php
@@ -3,7 +3,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">Add comment to this ticket</h4>
+        <h4 class="modal-title" id="comment_modal_label">Add comment to this ticket</h4>
       </div>
       <div class="modal-body">
         {{ Form::textarea('comment_add', null, ['id' => 'comment_add', 'class' => 'form-control']) }}

diff --git a/app/views/tickets/show.blade.php b/app/views/tickets/show.blade.php
@@ -62,12 +62,12 @@
 			{{ Form::textarea('description', $ticket->master_description, ['id' => 'content_editor', 'class' => 'form-control']) }}
 	  	</div>
 	</div>
-	<div class="col-md-6">
+	<div class="col-md-6 comment_box">
 	  	<div class="form-group"> 
-			{{ Form::label('comments', 'Comments: ') }} {{ Form::button('Add Comment', ['class' => 'btn btn-xs btn-primary pull-right', 'data-toggle' => 'modal', 'data-target' => '#comment_modal']) }}
-			<ul id="comment_list">
+			{{ Form::label('comments', 'Comments: ') }} {{ Form::button('Add Comment', ['id' => 'new_comment', 'class' => 'btn btn-xs btn-primary pull-right', 'data-toggle' => 'modal', 'data-target' => '#comment_modal']) }}
+			<ul id="list-group">
 			@foreach($comments as $comment)
-				<li>{{ $comment->updated_at . ': ' . $comment->comments_comment }}</li>
+				<li class="list-group-item">{{ 'By <strong>' . $comment->users->users_username . '</strong> at ' . $comment->updated_at . '<br />' . $comment->comments_comment }}</li>
 			@endforeach
 			</ul>
 		</div>

diff --git a/public/css/main.css b/public/css/main.css
@@ -1,9 +1,22 @@
-/* LaraDesk Project CSS */
+/* LaraDesk CSS */
 
-/*Structural*/
+/* Structural */
 .page
 {
 	padding-top: 60px;
 }
 
 /* Bootstrap Fine Tuning */
+
+
+/* Ticket Show View */
+.comment_box
+{
+	height: 255px;
+	overflow-y: scroll;
+}
+
+.comment_box ul
+{
+	padding-left: 0;
+}
diff --git a/public/js/utilities.js b/public/js/utilities.js
@@ -1,4 +1,14 @@
-// General Scripts
+ /*    _ _   _ _ _ _            _____           _       _       
+ | |  | | | (_) (_) |          / ____|         (_)     | |      
+ | |  | | |_ _| |_| |_ _   _  | (___   ___ _ __ _ _ __ | |_ ___ 
+ | |  | | __| | | | __| | | |  \___ \ / __| '__| | '_ \| __/ __|
+ | |__| | |_| | | | |_| |_| |  ____) | (__| |  | | |_) | |_\__ \
+  \____/ \__|_|_|_|\__|\__, | |_____/ \___|_|  |_| .__/ \__|___/
+                        __/ |                    | |            
+                       |___/                     |_|  
+*/
+
+// Ticket Comments
 $(document).ready(function() 
 {
 	$('#submit_comment').on('click', function() {
@@ -7,6 +17,7 @@ $(document).ready(function()
 
 });
 
+
 // AJAX Functions
 function add_comment(event)
 {