Download as
Browse Code »

Commit 82d16ccfd189f5bdc65090ac7af1d4eef1f1774e

Authored by gitlabhq
1 parent babd0557
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

commits + tree in progress

Showing 7 changed files with 105 additions and 49 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @82d16cc
... ... @@ -335,11 +335,6 @@ input.ssh_project_url {
335 335 border-width: 1px;
336 336 }
337 337  
338   -tbody tr:nth-child(2n) td, tbody tr.even td {
339   - background: none repeat scroll 0 0 #F7FBFC;
340   - border-top: 1px solid #E2EAEE;
341   - border-bottom: 1px solid #E2EAEE;
342   -}
343 338  
344 339 .top_menu_count {
345 340 background: none repeat scroll 0 0 white;
... ... @@ -672,6 +667,42 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
672 667 }
673 668 .width-65p{
674 669 width:65%;
  670 +}
675 671 pre.commit_message {
676 672 white-space: pre-wrap;
677 673 }
  674 +
  675 +#container {
  676 + min-height:100%;
  677 +}
  678 +.ui-selectmenu{
  679 + @include round-borders-all(4px);
  680 + margin-right:10px;
  681 + font-size:1.5em;
  682 + height:auto;
  683 + font-weight:bold;
  684 + .ui-selectmenu-status {
  685 + padding:3px 10px;
  686 + }
  687 +}
  688 +
  689 +td.code {
  690 + width: 100%;
  691 + .highlight {
  692 + margin-left: 55px;
  693 + overflow:auto;
  694 + overflow-y:hidden;
  695 + }
  696 +}
  697 +.highlight pre {
  698 + white-space: pre;
  699 + word-wrap:normal;
  700 +}
  701 +
  702 +.highlighttable tr:hover {
  703 + background:white;
  704 +}
  705 +table.highlighttable pre{
  706 + line-height:16px !important;
  707 + font-size:12px !important;
  708 +}
... ...
app/views/commits/index.html.haml
  Diff comments   View file @82d16cc
1 1 - content_for(:body_class, "project-page commits-page")
2   -%div
3   - %h3
4   - .left
5   - = form_tag project_commits_path(@project), :method => :get do
6   - = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
7   -  
8   - .left.prepend-1
9   - = form_tag project_commits_path(@project), :method => :get do
10   - = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
11   - = text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
12   - .clear
  2 +
  3 +.left
  4 + = form_tag project_commits_path(@project), :method => :get do
  5 + = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
  6 +.left
  7 + = form_tag project_commits_path(@project), :method => :get do
  8 + = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
  9 +.clear
  10 +
  11 +%br
  12 +
  13 +
  14 +-#%a.right.button{:href => "#"} Download
  15 +-#-if can? current_user, :admin_project, @project
  16 + %a.right.button.blue{:href => "#"} EDIT
  17 +%h2.icon
  18 + %span
  19 + %a.project-name{:href => "#"}
  20 + %i.arrow>
  21 + Project
  22 +  
  23 + %d
  24 + %a{:href => "#"}
  25 + = @ref
13 26 - if params[:path]
14   - %h3{:style => "color:#555"} /#{params[:path]}
15   - %div{:id => dom_id(@project)}
16   - = render "commits"
  27 +  
  28 + %d
  29 + %a{:href => "#"}= params[:path].split("/").join(" / ")
  30 +
  31 +
  32 +%div{:id => dom_id(@project)}
  33 + = render "commits"
... ...
app/views/issues/_issues.html.haml
  Diff comments   View file @82d16cc
1 1 %table.round-borders#issues-table
2   - %tr
  2 + %thead
3 3 - if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
4 4 %th
5 5 %th Assignee
... ...
app/views/layouts/_page_title.html.haml
  Diff comments   View file @82d16cc
1 1 - if content_for?(:page_title)
2 2 = yield :page_title
3   -- else
4   - .grid_4
5   - .container_3
6   - %h2.icon
7   - %span= controller.controller_name.capitalize
... ...
app/views/layouts/project.html.haml
  Diff comments   View file @82d16cc
... ... @@ -41,6 +41,5 @@
41 41 - if @commit
42 42 = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
43 43  
44   -
45 44 .project-content
46 45 = yield
... ...
app/views/projects/_team.html.haml
  Diff comments   View file @82d16cc
... ... @@ -2,7 +2,7 @@
2 2 %div#new-member-holder
3 3 = link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "lbutton vm"
4 4 %table.round-borders#team-table
5   - %tr
  5 + %thead
6 6 %th Name
7 7 %th Email
8 8 %th Web
... ...
app/views/projects/_tree.html.haml
  Diff comments   View file @82d16cc
1   -%h3
2   - .left
3   - = form_tag tree_project_path(@project), :method => :get do
4   - = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
5   -  
6   - .left.prepend-1
7   - = form_tag tree_project_path(@project), :method => :get do
8   - = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
9   - = text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url","one_click_select"]
10   - .clear
11   -
12   -%h3#tree-breadcrumbs
13   - = link_to @project.name, tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true
14   - - if params[:path]
15   - - part_path = ""
16   - - params[:path].split("\/").each do |part|
17   - - part_path = File.join(part_path, part) unless part_path.empty?
18   - - if part_path.empty?
19   - - part_path = part
20   - \/
21   - = link_to truncate(part, :length => 40), tree_file_project_path(@project, :path => part_path, :commit_id => @commit.try(:id), :branch => @branch, :tag => @tag), :remote => :true
  1 +.left
  2 + = form_tag tree_project_path(@project), :method => :get do
  3 + = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
  4 +.left
  5 + = form_tag tree_project_path(@project), :method => :get do
  6 + = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
  7 +.clear
  8 +
  9 +%br
  10 +
  11 +-#%a.right.button{:href => "#"} Download
  12 +-#-if can? current_user, :admin_project, @project
  13 + %a.right.button.blue{:href => "#"} EDIT
  14 +#tree-breadcrumbs
  15 + %h2.icon
  16 + %span
  17 + = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true, :class => 'project-name' do
  18 + %i.arrow>
  19 + = @project.name
  20 +  
  21 + %d
  22 + %a{:href => "#"}
  23 + = @ref
  24 +
  25 + - if params[:path]
  26 + - part_path = ""
  27 + - params[:path].split("\/").each do |part|
  28 + - part_path = File.join(part_path, part) unless part_path.empty?
  29 + - if part_path.empty?
  30 + - part_path = part
  31 + \/
  32 + = link_to truncate(part, :length => 40), tree_file_project_path(@project, :path => part_path, :commit_id => @commit.try(:id), :branch => @branch, :tag => @tag), :remote => :true
  33 +
  34 +.clear
  35 +
22 36 #tree-content-holder
23 37 - if tree.is_a?(Grit::Blob)
24 38 = render :partial => "projects/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
25 39 - else
26 40 - contents = tree.contents
27 41 %table#tree-slider.round-borders
28   - %tr
  42 + %thead
29 43 %th Name
30 44 %th Last Update
31 45 %th
... ...