commits + tree in progress
This commit is contained in:
parent
babd0557cb
commit
82d16ccfd1
|
@ -335,11 +335,6 @@ input.ssh_project_url {
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
tbody tr:nth-child(2n) td, tbody tr.even td {
|
|
||||||
background: none repeat scroll 0 0 #F7FBFC;
|
|
||||||
border-top: 1px solid #E2EAEE;
|
|
||||||
border-bottom: 1px solid #E2EAEE;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top_menu_count {
|
.top_menu_count {
|
||||||
background: none repeat scroll 0 0 white;
|
background: none repeat scroll 0 0 white;
|
||||||
|
@ -672,6 +667,42 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
}
|
}
|
||||||
.width-65p{
|
.width-65p{
|
||||||
width:65%;
|
width:65%;
|
||||||
|
}
|
||||||
pre.commit_message {
|
pre.commit_message {
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#container {
|
||||||
|
min-height:100%;
|
||||||
|
}
|
||||||
|
.ui-selectmenu{
|
||||||
|
@include round-borders-all(4px);
|
||||||
|
margin-right:10px;
|
||||||
|
font-size:1.5em;
|
||||||
|
height:auto;
|
||||||
|
font-weight:bold;
|
||||||
|
.ui-selectmenu-status {
|
||||||
|
padding:3px 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
td.code {
|
||||||
|
width: 100%;
|
||||||
|
.highlight {
|
||||||
|
margin-left: 55px;
|
||||||
|
overflow:auto;
|
||||||
|
overflow-y:hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.highlight pre {
|
||||||
|
white-space: pre;
|
||||||
|
word-wrap:normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.highlighttable tr:hover {
|
||||||
|
background:white;
|
||||||
|
}
|
||||||
|
table.highlighttable pre{
|
||||||
|
line-height:16px !important;
|
||||||
|
font-size:12px !important;
|
||||||
|
}
|
||||||
|
|
|
@ -1,16 +1,33 @@
|
||||||
- content_for(:body_class, "project-page commits-page")
|
- content_for(:body_class, "project-page commits-page")
|
||||||
%div
|
|
||||||
%h3
|
.left
|
||||||
.left
|
= form_tag project_commits_path(@project), :method => :get do
|
||||||
= form_tag project_commits_path(@project), :method => :get do
|
= select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
|
||||||
= select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
|
.left
|
||||||
|
= form_tag project_commits_path(@project), :method => :get do
|
||||||
.left.prepend-1
|
= select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
|
||||||
= form_tag project_commits_path(@project), :method => :get do
|
.clear
|
||||||
= select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
|
|
||||||
= text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
|
%br
|
||||||
.clear
|
|
||||||
|
|
||||||
|
-#%a.right.button{:href => "#"} Download
|
||||||
|
-#-if can? current_user, :admin_project, @project
|
||||||
|
%a.right.button.blue{:href => "#"} EDIT
|
||||||
|
%h2.icon
|
||||||
|
%span
|
||||||
|
%a.project-name{:href => "#"}
|
||||||
|
%i.arrow>
|
||||||
|
Project
|
||||||
|
|
||||||
|
%d
|
||||||
|
%a{:href => "#"}
|
||||||
|
= @ref
|
||||||
- if params[:path]
|
- if params[:path]
|
||||||
%h3{:style => "color:#555"} /#{params[:path]}
|
|
||||||
%div{:id => dom_id(@project)}
|
%d
|
||||||
= render "commits"
|
%a{:href => "#"}= params[:path].split("/").join(" / ")
|
||||||
|
|
||||||
|
|
||||||
|
%div{:id => dom_id(@project)}
|
||||||
|
= render "commits"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
%table.round-borders#issues-table
|
%table.round-borders#issues-table
|
||||||
%tr
|
%thead
|
||||||
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
|
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
|
||||||
%th
|
%th
|
||||||
%th Assignee
|
%th Assignee
|
||||||
|
|
|
@ -1,7 +1,2 @@
|
||||||
- if content_for?(:page_title)
|
- if content_for?(:page_title)
|
||||||
= yield :page_title
|
= yield :page_title
|
||||||
- else
|
|
||||||
.grid_4
|
|
||||||
.container_3
|
|
||||||
%h2.icon
|
|
||||||
%span= controller.controller_name.capitalize
|
|
||||||
|
|
|
@ -41,6 +41,5 @@
|
||||||
- if @commit
|
- if @commit
|
||||||
= 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
|
= 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
|
||||||
|
|
||||||
|
|
||||||
.project-content
|
.project-content
|
||||||
= yield
|
= yield
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
%div#new-member-holder
|
%div#new-member-holder
|
||||||
= link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "lbutton vm"
|
= link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "lbutton vm"
|
||||||
%table.round-borders#team-table
|
%table.round-borders#team-table
|
||||||
%tr
|
%thead
|
||||||
%th Name
|
%th Name
|
||||||
%th Email
|
%th Email
|
||||||
%th Web
|
%th Web
|
||||||
|
|
|
@ -1,31 +1,45 @@
|
||||||
%h3
|
.left
|
||||||
.left
|
= form_tag tree_project_path(@project), :method => :get do
|
||||||
= form_tag tree_project_path(@project), :method => :get do
|
= select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
|
||||||
= select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
|
.left
|
||||||
|
= form_tag tree_project_path(@project), :method => :get do
|
||||||
.left.prepend-1
|
= select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
|
||||||
= form_tag tree_project_path(@project), :method => :get do
|
.clear
|
||||||
= select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
|
|
||||||
= text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url","one_click_select"]
|
%br
|
||||||
.clear
|
|
||||||
|
-#%a.right.button{:href => "#"} Download
|
||||||
|
-#-if can? current_user, :admin_project, @project
|
||||||
|
%a.right.button.blue{:href => "#"} EDIT
|
||||||
|
#tree-breadcrumbs
|
||||||
|
%h2.icon
|
||||||
|
%span
|
||||||
|
= link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true, :class => 'project-name' do
|
||||||
|
%i.arrow>
|
||||||
|
= @project.name
|
||||||
|
|
||||||
|
%d
|
||||||
|
%a{:href => "#"}
|
||||||
|
= @ref
|
||||||
|
|
||||||
|
- if params[:path]
|
||||||
|
- part_path = ""
|
||||||
|
- params[:path].split("\/").each do |part|
|
||||||
|
- part_path = File.join(part_path, part) unless part_path.empty?
|
||||||
|
- if part_path.empty?
|
||||||
|
- part_path = part
|
||||||
|
\/
|
||||||
|
= 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
|
||||||
|
|
||||||
|
.clear
|
||||||
|
|
||||||
%h3#tree-breadcrumbs
|
|
||||||
= link_to @project.name, tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true
|
|
||||||
- if params[:path]
|
|
||||||
- part_path = ""
|
|
||||||
- params[:path].split("\/").each do |part|
|
|
||||||
- part_path = File.join(part_path, part) unless part_path.empty?
|
|
||||||
- if part_path.empty?
|
|
||||||
- part_path = part
|
|
||||||
\/
|
|
||||||
= 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
|
|
||||||
#tree-content-holder
|
#tree-content-holder
|
||||||
- if tree.is_a?(Grit::Blob)
|
- if tree.is_a?(Grit::Blob)
|
||||||
= render :partial => "projects/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
|
= render :partial => "projects/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
|
||||||
- else
|
- else
|
||||||
- contents = tree.contents
|
- contents = tree.contents
|
||||||
%table#tree-slider.round-borders
|
%table#tree-slider.round-borders
|
||||||
%tr
|
%thead
|
||||||
%th Name
|
%th Name
|
||||||
%th Last Update
|
%th Last Update
|
||||||
%th
|
%th
|
||||||
|
|
Loading…
Reference in a new issue