Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq

app/views/projects/_project_score_index.html.erb

@@ -1,6 +1,6 @@
 <!-- added by bai -->
 
-<%= l(:label_projects_score) %> 
+<div  style="color: #64BDD9;font-size: 14px;font-weight: bold"><%= l(:label_projects_score) %></div>
 <div> = <%= l(:label_issue_score) %> + <%= l(:label_news_score) %> + <%= l(:label_file_score) %> + 
 	  <%= l(:label_code_submit_score) %> + <%= l(:label_topic_score) %></div>
 <div> = <%= format("%.2f" , issue_score(project)).to_i %> + <%= format("%.2f" , news_score(project)).to_i %> +

app/views/projects/_show_projects_score.html.erb

@@ -4,16 +4,16 @@
 <div class="inf_user_image">
 <table style="border-bottom: solid 1px #80a6d2;" width="100%">
 	<tr>
-		<td align="left" valign="middle" ><%= image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
+		<td class="pr_info_logo fl mr10 mb5"><%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %></td>
 	    <td>
 	    	<table>
-	    		<tr class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all"><td><%= @project.name %></td>
+	    		<tr class="info_font" align="center" ><td class="problem_tit fl fb"><%= @project.name %></td>
 	    	    </tr>
 	    	</table>
 	    </td>
 	    <td width="35%">
 	    	<table>
-	    		<tr class="info_font"><td><%= l(:label_projects_score) %></td></tr>
+	    		<tr class="info_font" style="color: #64BDD9;font-size: 14px;font-weight: bold"><td><%= l(:label_projects_score) %></td></tr>
 	    		<tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , project_scores(@project) ).to_i %></span></td></tr>
 	    	</table>
 	    </td>

app/views/repositories/_breadcrumbs.html.erb

@@ -1,7 +1,8 @@
-<%= link_to(@repository.identifier.present? ? h(@repository.identifier) : 'root',
-            :action => 'show', :id => @project,
+<%= 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=>"fl c_blue f14 fb" %>
 <%
    dirs = path.split('/')
    if 'file' == kind
@@ -14,7 +15,7 @@
      link_path << "#{dir}"
 %>
     / <%= link_to h(dir), :action => 'show', :id => @project, :repository_id => @repository.identifier_param,
-                  :path => to_path_param(link_path), :rev => @rev %>
+                  :path => to_path_param(link_path), :rev => @rev  %>
 <% end %>
 <% if filename %>
     / <%= link_to h(filename),
@@ -24,8 +25,8 @@
 <%
    # @rev is revsion or Git and Mercurial branch or tag.
    # For Mercurial *tip*, @rev and @changeset are nil.
-   rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
+   rev_text = @changeset.nil? ? "master" : format_revision(@changeset)
 %>
-<%= "@ #{h rev_text}" unless rev_text.blank? %>
+<p class="fl f14 fb c_grey02"><%= "@ #{h rev_text}" unless rev_text.blank? %></p>
 
 <% html_title(with_leading_slash(path)) -%>

app/views/repositories/_navigation.html.erb

@@ -1,17 +1,17 @@
 <% content_for :header_tags do %>
     <%= javascript_include_tag 'repository_navigation' %>
 <% end %>
-
+<a  href="javascript:void(0);" class="pic_stats fl ml20 mt3"></a>
 <%= link_to l(:label_statistics),
             {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
-            :class => 'icon icon-stats' if @repository.supports_all_revisions? %>
+            :class => 'mt3 c_blue fl' if @repository.supports_all_revisions? %>
 
 <%= 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'}) do -%>
+             {:method => :get, :id => 'revision_selector', :class => "fl c_grey02 ml5"}) do -%>
     <!-- Branches Dropdown -->
     <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
         | <%= l(:label_branch) %>:

app/views/repositories/revisions.html.erb

@@ -1,7 +1,8 @@
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_repository_plural) %></h2>
 </div>
-<div class="contextual">
+<div>
+  <h3><%= l(:label_revision_plural) %></h3>
 <%= form_tag(
        {:controller => 'repositories', :action => 'revision', :id => @project,
         :repository_id => @repository.identifier_param},
@@ -12,7 +13,7 @@
 <% end %>
 </div>
 
-<h3><%= l(:label_revision_plural) %></h3>
+
 
 <%= render :partial => 'revisions',
            :locals => {:project   => @project,

app/views/repositories/show.html.erb

@@ -3,7 +3,7 @@
   <h2 class="project_h2">版本库</h2>
 </div>
 <div class="repository_con" style="line-height:1.9;">
-  <div class="contextual" >
+  <div class="repositorytitle" style="float:left;" >
     <%= render :partial => 'breadcrumbs',
                :locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
     <%= render :partial => 'navigation' %>

public/stylesheets/project.css

@@ -139,6 +139,7 @@ a:hover.c_dblue{ color: #0781b4;}
 .c_dblue{ color:#3e6d8e;}
 .w90{width:90px;}
 .ml10{margin-left:10px;}
+.ml20{margin-left:20px;}
 .resource{  width:670px;}
 .re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
 .re_top input{ float:left;}
@@ -446,6 +447,8 @@ img.ui-datepicker-trigger {
 .repos_files ul li{ float:left;  padding-left:10px; height:26px;}
 .repos_files ul:hover{ background:#ffffdd;}
 .repos_t_c li{ text-align:center;}
+.pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
+
 
 /* 里程碑 */
 .roadmap_box{ background:#f8f8f8; width:648px; padding:10px; margin-top:5px; border:1px solid #ddd; color:#555;}
@@ -511,6 +514,17 @@ p.percent {
     font-size: 0.9em;
 }
 
+.repositorytitle {
+    float: left;
+    white-space: nowrap;
+    line-height: 1.4em;
+    padding-top: 5px;
+    font-size: 12px;
+}
+.repositorytitle select{ width: 110px; height: 21px; }
+
+
+
 /*导出*/
 a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
 p.other-formats { text-align: right; font-size:0.9em; color: #666; }