1、title数据更新

2、summary调整
3、本版库显示，变更页面
4、相关CSS

app/views/repositories/_breadcrumbs.html.erb

@@ -2,10 +2,11 @@
   <span><%= link_to @repository.identifier.present? ? h(@repository.identifier) : 'root',
                     {:action => 'show', :id => @project,
                      :repository_id => @repository.identifier_param,
-                     :path => nil, :rev => @rev }
+                     :path => nil, :rev => @rev },
+                     :class => "repository-title-dec"
   %>
     /
-    <%=link_to @project.owner, user_path(@project.owner) %>
+    <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %>
   </span>
 </div>
 

app/views/repositories/_navigation.html.erb

@@ -5,26 +5,28 @@
 <%#= link_to l(:label_statistics),
             {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
             :class => 'mt3 c_blue fl' if @repository.supports_all_revisions? %>
+<div class="pt5 ">
+  <%= form_tag({:action => controller.action_name,
+                :id => @project,
+                :repository_id => @repository.identifier_param,
+                :path => to_path_param(@path),
+                :rev => nil},
+               {:method => :get, :id => 'revision_selector', :class => "fl c_grey02"}) do -%>
+      <!-- Branches Dropdown -->
+      <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
+          <%= l(:label_branch) %>:
+          <%= select_tag :branch, options_for_select([''] + @repository.branches, @rev), :id => 'branch' %>
+      <% end -%>
 
-<%= form_tag({:action => controller.action_name,
+      <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
-             :id => @project,
+          | <%= l(:label_tag) %>:
-             :repository_id => @repository.identifier_param,
+          <%= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag' %>
-             :path => to_path_param(@path),
+      <% end -%>
-             :rev => nil},
-             {:method => :get, :id => 'revision_selector', :class => "fl c_grey02 ml5"}) do -%>
-    <!-- Branches Dropdown -->
-    <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
-        <%= l(:label_branch) %>:
-        <%= select_tag :branch, options_for_select([''] + @repository.branches, @rev), :id => 'branch' %>
-    <% end -%>
 
-    <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+      <%# if @repository.supports_all_revisions? %>
-        | <%= l(:label_tag) %>:
+      <%#= l(:label_revision) %>
-        <%= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag' %>
+      <%#= text_field_tag 'rev', @rev, :size => 8 %>
-    <% end -%>
+      <%# end %>
+  <% end -%>
+</div>
 
-    <%# if @repository.supports_all_revisions? %>
-        | <%#= l(:label_revision) %>:
-        <%#= text_field_tag 'rev', @rev, :size => 8 %>
-    <%# end %>
-<% end -%>

app/views/repositories/_summary.html.erb

@@ -7,7 +7,7 @@
           <a data-pjax="" href="/redmine/redmine/commits/0.6-stable">
             <span class="octicon octicon-history"></span>
             <span class="num text-emphasized">
-              <%=link_to @changesets.count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev}, :class => "num text-emphasized" %>
+              <%=link_to @changesets.count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev}, :class => "num text-emphasized c_blue" %>
             </span>
             commits
           </a>
@@ -15,7 +15,7 @@
 
         <li>
           <span class="octicon image-type"></span>
-          <span class="num text-emphasized">
+          <span class="num text-emphasized" style="color: #269AC9">
             <%= @repository.branches.count %>
           </span>
           branches
@@ -24,7 +24,7 @@
         <li>
             <span class="octicon octicon-organization"></span>
             <span class="num text-emphasized">
-               <%=link_to @repository.committers.count, committers_repository_path(@repository) %>
+               <%=link_to @repository.committers.count, committers_repository_path(@repository), :class => "c_blue" %>
             </span>
             contributors
         </li>

app/views/repositories/changes.html.erb

@@ -1,16 +1,19 @@
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
 
-<div class="contextual">
+<div class="project_r_h">
-  <%= render :partial => 'navigation' %>
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
 </div>
 
-<h3><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h3>
+<div class="repository_con " style="line-height:1.9;">
+  <%= render :partial => 'navigation' %>
+  <div class="cl"></div>
+</div>
 
 <%= render :partial => 'link_to_functions' %>
 
 <%= render_properties(@properties) %>
 
-<div class="mt40">
+<div class="mt10">
 <%= render(:partial => 'revisions',
            :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
 </div>

app/views/repositories/show.html.erb

@@ -1,22 +1,16 @@
 <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
-  <h2 class="project_h2">版本库</h2>
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
 </div>
 <div class="repository_con" style="line-height:1.9;">
-  <div class="repositorytitle" style="float:left;">
+  <%= render :partial => 'navigation' %>
-    <%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
-    <%= render :partial => 'navigation' %>
-  </div>
   <div class="cl"></div>
-
   <div class=" c_dark f14">
-    <p>
+    <% if @repository.type.to_s=="Repository::Gitlab" %>
-      <% if @repository.type.to_s=="Repository::Gitlab" %>
           <%= @repos_url %>
-      <% else %>
+    <% else %>
           <%= h @repository.url %>
-      <% end %>
+    <% end %>
-    </p>
   </div>
 </div>
 
@@ -32,7 +26,45 @@
 <%= render_properties(@properties) %>
 
 <!-- 代码修订 -->
+<% if authorize_for('repositories', 'revisions') %>
+    <%# if @changesets && !@changesets.empty? %>
+    <h3>
+      <%= l(:label_latest_revision_plural) %>
+    </h3>
+    <%= render :partial => 'revisions',
+               :locals => {:project => @project, :path => @path,
+                           :revisions => @changesets, :entry => nil} %>
+    <%# end %>
 
+    <p style="padding-top: 10px;">
+      <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
+         sep = '' %>
+      <% if @repository.supports_all_revisions? && @path.blank? %>
+          <%= link_to l(:label_view_all_revisions), {:action => 'revisions', :id => @project,
+                                                     :repository_id => @repository.identifier_param},
+                      :class => "orange_u_btn" %>
+          <% sep = '|' %>
+      <% end %>
+      <% if @repository.supports_directory_revisions? && (has_branches || !@path.blank? || !@rev.blank?) %>
+          <%= sep %>
+          <%= link_to l(:label_view_revisions),
+                      {:action => 'changes',
+                       :path => to_path_param(@path),
+                       :id => @project,
+                       :repository_id => @repository.identifier_param,
+                       :rev => @rev},
+                      :class => "orange_u_btn" %>
+      <% end %>
+    </p>
+    <% if @repository.supports_all_revisions? %>
+        <% content_for :header_tags do %>
+            <%= auto_discovery_link_tag(
+                        :atom, params.merge(
+                        {:format => 'atom', :action => 'revisions',
+                         :id => @project, :page => nil, :key => User.current.rss_key})) %>
+        <% end %>
+    <% end %>
+<% end %>
 
 <!-- added by bai -->
 <p class="fb mt10"><a href="http://<%=Setting.host_name %>/forums/1/memos/1232" class=" c_blue ">点击查看如何提交代码</a></p>

public/stylesheets/project.css

@@ -13,6 +13,7 @@ a:hover.lg-foot{ color:#787b7e;}
 /*右侧内容--动态*/
 .project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
 .project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
+.project_h2_repository{ background:#64bdd9; color:#fff; height:33px; width:auto; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
 .project_h22{ background:#64bdd9; color:#fff; height:33px; width:124px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
 .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
 .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}

public/stylesheets/public.css

@@ -104,6 +104,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px !important;}
 .mt30{ margin-top: 30px;}
+.mt40{ margin-top: 40px;}
 .mt12 { margin-top:12px !important;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
@@ -115,6 +116,8 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
 .pt5{ padding-top:5px;}
+.pt10{ padding-top:10px;}
+.pb5{ padding-bottom: 5px;}
 .w20{ width:20px;}
 .w40{width: 40px;}
 .w45{ width: 45px;}

public/stylesheets/repository.css

@@ -3,10 +3,10 @@
     overflow: hidden;
     font-size: 18px;
     font-weight: bold;
-    color: #444;
     text-overflow: ellipsis;
     vertical-align: top;
     white-space: nowrap;
+    padding: 0px 10px;
 }
 .overall-summary{
     position: relative;
@@ -32,6 +32,7 @@
     display: table;
     width: 100%;
     table-layout: fixed;
+    margin-top: 9px;
 }
 .numbers-summary li{
     display: table-cell;
@@ -53,4 +54,31 @@
     text-decoration: none;
     text-rendering: auto;
     -moz-user-select: none;
+}
+.select2-container {
+    margin: 0px;
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.select2-container .select2-choice {
+    display: block;
+    height: 26px;
+    padding: 0px 0px 0px 8px;
+    overflow: hidden;
+    position: relative;
+    border: 1px solid #AAA;
+    white-space: nowrap;
+    line-height: 26px;
+    color: #444;
+    text-decoration: none;
+    border-radius: 4px;
+    background-clip: padding-box;
+    -moz-user-select: none;
+    background-color: #FFF;
+    background-image: linear-gradient(to top, #EEE 0%, #FFF 50%);
+}
+.repository-title-dec{
+    color: #fff !important;
 }