Description added to temas

Andrew8xx8
1 parent 9f45e01e
Showing 9 changed files with 74 additions and 14 deletions Show diff stats
app/assets/stylesheets/application.scss
app/assets/stylesheets/sections/teams.scss
app/models/user_team.rb
app/views/admin/teams/edit.html.haml
app/views/admin/teams/index.html.haml
app/views/admin/teams/new.html.haml
app/views/admin/teams/show.html.haml
app/views/dashboard/_teams.html.haml
db/migrate/20130207104426_add_description_to_teams.rb
@@ -21,6 +21,7 @@
 @import "sections/commits.scss";
 @import "sections/issues.scss";
 @import "sections/groups.scss";
+@import "sections/teams.scss";
 @import "sections/projects.scss";
 @import "sections/snippets.scss";
 @import "sections/votes.scss";
@@ -0,0 +1,31 @@
+.projects {
+  @extend .row;
+  .activities {
+  }
+
+  .side {
+    @extend .right;
+
+    .teams_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;
+    }
+  }
+}
@@ -11,7 +11,7 @@
 #
 class UserTeam < ActiveRecord::Base
-  attr_accessible :name, :owner_id, :path
+  attr_accessible :name, :description, :owner_id, :path
   belongs_to :owner, class_name: User
@@ -26,6 +26,7 @@ class UserTeam &lt; 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" }
-%h3.page_title Rename Team
+%h3.page_title Edit Team
 %hr
 = form_for @team, url: admin_team_path(@team), method: :put do |f|
   - if @team.errors.any?
@@ -10,6 +10,11 @@
     .input
       = f.text_field :name, placeholder: "Example Team", class: "xxlarge"
+  .clearfix.team_description_holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
   .clearfix.team_name_holder
     = f.label :path do
       %span.cred Team path is
@@ -19,5 +24,5 @@
         %li It will change web url for access team and team projects.
   .form-actions
-    = f.submit 'Rename team', class: "btn btn-remove"
+    = f.submit 'Edit team', class: "btn btn-remove"
     = link_to  'Cancel', admin_teams_path, class: "btn btn-cancel"
@@ -16,6 +16,7 @@
       %th
         Name
         %i.icon-sort-down
+      %th Description
       %th Path
       %th Projects
       %th Members
@@ -26,13 +27,14 @@
     %tr
       %td
         %strong= link_to team.name, admin_team_path(team)
+      %td= team.description
       %td= team.path
       %td= team.projects.count
       %td= team.members.count
       %td
         = link_to team.owner.name, admin_user_path(team.owner)
       %td.bgred
-        = link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
+        = link_to 'Edit', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
         = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
 = paginate @teams, theme: "admin"
@@ -9,8 +9,15 @@
       Team name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-      &nbsp;
-      = f.submit 'Create team', class: "btn btn-primary"
+
+  .clearfix.team_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 team', class: "btn btn-primary"
+
   %hr
   .padded
     %ul
@@ -16,7 +16,13 @@
       &nbsp;
       = link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do
         %i.icon-edit
-        Rename
+        Edit
+  %tr
+    %td
+      %b
+        Description:
+    %td
+      = @team.description
   %tr
     %td
       %b
-.ui-box.teams-box
+.ui-box.teams_box
   %h5.title
     Teams
     %small
@@ -12,9 +12,11 @@
       %li
         = link_to team_path(id: team.path), class: dom_class(team) do
           %strong.well-title= truncate(team.name, length: 35)
-        %span.pull-right.light
-          - if team.owner == current_user
-            %i.icon-wrench
-          - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
-          - if tm
-            = tm.access_human
+          %span.edit.light
+            - if team.owner == current_user
+              %i.icon-wrench
+            - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
+            - if tm
+              = tm.access_human
+          %span.description
+            %strong= team.description
@@ -0,0 +1,5 @@
+class AddDescriptionToTeams < ActiveRecord::Migration
+  def change
+    add_column :user_teams, :description, :string, default: '', null: false
+  end
+end
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+.projects {
	2	+ @extend .row;
	3	+ .activities {
	4	+ }
	5	+
	6	+ .side {
	7	+ @extend .right;
	8	+
	9	+ .teams_box {
	10	+ > .title {
	11	+ padding: 2px 15px;
	12	+ }
	13	+ .well-list {
	14	+ li { padding: 15px; }
	15	+ .edit {
	16	+ float: right;
	17	+ margin: 0;
	18	+ }
	19	+ .description {
	20	+ padding-top: 5px;
	21	+ display: block;
	22	+ span, strong {
	23	+ font-size: 12px;
	24	+ color: #666;
	25	+ }
	26	+ }
	27	+ }
	28	+ @extend .ui-box;
	29	+ }
	30	+ }
	31	+}
	@@ -9,8 +9,15 @@		@@ -9,8 +9,15 @@
9	Team name is	9	Team name is
10	.input	10	.input
11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"	11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12	-
13	- = f.submit 'Create team', class: "btn btn-primary"	12	+
		13	+ .clearfix.team_description_holder
		14	+ = f.label :description, "Details"
		15	+ .input
		16	+ = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
		17	+
		18	+ .form-actions
		19	+ = f.submit 'Create team', class: "btn btn-primary"
		20	+
14	%hr	21	%hr
15	.padded	22	.padded
16	%ul	23	%ul
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddDescriptionToTeams < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :user_teams, :description, :string, default: '', null: false
	4	+ end
	5	+end