Description to groups added

app/assets/stylesheets/application.scss

@@ -20,6 +20,7 @@
 @import "sections/nav.scss";
 @import "sections/commits.scss";
 @import "sections/issues.scss";
+@import "sections/groups.scss";
 @import "sections/projects.scss";
 @import "sections/snippets.scss";
 @import "sections/votes.scss";

app/assets/stylesheets/sections/groups.scss

@@ -0,0 +1,31 @@
+.projects {
+  @extend .row;
+  .activities {
+  }
+
+  .side {
+    @extend .right;
+
+    .groups_box {
+      > .title {
+        padding: 2px 15px;
+      }
+      .well-list {
+        li { padding: 15px; }
+        .edit {
+          float: right;
+          margin: 0;
+        }
+        .description {
+          padding-top: 5px;
+          display: block;
+          span, strong {
+            font-size: 12px;
+            color: #666;
+          }
+        }
+      }
+      @extend .ui-box;
+    }
+  }
+}

app/models/group.rb

@@ -2,13 +2,14 @@
 #
 # Table name: namespaces
 #
-#  id         :integer          not null, primary key
+#  id          :integer          not null, primary key
-#  name       :string(255)      not null
+#  name        :string(255)      not null
-#  path       :string(255)      not null
+#  description :string(255)      not null
-#  owner_id   :integer          not null
+#  path        :string(255)      not null
-#  created_at :datetime         not null
+#  owner_id    :integer          not null
-#  updated_at :datetime         not null
+#  created_at  :datetime         not null
-#  type       :string(255)
+#  updated_at  :datetime         not null
+#  type        :string(255)
 #
 
 class Group < Namespace

app/models/namespace.rb

@@ -4,6 +4,7 @@
 #
 #  id         :integer          not null, primary key
 #  name       :string(255)      not null
+#  description :string(255)      not null
 #  path       :string(255)      not null
 #  owner_id   :integer          not null
 #  created_at :datetime         not null
@@ -12,7 +13,7 @@
 #
 
 class Namespace < ActiveRecord::Base
-  attr_accessible :name, :path
+  attr_accessible :name, :description, :path
 
   has_many :projects, dependent: :destroy
   belongs_to :owner, class_name: "User"
@@ -22,7 +23,7 @@ class Namespace < ActiveRecord::Base
             length: { within: 0..255 },
             format: { with: Gitlab::Regex.name_regex,
                       message: "only letters, digits, spaces & '_' '-' '.' allowed." }
-
+  validates :description, length: { within: 0..255 }
   validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
             format: { with: Gitlab::Regex.path_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }

app/views/admin/groups/edit.html.haml

@@ -1,4 +1,4 @@
-%h3.page_title Rename Group
+%h3.page_title Edit Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
@@ -10,7 +10,10 @@
     .input
       = f.text_field :name, placeholder: "Example Group", class: "xxlarge"
 
-
+  .clearfix.group_description_holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
 
   .clearfix.group_name_holder
     = f.label :path do
@@ -24,5 +27,5 @@
         %li It will change the git path to repositories under this group.
 
   .form-actions
-    = f.submit 'Rename group', class: "btn btn-remove"
+    = f.submit 'Edit group', class: "btn btn-remove"
     = link_to  'Cancel', admin_groups_path, class: "btn btn-cancel"

app/views/admin/groups/index.html.haml

@@ -17,6 +17,7 @@
         Name
         %i.icon-sort-down
       %th Path
+      %th Description
       %th Projects
       %th Owner
       %th.cred Danger Zone!
@@ -25,11 +26,12 @@
     %tr
       %td
         %strong= link_to group.name, [:admin, group]
+      %td= group.description
       %td= group.path
       %td= group.projects.count
       %td
         = link_to group.owner_name, admin_user_path(group.owner)
       %td.bgred
-        = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
+        = link_to 'Edit', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
         = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
 = paginate @groups, theme: "admin"

app/views/admin/groups/new.html.haml

@@ -9,8 +9,14 @@
       Group name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-       
+  .clearfix.group_description_holder
-      = f.submit 'Create group', class: "btn btn-primary"
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Create group', class: "btn btn-primary"
+
   %hr
   .padded
     %ul

app/views/admin/groups/show.html.haml

@@ -16,7 +16,13 @@
        
       = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
         %i.icon-edit
-        Rename
+        Edit
+  %tr
+    %td
+      %b
+        Description:
+    %td
+      = @group.description
   %tr
     %td
       %b

app/views/dashboard/_groups.html.haml

@@ -1,4 +1,4 @@
-.ui-box
+.groups_box
   %h5.title
     Groups
     %small
@@ -13,6 +13,8 @@
       %li
         = link_to group_path(id: group.path), class: dom_class(group) do
           %strong.well-title= truncate(group.name, length: 35)
-        %span.pull-right.light
+          %span.edit.light
-          - if group.owner == current_user
+            - if group.owner == current_user
-            %i.icon-wrench
+              %i.icon-wrench
+          %span.description
+            %strong= group.description

db/migrate/20130206084024_add_description_to_namsespace.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToNamsespace < ActiveRecord::Migration
+  def change
+    add_column :namespaces, :description, :string, default: '', null: false
+  end
+end

db/schema.rb

@@ -112,6 +112,7 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
     t.datetime "created_at",                  :null => false
     t.datetime "updated_at",                  :null => false
     t.string   "type"
+    t.string   "description", :default => "", :null => false
   end
 
   add_index "namespaces", ["name"], :name => "index_namespaces_on_name"
@@ -152,6 +153,8 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
     t.boolean  "wiki_enabled",           :default => true,     :null => false
     t.integer  "namespace_id"
     t.boolean  "public",                 :default => false,    :null => false
+    t.string   "issues_tracker",         :default => "gitlab", :null => false
+    t.string   "issues_tracker_id"
   end
 
   add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id"
@@ -230,8 +233,8 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
     t.string   "name"
     t.string   "path"
     t.integer  "owner_id"
-    t.datetime "created_at",                  :null => false
+    t.datetime "created_at", :null => false
-    t.datetime "updated_at",                  :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "users", :force => true do |t|