deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tree view readme support

Browse source
This commit is contained in:
Saito 2011-12-13 00:42:07 +08:00 committed by Jeremy Mack
parent a1cd582c67
commit a39fb5fc25
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
app/assets/stylesheets/projects.css.scss
View file

@ -67,8 +67,8 @@ a {
} }
} }
.view_file .view_file_header, .view_file .view_file_header,
.diff_file .diff_file_header { .diff_file .diff_file_header {
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8)); background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
@ -116,7 +116,7 @@ td.code {
word-wrap:normal; word-wrap:normal;
} }
table.highlighttable { table.highlighttable {
border: none; border: none;
background: #F7F7F7; background: #F7F7F7;
} }
@ -331,7 +331,7 @@ body.project-page table .commit {
border:none; border:none;
text-shadow:none; text-shadow:none;
&.inline { &.inline {
display:inline; display:inline;
} }
@ -430,28 +430,28 @@ body.projects-page input.text.git-url.project_list_url { width:165px; }
body.project-page table.no-borders tr, body.project-page table.no-borders tr,
body.project-page table.no-borders td{ body.project-page table.no-borders td{
border:none; border:none;
} }
#gitlab-tabs { #gitlab-tabs {
.ui-tabs-nav { .ui-tabs-nav {
border-bottom: 1px solid #DEDFE1; border-bottom: 1px solid #DEDFE1;
li { li {
background: none; background: none;
border:none; border:none;
font-size: 16px; font-size: 16px;
margin: 0; margin: 0;
padding: 0; padding: 0;
a { a {
margin: 0; margin: 0;
padding: 10px 16px; padding: 10px 16px;
width:150px; width:150px;
} }
&.ui-tabs-selected { &.ui-tabs-selected {
background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8)); background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8); background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
@ -466,17 +466,28 @@ body.project-page table.no-borders td{
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
} }
} }
} }
} }
.ajax-tab-loading { .ajax-tab-loading {
padding:40px; padding:40px;
display:none; display:none;
} }
#tree-content-holder { float:left; width:100%; } #tree-content-holder { float:left; width:100%; }
#tree-readme-holder {
float:left;
width:100%;
.readme {
@include round-borders-all(4px);
padding: 4px 15px;
background:#F7F7F7;
}
}
/* Commit Page */ /* Commit Page */

8
app/views/refs/_tree.html.haml
View file

@ -21,7 +21,7 @@
%th %th
Last commit Last commit
= link_to "history", tree.history_path, :class => "right" = link_to "history", tree.history_path, :class => "right"
- if tree.up_dir? - if tree.up_dir?
%tr{ :class => "tree-item", :url => tree.up_dir_path } %tr{ :class => "tree-item", :url => tree.up_dir_path }
%td.tree-item-file-name %td.tree-item-file-name
@ -35,6 +35,12 @@
- contents.select{ |i| i.is_a?(Grit::Blob)}.each do |content| - contents.select{ |i| i.is_a?(Grit::Blob)}.each do |content|
= render :partial => "refs/tree_item", :locals => { :content => content } = render :partial => "refs/tree_item", :locals => { :content => content }
- if content = contents.select{ |c| c.is_a?(Grit::Blob) and c.name =~ /^readme\.(md|markdown)$/i }.first
#tree-readme-holder
%h3= content.name
.readme
= markdown(encode content.data)
:javascript :javascript
$(function(){ $(function(){
$('select#branch').selectmenu({style:'popup', width:200}); $('select#branch').selectmenu({style:'popup', width:200});