Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/repositories/_link_to_functions.html.erb

@@ -1,6 +1,6 @@
 <% if @entry && @entry.kind == 'file' %>
 
-<p>
+<p class="mt13 mb13">
 <%= 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 } %> |

app/views/repositories/_revisions.html.erb

@@ -33,7 +33,7 @@ end %>
 <% line_num = 1 %>
 <% revisions.each do |changeset| %>
 <tr class="changeset <%= cycle 'odd', 'even' %>">
-<% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 12}px" : nil) %>
+<% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %>
 <%= content_tag(:td, :class => 'id', :style => id_style) do %>
   <%= link_to_revision(changeset, @repository) %>
 <% end %>
@@ -48,7 +48,7 @@ end %>
 </tbody>
 </table>
 <p style="padding-top: 10px;">
-      <%= 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 %>
 </p>
 
 <% end %>

app/views/repositories/changes.html.erb

@@ -10,9 +10,10 @@
 
 <%= render_properties(@properties) %>
 
+<div class="mt40">
 <%= render(:partial => 'revisions',
            :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
-
+</div>
 <% content_for :header_tags do %>
 <%=   stylesheet_link_tag "scm" %>
 <% end %>

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] %>
-  <p>
+  <p class="mt13 mb13">
     <%= l(:label_view_diff) %>:
     <label><%= radio_button_tag 'type', 'inline', @diff_type != 'sbs', :onchange => "this.form.submit()" %> <%= l(:label_diff_inline) %></label>
     <label><%= radio_button_tag 'type', 'sbs', @diff_type == 'sbs', :onchange => "this.form.submit()" %> <%= l(:label_diff_side_by_side) %></label>

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); }

public/stylesheets/public.css

@@ -74,9 +74,12 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px;}
+.mt13{ margin-top:13px;}
 .mt43{ margin-top:43px;}
+.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;}