From 6fa065a436770185632a87f6cc82377253e2719d Mon Sep 17 00:00:00 2001
From: Scott Miller <scott.miller.utah@gmail.com>
Date: Sun, 31 May 2015 10:15:16 -0600
Subject: [PATCH] Few tweaks

Signed-off-by: Scott Miller <scott.miller.utah@gmail.com>
---
 app/views/admin/_article_editor.html.erb | 8 ++++----
 app/views/admin/tickets.html.erb         | 2 +-
 app/views/home/_team_member.html.erb     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/_article_editor.html.erb b/app/views/admin/_article_editor.html.erb
index 0c736e2f7..8e78b368d 100644
--- a/app/views/admin/_article_editor.html.erb
+++ b/app/views/admin/_article_editor.html.erb
@@ -43,12 +43,12 @@
       'link-tooltip': true
     }
   });
-//  quill.addModule('toolbar', {
-//    container: '#toolbar'
-//  });
+  <% if @post.nil? %>
   quill.setHTML('<%= @doc.body.html_safe if @doc.body? %>');
+  <% else %>
   quill.setHTML('<%= @post.body.html_safe unless @post.nil? %>');
-
+  <% end %>
+  
   quill.on('text-change', function(delta, source) {
     //console.log(quill.getHTML());
     $('#doc_body').val(quill.getHTML());
diff --git a/app/views/admin/tickets.html.erb b/app/views/admin/tickets.html.erb
index 6c69f5011..82b007b3c 100644
--- a/app/views/admin/tickets.html.erb
+++ b/app/views/admin/tickets.html.erb
@@ -1,7 +1,7 @@
 <%#= render 'admin/ticket_stats' %>
 
 <h2 id="ticket-page-title">
-  <%= t(:discussions, default: "Discussions: ") %> <%= render 'admin/ticket_nav_dropdown' %> <span class="hidden-xs pull-right"><%= link_to t(:open_new_discussion, default: "Open Discussion"), admin_new_ticket_path, remote: true, class: 'btn btn-primary' %></span>
+  <%= t(:discussions, default: "Discussions") %>: <span class='label <%= status_class(@status) %>' style='text-transform: uppercase'><%= status_label(@status) if @status %></span> <%= render 'admin/ticket_nav_dropdown' %> <span class="hidden-xs pull-right"><%= link_to t(:open_new_discussion, default: "Open Discussion"), admin_new_ticket_path, remote: true, class: 'btn btn-primary' %></span>
 </h2>
 
 <div class="row">
diff --git a/app/views/home/_team_member.html.erb b/app/views/home/_team_member.html.erb
index 2281aa4c7..9d62227fb 100644
--- a/app/views/home/_team_member.html.erb
+++ b/app/views/home/_team_member.html.erb
@@ -9,8 +9,8 @@
       <h4>
         <%= team_member.name.titleize %><br/>
         <span class="small less-important">
-          <%= team_member.company.titleize unless team_member.company.nil? %><br/>
-          <%= team_member.title.titleize unless team_member.title.nil? %>
+          <%#= team_member.company.titleize unless team_member.company.nil? %><br/>
+          <%#= team_member.title.titleize unless team_member.title.nil? %>
         </span>
       </h4>