Merge branch 'dev'

Gemfile

@@ -21,6 +21,8 @@ gem "git"
 gem "acts_as_list"
 gem 'rdiscount'
 
+gem 'acts-as-taggable-on', '~>2.1.0'
+
 group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"

Gemfile.lock

@@ -54,6 +54,8 @@ GEM
       activesupport (= 3.1.0)
     activesupport (3.1.0)
       multi_json (~> 1.0)
+    acts-as-taggable-on (2.1.1)
+      rails
     acts_as_list (0.1.4)
     addressable (2.2.6)
     ansi (1.3.0)
@@ -246,6 +248,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts-as-taggable-on (~> 2.1.0)
   acts_as_list
   annotate!
   autotest

app/assets/javascripts/application.js

@@ -8,6 +8,7 @@
 //= require jquery-ui
 //= require jquery_ujs
 //= require jquery.ui.selectmenu
+//= require jquery.tagify
 //= require jquery.cookie
 //= require_tree .
 
@@ -20,6 +21,6 @@ $(function(){
   $('select#tag').selectmenu({style:'popup', width:200});
 });
 
-function updatePage(){
-  $.ajax({type: "GET", url: location.href, dataType: "script"});
+function updatePage(data){
+  $.ajax({type: "GET", url: location.href, data: data, dataType: "script"});
 }

app/assets/javascripts/commits.js

@@ -7,3 +7,51 @@ $(document).ready(function(){
     }
   });
 });
+
+
+
+var CommitsList = { 
+
+ref:null,
+limit:0,
+offset:0,
+
+init: 
+  function(ref, limit) { 
+    this.ref=ref; 
+    this.limit=limit; 
+    this.offset=limit; 
+    this.initLoadMore();
+    $('.loading').show();
+  },
+
+getOld:
+  function() { 
+    $('.loading').show();
+    $.ajax({
+      type: "GET",
+      url: location.href,
+      data: "limit=" + this.limit + "&offset=" + this.offset + "&ref=" + this.ref,
+      complete: function(){ $('.loading').hide()},
+      dataType: "script"});
+  },
+
+append:
+  function(count, html) {
+    $("#commits_list").append(html);
+    if(count > 0) { 
+      this.offset += count;
+      this.initLoadMore();
+    }  
+  },
+
+initLoadMore:
+  function() { 
+    $(window).bind('scroll', function(){
+      if($(window).scrollTop() == $(document).height() - $(window).height()){
+        $(window).unbind('scroll');
+        CommitsList.getOld();
+      }
+    });
+  }
+}

app/assets/javascripts/note.js

+var NoteList = { 
+
+first_id: 0,
+last_id: 0,
+resource_name: null,
+
+init: 
+  function(resource_name, first_id, last_id) { 
+    this.resource_name = resource_name; 
+    this.first_id = first_id; 
+    this.last_id = last_id; 
+    this.initRefresh();
+    this.initLoadMore();
+  },
+
+getOld:
+  function() { 
+    $('.loading').show();
+    $.ajax({
+      type: "GET",
+      url: location.href,
+      data: "first_id=" + this.first_id,
+      complete: function(){ $('.loading').hide()},
+      dataType: "script"});
+  },
+
+append:
+  function(id, html) {
+    this.first_id = id;
+    $("#notes-list").append(html);
+    this.initLoadMore();
+  },
+
+replace: 
+  function(fid, lid, html) {
+    this.first_id = fid;
+    this.last_id = lid;
+    $("#notes-list").html(html);
+    this.initLoadMore();
+  },
+
+
+prepend:
+  function(id, html) {
+    this.last_id = id;
+    $("#notes-list").prepend(html);
+  },
+
+getNew:
+  function() { 
+    // refersh notes list
+    $.ajax({
+      type: "GET",
+      url: location.href,
+      data: "last_id=" + this.last_id,
+      dataType: "script"});
+  },
+
+refresh:
+  function() { 
+    // refersh notes list
+    $.ajax({
+      type: "GET",
+      url: location.href,
+      data: "first_id=" + this.first_id + "&last_id=" + this.last_id,
+      dataType: "script"});
+  },
+
+
+
+initRefresh:
+  function() {
+    // init timer
+    var intNew = setInterval("NoteList.getNew()", 15000);
+    var intRefresh = setInterval("NoteList.refresh()", 90000);
+  },
+
+initLoadMore:
+  function() { 
+    $(window).bind('scroll', function(){
+      if($(window).scrollTop() == $(document).height() - $(window).height()){
+        $(window).unbind('scroll');
+        NoteList.getOld();
+      }
+    });
+  }
+}

app/assets/stylesheets/application.css

@@ -4,6 +4,7 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require jquery-ui/jquery-ui
  *= require jquery-ui/jquery.ui.selectmenu
+ *= require jquery-ui/jquery.tagify
  *= require_self
  *= require_tree .
 */

app/assets/stylesheets/projects.css.scss

@@ -52,7 +52,8 @@
     background: #eee;
   }
   .diff_file_content {
-    overflow-x: scroll;
+    overflow:auto;
+    overflow-y:hidden;
     background:#fff;
     color:#333;
     font-size: 12px;
@@ -162,10 +163,6 @@ table.round-borders {
   padding:20px;
 }
 
-//body {
-  //background: #eaeaea;
-//}
-
 a {
   color: #111;
 }
@@ -174,9 +171,9 @@ a {
   .old_line, .new_line {
     background:#ECECEC;
     color:#777;
-    width:15px;
+    width:30px;
     float:left;
-    padding: 0px 10px;
+    padding: 0px 5px;
     border-right: 1px solid #ccc;
   }
 }
@@ -231,43 +228,15 @@ input.ssh_project_url {
   text-align:center;
 }
 
-.day-commits-table li.commit {
-  cursor:pointer;
-
-  &:hover {
-    @include hover-color;
-  }
-}
-
-/*
-#FFF6BF
-#FFD324
-*/
-#tree-slider tr.tree-item {
-  cursor:pointer;
-
-  &:hover {
-    @include hover-color;
-    td {
-      @include hover-color;
-    }
-  }
-}
 #projects-list .project {
   height:50px;
 }
 
+#tree-slider .tree-item,
 #projects-list .project,
 #snippets-table .snippet,
 #issues-table .issue{
   cursor:pointer;
-
-  &:hover {
-      @include hover-color;
-    td {
-      @include hover-color;
-    }
-  }
 }
 
 .clear {
@@ -421,31 +390,6 @@ input.ssh_project_url {
   list-style:none;
   margin:0px;
   padding:0px;
-
-  li {
-    display:list-item;
-    padding:8px;
-    margin:0px;
-    background: #F7FBFC;
-    border-top: 1px solid #E2EAEE;
-
-    &:first-child {
-      border-top: none;
-    }
-    &:nth-child(2n+1) {
-      background: white;
-    }
-    p {
-      margin-bottom: 4px;
-      font-size: 13px;
-      color:#111;
-    }
-  }
-  cite {
-    &.ago {
-      color:#666;
-    }
-  }
 }
 
 .notes_count {
@@ -460,14 +404,6 @@ input.ssh_project_url {
   right: 6px;
   top: 6px;
 }
-.note_author {
-  float:left;
-  width:60px;
-}
-.note_content {
-  float:left;
-  width:650px;
-}
 
 .issue_notes {
   .note_content {
@@ -556,8 +492,7 @@ input.ssh_project_url {
 
 }
 .commit,
-.message,
-#notes-list{
+.message{
   .author {
     background: #eaeaea;
     color: #333;
@@ -574,7 +509,7 @@ input.ssh_project_url {
   font-size:14px;
 }
 
-.wall_page {
+#new_note {
   #note_note {
     height:25px;
   }
@@ -596,6 +531,7 @@ input.ssh_project_url {
   @include round-borders-all(4px);
   padding:2px 4px;
   border:none;
+  text-shadow:none;
 
   &.high {
     background: #D12F19;
@@ -706,3 +642,44 @@ table.highlighttable pre{
   line-height:16px !important;
   font-size:12px !important;
 }
+
+.project-refs-form { 
+  span {
+    background: none !important;
+    position:static !important;
+    width:auto !important;
+    height: auto !important;
+  }
+}
+
+.project-refs-select {
+  width:200px;
+}
+
+.issues_filter {
+  margin-top:10px;
+  .left { 
+    margin-right:15px;
+  }
+}
+
+.cgray { color:gray; }
+.cred { color:#D12F19; }
+.cgreen { color:#44aa22; }
+
+body.project-page table .commit { 
+  a.tree-commit-link { 
+    color:gray;
+    &:hover { 
+      text-decoration:underline;
+    }
+  }
+}
+
+body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
+body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
+body.project-page #notes-list .note img{float: left; margin-right: 10px;}
+body.project-page #notes-list .note span.note-title{display: block;}
+body.project-page #notes-list .note span.note-title{margin-bottom: 10px}
+body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
+body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}

app/assets/stylesheets/style.scss

@@ -292,7 +292,7 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
 
 /* General */
 #container{background-color: white; overflow: hidden;}
-/*#container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}*/
+body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}
 
 
 
@@ -323,6 +323,7 @@ header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 294px; margin
 	background-image: -moz-linear-gradient(#595d63 6.6%, #31363e);
 	background-image: -o-linear-gradient(#595d63 6.6%, #31363e);
 	margin-top: 2px;
+	height:30px
 }
 header nav a{padding: 8px 12px 8px 34px; display: inline-block; color: #D6DADF; border-right: 1px solid #31363E; position: relative; box-shadow: 1px 0 0 rgba(255,255,255,.1); margin: 0}
 header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;}

app/assets/stylesheets/tags.css.css

+.tags-list {
+	padding : 0px 10px 10px 10px;
+	
+}
+
+.tags-list a {
+    display: inline-block;
+    padding: 8px 11px 8px 11px;
+    margin: 1px 5px 0px 0px;
+    border-radius: 4px;
+    border: 1px solid #72bbdf;
+    background-color: #72bbdf;
+    color: #0f326d;
+    font-weight: bold;
+    font-size: 14px;
+}
+
+
+.small-tags a{
+  font-size: 9px;
+
+  display: inline-block;
+  padding: 2px 3px 1px 3px;
+  margin: 0px 3px 0px 0px;
+  border-radius: 2px;
+  background-color: #72bbdf;
+  color: #FFF;
+  text-shadow: none;
+  font-weight: bold;  
+}
\ No newline at end of file

app/controllers/application_controller.rb

 class ApplicationController < ActionController::Base
   before_filter :authenticate_user!
+  before_filter :view_style
+
   protect_from_forgery
 
   helper_method :abilities, :can?
@@ -57,20 +59,14 @@ class ApplicationController < ActionController::Base
   end
 
   def load_refs
-    @branch = unless params[:branch].blank?
-                params[:branch]
-              else
-                nil
-              end
-
-    @tag = unless params[:tag].blank?
-             params[:tag]
+    unless params[:ref].blank?
+      @ref = params[:ref]
     else
-             nil
-           end
-
+      @branch = params[:branch].blank? ? nil : params[:branch]
+      @tag = params[:tag].blank? ? nil : params[:tag]
       @ref = @branch || @tag || "master"
     end
+  end
 
   def render_404
     render :file => File.join(Rails.root, "public", "404"), :layout => false, :status => "404"
@@ -79,4 +75,30 @@ class ApplicationController < ActionController::Base
   def require_non_empty_project
     redirect_to @project unless @project.repo_exists?
   end
+
+  def view_style
+    if params[:view_style] == "collapsed"
+      cookies[:view_style] = "collapsed" 
+    elsif params[:view_style] == "fluid"
+      cookies[:view_style] = "" 
+    end
+
+    @view_mode = if cookies[:view_style] == "collapsed"
+                   :fixed
+                 else
+                   :fluid
+                 end
+  end
+
+  def respond_with_notes
+    if params[:last_id] && params[:first_id]
+      @notes = @notes.where("id >= ?", params[:first_id])
+    elsif params[:last_id]
+      @notes = @notes.where("id > ?", params[:last_id])
+    elsif params[:first_id]
+      @notes = @notes.where("id < ?", params[:first_id]) 
+    else 
+      nil
+    end
+  end
 end

app/controllers/commits_controller.rb

@@ -13,11 +13,12 @@ class CommitsController < ApplicationController
     load_refs # load @branch, @tag & @ref
 
     @repo = project.repo
+    limit, offset = (params[:limit] || 20), (params[:offset] || 0) 
 
     if params[:path]
-      @commits = @repo.log(@ref, params[:path], :max_count => params[:limit] || 100, :skip => params[:offset] || 0)
+      @commits = @repo.log(@ref, params[:path], :max_count => limit, :skip => offset)
     else
-      @commits = @repo.commits(@ref, params[:limit] || 100, params[:offset] || 0)
+      @commits = @repo.commits(@ref, limit, offset)
     end
 
     respond_to do |format|
@@ -28,12 +29,12 @@ class CommitsController < ApplicationController
 
   def show
     @commit = project.repo.commits(params[:id]).first
-    @notes = project.notes.where(:noteable_id => @commit.id, :noteable_type => "Commit")
+    @notes = project.notes.where(:noteable_id => @commit.id, :noteable_type => "Commit").order("created_at DESC").limit(20)
     @note = @project.notes.new(:noteable_id => @commit.id, :noteable_type => "Commit")
 
     respond_to do |format| 
-      format.html # show.html.erb
-      format.js
+      format.html
+      format.js { respond_with_notes }
     end
   end
 end

app/controllers/issues_controller.rb

@@ -35,8 +35,13 @@ class IssuesController < ApplicationController
   end
 
   def show
-    @notes = @issue.notes.order("created_at ASC")
+    @notes = @issue.notes.order("created_at DESC").limit(20)
     @note = @project.notes.new(:noteable => @issue)
+
+    respond_to do |format| 
+      format.html
+      format.js { respond_with_notes }
+    end
   end
 
   def create

app/controllers/projects_controller.rb

@@ -10,7 +10,9 @@ class ProjectsController < ApplicationController
   before_filter :require_non_empty_project, :only => [:blob, :tree]
 
   def index
-    @projects = current_user.projects.all
+    source = current_user.projects
+    source = source.tagged_with(params[:tag]) unless params[:tag].blank?
+    @projects = source.all
   end
 
   def new
@@ -86,12 +88,11 @@ class ProjectsController < ApplicationController
   def wall
     @note = Note.new
     @notes = @project.common_notes.order("created_at DESC")
+    @notes = @notes.fresh.limit(20)
 
-    @notes = case params[:view]
-             when "week" then @notes.since((Date.today - 7.days).at_beginning_of_day)
-             when "all" then @notes.all
-             when "day" then @notes.since(Date.today.at_beginning_of_day)
-             else @notes.fresh.limit(10)
+    respond_to do |format| 
+      format.html
+      format.js { respond_with_notes }
     end
   end
 

app/controllers/tags_controller.rb

+class TagsController < ApplicationController
+	def index
+		@tags = Project.tag_counts.order('count DESC')
+		@tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank?
+
+		respond_to do |format|
+			format.html
+			format.json { render json: @tags.limit(8).map {|t| t.name}}
+		end
+	end
+end

app/helpers/application_helper.rb

@@ -4,6 +4,18 @@ module ApplicationHelper
     "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email)}?s=40&d=identicon"
   end
 
+  def fixed_mode?
+    @view_mode == :fixed
+  end
+
+  def body_class(default_class = nil)
+    main = content_for(:body_class).blank? ? 
+      default_class :
+      content_for(:body_class)
+
+    [main, cookies[:view_style]].join(" ")
+  end
+
   def commit_name(project, commit)
     if project.commit.id == commit.id
       "master"
@@ -32,6 +44,15 @@ module ApplicationHelper
     "Never"
   end
 
+  def grouped_options_refs
+    options = [
+      ["Branch", @repo.heads.map(&:name) ],
+      [ "Tag", @project.tags ]
+    ]
+
+    grouped_options_for_select(options, @ref)
+  end
+
   def markdown(text)
     RDiscount.new(text, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
   end

app/models/key.rb

@@ -8,7 +8,7 @@ class Key < ActiveRecord::Base
   validates :key,
             :presence => true,
             :uniqueness => true,
-            :length   => { :within => 0..1024 }
+            :length   => { :within => 0..1600 }
 
   before_save :set_identifier
   after_save :update_gitosis

app/models/project.rb

@@ -9,6 +9,8 @@ class Project < ActiveRecord::Base
   has_many :notes, :dependent => :destroy
   has_many :snippets, :dependent => :destroy
 
+  acts_as_taggable
+
   validates :name,
             :uniqueness => true,
             :presence => true,
@@ -48,6 +50,11 @@ class Project < ActiveRecord::Base
     code
   end
 
+  def team_member_by_name_or_email(email = nil, name = nil)
+    user = users.where("email like ? or name like ?", email, name).first
+    users_projects.find_by_user_id(user.id) if user
+  end
+
   def common_notes
     notes.where(:noteable_type => ["", nil])
   end

app/views/commits/_commits.html.haml

@@ -17,9 +17,8 @@
               = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
             %span.commit-title
               %strong
-                = truncate(commit.safe_message, :length => 60)
+                = truncate(commit.safe_message, :length => fixed_mode? ? 60 : 120)
             %span.commit-author
               %strong= commit.author_name
               = time_ago_in_words(commit.committed_date)
               ago
-= more_commits_link if @commits.size > 99

app/views/commits/index.html.haml

 - content_for(:body_class, "project-page commits-page")
 
-.left
-  = form_tag project_commits_path(@project), :method => :get do
-    = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
-.left
-  = form_tag project_commits_path(@project), :method => :get do
-    = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
-.clear
-
-%br
-
-
 -#%a.right.button{:href => "#"} Download
 -#-if can? current_user, :admin_project, @project
   %a.right.button.blue{:href => "#"} EDIT
 %h2.icon
   %span
-  %a.project-name{:href => "#"}
-    %i.arrow>
-    Project
-   
   %d
-    %a{:href => "#"}
-      = @ref
+    = link_to project_commits_path(@project) do 
+      = @project.name
     - if params[:path]
-     
-    %d
+      \/
       %a{:href => "#"}= params[:path].split("/").join(" / ")
 
+.right= render :partial => "projects/refs", :locals => { :destination => project_commits_path(@project) }
 
 %div{:id => dom_id(@project)}
-  = render "commits"
+  #commits_list= render "commits"
+.clear
+.loading{ :style => "display:none;"}
+  %center= image_tag "ajax-loader.gif"
+
+
+
+:javascript
+  $(function(){
+    CommitsList.init("#{@ref}", 20);
+  });

app/views/commits/index.js.erb

-$("#more-commits-link").remove();
-$('#<%= dom_id(@project)%>').append('<%= escape_javascript(render("commits")) %>');

app/views/commits/index.js.haml

+:plain
+  CommitsList.append(#{@commits.count}, "#{escape_javascript(render(:partial => 'commits/commits'))}");
+

app/views/commits/show.html.haml

 %h3
-  = "[ #{@commit.committer} ]  #{truncate(@commit.safe_message)}"
+  = "[ #{@commit.author_name} ]  #{truncate(@commit.safe_message, :length => 70)}"
 -#= link_to 'Back', project_commits_path(@project), :class => "button"
 %table.round-borders
   %tr
@@ -8,12 +8,9 @@
   %tr
     %td Author
     %td= @commit.author_name
-  %tr
-    %td Commiter
-    %td= @commit.committer
   %tr
     %td Commited Date
-    %td= @commit.committed_date
+    %td= @commit.committed_date.stamp("21 Aug 2011, 11:15pm")
   %tr
     %td Message
     %td
@@ -24,18 +21,7 @@
     %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)
 .clear
 
-#tabs
-  %ul
-    %li
-      %a{ :href => "#tabs-1" } Diff
-    %li
-      %a{ :href => "#tabs-2" } Comments
-      %span{ :class => "notes_count" }= @notes.count
-  %hr
-  #tabs-1
-    = render "commits/diff"
-  #tabs-2
-    = render "notes/notes"
+%br
 
-:javascript
-  $(function() { $( "#tabs" ).tabs(); });
+= render "commits/diff"
+= render "notes/notes"

app/views/commits/show.js.haml

--#:plain
-  $("#side-commit-preview").remove();
-  var side = $("<div id='side-commit-preview'></div>");
-  side.html("#{escape_javascript(render "commits/show")}");
-  $("##{dom_id(@project)}").parent().append(side);
-  $("##{dom_id(@project)}").addClass("span-14");
-:plain
-  $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+= render "notes/load"

app/views/issues/_issues.html.haml

@@ -6,7 +6,6 @@
     %th ID
     %th Title
     %th Closed?
-    %th
 
   - @issues.critical.each do |issue|
     = render(:partial => 'show', :locals => {:issue => issue})

app/views/issues/_show.html.haml

@@ -4,15 +4,24 @@
       = image_tag "move.png" , :class => [:handle, :left]
   %td
     = image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
-    = truncate issue.assignee.name, :lenght => 20
+    = issue.assignee.name
   %td ##{issue.id}
   %td
-    = truncate(html_escape(issue.title), :length => 60)
+    = truncate(html_escape(issue.title), :length => 200)
+    %br
     %br
     - if issue.critical
       %span.tag.high critical
     - if issue.today?
       %span.tag.today today
+
+    .right
+      - if can?(current_user, :admin_issue, @project) || issue.author == current_user
+        = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray", :remote => true
+      - if can?(current_user, :admin_issue, @project) || issue.author == current_user
+         
+        = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
+
     -#- if issue.author == current_user
       -#%span.tag.yours yours
     -#- if issue.notes.count > 0
@@ -26,8 +35,3 @@
         = hidden_field_tag :status_only, true
     - else
       = check_box_tag "closed", 1, issue.closed, :disabled => true
-  %td
-    - if can?(current_user, :admin_issue, @project) || issue.author == current_user
-      = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "lbutton positive", :remote => true
-    - if can?(current_user, :admin_issue, @project) || issue.author == current_user
-      = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-issue negative", :id => "destroy_issue_#{issue.id}"

app/views/issues/index.html.haml

@@ -7,18 +7,18 @@
       = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
       = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
 
-    .right
+    .right.issues_filter
       = form_tag project_issues_path(@project), :method => :get do
-        .span-2
+        .left
           = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
           = label_tag "open_issues","Open"
-        .span-2
+        .left
           = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
           = label_tag "closed_issues","Closed"
-        .span-2
+        .left
           = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
           = label_tag "my_issues","To Me"
-        .span-2
+        .left
           = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
           = label_tag "all_issues","All"
 

app/views/issues/show.html.haml

 %h2
-  = "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
+  %strong
+    Issue
+    = "##{@issue.id}"
+  –
+  = html_escape(@issue.title)
 .left.width-65p
-  -#= simple_format html_escape(@issue.content)
   .issue_notes= render "notes/notes"
+
+  .loading{ :style => "display:none;"}
+    %center= image_tag "ajax-loader.gif"
 .right.width-30p
   .span-8
-    - if @issue.closed
-      %center.success Closed
-    - else
-      %center.error Open
   %table.round-borders
-    %tr
-      %td Title:
-      %td
-        = truncate html_escape(@issue.title)
-    %tr
-      %td Project
-      %td
-        %strong= @issue.project.name
     %tr
       %td Author:
       %td
@@ -41,7 +35,7 @@
     %tr
       %td Closed?
       %td
-        - if can? current_user, :write_issue, @project
+        - if can? current_user, :write_issue, @issue
           = form_for([@project, @issue]) do |f|
             = f.check_box :closed, :onclick => "$(this).parent().submit();"
             = hidden_field_tag :status_only, true
@@ -49,9 +43,9 @@
           = check_box_tag "closed", 1, @issue.closed, :disabled => true
 
 
-  - if can?(current_user, :admin_issue, @issue)
+  - if can?(current_user, :write_issue, @issue)
     .clear
+    %br
     = link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "lbutton positive", :remote => true
     .right= link_to 'Destroy', [@project, @issue], :confirm => 'Are you sure?', :method => :delete,  :class => "lbutton delete-issue negative", :id => "destroy_issue_#{@issue.id}"
 .clear
-

app/views/issues/show.js.haml

-:plain
-  $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+= render "notes/load"

app/views/layouts/_head_panel.html.erb

 <!-- Page Header -->
 <header>
-<h1 class="logo">
-  <a href="/">GITLAB</a></h1>
-  <div class="login-top">
+  <h1 class="logo">
+    <a href="/">GITLAB</a>
+  </h1>
+  <div class="account-box">
     <%= link_to profile_path, :class => "pic" do %>
       <%= image_tag gravatar_icon(current_user.email) %>
     <% end %>
+
+    <a href="#" class="arrow-up"></a>
+
+    <div class="account-links">
       <%= link_to profile_path, :class => "username" do %>
-          <%= current_user.name %> 
+        <%#= current_user.name %> 
+        Your profile
       <% end %>
+      <%= link_to "Fluid layout", url_for( :view_style => 'fluid' ) if cookies[:view_style] == "collapsed"%>
+      <%= link_to "Fixed layout", url_for( :view_style => 'collapsed' ) unless cookies[:view_style] == "collapsed"%>
       <%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>
     </div>
+  </div><!-- .account-box -->
+
   <div class="search">
     <%= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"  %>
   </div>
@@ -26,23 +36,10 @@
       <span></span>Admin
     <% end  %>
   </nav>
+
 </header>
 <!-- eo Page Header -->
 
-<div id="header-panel" style="display:none">
-  <div class="container">
-    <div class="span-24">
-      <div class="span-10">
-        <span class="search-holder">
-        </span>
-      </div>
-      <div class="right">
-        <%= link_to truncate(@project.name, :length => 20), project_path(@project), :class => "current button" if @project && !@project.new_record? %>
-      </div>
-    </div>
-  </div>
-</div>
-
 <% if current_user %>
   <%= javascript_tag do %>
     $(function() {

app/views/layouts/admin.html.haml

@@ -6,11 +6,10 @@
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
-    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
     = javascript_tag do
       REQ_URI = "#{request.env["REQUEST_URI"]}";
       REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
-  %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
+  %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
     #container
       = render :partial => "layouts/flash"
       = render :partial => "layouts/head_panel"

app/views/layouts/application.html.haml

@@ -2,22 +2,16 @@
 %html
   %head
     %title
-      GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
-    -#= stylesheet_link_tag 'blueprint/screen', :media => "screen, projection"
-    -#= stylesheet_link_tag 'blueprint/print', :media => "print"
-    -#= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
-    -#= stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
+      GitLab
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
-    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
     = javascript_tag do
       REQ_URI = "#{request.env["REQUEST_URI"]}";
       REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
-  %body{ :class => yield(:body_class), :id => yield(:boyd_id)}
+  %body{ :class => body_class, :id => yield(:boyd_id)}
     #container
       = render :partial => "layouts/flash"
       = render :partial => "layouts/head_panel"
-      %div{ :id => "main", :role => "main", :class => "container_4" }
       = render :partial => "layouts/page_title"
       = yield

app/views/layouts/devise.html.haml

@@ -6,7 +6,6 @@
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
-    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
     = javascript_tag do
       REQ_URI = "#{request.env["REQUEST_URI"]}";
       REQ_REFFER = "#{request.env["HTTP_REFERER"]}";

app/views/layouts/profile.html.haml

@@ -6,11 +6,10 @@
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
-    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
     = javascript_tag do
       REQ_URI = "#{request.env["REQUEST_URI"]}";
       REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
-  %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
+  %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
     #container
       = render :partial => "layouts/flash"
       = render :partial => "layouts/head_panel"

app/views/layouts/project.html.haml

@@ -6,18 +6,17 @@
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
-    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
     = javascript_tag do
       REQ_URI = "#{request.env["REQUEST_URI"]}";
       REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
-  %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
+  %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
     #container
       = render :partial => "layouts/flash"
       = render :partial => "layouts/head_panel"
       .project-container
         .project-sidebar
           .fixed
-            %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
+            %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
             %aside
               = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
               = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil

app/views/notes/_load.js.haml

+- unless @notes.blank?
+
+  - if params[:last_id] && params[:first_id]
+    :plain
+      NoteList.replace(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+
+
+  - elsif params[:last_id]
+    :plain
+      NoteList.prepend(#{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+
+  - elsif params[:first_id]
+    :plain
+      NoteList.append(#{@notes.last.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+
+  - else
+    :plain

app/views/notes/_notes.html.haml

-- if controller.action_name == "wall"
-  %ul#notes-list= render "notes/notes_list"
-
-- else
-  %ul#notes-list= render "notes/notes_list"
-  %br
-  %br
-  - if can? current_user, :write_note, @project
+- if can? current_user, :write_note, @project
   = render "notes/form"
+.clear
+%hr
+%ul#notes-list= render "notes/notes_list"
 
 :javascript
   $('.delete-note').live('ajax:success', function() {
@@ -20,8 +16,11 @@
     $("#submit_note").removeAttr("disabled");
   })
 
-- if ["issues", "projects"].include?(controller.controller_name)
-  :javascript
   $(function(){
-      var int =self.setInterval("updatePage()", 20000);
+    $("#note_note").live("click", function(){
+      $(this).css("height", "100px");
+      $('.attach_holder').show();
+    });
+
+    NoteList.init("wall", #{@notes.last.try(:id) || 0}, #{@notes.first.try(:id) || 0});
   });

app/views/notes/_show.html.haml

-%li{:id => dom_id(note)}
-  %div.note_author
+%li{:id => dom_id(note), :class => "note"}
   = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
-  %div.note_content.left
-    = markdown(note.note)
-    - if note.attachment.url
-      Attachment:
-      = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
-      %br
-    %span.author= note.author.name
-    %cite.ago
+  %div.note-author
+    %strong= note.author_name
+    %cite.cgray
       = time_ago_in_words(note.updated_at)
       ago
-    %br
     - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
-    = link_to 'Remove', [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-note right negative"
+      = link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note right"
+    
+  %div.note-title
+    = markdown(note.note)
+    - if note.attachment.url
+      .right
+        %span.file
+        = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
   .clear

app/views/notes/create.js.haml

 - if @note.valid?
   :plain
     $("#new_note .errors").remove();
-    updatePage();
     $('#note_note').val("");
+    NoteList.prepend(#{@note.id}, "#{escape_javascript(render :partial => "notes/show", :locals => {:note => @note})}");
 - else
   :plain
     $("#new_note").replaceWith("#{escape_javascript(render('form'))}");

app/views/projects/_form.html.haml

@@ -25,6 +25,11 @@
           .left= f.label :code
           %cite.right http://yourserver/
         %td= f.text_field :code, :placeholder => "example"
+
+      %tr
+        %td= f.label :tag_list
+        %td= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field
+
     .field
       = f.label :description
       %br/
@@ -41,8 +46,25 @@
         %h3.prepend-top Creating project & repository. Please wait for few minutes
       - else
         %h3.prepend-top Updating project & repository. Please wait for few minutes
+
 :javascript
   $('.new_project, .edit_project').bind('ajax:before', function() {
     $(this).find(".form_content").hide();
     $('.ajax_loader').show();
   });
+
+:javascript
+  $(function(){
+    var tag_field = $('#tag_field').tagify();
+
+    tag_field.tagify('inputField').autocomplete({
+        source: '/tags.json'
+    });
+
+
+    $('form').submit( function() {
+      var tag_field = $('#tag_field')
+         tag_field.val( tag_field.tagify('serialize') );
+         return true;
+    });
+  })  

app/views/projects/_list.html.haml

@@ -10,7 +10,12 @@
 
   - @projects.each do |project|
     %tr{ :class => "project", :url => project_path(project) }
-      %td= project.name
+      %td
+        = project.name
+        .small-tags
+          - project.tag_list.each do |tag|
+            = link_to tag, "/tags/#{tag}"
+
       %td= truncate project.url_to_repo
       %td= project.code
       %td= check_box_tag "read",   1, project.readers.include?(current_user), :disabled => :disabled

app/views/projects/_refs.html.haml

+= form_tag destination, :method => :get, :class => "project-refs-form" do
+  = select_tag "ref", grouped_options_refs, :onchange => "this.form.submit();", :class => "project-refs-select"
+
+
+:javascript
+  $(function(){
+    $('.project-refs-select').chosen();
+  })

app/views/projects/_tile.html.haml

@@ -12,6 +12,11 @@
             %span Last Activity:
             - last_note = project.notes.last
             = last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never"
+
+          %p.small-tags
+            - project.tag_list.each do |tag|
+              = link_to tag, "/tags/#{tag}"
+
         .buttons
           %a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code
           %a.commits.button.green{:href => project_commits_path(project)} Commits

app/views/projects/_tree.html.haml

-.left
-  = form_tag tree_project_path(@project), :method => :get do
-    = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
-.left
-  = form_tag tree_project_path(@project), :method => :get do
-    = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
-.clear
-
-%br
 
 -#%a.right.button{:href => "#"} Download
 -#-if can? current_user, :admin_project, @project
@@ -14,14 +5,9 @@
 #tree-breadcrumbs
   %h2.icon
     %span
-    = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true, :class => 'project-name' do 
-      %i.arrow>
-      = @project.name
-     
     %d
-      %a{:href => "#"}
-        = @ref
-
+      = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true do 
+        = @project.name
       - if params[:path]
         - part_path = ""
         - params[:path].split("\/").each do |part|
@@ -30,7 +16,8 @@
             - part_path = part
           \/
           = link_to truncate(part, :length => 40), tree_file_project_path(@project, :path => part_path, :commit_id => @commit.try(:id), :branch => @branch, :tag => @tag), :remote => :true
-
+         
+  .right= render :partial => "projects/refs", :locals => { :destination => tree_project_path(@project) }
 .clear
 
 #tree-content-holder

app/views/projects/_tree_item.html.haml

@@ -11,5 +11,8 @@
   %td
     = time_ago_in_words(content_commit.committed_date)
     ago
-  %td
-    = link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit)
+  %td.commit
+    = link_to truncate(content_commit.safe_message, :length => fixed_mode? ? 40 : 80), project_commit_path(@project, content_commit), :class => "tree-commit-link"
+    - tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
+    - if tm
+      = link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)

app/views/projects/index.html.haml

 - content_for(:body_class, "projects-page")
 - content_for(:page_title) do
+  .container_4
     .grid_4
       - if current_user.can_create_project?
         %a.grey-button.right{:href => new_project_path} Create new project
@@ -7,12 +8,13 @@
         %span
         Projects
 
-- unless @projects.empty?
+    %div.clear
+    - unless @projects.empty?
       %div{:class => "tile", :style => view_mode_style("tile")}
         = render "tile"
       %div{:class => "list", :style => view_mode_style("list")}
         = render "list"
-- else
+    - else
       %center.prepend-top
         %h2
           %cite Nothing here

app/views/projects/wall.html.haml

 %div.wall_page
-  - if can? current_user, :write_note, @project
-    = render "notes/form"
-  .right
-    = form_tag wall_project_path(@project), :method => :get do
-      .span-2
-        = radio_button_tag :view, "recent", (params[:view] || "recent") == "recent", :onclick => "this.form.submit()", :id => "recent_view"
-        = label_tag "recent_view","Recent"
-      .span-2
-        = radio_button_tag :view, "day", params[:view] == "day", :onclick => "this.form.submit()", :id => "day_view"
-        = label_tag "day_view","Today"
-      .span-2
-        = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
-        = label_tag "week_view","Week"
-      .span-2
-        = radio_button_tag :view, "all", params[:view] == "all", :onclick => "this.form.submit()", :id => "all_view"
-        = label_tag "all_view","All"
-  .clear
-  %br
-  %hr
-= render "notes/notes"
+  = render "notes/notes"
+
+.loading{ :style => "display:none;"}
+  %center= image_tag "ajax-loader.gif"
 
-:javascript
-  $(function(){
-    $("#note_note").live("click", function(){
-      $(this).css("height", "100px");
-      $('.attach_holder').show();
-    });
-  });

app/views/projects/wall.js.haml

-:plain
-  $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+= render "notes/load"

app/views/tags/index.html.haml

+- content_for(:body_class, "projects-page")
+- content_for(:page_title) do
+  .grid_4
+    %h2  
+      Tags
+
+ 
+  .tags-list
+    - @tags.all.each do |tag|
+      = link_to "#{tag.name}(#{tag.count})", "/tags/#{tag.name}"
+        

config/routes.rb

 Gitlab::Application.routes.draw do
+
+  get 'tags'=> 'tags#index'
+  get 'tags/:tag' => 'projects#index'
+
+
   namespace :admin do
     resources :users
     resources :projects
@@ -20,6 +25,7 @@ Gitlab::Application.routes.draw do
 
   resources :projects, :only => [:new, :create, :index]
   resources :keys
+
   devise_for :users
 
   resources :projects, :except => [:new, :create, :index], :path => "/" do

db/migrate/20111101222453_acts_as_taggable_on_migration.rb

+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, :polymorphic => true
+      t.references :tagger, :polymorphic => true
+
+      t.string :context
+
+      t.datetime :created_at
+    end
+
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111027152724) do
+ActiveRecord::Schema.define(:version => 20111101222453) do
 
   create_table "issues", :force => true do |t|
     t.string   "title"
@@ -68,6 +68,23 @@ ActiveRecord::Schema.define(:version => 20111027152724) do
     t.datetime "expires_at"
   end
 
+  create_table "taggings", :force => true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context"
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
   create_table "users", :force => true do |t|
     t.string   "email",                                 :default => "",    :null => false
     t.string   "encrypted_password",     :limit => 128, :default => "",    :null => false

spec/requests/commits_notes_spec.rb

@@ -12,7 +12,6 @@ describe "Issues" do
   describe "add new note", :js => true do
     before do
       visit project_commit_path(project, commit)
-      click_link "Comments" # notes tab
       fill_in "note_note", :with => "I commented this commit"
       click_button "Add note"
     end

spec/requests/tags_spec.rb

+require 'spec_helper'
+
+describe "Tags" do
+  before { login_as :user }
+
+  # describe "GET 'tags/index'" do
+  #   it "should be successful" do
+  #     get 'tags/index'
+  #     response.should be_success
+  #   end
+  # end
+
+
+  describe "GET '/tags.json'" do
+    before do
+     @project = Factory :project
+     @project.add_access(@user, :read)
+     @project.tag_list = 'demo1'
+     @project.save
+     visit '/tags.json'
+    end
+
+
+    it "should contains tags" do
+      page.should have_content('demo1')
+    end
+end
+
+
+
+end

vendor/assets/javascripts/jquery.tagify.js

+/* Author: Alicia Liu */
+
+(function ($) {
+
+	$.widget("ui.tagify", {
+		options: {
+			delimiters: [13, 188],          // what user can type to complete a tag in char codes: [enter], [comma]
+			outputDelimiter: ',',           // delimiter for tags in original input field
+			cssClass: 'tagify-container',   // CSS class to style the tagify div and tags, see stylesheet
+			addTagPrompt: 'add tags'        // placeholder text
+		},
+
+		_create: function() {
+			var self = this,
+				el = self.element,
+				opts = self.options;
+
+			this.tags = [];
+
+			// hide text field and replace with a div that contains it's own input field for entering tags
+			this.tagInput = $("<input type='text'>")
+				.attr( 'placeholder', opts.addTagPrompt )
+				.keypress( function(e) {
+					var $this = $(this),
+					    pressed = e.which;
+
+					for ( i in opts.delimiters ) {
+
+						if (pressed == opts.delimiters[i]) {
+							self.add( $this.val() );
+							e.preventDefault(); 
+							return false;
+						}
+					}
+				})
+				// for some reason, in Safari, backspace is only recognized on keyup
+				.keyup( function(e) {
+					var $this = $(this),
+					    pressed = e.which;
+
+					// if backspace is hit with no input, remove the last tag
+					if (pressed == 8) { // backspace
+						if ( $this.val() == "" ) {
+							self.remove();
+							return false;
+						}
+						return;
+					}
+				});
+
+			this.tagDiv = $("<div></div>")
+			    .addClass( opts.cssClass )
+			    .click( function() {
+			        $(this).children('input').focus();
+			    })
+			    .append( this.tagInput )
+				.insertAfter( el.hide() );
+
+			// if the field isn't empty, parse the field for tags, and prepopulate existing tags
+			var initVal = $.trim( el.val() );
+
+			if ( initVal ) {
+				var initTags = initVal.split( opts.outputDelimiter );
+				$.each( initTags, function(i, tag) {
+				    self.add( tag );
+				});
+			}
+		},
+
+		_setOption: function( key, value ) {
+			options.key = value;
+		},
+
+		// add a tag, public function		
+		add: function(text) {
+    		var self = this;
+			text = text || self.tagInput.val();
+			if (text) {
+				var tagIndex = self.tags.length;
+
+				var removeButton = $("<a href='#'>x</a>")
+					.click( function() {
+						self.remove( tagIndex );
+						return false;
+					});
+				var newTag = $("<span></span>")
+					.text( text )
+					.append( removeButton );
+
+				self.tagInput.before( newTag );
+				self.tags.push( text );
+				self.tagInput.val('');
+			}
+		},
+
+		// remove a tag by index, public function
+		// if index is blank, remove the last tag
+		remove: function( tagIndex ) {
+			var self = this;
+			if ( tagIndex == null  || tagIndex === (self.tags.length - 1) ) {
+				this.tagDiv.children("span").last().remove();
+				self.tags.pop();
+			}
+			if ( typeof(tagIndex) == 'number' ) {
+				// otherwise just hide this tag, and we don't mess up the index
+				this.tagDiv.children( "span:eq(" + tagIndex + ")" ).hide();
+				 // we rely on the serialize function to remove null values
+				delete( self.tags[tagIndex] );
+			}
+		},
+
+		// serialize the tags with the given delimiter, and write it back into the tagified field
+		serialize: function() {
+			var self = this;
+			var delim = self.options.outputDelimiter;
+			var tagsStr = self.tags.join( delim );
+
+			// our tags might have deleted entries, remove them here
+			var dupes = new RegExp(delim + delim + '+', 'g'); // regex: /,,+/g
+			var ends = new RegExp('^' + delim + '|' + delim + '$', 'g');  // regex: /^,|,$/g
+			var outputStr = tagsStr.replace( dupes, delim ).replace(ends, '');
+
+			self.element.val(outputStr);
+			return outputStr;
+		},
+
+		inputField: function() {
+		    return this.tagInput;
+		},
+
+		containerDiv: function() {
+		    return this.tagDiv;
+		},
+
+		// remove the div, and show original input
+		destroy: function() {
+		    $.Widget.prototype.destroy.apply(this);
+			this.tagDiv.remove();
+			this.element.show();
+		}
+	});
+
+})(jQuery);
\ No newline at end of file

vendor/assets/stylesheets/jquery-ui/jquery.tagify.css

+/* Tagify styles 
+Author: Alicia Liu test
+*/
+
+.tagify-container {
+}
+
+.tagify-container > span {
+    display: inline-block;
+    padding: 8px 11px 8px 11px;
+    margin: 1px 5px 0px 0px;
+    border-radius: 4px;
+    border: 1px solid #d0e1ff;
+    background-color: #d0e1ff;
+    color: #0f326d;
+    font-weight: bold;
+    font-size: 14px;
+}
+
+.tagify-container > span > a {
+    padding-left: 5px !important;
+    color: #83a5e1;
+    text-decoration: none;
+    font-weight: bold;
+}
+
+.tagify-container > input {
+    border: 0 none;
+    width: 100px !important;
+}
+
+.tagify-container > input:focus {
+    outline: none;
+}
\ No newline at end of file