Commit 5f4a7c3e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Home tab added, Repository tab removed\n Ability to download branch

parent ccbf9781719c
......@@ -98,6 +98,7 @@ a {
}
nav.main_menu {
overflow:hidden;
border-radius: 4px;
margin: auto;
margin:30px $app_padding;
......@@ -116,7 +117,7 @@ nav.main_menu {
.count {
color:#bbb;
color:#aaa;
margin-left:3px;
}
......@@ -149,7 +150,9 @@ nav.main_menu {
&.home {
padding:7px 35px;
background: url(home_icon.PNG) no-repeat center center;
text-indent:-9999px;
min-width:40px;
img {
position:relative;
......@@ -157,7 +160,7 @@ nav.main_menu {
}
}
&.current {
background:#DDD;
background-color:#DDD;
}
}
}
......@@ -346,3 +349,24 @@ img.lil_av {
.well.padded {
padding:29px;
}
.download_repo_link {
background: url("images.png") no-repeat 0 -48px;
padding-left:20px;
}
.number {
border-radius: 4px;
text-shadow: none;
background: rgba(0,0,0,.12);
text-align: center;
padding: 2px 4px;
line-height:20px;
margin-left:2px;
}
table a code {
position: relative;
top: -2px;
margin-right: 3px;
}
......@@ -7,6 +7,7 @@ class ProtectedBranchesController < ApplicationController
before_filter :require_non_empty_project
before_filter :authorize_admin_project!, :only => [:destroy, :create]
before_filter :render_full_content
layout "project"
......
......@@ -5,6 +5,7 @@ class RepositoriesController < ApplicationController
before_filter :add_project_abilities
before_filter :authorize_read_project!
before_filter :require_non_empty_project
before_filter :render_full_content
layout "project"
......
......@@ -22,6 +22,8 @@ def project_tab_class
end
if controller.controller_name == "snippets" ||
controller.controller_name == "hooks" ||
controller.controller_name == "deploy_keys" ||
controller.controller_name == "team_members"
"current"
end
......@@ -33,11 +35,26 @@ def tree_tab_class
end
def repository_tab_class
if controller.controller_name == "repositories" ||
controller.controller_name == "hooks" ||
#if controller.controller_name == "repositories" ||
#controller.controller_name == "hooks" ||
#controller.controller_name == "deploy_keys"
#"current"
#end
end
def commit_tab_class
if controller.controller_name == "commits" ||
controller.controller_name == "repositories" ||
controller.controller_name == "protected_branches"
"current"
end
end
def branches_tab_class
if current_page?(branches_project_repository_path(@project)) ||
controller.controller_name == "protected_branches" ||
controller.controller_name == "deploy_keys"
"current"
current_page?(project_repository_path(@project))
'active'
end
end
end
......@@ -6,12 +6,19 @@
%li{:class => "#{'active' if current_page?(project_commits_path(@project)) }"}
= link_to project_commits_path(@project) do
%span
Commits
%li{:class => "#{'active' if current_page?(compare_project_commits_path(@project)) }"}
= link_to compare_project_commits_path(@project) do
%span
Compare
%li{:class => "#{branches_tab_class}"}
= link_to project_repository_path(@project) do
Branches
%span.number= @project.repo.branches.count
%li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
= link_to tags_project_repository_path(@project) do
Tags
%span.number= @project.repo.tags.count
......
= render "repositories/head"
= render "projects/project_head"
- if can? current_user, :admin_project, @project
.alert-message.block-message
......
%nav.main_menu
= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path) || current_page?(root_path)}"
= render "layouts/const_menu_links"
-#= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path) || current_page?(root_path)}"
= link_to "Issues", dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
= link_to "Requests", dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
= link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
= link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"
%nav.main_menu
= render "layouts/const_menu_links"
= link_to project_path(@project), :class => "#{project_tab_class}", :title => "Project" do
Project
- if @project.repo_exists?
= link_to "Repository", project_repository_path(@project), :class => repository_tab_class
= link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
= link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
= link_to "Commits", project_commits_path(@project), :class => commit_tab_class
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
- if @project.issues_enabled
......
......@@ -6,6 +6,7 @@
= render "layouts/head_panel", :title => "Admin area"
.container
%nav.main_menu
= render "layouts/const_menu_links"
= link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
= link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
= link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
......
......@@ -6,6 +6,7 @@
= render "layouts/head_panel", :title => "Profile"
.container
%nav.main_menu
= render "layouts/const_menu_links"
= link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
= link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
= link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
......
......@@ -16,3 +16,16 @@
%li{ :class => " #{'active' if (controller.controller_name == "snippets") }" }
= link_to project_snippets_path(@project), :class => "snippets-tab tab" do
Snippets
-#%li{:class => "#{'active' if current_page?(project_repository_path(@project)) }"}
-#= link_to project_repository_path(@project) do
-#%span
-#Activities
%li{:class => "#{'active' if controller.controller_name == "hooks" }"}
= link_to project_hooks_path(@project) do
%span
Hooks
%li{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
- if can? current_user, :admin_project, @project
= link_to project_deploy_keys_path(@project) do
%span
Deploy Keys
%tr
%td
= link_to project_commits_path(@project, :ref => branch.name) do
%strong= branch.name
- if branch.name == @project.root_ref
%span.label default
%td
= link_to project_commits_path(@project, branch.commit.id) do
%code= branch.commit.id.to_s[0..10]
= image_tag gravatar_icon(Commit.new(branch.commit).author_email), :class => "", :width => 16
= truncate(Commit.new(branch.commit).safe_message, :length => 40)
%td
%span.update-author.right
= time_ago_in_words(branch.commit.committed_date)
ago
%td
- if can? current_user, :download_code, @project
= link_to "Download", archive_project_repository_path(@project, :ref => branch.name), :class => "visible_link download_repo_link"
= render "repositories/head"
= render "commits/head"
%ul.pills
%li{:class => ("active" if current_page?(branches_project_repository_path(@project)))}
= link_to branches_project_repository_path(@project) do
All
%li{:class => ("active" if current_page?(project_repository_path(@project)))}
= link_to project_repository_path(@project) do
Recent
%li{:class => ("active" if current_page?(project_protected_branches_path(@project)))}
= link_to project_protected_branches_path(@project) do
Protected
%li{:class => ("active" if current_page?(branches_project_repository_path(@project)))}
= link_to branches_project_repository_path(@project) do
All
%hr
......@@ -4,9 +4,13 @@
= link_to project_commits_path(@project, :ref => commit.head.name) do
%strong
= commit.head.name
- if commit.head.name == @project.root_ref
%span.label default
%td
%div
%code= commit.id.to_s[0..10]
= link_to project_commits_path(@project, commit.id) do
%code= commit.id.to_s[0..10]
= image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
= truncate(commit.safe_message, :length => 40)
%td
......
%ul.tabs
%li{:class => "#{'active' if current_page?(project_repository_path(@project)) }"}
= link_to project_repository_path(@project) do
%span
Activities
%li{:class => "#{'active' if current_page?(branches_project_repository_path(@project)) || current_page?(project_protected_branches_path(@project)) }"}
= link_to branches_project_repository_path(@project) do
%span
Branches
%li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
= link_to tags_project_repository_path(@project) do
%span
Tags
%li{:class => "#{'active' if controller.controller_name == "hooks" }"}
= link_to project_hooks_path do
%span
Hooks
%li{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
- if can? current_user, :admin_project, @project
= link_to project_deploy_keys_path(@project) do
%span
Deploy Keys
= render "projects/project_head"
= render "repositories/branches_head"
- unless @branches.empty?
%table.zebra-striped.borders
%thead
%tr
%th Name
%th Last commit
%tbody
- @branches.each do |branch|
%tr
%td
= link_to project_commits_path(@project, :ref => branch.name) do
%strong= branch.name
- if branch.name == @project.root_ref
%span.label default
%td
= link_to project_commits_path(@project, branch.commit.id) do
= truncate branch.commit.id.to_s, :length => 10
= time_ago_in_words(branch.commit.committed_date)
ago
= render "repositories/branch", :branch => branch
= render "head"
%h3
= @project.name
- if can? current_user, :download_code, @project
= link_to "Download", archive_project_repository_path(@project), :class => "btn small right"
%hr
.entry
%p
Last commit was
%small
%code= @activities.first.commit.id.to_s[0..10]
= time_ago_in_words(@activities.first.commit.committed_date)
ago to
= link_to project_commits_path(@project, :ref => @activities.first.head.name), :class => "visible_link" do
%span.label= @activities.first.head.name
.alert-message.block-message.warning
.input
.input-prepend
%span.add-on git clone
= text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
%h5.cgray
Recently updated branches
= render "branches_head"
%table.zebra-striped.borders
- @activities.each do |update|
= render "repositories/feed", :update => update, :project => @project
= render "repositories/branch", :branch => update.head
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment