4 files changed, 40 insertions, 25 deletions

diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index 444fbd768fe..94a621c2d26 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -35,6 +35,12 @@
             = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14
             %p.hint Markdown is enabled.
 
+        .clearfix
+          = f.label :label_list, "Labels"
+          .input
+            = f.text_field :label_list, :maxlength => 2000, :class => "xxlarge"
+            %p.hint Separate with comma.
+
     .actions
       - if @issue.new_record?
         = f.submit 'Submit new issue', :class => "primary btn"
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index fe9b6b37c42..797d2387e31 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -2,6 +2,11 @@
   .list_legend
     .icon
   .right
+    - issue.labels.each do |label|
+      %span.label.label-issue
+        %i.icon-tag
+        = label.name
+       
     - if issue.notes.any?
       %span.btn.small.disabled.padded
         %i.icon-comment
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index e49c9513844..ebe432bc7a8 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -31,28 +31,29 @@
 
   %div#issues-table-holder.ui-box
     .title
-      .row
-        .span4
-          %ul.nav.nav-pills.left
-            %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
-              = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do
-                Open
-            %li{:class => ("active" if params[:f] == "2")}
-              = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do
-                Closed
-            %li{:class => ("active" if params[:f] == "3")}
-              = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do
-                To Me
-            %li{:class => ("active" if params[:f] == "1")}
-              = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do
-                All
-
-        .span6.right
-          = form_tag project_issues_path(@project), :method => :get, :class => :right  do
-            = select_tag(:assignee_id, options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
-            = select_tag(:milestone_id, options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")
-            = hidden_field_tag :f, params[:f]
+      .left
+        %ul.nav.nav-pills.left
+          %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
+            = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do
+              Open
+          %li{:class => ("active" if params[:f] == "2")}
+            = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do
+              Closed
+          %li{:class => ("active" if params[:f] == "3")}
+            = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do
+              To Me
+          %li{:class => ("active" if params[:f] == "1")}
+            = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do
+              All
 
+      .right
+        = form_tag project_issues_path(@project), :method => :get, :class => :right  do
+          = select_tag(:label_name, options_for_select(issue_tags, params[:label_name]), :prompt => "Labels")
+          = select_tag(:assignee_id, options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
+          = select_tag(:milestone_id, options_from_collection_for_select(@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"
 
@@ -60,9 +61,10 @@
   $(function(){
     initIssuesSearch();
     setSortable();
+    $("#label_name").chosen();
     $("#assignee_id").chosen();
     $("#milestone_id").chosen();
-    $("#milestone_id, #assignee_id").live("change", function(){
+    $("#milestone_id, #assignee_id, #label_name").live("change", function(){
       $(this).closest("form").submit();
     });
   })
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 1bb4e04d2b6..cd7ad57a7e8 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -51,9 +51,11 @@
           = truncate(milestone.title, :length => 20)
 
     .right
-      - if @issue.critical
-        %span.label.label-important
-          Critical
+      - @issue.labels.each do |label|
+        %span.label.label-issue
+          %i.icon-tag
+          = label.name
+         
 
   - if @issue.description.present?
     .bottom_box_content