diff --git a/app/views/repositories/_link_to_functions.html.erb b/app/views/repositories/_link_to_functions.html.erb index f75a7ce5f..fc3784d46 100644 --- a/app/views/repositories/_link_to_functions.html.erb +++ b/app/views/repositories/_link_to_functions.html.erb @@ -1,6 +1,6 @@ <% if @entry && @entry.kind == 'file' %> -

+

<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> | <% if @repository.supports_cat? %> <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> | diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb index 9b37795be..a0a960b6c 100644 --- a/app/views/repositories/_revisions.html.erb +++ b/app/views/repositories/_revisions.html.erb @@ -48,7 +48,7 @@ end %>

- <%= submit_tag(l(:label_view_diff), :name => nil, :class=>"orange_u_btn ") if show_diff %> + <%= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %>

<% end %> diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb index 9d7c4aa30..302c839ba 100644 --- a/app/views/repositories/changes.html.erb +++ b/app/views/repositories/changes.html.erb @@ -10,9 +10,10 @@ <%= render_properties(@properties) %> +
<%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %> - +
<% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> <% end %> diff --git a/app/views/repositories/diff.html.erb b/app/views/repositories/diff.html.erb index 3d206854d..a3afebfff 100644 --- a/app/views/repositories/diff.html.erb +++ b/app/views/repositories/diff.html.erb @@ -5,7 +5,7 @@ :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev=> @rev}, :method => 'get') do %> <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %> -

+

<%= l(:label_view_diff) %>: diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index c4f06f2f0..2f6a4babe 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -595,6 +595,7 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;} /*****项目版本库修订 Tables *****/ + table.list{ border:none; border-collapse: collapse; width: 100%; margin-bottom: 4px; } table.list th { background-color:#EEEEEE; padding: 4px; white-space:pre-line; } table.list td { vertical-align: top; padding-right:10px; } @@ -663,6 +664,7 @@ tr.entry.file td.filename_no_report a { margin-left: 16px; } tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;} tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);} +.icon-folder { background-image: url(../images/folder.png); } .open .icon-folder { background-image: url(../images/folder_open.png); } .icon-file { background-image: url(../images/files/default.png); } .icon-file.text-plain { background-image: url(../images/files/text.png); } diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 28a6f2b02..e940d60cd 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -73,8 +73,11 @@ h4{ font-size:14px; color:#3b3b3b;} .mt5{ margin-top:5px;} .mt8{ margin-top:8px;} .mt10{ margin-top:10px;} +.mt13{ margin-top:13px;} +.mt40{ margin-top:40px;} .mb5{ margin-bottom:5px;} .mb10{ margin-bottom:10px;} +.mb13{ margin-bottom:13px;} .pl15{ padding-left:15px;} .w90{ width:90px;} .w210{ width:210px;}