Merge branch 'gropu-ldap-info' into 'master'

Show ldap sync info on group pages

Fixes #141

See merge request !142

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

@@ -31,6 +31,17 @@
           %strong
             = @group.created_at.stamp("March 1, 1999")
 
+        - if @group.ldap_cn.present?
+          %li
+            %span.light LDAP group cn:
+            %strong
+              = @group.ldap_cn
+
+          %li
+            %span.light LDAP access level:
+            %strong
+              = @group.human_ldap_access
+
     .panel.panel-default
       .panel-heading
         %h3.panel-title
@@ -50,11 +61,11 @@
         = paginate @projects, param_name: 'projects_page', theme: 'gitlab'
 
     - if @group.shared_projects.any?
-      .ui-box
-        .title
+      .panel.panel-default
+        .panel-heading
           Projects shared with #{@group.name}
-          %small
-            (#{@group.shared_projects.count})
+          %span.badge
+            #{@group.shared_projects.count}
         %ul.well-list
           - @group.shared_projects.sort_by(&:name).each do |project|
             %li

app/views/groups/members.html.haml

@@ -18,7 +18,7 @@
   - if current_user && current_user.can?(:manage_group, @group)
     .pull-right
       - if ldap_enabled? && @group.ldap_cn.present?
-        = link_to reset_access_group_ldap_path(@group), class: 'btn grouped', data: { confirm: "Reset the access level of all other LDAP group team members to '#{@group.human_ldap_access}'?" }, method: :put do
+        = link_to reset_access_group_ldap_path(@group), class: 'btn btn-grouped', data: { confirm: "Reset the access level of all other LDAP group team members to '#{@group.human_ldap_access}'?" }, method: :put do
           Reset access
 
       = link_to '#', class: 'btn btn-new js-toggle-button' do
@@ -28,6 +28,14 @@
     .js-toggle-content.hide.new-group-member-holder
       = render "new_group_member"
 
+- if ldap_enabled? && @group.ldap_cn.present?
+  .bs-callout.bs-callout-info
+    The members of this group are synced with the LDAP group with cn 
+    %code #{@group.ldap_cn}
+    \. They are given 
+    %code #{@group.human_ldap_access}
+    access.
+    
 .panel.panel-default.prepend-top-20
   .panel-heading
     %strong #{@group.name}