added NamespacedProject role. Extended project info displayed for admin. Fixed project limit

11 files changed, 109 insertions, 56 deletions

diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml
index d90d4a03d67..27c22872d50 100644
--- a/app/views/admin/projects/_form.html.haml
+++ b/app/views/admin/projects/_form.html.haml
@@ -19,43 +19,47 @@
       .input
         = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
 
-    - unless project.new_record?
+    - if project.repo_exists?
       .clearfix
-        = f.label :namespace_id
-        .input
-          = f.select :namespace_id, namespaces_options(@project.namespace_id, :all), {}, {class: 'chosen'}
-           
-          %span.cred Be careful. Changing project namespace can have unintended side effects
+        = f.label :default_branch, "Default Branch"
+        .input= f.select(:default_branch, project.heads.map(&:name), {}, style: "width:210px;")
 
-      - if project.repo_exists?
-        .clearfix
-          = f.label :default_branch, "Default Branch"
-          .input= f.select(:default_branch, project.heads.map(&:name), {}, style: "width:210px;")
+  %fieldset.adv_settings
+    %legend Features:
 
-  - unless project.new_record?
-    %fieldset.adv_settings
-      %legend Features:
+    .clearfix
+      = f.label :issues_enabled, "Issues"
+      .input= f.check_box :issues_enabled
 
-      .clearfix
-        = f.label :issues_enabled, "Issues"
-        .input= f.check_box :issues_enabled
+    .clearfix
+      = f.label :merge_requests_enabled, "Merge Requests"
+      .input= f.check_box :merge_requests_enabled
 
-      .clearfix
-        = f.label :merge_requests_enabled, "Merge Requests"
-        .input= f.check_box :merge_requests_enabled
+    .clearfix
+      = f.label :wall_enabled, "Wall"
+      .input= f.check_box :wall_enabled
 
-      .clearfix
-        = f.label :wall_enabled, "Wall"
-        .input= f.check_box :wall_enabled
+    .clearfix
+      = f.label :wiki_enabled, "Wiki"
+      .input= f.check_box :wiki_enabled
+
+  %fieldset.features
+    %legend Transfer:
+    .control-group
+      = f.label :namespace_id do
+        %span Namespace
+      .controls
+        = f.select :namespace_id, namespaces_options(@project.namespace_id, :all), {}, {class: 'chosen'}
+        %br
+        %ul.prepend-top-10.cred
+          %li Be careful. Changing project namespace can have unintended side effects
+          %li You can transfer project only to namespaces you can manage
+          %li You will need to update your local repositories to point to the new location.
 
-      .clearfix
-        = f.label :wiki_enabled, "Wiki"
-        .input= f.check_box :wiki_enabled
 
-  - unless project.new_record?
-    .actions
-      = f.submit 'Save Project', class: "btn save-btn"
-      = link_to 'Cancel', admin_projects_path, class: "btn cancel-btn"
+  .actions
+    = f.submit 'Save Project', class: "btn save-btn"
+    = link_to 'Cancel', admin_projects_path, class: "btn cancel-btn"
 
 
 
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 605a733574c..832bc352b56 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,5 +1,5 @@
 %h3.page_title
-  Projects
+  Projects (#{@projects.count})
   = link_to 'New Project', new_project_path, class: "btn small right"
 %br
 = form_tag admin_projects_path, method: :get, class: 'form-inline' do
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 1ca3128523f..634b1836754 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -47,9 +47,12 @@
   %tr
     %td
       %b
-        Path:
+        Owned by:
     %td
-      %code= @project.path_to_repo
+      - if @project.chief
+        = link_to @project.chief.name, admin_user_path(@project.chief)
+      - else
+        (deleted)
   %tr
     %td
       %b
@@ -59,9 +62,46 @@
   %tr
     %td
       %b
+        Created at:
+    %td
+      = @project.created_at.stamp("March 1, 1999")
+
+%table.zebra-striped
+  %thead
+    %tr
+      %th Repository
+      %th
+  %tr
+    %td
+      %b
+        FS Path:
+    %td
+      %code= @project.path_to_repo
+  %tr
+    %td
+      %b
+        Smart HTTP:
+    %td
+      = link_to @project.http_url_to_repo
+  %tr
+    %td
+      %b
+        SSH:
+    %td
+      = link_to @project.ssh_url_to_repo
+  %tr
+    %td
+      %b
+        Last commit at:
+    %td
+      = last_commit(@project)
+  %tr
+    %td
+      %b
         Post Receive File:
     %td
       = check_box_tag :post_receive_file, 1, @project.has_post_receive_file?, disabled: true
+
 %br
 %h5
   Team
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 7544a732db2..63de1d3af56 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,5 +1,5 @@
 %h3.page_title
-  Users
+  Users (#{@admin_users.count})
   = link_to 'New User', new_admin_user_path, class: "btn small right"
 %br
 
@@ -40,10 +40,13 @@
       %td= user.users_projects.count
       %td= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn small"
       %td.bgred
-        - if user.blocked
-          = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn small success"
+        - if user == current_user
+          %span.cred It's you!
         - else
-          = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger"
-        = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small danger"
+          - if user.blocked
+            = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn small success"
+          - else
+            = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger"
+          = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small danger"
 
 = paginate @admin_users, theme: "admin"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 1af7549c074..852aead79e2 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -40,6 +40,12 @@
   %tr
     %td
       %b
+        Created at:
+    %td
+      = @admin_user.created_at.stamp("March 1, 1999")
+  %tr
+    %td
+      %b
         Projects limit:
     %td
       = @admin_user.projects_limit
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index 1b59c8e81ab..6a36c749123 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -22,22 +22,21 @@
 %hr
 
 -if @hooks.any?
-  %h3
-    Hooks
-    %small (#{@hooks.count})
+  %h3.page_title
+    Hooks (#{@hooks.count})
   %br
   %table
     %thead
       %tr
         %th URL
-        %th Method
         %th
     - @hooks.each do |hook|
       %tr
         %td
+          %span.badge.badge-info POST
           = link_to project_hook_path(@project, hook) do
             %strong= hook.url
-          = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn small right"
-        %td POST
         %td
-          = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small right"
+          .right
+            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn small grouped"
+            = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small grouped"
diff --git a/app/views/projects/create.js.haml b/app/views/projects/create.js.haml
index ce73fe0cf01..d388988676d 100644
--- a/app/views/projects/create.js.haml
+++ b/app/views/projects/create.js.haml
@@ -9,3 +9,4 @@
     $('.project_new_holder').show();
     $("#new_project").replaceWith("#{escape_javascript(render('new_form'))}");
     $('.save-project-loader').hide();
+    new Projects();
diff --git a/app/views/projects/files.html.haml b/app/views/projects/files.html.haml
index 9f7efcdc515..d108308318e 100644
--- a/app/views/projects/files.html.haml
+++ b/app/views/projects/files.html.haml
@@ -17,7 +17,6 @@
           = time_ago_in_words(note.created_at)
           ago
 - else
-  .alert-message.block-message
-    %span All files attached to project wall, issues etc will be displayed here
+  %p.slead All files attached to project wall, issues etc will be displayed here
 
 
diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml
index a2d3a65e6cb..a576500c15d 100644
--- a/app/views/snippets/_snippet.html.haml
+++ b/app/views/snippets/_snippet.html.haml
@@ -1,12 +1,13 @@
 %tr
   %td
+    = image_tag gravatar_icon(snippet.author_email), class: "avatar s24"
     %a{href: project_snippet_path(snippet.project, snippet)}
       %strong= truncate(snippet.title, length: 60)
   %td
     = snippet.file_name
   %td
     %span.cgray
-      - if snippet.expires_at 
+      - if snippet.expires_at
         = snippet.expires_at.to_date.to_s(:short)
       - else
         Never
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 515daec6207..7b8f94de7dd 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,21 +1,21 @@
 = render "projects/project_head"
 
-- if can? current_user, :write_snippet, @project
-  .alert-message.block-message
+%h3.page_title
+  Snippets
+  %small share code pastes with others out of git repository
+
+  - if can? current_user, :write_snippet, @project
     = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do
       Add new snippet
-    Share code pastes with others if it can't be in a git repository
-    %br
-    To add new snippet - click on button.
-
+%br
 %table
   %thead
     %tr
       %th Title
       %th File Name
       %th Expires At
-  = render @snippets.fresh
-  - if @snippets.fresh.empty?
+  = render @snippets
+  - if @snippets.empty?
     %tr
       %td{colspan: 3}
         %h3.nothing_here_message Nothing here.
diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml
index 65f17864814..e5fc4316279 100644
--- a/app/views/team_members/_team.html.haml
+++ b/app/views/team_members/_team.html.haml
@@ -4,7 +4,7 @@
       = Project.access_options.key(access).pluralize
       %small= members.size
     %ul.unstyled
-      - members.each do |up|
+      - members.sort_by(&:user_name).each do |up|
         = render(partial: 'team_members/show', locals: {member: up})