3 files changed, 12 insertions, 8 deletions

diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index 6139f3d4cbc..1b67eabd5a5 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -1,5 +1,5 @@
 %div.issue-form-holder
-  %h3= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
+  %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
   = form_for [@project, @issue], remote: request.xhr? do |f|
     -if @issue.errors.any?
       .alert-message.block-message.error
@@ -9,26 +9,26 @@
     .issue_form_box
       .issue_title
         .clearfix
-          = f.label :title do 
+          = f.label :title do
             %strong= "Subject *"
           .input
             = f.text_field :title, maxlength: 255, class: "xxlarge"
       .issue_middle_block
         .issue_assignee
-          = f.label :assignee_id do 
+          = f.label :assignee_id do
             %i.icon-user
             Assign to
           .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" })
         .issue_milestone
-          = f.label :milestone_id do 
+          = f.label :milestone_id do
             %i.icon-time
             Milestone
           .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" })
 
       .issue_description
         .clearfix
-          = f.label :label_list do 
-            %i.icon-tag 
+          = f.label :label_list do
+            %i.icon-tag
             Labels
           .input
             = f.text_field :label_list, maxlength: 2000, class: "xxlarge"
diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml
index 1f6e7d7f81f..8ebe3e057bc 100644
--- a/app/views/issues/_head.html.haml
+++ b/app/views/issues/_head.html.haml
@@ -5,6 +5,9 @@
   %li{class: "#{'active' if current_page?(project_milestones_path(@project))}"}
     = link_to project_milestones_path(@project), class: "tab" do
       Milestones
+  %li{class: "#{'active' if current_page?(project_labels_path(@project))}"}
+    = link_to project_labels_path(@project), class: "tab" do
+      Labels
   %li.right
     %span.rss-icon
       = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 8876d24dee5..a6836fd4fd1 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -7,6 +7,7 @@
       .span5
         - if can? current_user, :write_issue, @project
           = link_to new_project_issue_path(@project), class: "right btn small", title: "New Issue", remote: true do
+            %i.icon-plus
             New Issue
         = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right  do
           = hidden_field_tag :project_id, @project.id, { id: 'project_id' }
@@ -21,7 +22,7 @@
 
 
       .issues_bulk_update.hide
-        = form_tag bulk_update_project_issues_path(@project), method: :post  do 
+        = form_tag bulk_update_project_issues_path(@project), method: :post  do
           %span.update_issues_text Update selected issues with  
           .left
             = select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status")
@@ -53,7 +54,7 @@
             = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone")
             = hidden_field_tag :f, params[:f]
         .clearfix
-  
+
     %ul#issues-table.unstyled.issues_table
       = render "issues"