Merge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root

[wvm/gitlab.git] / app / views / groups / show.html.haml

diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 0c2eb15..1ce008f 100644 (file)
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,30 +1,26 @@
-.projects
+.dashboard
   .activities.span8
     = render "events/event_last_push", event: @last_push
-    = link_to dashboard_path, class: 'btn very_small' do
+    = link_to dashboard_path, class: 'btn btn-tiny' do
       ← To dashboard
      
-    %span.cgray Events and projects are filtered in scope of group
+    %span.cgray You will only see events from projects in this group
     %hr
-    = render 'shared/no_ssh'
     - if @events.any?
-      .content_list= render @events
+      .content_list
     - else
-      %p.nothing_here_message Projects activity will be displayed here
+      %p.nothing_here_message Project activity will be displayed here
     .loading.hide
-  .side
+  .side.span4
+    - if @group.description.present?
+      .description.well.well-small.light
+        = @group.description
     = render "projects", projects: @projects
-    %div
-      %span.rss-icon
-        = link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
-          = image_tag "rss_ui.png", title: "feed"
-          %strong News Feed
+    .prepend-top-20
+      = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
+        %strong
+          %i.icon-rss
+          News Feed
 
     %hr
-    .gitlab-promo
-      = link_to "Homepage", "http://gitlabhq.com"
-      = link_to "Blog", "http://blog.gitlabhq.com"
-      = link_to "@gitlabhq", "https://twitter.com/gitlabhq"
-
-:javascript
-  $(function(){ Pager.init(20); });
+    = render 'shared/promo'