Few tweaks

Signed-off-by: Scott Miller <scott.miller.utah@gmail.com>
helpyio · May 31, 2015 · 6fa065a · 6fa065a
1 parent 0a06b6f
commit 6fa065a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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>