From 9f45e01e8426b9d678a210bb5237628676f99894 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Thu, 7 Feb 2013 14:42:52 +0400
Subject: Description to groups added

---
 app/views/admin/groups/edit.html.haml  |  9 ++++++---
 app/views/admin/groups/index.html.haml |  4 +++-
 app/views/admin/groups/new.html.haml   | 10 ++++++++--
 app/views/admin/groups/show.html.haml  |  8 +++++++-
 4 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'app/views/admin/groups')

diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index dce044956c3..f34ed83fb82 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/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"
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 6d5a293ef7f..1b4ffcb6e02 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/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"
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index 60c6fa5ad09..29bbcc55c93 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/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"
-      &nbsp;
-      = f.submit 'Create group', class: "btn btn-primary"
+  .clearfix.group_description_holder
+    = 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
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 90f8fc0f814..63ea78fdd99 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -16,7 +16,13 @@
       &nbsp;
       = 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
-- 
cgit v1.2.1