Projects page as dashboard. Old dashboard removed
This commit is contained in:
parent
5f31989a05
commit
95fde9bd7a
|
@ -1,17 +0,0 @@
|
|||
%div.ui-box
|
||||
%h5
|
||||
= link_to "Issues" , "#issues", :id => "issues"
|
||||
%small (assigned to you)
|
||||
%ul.unstyled
|
||||
- @issues.each do |issue|
|
||||
%li.wll
|
||||
= link_to [issue.project, issue] do
|
||||
%p
|
||||
%span.btn.disabled.small= issue.project.name
|
||||
%strong
|
||||
–
|
||||
Issue #
|
||||
= issue.id
|
||||
= truncate issue.title, :length => 50
|
||||
%span.right.cgray
|
||||
= issue.updated_at.stamp("Aug 21, 2011")
|
|
@ -1,12 +0,0 @@
|
|||
- @issues.each do |issue|
|
||||
.wll
|
||||
= link_to [issue.project, issue] do
|
||||
%p
|
||||
%strong
|
||||
%span= issue.project.name
|
||||
–
|
||||
Issue #
|
||||
= issue.id
|
||||
= truncate issue.title, :length => 50
|
||||
%span.right.cgray
|
||||
= issue.updated_at.stamp("Aug 21, 2011")
|
|
@ -1,20 +0,0 @@
|
|||
%div.ui-box
|
||||
%h5
|
||||
= link_to "5 Latest Merge Requests" , "#merge_requests", :id => "merge_requests"
|
||||
%small (authored or assigned to you)
|
||||
%ul.unstyled
|
||||
- @merge_requests.each do |merge_request|
|
||||
%li.wll
|
||||
= link_to [merge_request.project, merge_request] do
|
||||
%p
|
||||
%span.btn.disabled.small= merge_request.project.name
|
||||
%strong
|
||||
–
|
||||
Merge Request ##{merge_request.id}
|
||||
= truncate merge_request.title, :length => 50
|
||||
%span.right.cgray
|
||||
= merge_request.updated_at.stamp("Aug 21, 2011")
|
||||
|
||||
%li.bottom
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
- @merge_requests.each do |merge_request|
|
||||
.wll
|
||||
= link_to [merge_request.project, merge_request] do
|
||||
%p
|
||||
%strong
|
||||
%strong= merge_request.project.name
|
||||
–
|
||||
Merge Request ##{merge_request.id}
|
||||
= truncate merge_request.title, :length => 50
|
||||
%span.right.cgray
|
||||
= merge_request.updated_at.stamp("Aug 21, 2011")
|
|
@ -1,22 +0,0 @@
|
|||
%div
|
||||
%h3
|
||||
%span.ico.projects
|
||||
Projects
|
||||
%small
|
||||
(most recent)
|
||||
%hr
|
||||
%div.dash_projects
|
||||
- projects.first(5).each do |project|
|
||||
%div.dash_project
|
||||
%h4
|
||||
= link_to project, :class => "project_link" do
|
||||
= truncate project.name, :length => 30
|
||||
%small
|
||||
last activity at
|
||||
= project.last_activity_date.stamp("Aug 25, 2011")
|
||||
|
||||
.right
|
||||
%small
|
||||
%strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "neib"
|
||||
%strong= link_to "Commits »", project_commits_path(project)
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
- projects.first(5).each do |project|
|
||||
%div.dash_project_item
|
||||
%h4
|
||||
= link_to project, :class => "project_link" do
|
||||
%span.ico.project
|
||||
= truncate project.name, :length => 24
|
||||
|
||||
%small
|
||||
last activity at
|
||||
= project.last_activity_date.stamp("Aug 25, 2011")
|
||||
|
||||
.right
|
||||
%small
|
||||
%strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "neib gray"
|
||||
%strong= link_to "Commits »", project_commits_path(project), :class => "gray"
|
|
@ -1,82 +0,0 @@
|
|||
- if current_user.require_ssh_key?
|
||||
.alert-message.block-message.error
|
||||
%p
|
||||
You wont be able to pull/push project code unless you
|
||||
= link_to new_key_path, :class => "vlink" do
|
||||
add new key
|
||||
to your profile
|
||||
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
%span.ico.projects
|
||||
= link_to "Projects" , "#projects", :id => "projects"
|
||||
%small
|
||||
(most recent)
|
||||
|
||||
%strong.right
|
||||
= link_to projects_path do
|
||||
Projects list →
|
||||
%hr
|
||||
.dashboard_block
|
||||
.row
|
||||
.span3.right
|
||||
%div.lborder.ipadded
|
||||
%h3
|
||||
= pluralize current_user.projects.count, "project", "projects"
|
||||
- if current_user.can_create_project?
|
||||
%hr
|
||||
%div
|
||||
You can create up to
|
||||
= current_user.projects_limit
|
||||
projects. Click on button below to add a new one
|
||||
.link_holder
|
||||
%br
|
||||
= link_to new_project_path, :class => "btn" do
|
||||
New Project »
|
||||
- else
|
||||
%hr
|
||||
%div
|
||||
You've reached project limit for your account.
|
||||
You cannot create new projects.
|
||||
.link_holder
|
||||
%br
|
||||
= link_to profile_path, :class => "btn" do
|
||||
Your Profile »
|
||||
.span9.left= render "dashboard/projects_feed", :projects => @active_projects
|
||||
- if @last_push && @last_push.valid_push?
|
||||
.padded.prepend-top-20
|
||||
%h5
|
||||
%small Latest push was to the #{@last_push.ref_name} #{@last_push.ref_type} of #{@last_push.project.name}:
|
||||
%ul.unstyled= render @last_push
|
||||
|
||||
- if @merge_requests.any?
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
= link_to "Merge Requests" , "#merge_requests", :id => "merge_requests"
|
||||
|
||||
%small (authored or assigned to you)
|
||||
%strong.right
|
||||
= link_to dashboard_merge_requests_path do
|
||||
Visit merge requests page →
|
||||
%hr
|
||||
.dashboard_block= render "dashboard/merge_requests_feed"
|
||||
|
||||
- if @issues.any?
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
= link_to "Issues" , "#issues", :id => "issues"
|
||||
%small (assigned to you)
|
||||
%strong.right
|
||||
= link_to dashboard_issues_path do
|
||||
Visit issues page →
|
||||
%hr
|
||||
.dashboard_block= render "dashboard/issues_feed"
|
||||
|
||||
- if @events.any?
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
%span.ico.activities
|
||||
= link_to "Activities" , "#activities", :id => "activities"
|
||||
|
||||
%hr
|
||||
.dashboard_block= render @events
|
|
@ -1,6 +1,5 @@
|
|||
%nav.main_menu
|
||||
= render "layouts/const_menu_links"
|
||||
= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path)}"
|
||||
= link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do
|
||||
Issues
|
||||
%span.count= current_user.assigned_issues.opened.count
|
||||
|
|
|
@ -1 +1 @@
|
|||
= link_to "Home", root_path, :class => "home #{"current" if current_page?(dashboard_path) || current_page?(root_path)}", :title => "Home"
|
||||
= link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"
|
||||
|
|
|
@ -1,7 +1,19 @@
|
|||
- if @projects.any?
|
||||
.row
|
||||
.span8
|
||||
= render @events
|
||||
- if current_user.require_ssh_key?
|
||||
.alert.alert-error.padded
|
||||
%span
|
||||
You wont be able to pull/push project code unless you
|
||||
%strong
|
||||
= link_to new_key_path, :class => "vlink" do
|
||||
add new key
|
||||
to your profile
|
||||
- if @events.any?
|
||||
= render @events
|
||||
- else
|
||||
.padded
|
||||
%strong.cgray Projects activity will be displayed here
|
||||
.span4.right
|
||||
%div.leftbar.ui-box
|
||||
%h5
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
= form_tag search_path, :method => :get do |f|
|
||||
.padded
|
||||
= label_tag :search, "Looking for"
|
||||
= label_tag :search do
|
||||
%strong Looking for
|
||||
.input
|
||||
= text_field_tag :search, params[:search],:placeholder => "issue 143", :class => "input-xxlarge"
|
||||
= submit_tag 'Search', :class => "btn btn-primary"
|
||||
|
|
|
@ -38,12 +38,8 @@ Gitlab::Application.routes.draw do
|
|||
get "profile/design", :to => "profile#design"
|
||||
put "profile/update", :to => "profile#update"
|
||||
|
||||
get "dashboard", :to => "dashboard#index"
|
||||
get "dashboard/issues", :to => "dashboard#issues"
|
||||
get "dashboard/merge_requests", :to => "dashboard#merge_requests"
|
||||
get "dashboard/activities", :to => "dashboard#activities"
|
||||
|
||||
#get "profile/:id", :to => "profile#show"
|
||||
|
||||
resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create, :index]
|
||||
resources :keys
|
||||
|
@ -131,5 +127,5 @@ Gitlab::Application.routes.draw do
|
|||
end
|
||||
resources :notes, :only => [:index, :create, :destroy]
|
||||
end
|
||||
root :to => "dashboard#index"
|
||||
root :to => "projects#index"
|
||||
end
|
||||
|
|
40
db/schema.rb
40
db/schema.rb
|
@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
t.integer "assignee_id"
|
||||
t.integer "author_id"
|
||||
t.integer "project_id"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.boolean "closed", :default => false, :null => false
|
||||
t.integer "position", :default => 0
|
||||
t.boolean "critical", :default => false, :null => false
|
||||
|
@ -44,8 +44,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
|
||||
create_table "keys", :force => true do |t|
|
||||
t.integer "user_id"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.text "key"
|
||||
t.string "title"
|
||||
t.string "identifier"
|
||||
|
@ -60,10 +60,10 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
t.integer "assignee_id"
|
||||
t.string "title"
|
||||
t.boolean "closed", :default => false, :null => false
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.text "st_commits", :limit => 4294967295
|
||||
t.text "st_diffs", :limit => 4294967295
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.text "st_commits", :limit => 2147483647
|
||||
t.text "st_diffs", :limit => 2147483647
|
||||
t.boolean "merged", :default => false, :null => false
|
||||
end
|
||||
|
||||
|
@ -84,8 +84,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
t.string "noteable_id"
|
||||
t.string "noteable_type"
|
||||
t.integer "author_id"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.integer "project_id"
|
||||
t.string "attachment"
|
||||
t.string "line_code"
|
||||
|
@ -98,8 +98,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
t.string "name"
|
||||
t.string "path"
|
||||
t.text "description"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.boolean "private_flag", :default => true, :null => false
|
||||
t.string "code"
|
||||
t.integer "owner_id"
|
||||
|
@ -122,8 +122,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
t.text "content"
|
||||
t.integer "author_id", :null => false
|
||||
t.integer "project_id", :null => false
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.string "file_name"
|
||||
t.datetime "expires_at"
|
||||
end
|
||||
|
@ -156,8 +156,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
t.datetime "last_sign_in_at"
|
||||
t.string "current_sign_in_ip"
|
||||
t.string "last_sign_in_ip"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.string "name"
|
||||
t.boolean "admin", :default => false, :null => false
|
||||
t.integer "projects_limit", :default => 10
|
||||
|
@ -177,16 +177,16 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
|
|||
create_table "users_projects", :force => true do |t|
|
||||
t.integer "user_id", :null => false
|
||||
t.integer "project_id", :null => false
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.integer "project_access", :default => 0, :null => false
|
||||
end
|
||||
|
||||
create_table "web_hooks", :force => true do |t|
|
||||
t.string "url"
|
||||
t.integer "project_id"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
end
|
||||
|
||||
create_table "wikis", :force => true do |t|
|
||||
|
|
Loading…
Reference in New Issue