From 0ae9ac155c2d6d91060e0b0a3d528681aeb0dfe2 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 30 Dec 2011 22:56:13 +0200 Subject: [PATCH] repo tab added. activities page for repo --- app/controllers/repositories_controller.rb | 14 ++++++++++++++ app/helpers/projects_helper.rb | 6 ++++++ app/views/layouts/project.html.haml | 1 + app/views/repositories/_head.html.haml | 19 +++++++++++++++++++ app/views/repositories/show.html.haml | 7 +++++++ config/routes.rb | 2 ++ 6 files changed, 49 insertions(+) create mode 100644 app/controllers/repositories_controller.rb create mode 100644 app/views/repositories/_head.html.haml create mode 100644 app/views/repositories/show.html.haml diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb new file mode 100644 index 00000000000..8e1fc74df89 --- /dev/null +++ b/app/controllers/repositories_controller.rb @@ -0,0 +1,14 @@ +class RepositoriesController < ApplicationController + before_filter :project + + # Authorize + before_filter :add_project_abilities + before_filter :authorize_read_project! + before_filter :require_non_empty_project + + layout "project" + + def show + @activities = @project.fresh_commits(20) + end +end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index cc1d69d46c5..902d278019c 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -33,4 +33,10 @@ module ProjectsHelper :project_id => @project, :id => @ref || @project.root_ref ) ? "current" : nil end + + def repository_tab_class + if controller.controller_name == "repositories" + "current" + end + end end diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 1c9b588476a..5545cc2f269 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -24,6 +24,7 @@ .fixed %aside = link_to "Project", project_path(@project), :class => project_tab_class + = link_to "Repository", project_repository_path(@project), :class => repository_tab_class = link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil = link_to "Network graph", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml new file mode 100644 index 00000000000..7c5ae8da500 --- /dev/null +++ b/app/views/repositories/_head.html.haml @@ -0,0 +1,19 @@ +.merge-tabs.repository + = link_to project_repository_path(@project), :class => "tab #{'active' if current_page?(project_repository_path(@project)) }" do + %span + Activities + = link_to "#", :class => "tab" do + %span + Branches + = link_to "#", :class => "tab" do + %span + Tags + = link_to "#", :class => "tab" do + %span + Hooks + = link_to "#", :class => "tab" do + %span + Deploy Keys + + + diff --git a/app/views/repositories/show.html.haml b/app/views/repositories/show.html.haml new file mode 100644 index 00000000000..494f82b9433 --- /dev/null +++ b/app/views/repositories/show.html.haml @@ -0,0 +1,7 @@ +- content_for(:body_class, "project-page dashboard") += render "head" + +#news-feed.news-feed + .project-box.project-updates.ui-box.ui-box-small.ui-box-big + - @activities.each do |update| + = render "projects/feed", :update => update, :project => @project diff --git a/config/routes.rb b/config/routes.rb index 5888096653a..9e5e15a3abb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -46,6 +46,8 @@ Gitlab::Application.routes.draw do get "files" end + resource :repository + resources :refs, :only => [], :path => "/" do collection do get "switch"